From 65489cd1069b6e9cb592508103211984c43d3bbf Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Mon, 25 May 2015 20:33:22 -0400
Subject: Merge branch 'feature/block-device-mounting'

---
(limited to 'locale')

diff --git a/locale/en_US.sh b/locale/en_US.sh
index 3063cb0..efcc65b 100644
--- a/locale/en_US.sh
+++ b/locale/en_US.sh
@@ -48,6 +48,13 @@ msg_prokit_cant_lock_sessions='Cannot acquire sessions state lock'
 msg_prokit_install_running='Another instance of prokit is installing this '\
 'system'
 
+# lib/block.sh
+msg_prokit_block_device_invalid='Not a block device: %s'
+msg_prokit_block_mkdir_fail='Failed to create block device mount point "%s"'
+msg_prokit_block_mount_fail='Failed to mount block device "%s"'
+msg_prokit_block_umount_fail='Failed to unmount block device mounted at "%s"'
+msg_prokit_block_rmdir_fail='Failed to remove block device mount point "%s"'
+
 # lib/rand.sh
 msg_prokit_rand_bad_x='Invalid random number generator seed value'
 
@@ -73,7 +80,7 @@ There is NO WARRANTY, to the extent permitted by law.'
 # lib/cmd/install.sh
 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-dir>'
+'<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'
@@ -92,17 +99,17 @@ 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'
-msg_prokit_cmd_shell_usage='<root-dir> [<command> [<argument> ...]]'
+msg_prokit_cmd_shell_usage='<root> [<command> [<argument> ...]]'
 msg_prokit_cmd_shell_exiting='Exiting...'
 
 # lib/cmd/opkg.sh
 msg_prokit_cmd_opkg_summary='manage packages with opkg'
-msg_prokit_cmd_opkg_usage='<root-dir> [<option> ...] <sub-command> '\
+msg_prokit_cmd_opkg_usage='<root> [<option> ...] <sub-command> '\
 '[<argument> ...]'
 
 # lib/cmd/build.sh
 msg_prokit_cmd_build_summary='build a package'
-msg_prokit_cmd_build_usage='<root-dir> [<option> ...] <pkg-dir>'
+msg_prokit_cmd_build_usage='<root> [<option> ...] <pkg-dir>'
 msg_prokit_cmd_build_not_a_dir='Not a directory: %s'
 
 # lib/profile.sh
--
cgit v0.9.1