From 2cd968e982bb9942e6d044270a42de88d8d01b67 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Tue, 26 May 2015 18:07:14 -0400
Subject: Merge branch 'feature/installer-integration'

---
(limited to 'locale/en_US.sh')

diff --git a/locale/en_US.sh b/locale/en_US.sh
index efcc65b..8731c3d 100644
--- a/locale/en_US.sh
+++ b/locale/en_US.sh
@@ -81,21 +81,6 @@ There is NO WARRANTY, to the extent permitted by law.'
 msg_prokit_cmd_install_summary='install a system into a directory'
 msg_prokit_cmd_install_usage='[-a <arch>] [-p <plat>] [-m <mirror>] [-F] '\
 '<suite> <root>'
-msg_prokit_cmd_install_bad_archplat='Invalid combination of architecture "%s" '\
-'and platform "%s"'
-msg_prokit_cmd_install_selected_arch='Using architecture %s'
-msg_prokit_cmd_install_selected_plat='Using platform %s'
-msg_prokit_cmd_install_selected_mirror='Using mirror %s'
-msg_prokit_cmd_install_setting_up_chroot='Setting up root...'
-msg_prokit_cmd_install_chroot_dir_exists='Directory "%s" exists'
-msg_prokit_cmd_install_mkdir_chroot_fail='Failed to create directory "%s"'
-msg_prokit_cmd_install_find_pkgs='Configuring opkg and retrieving Packages '\
-'files...'
-msg_prokit_cmd_install_downloading_pkg='Downloading %s...'
-msg_prokit_cmd_install_downloading_pkg_fail='Failed to download package'
-msg_prokit_cmd_install_unpacking_pkg='Unpacking %s...'
-msg_prokit_cmd_install_configuring='Configuring packages...'
-msg_prokit_cmd_install_checksum_fail='Checksum of package file failed'
 
 # lib/cmd/shell.sh
 msg_prokit_cmd_shell_summary='run a shell in an isolated environment'
@@ -112,8 +97,30 @@ msg_prokit_cmd_build_summary='build a package'
 msg_prokit_cmd_build_usage='<root> [<option> ...] <pkg-dir>'
 msg_prokit_cmd_build_not_a_dir='Not a directory: %s'
 
+# lib/cmd/installer-pc.sh
+msg_prokit_cmd_installer_pc_summary='install a PC system onto a block device'
+msg_prokit_cmd_installer_pc_usage='-a <arch> -p <plat> [-m <mirror>] '\
+'<suite> <device>'
+
 # lib/profile.sh
 msg_prokit_profile_not_found='Profile "%s" not found'
 
 # lib/package.sh
 msg_prokit_package_format_unknown='Unable to detect package format'
+
+# lib/install.sh
+msg_prokit_install_bad_archplat='Invalid combination of architecture "%s" '\
+'and platform "%s"'
+msg_prokit_install_selected_arch='Using architecture %s'
+msg_prokit_install_selected_plat='Using platform %s'
+msg_prokit_install_selected_mirror='Using mirror %s'
+msg_prokit_install_setting_up_chroot='Setting up root...'
+msg_prokit_install_chroot_dir_exists='Directory "%s" exists'
+msg_prokit_install_mkdir_chroot_fail='Failed to create directory "%s"'
+msg_prokit_install_find_pkgs='Configuring opkg and retrieving Packages '\
+'files...'
+msg_prokit_install_downloading_pkg='Downloading %s...'
+msg_prokit_install_downloading_pkg_fail='Failed to download package'
+msg_prokit_install_unpacking_pkg='Unpacking %s...'
+msg_prokit_install_configuring='Configuring packages...'
+msg_prokit_install_checksum_fail='Checksum of package file failed'
--
cgit v0.9.1