* schroot/schroot.conf.5.in: Minor whitespace cleanup.

* TODO: Remove completed item.
* Updated British English translation.
* Apply quoting style to all sources.
* HACKING: Document quoting style for format strings.

21 files changed, 436 insertions, 447 deletions

diff --git a/ChangeLog b/ChangeLog
index ef57006d..2274fd4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2006-07-14  Roger Leigh  <rleigh@debian.org>
 
+	* schroot/schroot.conf.5.in: Minor whitespace cleanup.
+
+	* TODO: Remove completed item.
+
+	* Updated British English translation.
+
+	* Apply quoting style to all sources.
+
+	* HACKING: Document quoting style for format strings.
+
+2006-07-14  Roger Leigh  <rleigh@debian.org>
+
 	* HACKING: Document how to build the printed documentation.
 
 	* Makefile.am: Add ps and pdf phony targets.
diff --git a/HACKING b/HACKING
index fa27934e..a07755a5 100644
--- a/HACKING
+++ b/HACKING
@@ -30,3 +30,22 @@ The following styles are used:
   Cross references       Italics in double quotes  \[lq]\fI...\fP\[rq]
   Verbatim examples      Courier                   \f[CR]
   Verbatim user input    Courier bold              \f[CB]
+
+
+Format strings
+--------------
+
+The sources use boost::format for type-safe formatted output.  Make
+sure that the maximum number of options passed is the same as the
+highest %n% in the format string.
+
+The following styles are used
+
+  Style                  Formatting                Syntax
+  --------------------------------------------------------------------
+  Values                 Single quotes             '
+  Example text           Double quotes             \"
+  User input             Double quotes             \"
+
+These are transformed into proper UTF-8 quotes with gettext.
+
diff --git a/TODO b/TODO
index 1ceb3858..b8859a50 100644
--- a/TODO
+++ b/TODO
@@ -11,12 +11,6 @@ PENDING
 
 * Update documentation schroot.conf examples.
 
-* Review quoting style.
-
-  Use of single and double quotes in strings is inconsistent.  Needs
-  the boost::format markup changes fixing first.  What are other
-  projects doing?
-
 
 PLANNED
 -------
diff --git a/dchroot/dchroot-main-base.cc b/dchroot/dchroot-main-base.cc
index 0a1f14f6..834f2b81 100644
--- a/dchroot/dchroot-main-base.cc
+++ b/dchroot/dchroot-main-base.cc
@@ -67,7 +67,7 @@ main_base::action_config ()
 		<< "# "
 		<< _("To allow users access to the chroots, use the users or groups keys.") << endl;
       std::cout << "# "
-		<< _("To allow passwordless root access, use the root-users or root-groups keys.") << endl;
+		<< _("To allow password-less root access, use the root-users or root-groups keys.") << endl;
       std::cout << "# "
 		<< format(_("Remove '%1%' to use the new configuration."))
 	% DCHROOT_CONF
@@ -93,7 +93,7 @@ main_base::compat_check ()
 	% this->program_name
 	<< endl;
       sbuild::log_info()
-	<< _("Run 'schroot' for full capabilities")
+	<< _("Run \"schroot\" for full capabilities")
 	<< endl;
     }
 }
@@ -110,19 +110,18 @@ main_base::check_dchroot_conf ()
       if (this->options->verbose)
 	{
 	  sbuild::log_warning()
-	    << format(_("Using %1% configuration file: "))
-	    % this->program_name
-	    << DCHROOT_CONF
+	    << format(_("Using %1% configuration file: '%2%'"))
+	    % this->program_name % DCHROOT_CONF
 	    << endl;
 	  sbuild::log_info()
-	    << format(_("Run '%1%'"))
+	    << format(_("Run \"%1%\""))
 	    % "dchroot --config >> " SCHROOT_CONF
 	    << endl;
 	  sbuild::log_info()
 	    << _("to migrate to a schroot configuration.")
 	    << endl;
 	  sbuild::log_info()
-	    << format(_("Edit '%1%' to add appropriate group access."))
+	    << format(_("Edit '%1%' to add appropriate user and/or group access."))
 	    % SCHROOT_CONF
 	    << endl;
 	  sbuild::log_info()
diff --git a/po/en_GB.po b/po/en_GB.po
index 911adf11..ac6a2e85 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: schroot 0.1.2\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2006-07-13 21:29+0100\n"
-"PO-Revision-Date: 2006-07-06 11:10+0100\n"
+"POT-Creation-Date: 2006-07-14 12:11+0100\n"
+"PO-Revision-Date: 2006-07-14 12:12+0100\n"
 "Last-Translator: Roger Leigh <rleigh@debian.org>\n"
 "Language-Team: English <rleigh@debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -32,45 +32,46 @@ msgstr "schroot configuration generated by %1% %2% on %3%"
 
 #: dchroot/dchroot-main-base.cc:68
 msgid "To allow users access to the chroots, use the users or groups keys."
-msgstr ""
+msgstr "To allow users access to the chroots, use the users or groups keys."
 
 #: dchroot/dchroot-main-base.cc:70
 msgid ""
-"To allow passwordless root access, use the root-users or root-groups keys."
+"To allow password-less root access, use the root-users or root-groups keys."
 msgstr ""
+"To allow password-less root access, use the root-users or root-groups keys."
 
-#: dchroot/dchroot-main-base.cc:72 dchroot/dchroot-main-base.cc:129
+#: dchroot/dchroot-main-base.cc:72 dchroot/dchroot-main-base.cc:128
 #, boost-format
 msgid "Remove '%1%' to use the new configuration."
-msgstr ""
+msgstr "Remove ‘%1%’ to use the new configuration."
 
 #: dchroot/dchroot-main-base.cc:92
 #, boost-format
 msgid "Running schroot in %1% compatibility mode"
-msgstr ""
+msgstr "Running schroot in %1% compatibility mode"
 
 #: dchroot/dchroot-main-base.cc:96
-msgid "Run 'schroot' for full capabilities"
-msgstr ""
+msgid "Run \"schroot\" for full capabilities"
+msgstr "Run “schroot” for full capabilities"
 
 #: dchroot/dchroot-main-base.cc:113
 #, boost-format
-msgid "Using %1% configuration file: "
-msgstr ""
+msgid "Using %1% configuration file: '%2%'"
+msgstr "Using %1% configuration file: ‘%2%’"
 
-#: dchroot/dchroot-main-base.cc:118
+#: dchroot/dchroot-main-base.cc:117
 #, boost-format
-msgid "Run '%1%'"
-msgstr ""
+msgid "Run \"%1%\""
+msgstr "Run “%1%”"
 
-#: dchroot/dchroot-main-base.cc:122
+#: dchroot/dchroot-main-base.cc:121
 msgid "to migrate to a schroot configuration."
-msgstr ""
+msgstr "to migrate to a schroot configuration."
 
-#: dchroot/dchroot-main-base.cc:125
+#: dchroot/dchroot-main-base.cc:124
 #, boost-format
-msgid "Edit '%1%' to add appropriate group access."
-msgstr ""
+msgid "Edit '%1%' to add appropriate user and/or group access."
+msgstr "Edit ‘%1%’ to add appropriate user and/or group access."
 
 #: dchroot/dchroot-main.cc:44 schroot/schroot-main.cc:40
 msgid "[OPTION...] [COMMAND] - run command or shell in a chroot"
@@ -149,9 +150,9 @@ msgid "Failed to get hostname"
 msgstr "Failed to get hostname"
 
 #: sbuild/sbuild-auth.cc:54
-#, fuzzy, boost-format
-msgid "User \"%1%\" not found"
-msgstr "User not found"
+#, boost-format
+msgid "User '%1%' not found"
+msgstr "User ‘%1%’ not found"
 
 #: sbuild/sbuild-auth.cc:55
 msgid "Authentication failed"
@@ -207,9 +208,9 @@ msgid "Failed to get terminal settings"
 msgstr "Failed to get terminal settings"
 
 #: sbuild/sbuild-auth-conv-tty.cc:52
-#, fuzzy, boost-format
-msgid "Unsupported conversation type \"%1%\""
-msgstr "Unsupported conversation type"
+#, boost-format
+msgid "Unsupported conversation type '%1%'"
+msgstr "Unsupported conversation type ‘%1%’"
 
 #: sbuild/sbuild-chroot-block-device.cc:185
 msgid "Device"
@@ -228,9 +229,9 @@ msgid "Device name not set"
 msgstr "Device name not set"
 
 #: sbuild/sbuild-chroot.cc:60
-#, fuzzy, boost-format
-msgid "Unknown chroot type \"%1%\""
-msgstr "Unknown chroot type"
+#, boost-format
+msgid "Unknown chroot type '%1%'"
+msgstr "Unknown chroot type ‘%1%’"
 
 #: sbuild/sbuild-chroot.cc:61
 msgid "Device must have an absolute path"
@@ -294,8 +295,8 @@ msgstr "Failed to write session file"
 
 #: sbuild/sbuild-chroot.cc:371
 #, boost-format
-msgid "%1% chroot: personality \"%2%\" is unknown.\n"
-msgstr "%1% chroot: personality “%2%” is unknown.\n"
+msgid "%1% chroot: personality '%2%' is unknown.\n"
+msgstr "%1% chroot: personality ‘%2%’ is unknown.\n"
 
 #: sbuild/sbuild-chroot.cc:374
 #, boost-format
@@ -455,14 +456,14 @@ msgid "Source Root Groups"
 msgstr "Source Root Groups"
 
 #: sbuild/sbuild-dirstream.cc:40
-#, fuzzy, boost-format
-msgid "Failed to open directory \"%1%\""
-msgstr "Failed to open directory"
+#, boost-format
+msgid "Failed to open directory '%1%'"
+msgstr "Failed to open directory ‘%1%’"
 
 #: sbuild/sbuild-dirstream.cc:41
-#, fuzzy, boost-format
-msgid "Failed to read directory \"%1%\""
-msgstr "Failed to open directory"
+#, boost-format
+msgid "Failed to read directory '%1%'"
+msgstr "Failed to read directory ‘%1%’"
 
 #: sbuild/sbuild-format-detail.cc:73
 msgid "true"
@@ -478,54 +479,54 @@ msgid "--- %1% ---"
 msgstr "——— %1% ———"
 
 #: sbuild/sbuild-keyfile.cc:42
-#, fuzzy, boost-format
-msgid "Can't open file \"%4%\""
-msgstr "Can't open file"
+#, boost-format
+msgid "Can't open file '%4%'"
+msgstr "Can't open file ‘%4%’"
 
 #: sbuild/sbuild-keyfile.cc:43
-#, fuzzy, boost-format
-msgid "line %1% [%2%]: Disallowed key \"%4%\" used"
-msgstr "line %1% [%2%]: %3% “%4%”"
+#, boost-format
+msgid "line %1% [%2%]: Disallowed key '%4%' used"
+msgstr "line %1% [%2%]: Disallowed key ‘%4%’ used"
 
 #: sbuild/sbuild-keyfile.cc:44
-#, fuzzy, boost-format
-msgid "[%2%]: Disallowed key \"%4%\" used"
-msgstr "Disallowed key used"
+#, boost-format
+msgid "[%2%]: Disallowed key '%4%' used"
+msgstr "[%2%]: Disallowed key ‘%4%’ used"
 
 #: sbuild/sbuild-keyfile.cc:45
-#, fuzzy, boost-format
-msgid "line %1%: Duplicate group \"%4%\""
-msgstr "Duplicate group"
+#, boost-format
+msgid "line %1%: Duplicate group '%4%'"
+msgstr "line %1%: Duplicate group ‘%4%’"
 
 #: sbuild/sbuild-keyfile.cc:46
-#, fuzzy, boost-format
-msgid "line %1% [%2%]: Duplicate key \"%4%\""
-msgstr "line %1% [%2%]: %3% “%4%”"
+#, boost-format
+msgid "line %1% [%2%]: Duplicate key '%4%'"
+msgstr "line %1% [%2%]: Duplicate key ‘%4%’"
 
 #: sbuild/sbuild-keyfile.cc:47
-#, fuzzy, boost-format
+#, boost-format
 msgid "line %1%: Invalid group: \"%4%\""
-msgstr "line %1%: %2% “%3%”"
+msgstr "line %1%: Invalid group: “%4%”"
 
 #: sbuild/sbuild-keyfile.cc:48
-#, fuzzy, boost-format
+#, boost-format
 msgid "line %1%: Invalid line: \"%4%\""
-msgstr "line %1%: %2% “%3%”"
+msgstr "line %1%: Invalid line: “%4%”"
 
 #: sbuild/sbuild-keyfile.cc:49
-#, fuzzy, boost-format
-msgid "[%1%]: Required key \"%4%\" is missing"
-msgstr "Required key is missing"
+#, boost-format
+msgid "[%1%]: Required key '%4%' is missing"
+msgstr "[%1%]: Required key ‘%4%’ is missing"
 
 #: sbuild/sbuild-keyfile.cc:50
-#, fuzzy, boost-format
+#, boost-format
 msgid "line %1%: No group specified: \"%4%\""
-msgstr "No group specified"
+msgstr "line %1%: No group specified: “%4%”"
 
 #: sbuild/sbuild-keyfile.cc:51
-#, fuzzy, boost-format
+#, boost-format
 msgid "line %1%: No key specified: \"%4%\""
-msgstr "No key specified"
+msgstr "line %1%: No key specified: “%4%”"
 
 #: sbuild/sbuild-keyfile.cc:52
 #, boost-format
@@ -539,8 +540,8 @@ msgstr "line %1% [%2%] %3%: %4%"
 
 #: sbuild/sbuild-keyfile.cc:428
 #, boost-format
-msgid "%1% chroot: A deprecated parameter \"%2%\" has been specified."
-msgstr "%1% chroot: A deprecated parameter “%2%” has been specified."
+msgid "%1% chroot: A deprecated parameter '%2%' has been specified."
+msgstr "%1% chroot: A deprecated parameter ‘%2%’ has been specified."
 
 #: sbuild/sbuild-keyfile.cc:432
 msgid "This option will be removed in the future."
@@ -548,8 +549,8 @@ msgstr "This option will be removed in the future."
 
 #: sbuild/sbuild-keyfile.cc:436
 #, boost-format
-msgid "%1% chroot: An obsolete parameter \"%2%\" has been specified."
-msgstr "%1% chroot: An obsolete parameter “%2%” has been specified."
+msgid "%1% chroot: An obsolete parameter '%2%' has been specified."
+msgstr "%1% chroot: An obsolete parameter ‘%2%’ has been specified."
 
 #: sbuild/sbuild-keyfile.cc:440
 msgid "This option has been removed, and no longer has any effect."
@@ -572,20 +573,22 @@ msgid "Failed to acquire lock"
 msgstr "Failed to acquire lock"
 
 #: sbuild/sbuild-lock.cc:51
-#, fuzzy, boost-format
+#, boost-format
 msgid "Failed to acquire lock (timed out after %4% seconds)"
-msgstr "Failed to acquire lock (timed out)"
+msgstr "Failed to acquire lock (timed out after %4% seconds)"
 
 #: sbuild/sbuild-lock.cc:52
 msgid "Failed to acquire device lock"
 msgstr "Failed to acquire device lock"
 
 #: sbuild/sbuild-lock.cc:53
-#, fuzzy, boost-format
+#, boost-format
 msgid ""
 "Failed to acquire device lock (timed out after %4% seconds; lock held by PID "
 "%5%)"
-msgstr "Failed to acquire device lock (timed out)"
+msgstr ""
+"Failed to acquire device lock (timed out after %4% seconds; lock held by PID "
+"%5%)"
 
 #: sbuild/sbuild-lock.cc:54
 msgid "Failed to test device lock"
@@ -596,26 +599,27 @@ msgid "Failed to release device lock"
 msgstr "Failed to release device lock"
 
 #: sbuild/sbuild-lock.cc:56
-#, fuzzy, boost-format
+#, boost-format
 msgid ""
 "Failed to release device lock (timed out after %4% seconds; lock held by PID "
 "%5%)"
-msgstr "Failed to release device lock (timed out)"
+msgstr ""
+"Failed to release device lock (timed out after %4% seconds; lock held by PID "
+"%5%)"
 
 #: sbuild/sbuild-null.cc:30
-#, fuzzy
 msgid "unknown"
-msgstr "Unknown error"
+msgstr "unknown"
 
 #: sbuild/sbuild-parse-value.cc:37
-#, fuzzy, boost-format
-msgid "Could not parse value \"%1%\""
-msgstr "Could not parse value"
+#, boost-format
+msgid "Could not parse value '%1%'"
+msgstr "Could not parse value ‘%1%’"
 
 #: sbuild/sbuild-personality.cc:48
-#, fuzzy, boost-format
-msgid "Failed to set personality \"%1%\""
-msgstr "Failed to set personality"
+#, boost-format
+msgid "Failed to set personality '%1%'"
+msgstr "Failed to set personality ‘%1%’"
 
 #: sbuild/sbuild-run-parts.cc:48 sbuild/sbuild-session.cc:65
 msgid "Failed to fork child"
@@ -625,25 +629,25 @@ msgstr "Failed to fork child"
 msgid "Wait for child failed"
 msgstr "Wait for child failed"
 
-#: sbuild/sbuild-run-parts.cc:50 sbuild/sbuild-session.cc:75
-#, fuzzy, boost-format
-msgid "Failed to execute \"%1%\""
-msgstr "Failed to execute"
+#: sbuild/sbuild-run-parts.cc:50
+#, boost-format
+msgid "Failed to execute '%1%'"
+msgstr "Failed to execute ‘%1%’"
 
 #: sbuild/sbuild-run-parts.cc:175
 #, boost-format
-msgid "Executing %1%"
-msgstr ""
+msgid "Executing '%1%'"
+msgstr "Executing ‘%1%’"
 
 #: sbuild/sbuild-session.cc:61
-#, fuzzy, boost-format
-msgid "Failed to change to directory \"%1%\""
-msgstr "Failed to change to directory"
+#, boost-format
+msgid "Failed to change to directory '%1%'"
+msgstr "Failed to change to directory ‘%1%’"
 
 #: sbuild/sbuild-session.cc:62
-#, fuzzy, boost-format
-msgid "Falling back to directory \"%4%\""
-msgstr "Falling back to directory"
+#, boost-format
+msgid "Falling back to directory '%4%'"
+msgstr "Falling back to directory ‘%4%’"
 
 #: sbuild/sbuild-session.cc:63
 msgid "Child dumped core"
@@ -654,19 +658,19 @@ msgid "Child exited abnormally (reason unknown; not a signal or core dump)"
 msgstr "Child exited abnormally (reason unknown; not a signal or core dump)"
 
 #: sbuild/sbuild-session.cc:66
-#, fuzzy, boost-format
-msgid "Child terminated by signal \"%4%\""
-msgstr "Child terminated by signal"
+#, boost-format
+msgid "Child terminated by signal '%4%'"
+msgstr "Child terminated by signal ‘%4%’"
 
 #: sbuild/sbuild-session.cc:68
-#, fuzzy, boost-format
-msgid "Failed to change root to directory \"%1%\""
-msgstr "Failed to change root to directory"
+#, boost-format
+msgid "Failed to change root to directory '%1%'"
+msgstr "Failed to change root to directory ‘%1%’"
 
 #: sbuild/sbuild-session.cc:69
-#, fuzzy, boost-format
-msgid "No chroot found matching name or alias \"%1%\""
-msgstr "No chroot found matching alias"
+#, boost-format
+msgid "No chroot found matching name or alias '%1%'"
+msgstr "No chroot found matching name or alias ‘%1%’"
 
 #: sbuild/sbuild-session.cc:70
 msgid "Failed to lock chroot"
@@ -677,18 +681,23 @@ msgid "Chroot setup failed"
 msgstr "Chroot setup failed"
 
 #: sbuild/sbuild-session.cc:72
-#, fuzzy, boost-format
-msgid "Failed to find chroot \"%1%\""
-msgstr "Failed to find chroot"
+#, boost-format
+msgid "Failed to find chroot '%1%'"
+msgstr "Failed to find chroot ‘%1%’"
 
 #: sbuild/sbuild-session.cc:73
 msgid "Failed to unlock chroot"
 msgstr "Failed to unlock chroot"
 
 #: sbuild/sbuild-session.cc:74
-#, fuzzy, boost-format
+#, boost-format
 msgid "Command \"%1%\" must have an absolute path"
-msgstr "Command must have an absolute path"
+msgstr "Command “%1%” must have an absolute path"
+
+#: sbuild/sbuild-session.cc:75
+#, boost-format
+msgid "Failed to execute \"%1%\""
+msgstr "Failed to execute “%1%”"
 
 #: sbuild/sbuild-session.cc:76
 msgid "Failed to get supplementary groups"
@@ -699,32 +708,32 @@ msgid "Failed to get supplementary group count"
 msgstr "Failed to get supplementary group count"
 
 #: sbuild/sbuild-session.cc:78
-#, fuzzy, boost-format
-msgid "Failed to set group \"%1%\""
-msgstr "Failed to set group"
+#, boost-format
+msgid "Failed to set group '%1%'"
+msgstr "Failed to set group ‘%1%’"
 
 #: sbuild/sbuild-session.cc:79
 msgid "Failed to set supplementary groups"
 msgstr "Failed to set supplementary groups"
 
 #: sbuild/sbuild-session.cc:80
-#, fuzzy, boost-format
-msgid "Group \"%1%\" not found"
-msgstr "Group not found"
+#, boost-format
+msgid "Group '%1%' not found"
+msgstr "Group ‘%1%’ not found"
 
 #: sbuild/sbuild-session.cc:82
 msgid "Failed to drop root permissions"
 msgstr "Failed to drop root permissions"
 
 #: sbuild/sbuild-session.cc:83
-#, fuzzy, boost-format
-msgid "Shell \"%1%\" not available"
-msgstr "Shell not available"
+#, boost-format
+msgid "Shell '%1%' not available"
+msgstr "Shell ‘%1%’ not available"
 
 #: sbuild/sbuild-session.cc:84
-#, fuzzy, boost-format
-msgid "Falling back to shell \"%4%\""
-msgstr "Falling back to shell"
+#, boost-format
+msgid "Falling back to shell '%4%'"
+msgstr "Falling back to shell ‘%4%’"
 
 #: sbuild/sbuild-session.cc:85
 msgid "Caught hangup signal"
@@ -735,9 +744,9 @@ msgid "Failed to set hangup signal handler"
 msgstr "Failed to set hangup signal handler"
 
 #: sbuild/sbuild-session.cc:87
-#, fuzzy, boost-format
-msgid "Failed to set user \"%1%\""
-msgstr "Failed to set user"
+#, boost-format
+msgid "Failed to set user '%1%'"
+msgstr "Failed to set user ‘%1%’"
 
 #: sbuild/sbuild-session.cc:88
 msgid "User switching is not permitted"
@@ -745,23 +754,23 @@ msgstr "User switching is not permitted"
 
 #: sbuild/sbuild-session.cc:653
 #, boost-format
-msgid "[%1% chroot] Running login shell: \"%4%\""
-msgstr "[%1% chroot] Running login shell: “%4%”"
+msgid "[%1% chroot] Running login shell: '%4%'"
+msgstr "[%1% chroot] Running login shell: ‘%4%’"
 
 #: sbuild/sbuild-session.cc:655
 #, boost-format
-msgid "[%1% chroot] Running shell: \"%4%\""
-msgstr "[%1% chroot] Running shell: “%4%”"
+msgid "[%1% chroot] Running shell: '%4%'"
+msgstr "[%1% chroot] Running shell: ‘%4%’"
 
 #: sbuild/sbuild-session.cc:661
 #, boost-format
-msgid "[%1% chroot] (%2%->%3%) Running login shell: \"%4%\""
-msgstr "[%1% chroot] (%2%→%3%) Running login shell: “%4%”"
+msgid "[%1% chroot] (%2%->%3%) Running login shell: '%4%'"
+msgstr "[%1% chroot] (%2%→%3%) Running login shell: ‘%4%’"
 
 #: sbuild/sbuild-session.cc:663
 #, boost-format
-msgid "[%1% chroot] (%2%->%3%) Running shell: \"%4%\""
-msgstr "[%1% chroot] (%2%→%3%) Running shell: “%4%”"
+msgid "[%1% chroot] (%2%->%3%) Running shell: '%4%'"
+msgstr "[%1% chroot] (%2%→%3%) Running shell: ‘%4%’"
 
 #: sbuild/sbuild-session.cc:698
 #, boost-format
@@ -785,89 +794,86 @@ msgstr "terminating immediately"
 #: schroot/schroot-base-main.cc:60
 #, boost-format
 msgid "%1% (Debian sbuild) %2% (%3%)\n"
-msgstr ""
+msgstr "%1% (Debian sbuild) %2% (%3%)\n"
 
 #: schroot/schroot-base-main.cc:64
-msgid ""
-"Written by Roger Leigh\n"
-"\n"
-msgstr ""
+msgid "Written by Roger Leigh"
+msgstr "Written by Roger Leigh"
 
 #: schroot/schroot-base-main.cc:65
-msgid "Copyright (C) 2004-2006 Roger Leigh\n"
-msgstr ""
+msgid "Copyright (C) 2004-2006 Roger Leigh"
+msgstr "Copyright © 2004-2006 Roger Leigh"
 
 #: schroot/schroot-base-main.cc:66
 msgid ""
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
+"This is free software; see the source for copying conditions.  There is NO\n"
+"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 
 #: schroot/schroot-base-main.cc:75
 msgid "Usage:"
-msgstr ""
+msgstr "Usage:"
 
 #: schroot/schroot-base-main.cc:103
-#, fuzzy
 msgid "Error saving terminal settings"
-msgstr "Failed to get terminal settings"
+msgstr "Error saving terminal settings"
 
 #: schroot/schroot-base-main.cc:129 schroot/schroot-base-main.cc:157
-#, fuzzy
 msgid "Error restoring terminal settings"
-msgstr "Failed to get terminal settings"
+msgstr "Error restoring terminal settings"
 
 #: schroot/schroot-base-main.cc:143
 #, boost-format
 msgid "Run \"%1% --help\" to list usage example and all available options"
-msgstr ""
+msgstr "Run “%1% --help” to list usage example and all available options"
 
 #: schroot/schroot-base-options.cc:38
 msgid "General options"
-msgstr ""
+msgstr "General options"
 
 #: schroot/schroot-base-options.cc:39
 msgid "Hidden options"
-msgstr ""
+msgstr "Hidden options"
 
 #: schroot/schroot-base-options.cc:77
 msgid "Show help options"
-msgstr ""
+msgstr "Show help options"
 
 #: schroot/schroot-base-options.cc:79
 msgid "Print version information"
-msgstr ""
+msgstr "Print version information"
 
 #: schroot/schroot-base-options.cc:81
 msgid "Show less output"
-msgstr ""
+msgstr "Show less output"
 
 #: schroot/schroot-base-options.cc:83
 msgid "Show more output"
-msgstr ""
+msgstr "Show more output"
 
 #: schroot/schroot-base-options.cc:87
 msgid "Enable debugging messages"
-msgstr ""
+msgstr "Enable debugging messages"
 
 #: schroot/schroot-base-options.cc:123
-#, fuzzy
 msgid "Invalid debug level"
-msgstr "Invalid line"
+msgstr "Invalid debug level"
 
 #: schroot/schroot-listmounts-main.cc:47
 msgid "[OPTION...] - list mount points"
-msgstr ""
+msgstr "[OPTION...] - list mount points"
 
 #: schroot/schroot-listmounts-main.cc:67
-#, fuzzy, boost-format
-msgid "%1%: Failed to open: %2%"
-msgstr "Failed to open file"
+#, boost-format
+msgid "Failed to open '%1%': %2%"
+msgstr "Failed to open ‘%1%’: %2%"
 
 #: schroot/schroot-listmounts-main.cc:90
-#, fuzzy, boost-format
-msgid "%1%: Failed to close: %2%"
-msgstr "Failed to set user"
+#, boost-format
+msgid "Failed to close '%1%': %2%"
+msgstr "Failed to close ‘%1%’: %2%"
 
 #: schroot/schroot-listmounts-options.cc:41
 msgid "Mount"
@@ -888,30 +894,28 @@ msgid "Only one action may be specified"
 msgstr "Only one action may be specified"
 
 #: schroot/schroot-main-base.cc:106
-#, fuzzy, boost-format
+#, boost-format
 msgid "%1%: No such chroot"
-msgstr "No such chroot"
+msgstr "%1%: No such chroot"
 
 #: schroot/schroot-main-base.cc:155
 #, boost-format
-msgid "No chroots are defined in %1% or %2%"
-msgstr ""
+msgid "No chroots are defined in '%1%' or '%2%'"
+msgstr "No chroots are defined in ‘%1%’ or ‘%2%’"
 
 #: schroot/schroot-main-base.cc:163
-#, fuzzy, boost-format
-msgid "No chroots are defined in %1%"
-msgstr "No chroot specified"
+#, boost-format
+msgid "No chroots are defined in '%1%'"
+msgstr "No chroots are defined in ‘%1%’"
 
 #: schroot/schroot-main-base.cc:180
 #, boost-format
-msgid "The specified chroots are not defined in %1%"
-msgstr ""
+msgid "The specified chroots are not defined in '%1%'"
+msgstr "The specified chroots are not defined in ‘%1%’"
 
 #: schroot/schroot-main-base.cc:207
-#, fuzzy
 msgid "Only one chroot may be specified when beginning a session"
-msgstr ""
-"Only one chroot may be specified when recovering, running or ending a session"
+msgstr "Only one chroot may be specified when beginning a session"
 
 #: schroot/schroot-options-base.cc:46
 msgid "Chroot selection"
@@ -996,33 +1000,32 @@ msgid "Force operation, even if it fails"
 msgstr "Force operation, even if it fails"
 
 #: schroot/schroot-releaselock-main.cc:44
-#, fuzzy
 msgid "[OPTION...] - release a device lock"
-msgstr "Failed to release device lock"
+msgstr "[OPTION...] - release a device lock"
 
 #: schroot/schroot-releaselock-main.cc:59
 msgid "No pid specified; forcing release of lock"
-msgstr ""
+msgstr "No pid specified; forcing release of lock"
 
 #: schroot/schroot-releaselock-main.cc:68
-#, fuzzy, boost-format
-msgid "Failed to stat device %1%: %2%"
-msgstr "Failed to stat device"
+#, boost-format
+msgid "Failed to stat device '%1%': %2%"
+msgstr "Failed to stat device ‘%1%’: %2%"
 
 #: schroot/schroot-releaselock-main.cc:76
-#, fuzzy, boost-format
-msgid "%1% is not a block device"
-msgstr "File is not a block device"
+#, boost-format
+msgid "'%1%' is not a block device"
+msgstr "‘%1%’ is not a block device"
 
 #: schroot/schroot-releaselock-main.cc:85
-#, fuzzy, boost-format
+#, boost-format
 msgid "%1%: failed to release device lock"
-msgstr "Failed to release device lock"
+msgstr "%1%: failed to release device lock"
 
 #: schroot/schroot-releaselock-main.cc:93
-#, fuzzy, boost-format
+#, boost-format
 msgid "%1%: failed to release device lock owned by pid %2%"
-msgstr "Failed to release device lock"
+msgstr "%1%: failed to release device lock owned by pid %2%"
 
 #: schroot/schroot-releaselock-options.cc:42
 msgid "Lock"
@@ -1039,51 +1042,3 @@ msgstr "Process ID owning the lock"
 #: schroot/schroot-releaselock-options.cc:88
 msgid "No device specified"
 msgstr "No device specified"
-
-#~ msgid "lock held by pid %1%"
-#~ msgstr "lock held by pid %1%"
-
-#~ msgid "No error"
-#~ msgstr "No error"
-
-#~ msgid "Invalid group"
-#~ msgstr "Invalid group"
-
-#~ msgid "Duplicate key"
-#~ msgstr "Duplicate key"
-
-#~ msgid "%1% \"%2%\""
-#~ msgstr "%1% “%2%”\""
-
-#~ msgid "line %1%: %3%"
-#~ msgstr "line %1%: %3%"
-
-#~ msgid "line %1%: %2%"
-#~ msgstr "line %1%: %2%"
-
-#~ msgid "line %1% [%2%]: %4%"
-#~ msgstr "line %1% [%2%]: %4%"
-
-#~ msgid "line %1% [%2%]: %3%"
-#~ msgstr "line %1% [%2%]: %3%"
-
-#~ msgid "line %1% [%2%] %3%: %5%"
-#~ msgstr "line %1% [%2%] %3%: %5%"
-
-#~ msgid "line %1% [%2%] %3%: %4% \"%5%\""
-#~ msgstr "line %1% [%2%] %3%: %4% “%5%”"
-
-#~ msgid "[%1%]: %3%"
-#~ msgstr "[%1%]: %3%"
-
-#~ msgid "[%1%]: %2% \"%3%\""
-#~ msgstr "[%1%]: %2% “%3%”"
-
-#~ msgid "[%1%]: %2%"
-#~ msgstr "[%1%]: %2%"
-
-#~ msgid "[%1%] %2%: %3% \"%4%\""
-#~ msgstr "[%1%] %2%: %3% “%4%”"
-
-#~ msgid "[%1%] %2%: %3%"
-#~ msgstr "[%1%] %2%: %3%"
diff --git a/po/sv.po b/po/sv.po
index 007f24d8..96eeaf20 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: schroot\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2006-07-13 21:29+0100\n"
+"POT-Creation-Date: 2006-07-14 12:11+0100\n"
 "PO-Revision-Date: 2006-06-17 22:13+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -42,12 +42,12 @@ msgstr ""
 #: dchroot/dchroot-main-base.cc:70
 #, fuzzy
 msgid ""
-"To allow passwordless root access, use the root-users or root-groups keys."
+"To allow password-less root access, use the root-users or root-groups keys."
 msgstr ""
 "För att tillåta lösenordslös rotåtkomst, lägg till deras grupper till "
 "rotgruppsnycklarna."
 
-#: dchroot/dchroot-main-base.cc:72 dchroot/dchroot-main-base.cc:129
+#: dchroot/dchroot-main-base.cc:72 dchroot/dchroot-main-base.cc:128
 #, boost-format
 msgid "Remove '%1%' to use the new configuration."
 msgstr "Ta bort \"%1%\" för att använda den nya konfigurationen."
@@ -59,26 +59,26 @@ msgstr "Kör schroot i dchroot-kompatibelt läge"
 
 #: dchroot/dchroot-main-base.cc:96
 #, fuzzy
-msgid "Run 'schroot' for full capabilities"
+msgid "Run \"schroot\" for full capabilities"
 msgstr "Kör \"schroot\" för fullständiga färdigheter"
 
 #: dchroot/dchroot-main-base.cc:113
 #, fuzzy, boost-format
-msgid "Using %1% configuration file: "
+msgid "Using %1% configuration file: '%2%'"
 msgstr "Använder dchroots konfigurationsfil: "
 
-#: dchroot/dchroot-main-base.cc:118
-#, boost-format
-msgid "Run '%1%'"
+#: dchroot/dchroot-main-base.cc:117
+#, fuzzy, boost-format
+msgid "Run \"%1%\""
 msgstr "Kör \"%1%\""
 
-#: dchroot/dchroot-main-base.cc:122
+#: dchroot/dchroot-main-base.cc:121
 msgid "to migrate to a schroot configuration."
 msgstr "för att migrera till en schroot-konfiguration."
 
-#: dchroot/dchroot-main-base.cc:125
-#, boost-format
-msgid "Edit '%1%' to add appropriate group access."
+#: dchroot/dchroot-main-base.cc:124
+#, fuzzy, boost-format
+msgid "Edit '%1%' to add appropriate user and/or group access."
 msgstr "Redigera \"%1%\" för att lägga till lämplig gruppåtkomst."
 
 #: dchroot/dchroot-main.cc:44 schroot/schroot-main.cc:40
@@ -166,7 +166,7 @@ msgstr "Misslyckades med att hämta värdnamn: %1%"
 
 #: sbuild/sbuild-auth.cc:54
 #, fuzzy, boost-format
-msgid "User \"%1%\" not found"
+msgid "User '%1%' not found"
 msgstr "%1%: användaren hittades inte: %2%"
 
 #: sbuild/sbuild-auth.cc:55
@@ -228,7 +228,7 @@ msgstr "Misslyckades med att få tag på terminalinställningar"
 
 #: sbuild/sbuild-auth-conv-tty.cc:52
 #, fuzzy, boost-format
-msgid "Unsupported conversation type \"%1%\""
+msgid "Unsupported conversation type '%1%'"
 msgstr "Konversationstypen %1% stöds ej"
 
 #: sbuild/sbuild-chroot-block-device.cc:185
@@ -251,7 +251,7 @@ msgstr "%1% chroot: enhetsnamn ej inställt"
 
 #: sbuild/sbuild-chroot.cc:60
 #, fuzzy, boost-format
-msgid "Unknown chroot type \"%1%\""
+msgid "Unknown chroot type '%1%'"
 msgstr "okänd chroot-typ \"%1%\""
 
 #: sbuild/sbuild-chroot.cc:61
@@ -327,8 +327,8 @@ msgid "Failed to write session file"
 msgstr "%1%: misslyckades med att skapa sessionsfil: %2%\n"
 
 #: sbuild/sbuild-chroot.cc:371
-#, boost-format
-msgid "%1% chroot: personality \"%2%\" is unknown.\n"
+#, fuzzy, boost-format
+msgid "%1% chroot: personality '%2%' is unknown.\n"
 msgstr "%1% chroot: personligheten \"%2%\" är okänd.\n"
 
 #: sbuild/sbuild-chroot.cc:374
@@ -500,12 +500,12 @@ msgstr "Källrotgrupper"
 
 #: sbuild/sbuild-dirstream.cc:40
 #, fuzzy, boost-format
-msgid "Failed to open directory \"%1%\""
+msgid "Failed to open directory '%1%'"
 msgstr "%1%: misslyckades med att öppna katalog: %2%"
 
 #: sbuild/sbuild-dirstream.cc:41
 #, fuzzy, boost-format
-msgid "Failed to read directory \"%1%\""
+msgid "Failed to read directory '%1%'"
 msgstr "%1%: misslyckades med att öppna katalog: %2%"
 
 #: sbuild/sbuild-format-detail.cc:73
@@ -523,27 +523,27 @@ msgstr "  --- Chroot ---\n"
 
 #: sbuild/sbuild-keyfile.cc:42
 #, fuzzy, boost-format
-msgid "Can't open file \"%4%\""
+msgid "Can't open file '%4%'"
 msgstr "kan inte öppna fil"
 
 #: sbuild/sbuild-keyfile.cc:43
 #, fuzzy, boost-format
-msgid "line %1% [%2%]: Disallowed key \"%4%\" used"
+msgid "line %1% [%2%]: Disallowed key '%4%' used"
 msgstr "rad %1% [%2%]: %3% \"%4%\""
 
 #: sbuild/sbuild-keyfile.cc:44
 #, fuzzy, boost-format
-msgid "[%2%]: Disallowed key \"%4%\" used"
+msgid "[%2%]: Disallowed key '%4%' used"
 msgstr "ej tillåten nyckel användes"
 
 #: sbuild/sbuild-keyfile.cc:45
 #, fuzzy, boost-format
-msgid "line %1%: Duplicate group \"%4%\""
+msgid "line %1%: Duplicate group '%4%'"
 msgstr "dubblett av grupp"
 
 #: sbuild/sbuild-keyfile.cc:46
 #, fuzzy, boost-format
-msgid "line %1% [%2%]: Duplicate key \"%4%\""
+msgid "line %1% [%2%]: Duplicate key '%4%'"
 msgstr "rad %1% [%2%]: %3% \"%4%\""
 
 #: sbuild/sbuild-keyfile.cc:47
@@ -558,7 +558,7 @@ msgstr "rad %1%: ogiltig rad: %2%"
 
 #: sbuild/sbuild-keyfile.cc:49
 #, fuzzy, boost-format
-msgid "[%1%]: Required key \"%4%\" is missing"
+msgid "[%1%]: Required key '%4%' is missing"
 msgstr "nödvändig nyckel saknas"
 
 #: sbuild/sbuild-keyfile.cc:50
@@ -582,8 +582,8 @@ msgid "line %1% [%2%] %3%: %4%"
 msgstr "rad %1% [%2%] %3%: %4%"
 
 #: sbuild/sbuild-keyfile.cc:428
-#, boost-format
-msgid "%1% chroot: A deprecated parameter \"%2%\" has been specified."
+#, fuzzy, boost-format
+msgid "%1% chroot: A deprecated parameter '%2%' has been specified."
 msgstr "%1% chroot: En gammal parameter \"%2%\" har angivits."
 
 #: sbuild/sbuild-keyfile.cc:432
@@ -591,8 +591,8 @@ msgid "This option will be removed in the future."
 msgstr "Den här flaggan kommer att tas bort i framtiden."
 
 #: sbuild/sbuild-keyfile.cc:436
-#, boost-format
-msgid "%1% chroot: An obsolete parameter \"%2%\" has been specified."
+#, fuzzy, boost-format
+msgid "%1% chroot: An obsolete parameter '%2%' has been specified."
 msgstr "%1% chroot: En föråldrad parameter \"%2%\" har angivits."
 
 #: sbuild/sbuild-keyfile.cc:440
@@ -664,12 +664,12 @@ msgstr "okänt fel"
 
 #: sbuild/sbuild-parse-value.cc:37
 #, fuzzy, boost-format
-msgid "Could not parse value \"%1%\""
+msgid "Could not parse value '%1%'"
 msgstr "kunde inte tolka värde"
 
 #: sbuild/sbuild-personality.cc:48
 #, fuzzy, boost-format
-msgid "Failed to set personality \"%1%\""
+msgid "Failed to set personality '%1%'"
 msgstr "Misslyckades med att få tag på terminalinställningar"
 
 #: sbuild/sbuild-run-parts.cc:48 sbuild/sbuild-session.cc:65
@@ -682,24 +682,24 @@ msgstr "Misslyckades med att grena process: %1%"
 msgid "Wait for child failed"
 msgstr "väntan på barnprocess misslyckades: %1%"
 
-#: sbuild/sbuild-run-parts.cc:50 sbuild/sbuild-session.cc:75
+#: sbuild/sbuild-run-parts.cc:50
 #, fuzzy, boost-format
-msgid "Failed to execute \"%1%\""
+msgid "Failed to execute '%1%'"
 msgstr "misslyckades med att ställa in tidsgräns: %1%"
 
 #: sbuild/sbuild-run-parts.cc:175
 #, boost-format
-msgid "Executing %1%"
+msgid "Executing '%1%'"
 msgstr ""
 
 #: sbuild/sbuild-session.cc:61
 #, fuzzy, boost-format
-msgid "Failed to change to directory \"%1%\""
+msgid "Failed to change to directory '%1%'"
 msgstr "%1%: misslyckades med att öppna katalog: %2%"
 
 #: sbuild/sbuild-session.cc:62
 #, fuzzy, boost-format
-msgid "Falling back to directory \"%4%\""
+msgid "Falling back to directory '%4%'"
 msgstr "Faller tillbaka på hemkatalogen \"%1%\""
 
 #: sbuild/sbuild-session.cc:63
@@ -715,17 +715,17 @@ msgstr ""
 
 #: sbuild/sbuild-session.cc:66
 #, fuzzy, boost-format
-msgid "Child terminated by signal \"%4%\""
+msgid "Child terminated by signal '%4%'"
 msgstr "Barnprocess terminerades av signal \"%1%\""
 
 #: sbuild/sbuild-session.cc:68
 #, fuzzy, boost-format
-msgid "Failed to change root to directory \"%1%\""
+msgid "Failed to change root to directory '%1%'"
 msgstr "%1%: misslyckades med att öppna katalog: %2%"
 
 #: sbuild/sbuild-session.cc:69
 #, fuzzy, boost-format
-msgid "No chroot found matching name or alias \"%1%\""
+msgid "No chroot found matching name or alias '%1%'"
 msgstr "Inget chroot hittades som matchar alias \"%1%\""
 
 #: sbuild/sbuild-session.cc:70
@@ -740,7 +740,7 @@ msgstr "skapandet av chroot misslyckades"
 
 #: sbuild/sbuild-session.cc:72
 #, fuzzy, boost-format
-msgid "Failed to find chroot \"%1%\""
+msgid "Failed to find chroot '%1%'"
 msgstr "%1%: Misslyckades med att hitta chroot"
 
 #: sbuild/sbuild-session.cc:73
@@ -753,6 +753,11 @@ msgstr "%1%: Misslyckades med att hitta chroot"
 msgid "Command \"%1%\" must have an absolute path"
 msgstr ""
 
+#: sbuild/sbuild-session.cc:75
+#, fuzzy, boost-format
+msgid "Failed to execute \"%1%\""
+msgstr "misslyckades med att ställa in tidsgräns: %1%"
+
 #: sbuild/sbuild-session.cc:76
 #, fuzzy
 msgid "Failed to get supplementary groups"
@@ -765,7 +770,7 @@ msgstr "kan inte hämta antalet tilläggsgrupper: %1%"
 
 #: sbuild/sbuild-session.cc:78
 #, fuzzy, boost-format
-msgid "Failed to set group \"%1%\""
+msgid "Failed to set group '%1%'"
 msgstr "misslyckades med att ställa in tidsgräns: %1%"
 
 #: sbuild/sbuild-session.cc:79
@@ -775,7 +780,7 @@ msgstr "Kunde inte sätta id för tilläggsgrupper"
 
 #: sbuild/sbuild-session.cc:80
 #, fuzzy, boost-format
-msgid "Group \"%1%\" not found"
+msgid "Group '%1%' not found"
 msgstr "%1%: grupp hittades inte"
 
 #: sbuild/sbuild-session.cc:82
@@ -785,12 +790,12 @@ msgstr "Misslyckades med att släppa root-rättigheter."
 
 #: sbuild/sbuild-session.cc:83
 #, fuzzy, boost-format
-msgid "Shell \"%1%\" not available"
+msgid "Shell '%1%' not available"
 msgstr "%1%: misslyckades med att läsa status på fil: %2%"
 
 #: sbuild/sbuild-session.cc:84
 #, fuzzy, boost-format
-msgid "Falling back to shell \"%4%\""
+msgid "Falling back to shell '%4%'"
 msgstr "Faller tillbaka på \"%1%\""
 
 #: sbuild/sbuild-session.cc:85
@@ -805,7 +810,7 @@ msgstr "misslyckades med att ställa in påläggningshanterare: %1%"
 
 #: sbuild/sbuild-session.cc:87
 #, fuzzy, boost-format
-msgid "Failed to set user \"%1%\""
+msgid "Failed to set user '%1%'"
 msgstr "misslyckades med att ställa in tidsgräns: %1%"
 
 #: sbuild/sbuild-session.cc:88
@@ -814,22 +819,22 @@ msgstr ""
 
 #: sbuild/sbuild-session.cc:653
 #, fuzzy, boost-format
-msgid "[%1% chroot] Running login shell: \"%4%\""
+msgid "[%1% chroot] Running login shell: '%4%'"
 msgstr "[%1% chroot] Kör inloggningsskal: \"%2%\""
 
 #: sbuild/sbuild-session.cc:655
 #, fuzzy, boost-format
-msgid "[%1% chroot] Running shell: \"%4%\""
+msgid "[%1% chroot] Running shell: '%4%'"
 msgstr "[%1% chroot] Kör skal: \"%2%\""
 
 #: sbuild/sbuild-session.cc:661
-#, boost-format
-msgid "[%1% chroot] (%2%->%3%) Running login shell: \"%4%\""
+#, fuzzy, boost-format
+msgid "[%1% chroot] (%2%->%3%) Running login shell: '%4%'"
 msgstr "[%1% chroot] (%2%->%3%) Kör inloggningsskal: \"%4%\""
 
 #: sbuild/sbuild-session.cc:663
-#, boost-format
-msgid "[%1% chroot] (%2%->%3%) Running shell: \"%4%\""
+#, fuzzy, boost-format
+msgid "[%1% chroot] (%2%->%3%) Running shell: '%4%'"
 msgstr "[%1% chroot] (%2%->%3%) Kör skal: \"%4%\""
 
 #: sbuild/sbuild-session.cc:698
@@ -857,15 +862,15 @@ msgid "%1% (Debian sbuild) %2% (%3%)\n"
 msgstr "%1% (Debian sbuild) %2%\n"
 
 #: schroot/schroot-base-main.cc:64
-msgid ""
-"Written by Roger Leigh\n"
-"\n"
+#, fuzzy
+msgid "Written by Roger Leigh"
 msgstr ""
 "Skriven av Roger Leigh\n"
 "\n"
 
 #: schroot/schroot-base-main.cc:65
-msgid "Copyright (C) 2004-2006 Roger Leigh\n"
+#, fuzzy
+msgid "Copyright (C) 2004-2006 Roger Leigh"
 msgstr "Copyright © 2004-2005 Roger Leigh\n"
 
 #: schroot/schroot-base-main.cc:66
@@ -933,13 +938,13 @@ msgid "[OPTION...] - list mount points"
 msgstr "  schroot-listmounts [FLAGGA...] - lista monteringar"
 
 #: schroot/schroot-listmounts-main.cc:67
-#, boost-format
-msgid "%1%: Failed to open: %2%"
+#, fuzzy, boost-format
+msgid "Failed to open '%1%': %2%"
 msgstr "%1%: Misslyckades med att öppna: %2%"
 
 #: schroot/schroot-listmounts-main.cc:90
-#, boost-format
-msgid "%1%: Failed to close: %2%"
+#, fuzzy, boost-format
+msgid "Failed to close '%1%': %2%"
 msgstr "%1%: Misslyckades med att stänga: %2%"
 
 #: schroot/schroot-listmounts-options.cc:41
@@ -967,18 +972,18 @@ msgid "%1%: No such chroot"
 msgstr "%1%: Inget sådant chroot"
 
 #: schroot/schroot-main-base.cc:155
-#, boost-format
-msgid "No chroots are defined in %1% or %2%"
+#, fuzzy, boost-format
+msgid "No chroots are defined in '%1%' or '%2%'"
 msgstr "Inga chroot angivna i %1% eller %2%"
 
 #: schroot/schroot-main-base.cc:163
-#, boost-format
-msgid "No chroots are defined in %1%"
+#, fuzzy, boost-format
+msgid "No chroots are defined in '%1%'"
 msgstr "Inga chroot angivna i %1%"
 
 #: schroot/schroot-main-base.cc:180
-#, boost-format
-msgid "The specified chroots are not defined in %1%"
+#, fuzzy, boost-format
+msgid "The specified chroots are not defined in '%1%'"
 msgstr "De angivna chroot finns inte angivna i %1%"
 
 #: schroot/schroot-main-base.cc:207
@@ -1079,13 +1084,13 @@ msgid "No pid specified; forcing release of lock"
 msgstr "Ingen pid angiven; tvingar släpp av lås"
 
 #: schroot/schroot-releaselock-main.cc:68
-#, boost-format
-msgid "Failed to stat device %1%: %2%"
+#, fuzzy, boost-format
+msgid "Failed to stat device '%1%': %2%"
 msgstr "Misslyckades med att läsa status på enhet %1%: %2%"
 
 #: schroot/schroot-releaselock-main.cc:76
-#, boost-format
-msgid "%1% is not a block device"
+#, fuzzy, boost-format
+msgid "'%1%' is not a block device"
 msgstr "%1% är inte en blockenhet"
 
 #: schroot/schroot-releaselock-main.cc:85
diff --git a/po/vi.po b/po/vi.po
index e65f0a61..1726ea28 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: schroot-0.99.0-1\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2006-07-13 21:29+0100\n"
+"POT-Creation-Date: 2006-07-14 12:11+0100\n"
 "PO-Revision-Date: 2006-06-22 23:06+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -43,12 +43,12 @@ msgstr ""
 #: dchroot/dchroot-main-base.cc:70
 #, fuzzy
 msgid ""
-"To allow passwordless root access, use the root-users or root-groups keys."
+"To allow password-less root access, use the root-users or root-groups keys."
 msgstr ""
 "Để cho phép việc truy cập kiểu người chủ mà không cần mật khẩu, hãy thêm các "
 "nhóm của họ vào khoá nhóm chủ (root-groups)."
 
-#: dchroot/dchroot-main-base.cc:72 dchroot/dchroot-main-base.cc:129
+#: dchroot/dchroot-main-base.cc:72 dchroot/dchroot-main-base.cc:128
 #, boost-format
 msgid "Remove '%1%' to use the new configuration."
 msgstr "Gỡ bỏ « %1% » để sử dụng cấu hình mới."
@@ -60,26 +60,26 @@ msgstr "Đang chạy schroot trong chế độ tương thích"
 
 #: dchroot/dchroot-main-base.cc:96
 #, fuzzy
-msgid "Run 'schroot' for full capabilities"
+msgid "Run \"schroot\" for full capabilities"
 msgstr "Chạy « schroot » để có khả năng đầy đủ"
 
 #: dchroot/dchroot-main-base.cc:113
 #, fuzzy, boost-format
-msgid "Using %1% configuration file: "
+msgid "Using %1% configuration file: '%2%'"
 msgstr "Đang dùng tập tin cấu hình dchroot: "
 
-#: dchroot/dchroot-main-base.cc:118
-#, boost-format
-msgid "Run '%1%'"
+#: dchroot/dchroot-main-base.cc:117
+#, fuzzy, boost-format
+msgid "Run \"%1%\""
 msgstr "Chạy « %1% »"
 
-#: dchroot/dchroot-main-base.cc:122
+#: dchroot/dchroot-main-base.cc:121
 msgid "to migrate to a schroot configuration."
 msgstr "để nâng cấp lên một cấu hình schroot."
 
-#: dchroot/dchroot-main-base.cc:125
-#, boost-format
-msgid "Edit '%1%' to add appropriate group access."
+#: dchroot/dchroot-main-base.cc:124
+#, fuzzy, boost-format
+msgid "Edit '%1%' to add appropriate user and/or group access."
 msgstr "Hiệu chỉnh « %1% » để thêm cách truy cập nhóm thích hợp."
 
 #: dchroot/dchroot-main.cc:44 schroot/schroot-main.cc:40
@@ -172,7 +172,7 @@ msgstr "Việc lấy tên máy bị lỗi: %1%"
 
 #: sbuild/sbuild-auth.cc:54
 #, fuzzy, boost-format
-msgid "User \"%1%\" not found"
+msgid "User '%1%' not found"
 msgstr "%1%: không tìm thấy người dùng: %2%"
 
 #: sbuild/sbuild-auth.cc:55
@@ -234,7 +234,7 @@ msgstr "Việc lấy thiết lập thiết bị cuối bị lỗi"
 
 #: sbuild/sbuild-auth-conv-tty.cc:52
 #, fuzzy, boost-format
-msgid "Unsupported conversation type \"%1%\""
+msgid "Unsupported conversation type '%1%'"
 msgstr "Kiểu chuyển đổi không được hỗ trợ %1%"
 
 #: sbuild/sbuild-chroot-block-device.cc:185
@@ -257,7 +257,7 @@ msgstr "%1% chroot: chưa lập tên thiết bị"
 
 #: sbuild/sbuild-chroot.cc:60
 #, fuzzy, boost-format
-msgid "Unknown chroot type \"%1%\""
+msgid "Unknown chroot type '%1%'"
 msgstr "không biết kiểu chroot « %1% »"
 
 #: sbuild/sbuild-chroot.cc:61
@@ -333,8 +333,8 @@ msgid "Failed to write session file"
 msgstr "%1%: việc tạo tập tin phiên chạy bị lỗi: %2%\n"
 
 #: sbuild/sbuild-chroot.cc:371
-#, boost-format
-msgid "%1% chroot: personality \"%2%\" is unknown.\n"
+#, fuzzy, boost-format
+msgid "%1% chroot: personality '%2%' is unknown.\n"
 msgstr "%1% chroot: không biết cá tính « %2% ».\n"
 
 #: sbuild/sbuild-chroot.cc:374
@@ -504,12 +504,12 @@ msgstr "Nhóm chủ nguồn"
 
 #: sbuild/sbuild-dirstream.cc:40
 #, fuzzy, boost-format
-msgid "Failed to open directory \"%1%\""
+msgid "Failed to open directory '%1%'"
 msgstr "%1%: việc mở thư mục bị lỗi: %2%"
 
 #: sbuild/sbuild-dirstream.cc:41
 #, fuzzy, boost-format
-msgid "Failed to read directory \"%1%\""
+msgid "Failed to read directory '%1%'"
 msgstr "%1%: việc mở thư mục bị lỗi: %2%"
 
 #: sbuild/sbuild-format-detail.cc:73
@@ -527,27 +527,27 @@ msgstr "  ━━━ Chroot ━━━\n"
 
 #: sbuild/sbuild-keyfile.cc:42
 #, fuzzy, boost-format
-msgid "Can't open file \"%4%\""
+msgid "Can't open file '%4%'"
 msgstr "không thể mở tập tin"
 
 #: sbuild/sbuild-keyfile.cc:43
 #, fuzzy, boost-format
-msgid "line %1% [%2%]: Disallowed key \"%4%\" used"
+msgid "line %1% [%2%]: Disallowed key '%4%' used"
 msgstr "dòng %1% [%2%]: %3% \"%4%\""
 
 #: sbuild/sbuild-keyfile.cc:44
 #, fuzzy, boost-format
-msgid "[%2%]: Disallowed key \"%4%\" used"
+msgid "[%2%]: Disallowed key '%4%' used"
 msgstr "dùng khoá bị cấm"
 
 #: sbuild/sbuild-keyfile.cc:45
 #, fuzzy, boost-format
-msgid "line %1%: Duplicate group \"%4%\""
+msgid "line %1%: Duplicate group '%4%'"
 msgstr "dòng %1%: mục nhập nhóm trùng: %2%"
 
 #: sbuild/sbuild-keyfile.cc:46
 #, fuzzy, boost-format
-msgid "line %1% [%2%]: Duplicate key \"%4%\""
+msgid "line %1% [%2%]: Duplicate key '%4%'"
 msgstr "dòng %1% [%2%]: %3% \"%4%\""
 
 #: sbuild/sbuild-keyfile.cc:47
@@ -562,7 +562,7 @@ msgstr "dòng %1%: dòng không hợp lệ: %2%"
 
 #: sbuild/sbuild-keyfile.cc:49
 #, fuzzy, boost-format
-msgid "[%1%]: Required key \"%4%\" is missing"
+msgid "[%1%]: Required key '%4%' is missing"
 msgstr "thiếu khoá cần thiết"
 
 #: sbuild/sbuild-keyfile.cc:50
@@ -586,8 +586,8 @@ msgid "line %1% [%2%] %3%: %4%"
 msgstr "dòng %1% [%2%] %3%: %4%"
 
 #: sbuild/sbuild-keyfile.cc:428
-#, boost-format
-msgid "%1% chroot: A deprecated parameter \"%2%\" has been specified."
+#, fuzzy, boost-format
+msgid "%1% chroot: A deprecated parameter '%2%' has been specified."
 msgstr "%1% chroot: một tham số bị phản đối « %2% » đã được ghi rõ."
 
 #: sbuild/sbuild-keyfile.cc:432
@@ -595,8 +595,8 @@ msgid "This option will be removed in the future."
 msgstr "Tùy chọn này sẽ bị gỡ bỏ trong tương lai."
 
 #: sbuild/sbuild-keyfile.cc:436
-#, boost-format
-msgid "%1% chroot: An obsolete parameter \"%2%\" has been specified."
+#, fuzzy, boost-format
+msgid "%1% chroot: An obsolete parameter '%2%' has been specified."
 msgstr "%1% chroot: một tham số cũ « %2% » đã được ghi rõ."
 
 #: sbuild/sbuild-keyfile.cc:440
@@ -666,12 +666,12 @@ msgstr "lỗi không rõ"
 
 #: sbuild/sbuild-parse-value.cc:37
 #, fuzzy, boost-format
-msgid "Could not parse value \"%1%\""
+msgid "Could not parse value '%1%'"
 msgstr "không thể phân tách giá trị"
 
 #: sbuild/sbuild-personality.cc:48
 #, fuzzy, boost-format
-msgid "Failed to set personality \"%1%\""
+msgid "Failed to set personality '%1%'"
 msgstr "Việc lấy thiết lập thiết bị cuối bị lỗi"
 
 #: sbuild/sbuild-run-parts.cc:48 sbuild/sbuild-session.cc:65
@@ -684,24 +684,24 @@ msgstr "Việc tạo tiến trình con của điều con bị lỗi: %1%"
 msgid "Wait for child failed"
 msgstr "việc đợi tiến trình con bị lỗi: %1%"
 
-#: sbuild/sbuild-run-parts.cc:50 sbuild/sbuild-session.cc:75
+#: sbuild/sbuild-run-parts.cc:50
 #, fuzzy, boost-format
-msgid "Failed to execute \"%1%\""
+msgid "Failed to execute '%1%'"
 msgstr "việc lập thời hạn bị lỗi: %1%"
 
 #: sbuild/sbuild-run-parts.cc:175
 #, boost-format
-msgid "Executing %1%"
+msgid "Executing '%1%'"
 msgstr ""
 
 #: sbuild/sbuild-session.cc:61
 #, fuzzy, boost-format
-msgid "Failed to change to directory \"%1%\""
+msgid "Failed to change to directory '%1%'"
 msgstr "%1%: việc mở thư mục bị lỗi: %2%"
 
 #: sbuild/sbuild-session.cc:62
 #, fuzzy, boost-format
-msgid "Falling back to directory \"%4%\""
+msgid "Falling back to directory '%4%'"
 msgstr "Đang dự trữ về thư mục chính « %1 »"
 
 #: sbuild/sbuild-session.cc:63
@@ -716,17 +716,17 @@ msgstr ""
 
 #: sbuild/sbuild-session.cc:66
 #, fuzzy, boost-format
-msgid "Child terminated by signal \"%4%\""
+msgid "Child terminated by signal '%4%'"
 msgstr "Tiến trình con bị chấm dứt do tín hiệu « %1% »"
 
 #: sbuild/sbuild-session.cc:68
 #, fuzzy, boost-format
-msgid "Failed to change root to directory \"%1%\""
+msgid "Failed to change root to directory '%1%'"
 msgstr "%1%: việc mở thư mục bị lỗi: %2%"
 
 #: sbuild/sbuild-session.cc:69
 #, fuzzy, boost-format
-msgid "No chroot found matching name or alias \"%1%\""
+msgid "No chroot found matching name or alias '%1%'"
 msgstr "Không tìm thấy chroot khớp với biệt hiệu « %1% »"
 
 #: sbuild/sbuild-session.cc:70
@@ -741,7 +741,7 @@ msgstr "việc tạo chroot bị lỗi"
 
 #: sbuild/sbuild-session.cc:72
 #, fuzzy, boost-format
-msgid "Failed to find chroot \"%1%\""
+msgid "Failed to find chroot '%1%'"
 msgstr "%1%: việc tìm chroot bị lỗi"
 
 #: sbuild/sbuild-session.cc:73
@@ -754,6 +754,11 @@ msgstr "%1%: việc tìm chroot bị lỗi"
 msgid "Command \"%1%\" must have an absolute path"
 msgstr ""
 
+#: sbuild/sbuild-session.cc:75
+#, fuzzy, boost-format
+msgid "Failed to execute \"%1%\""
+msgstr "việc lập thời hạn bị lỗi: %1%"
+
 #: sbuild/sbuild-session.cc:76
 #, fuzzy
 msgid "Failed to get supplementary groups"
@@ -766,7 +771,7 @@ msgstr "không thể lấy số đếm nhóm phụ : %1%"
 
 #: sbuild/sbuild-session.cc:78
 #, fuzzy, boost-format
-msgid "Failed to set group \"%1%\""
+msgid "Failed to set group '%1%'"
 msgstr "việc lập thời hạn bị lỗi: %1%"
 
 #: sbuild/sbuild-session.cc:79
@@ -776,7 +781,7 @@ msgstr "Không thể lập các ID nhóm phụ"
 
 #: sbuild/sbuild-session.cc:80
 #, fuzzy, boost-format
-msgid "Group \"%1%\" not found"
+msgid "Group '%1%' not found"
 msgstr "%1%: không tìm thấy nhóm"
 
 #: sbuild/sbuild-session.cc:82
@@ -786,12 +791,12 @@ msgstr "Việc bỏ quyền chủ bị lỗi."
 
 #: sbuild/sbuild-session.cc:83
 #, fuzzy, boost-format
-msgid "Shell \"%1%\" not available"
+msgid "Shell '%1%' not available"
 msgstr "%1%: việc lấy các thông tin về tập tin bị lỗi: %2%"
 
 #: sbuild/sbuild-session.cc:84
 #, fuzzy, boost-format
-msgid "Falling back to shell \"%4%\""
+msgid "Falling back to shell '%4%'"
 msgstr "Đang dự trữ về « %1 »"
 
 #: sbuild/sbuild-session.cc:85
@@ -806,7 +811,7 @@ msgstr "lỗi lập bộ quản lý ngừng nói : %1%"
 
 #: sbuild/sbuild-session.cc:87
 #, fuzzy, boost-format
-msgid "Failed to set user \"%1%\""
+msgid "Failed to set user '%1%'"
 msgstr "việc lập thời hạn bị lỗi: %1%"
 
 #: sbuild/sbuild-session.cc:88
@@ -815,22 +820,22 @@ msgstr ""
 
 #: sbuild/sbuild-session.cc:653
 #, fuzzy, boost-format
-msgid "[%1% chroot] Running login shell: \"%4%\""
+msgid "[%1% chroot] Running login shell: '%4%'"
 msgstr "[%1% chroot] Đang chạy hệ vỏ đăng nhập: « %2% »"
 
 #: sbuild/sbuild-session.cc:655
 #, fuzzy, boost-format
-msgid "[%1% chroot] Running shell: \"%4%\""
+msgid "[%1% chroot] Running shell: '%4%'"
 msgstr "[%1% chroot] Đang chạy hệ vỏ đăng nhập: « %2% »"
 
 #: sbuild/sbuild-session.cc:661
-#, boost-format
-msgid "[%1% chroot] (%2%->%3%) Running login shell: \"%4%\""
+#, fuzzy, boost-format
+msgid "[%1% chroot] (%2%->%3%) Running login shell: '%4%'"
 msgstr "[%1% chroot] (%2%->%3%) Đang chạy hệ vỏ đăng nhập: « %4% »"
 
 #: sbuild/sbuild-session.cc:663
-#, boost-format
-msgid "[%1% chroot] (%2%->%3%) Running shell: \"%4%\""
+#, fuzzy, boost-format
+msgid "[%1% chroot] (%2%->%3%) Running shell: '%4%'"
 msgstr "[%1% chroot] (%2%->%3%) Đang chạy hệ vỏ đăng nhập: « %4% »"
 
 #: sbuild/sbuild-session.cc:698
@@ -858,15 +863,15 @@ msgid "%1% (Debian sbuild) %2% (%3%)\n"
 msgstr "%1% (Debian sbuild) %2%\n"
 
 #: schroot/schroot-base-main.cc:64
-msgid ""
-"Written by Roger Leigh\n"
-"\n"
+#, fuzzy
+msgid "Written by Roger Leigh"
 msgstr ""
 "Do Roger Leigh tạo\n"
 "\n"
 
 #: schroot/schroot-base-main.cc:65
-msgid "Copyright (C) 2004-2006 Roger Leigh\n"
+#, fuzzy
+msgid "Copyright (C) 2004-2006 Roger Leigh"
 msgstr "Bản quyền © năm 2004-2006 Roger Leigh\n"
 
 #: schroot/schroot-base-main.cc:66
@@ -933,13 +938,13 @@ msgid "[OPTION...] - list mount points"
 msgstr "  schroot-listmounts [TÙY_CHỌN...] — liệt kê các sự gắn kết"
 
 #: schroot/schroot-listmounts-main.cc:67
-#, boost-format
-msgid "%1%: Failed to open: %2%"
+#, fuzzy, boost-format
+msgid "Failed to open '%1%': %2%"
 msgstr "%1%: việc mở bị lỗi: %2%"
 
 #: schroot/schroot-listmounts-main.cc:90
-#, boost-format
-msgid "%1%: Failed to close: %2%"
+#, fuzzy, boost-format
+msgid "Failed to close '%1%': %2%"
 msgstr "%1%: việc đóng bị lỗi: %2%"
 
 #: schroot/schroot-listmounts-options.cc:41
@@ -967,18 +972,18 @@ msgid "%1%: No such chroot"
 msgstr "%1%: Không có chroot như vậy"
 
 #: schroot/schroot-main-base.cc:155
-#, boost-format
-msgid "No chroots are defined in %1% or %2%"
+#, fuzzy, boost-format
+msgid "No chroots are defined in '%1%' or '%2%'"
 msgstr "Chưa định nghĩa chroot trong %1% hay trong %2%"
 
 #: schroot/schroot-main-base.cc:163
-#, boost-format
-msgid "No chroots are defined in %1%"
+#, fuzzy, boost-format
+msgid "No chroots are defined in '%1%'"
 msgstr "Chưa định nghĩa chroot trong %1%"
 
 #: schroot/schroot-main-base.cc:180
-#, boost-format
-msgid "The specified chroots are not defined in %1%"
+#, fuzzy, boost-format
+msgid "The specified chroots are not defined in '%1%'"
 msgstr "Chưa định nghĩa những chroot đã ghi rõ trong %1%"
 
 #: schroot/schroot-main-base.cc:207
@@ -1080,13 +1085,13 @@ msgid "No pid specified; forcing release of lock"
 msgstr "Chưa ghi rõ PID (mã nhận diện tiến trình) nên đang ép buộc nhả khoá"
 
 #: schroot/schroot-releaselock-main.cc:68
-#, boost-format
-msgid "Failed to stat device %1%: %2%"
+#, fuzzy, boost-format
+msgid "Failed to stat device '%1%': %2%"
 msgstr "Việc lấy các thông tin về thiết bị %1% bị lỗi: %2%"
 
 #: schroot/schroot-releaselock-main.cc:76
-#, boost-format
-msgid "%1% is not a block device"
+#, fuzzy, boost-format
+msgid "'%1%' is not a block device"
 msgstr "%1% không phải là thiết bị khối"
 
 #: schroot/schroot-releaselock-main.cc:85
diff --git a/sbuild/sbuild-auth-conv-tty.cc b/sbuild/sbuild-auth-conv-tty.cc
index 651c5c5b..c498c859 100644
--- a/sbuild/sbuild-auth-conv-tty.cc
+++ b/sbuild/sbuild-auth-conv-tty.cc
@@ -49,7 +49,7 @@ namespace
       emap(auth_conv_tty::TIMEOUT,         N_("Timed out")),
       emap(auth_conv_tty::TIMEOUT_PENDING, N_("Time is running out...")),
       emap(auth_conv_tty::TERMIOS,         N_("Failed to get terminal settings")),
-      emap(auth_conv_tty::CONV_TYPE,       N_("Unsupported conversation type \"%1%\""))
+      emap(auth_conv_tty::CONV_TYPE,       N_("Unsupported conversation type '%1%'"))
     };
 
   volatile sig_atomic_t timer_expired = false;
diff --git a/sbuild/sbuild-auth.cc b/sbuild/sbuild-auth.cc
index 2106c04c..9bb7b072 100644
--- a/sbuild/sbuild-auth.cc
+++ b/sbuild/sbuild-auth.cc
@@ -51,7 +51,7 @@ namespace
   emap init_errors[] =
     {
       emap(auth::HOSTNAME,        N_("Failed to get hostname")),
-      emap(auth::USER,            N_("User \"%1%\" not found")),
+      emap(auth::USER,            N_("User '%1%' not found")),
       emap(auth::AUTHENTICATION,  N_("Authentication failed")),
       emap(auth::AUTHORISATION,   N_("Access not authorised")),
       emap(auth::PAM_DOUBLE_INIT, N_("PAM is already initialised")),
diff --git a/sbuild/sbuild-chroot.cc b/sbuild/sbuild-chroot.cc
index 00867e7a..4d7f53e1 100644
--- a/sbuild/sbuild-chroot.cc
+++ b/sbuild/sbuild-chroot.cc
@@ -57,7 +57,7 @@ namespace
     {
       emap(sbuild::chroot::CHROOT_CREATE,   N_("Chroot creation failed")),
       emap(sbuild::chroot::CHROOT_DEVICE,   N_("Device name not set")),
-      emap(sbuild::chroot::CHROOT_TYPE,     N_("Unknown chroot type \"%1%\"")),
+      emap(sbuild::chroot::CHROOT_TYPE,     N_("Unknown chroot type '%1%'")),
       emap(sbuild::chroot::DEVICE_ABS,      N_("Device must have an absolute path")),
       emap(sbuild::chroot::DEVICE_LOCK,     N_("Failed to lock device")),
       emap(sbuild::chroot::DEVICE_NOTBLOCK, N_("File is not a block device")),
@@ -368,7 +368,7 @@ sbuild::chroot::set_persona (std::string const& persona)
 
       // TODO: include line numbers by throwing an exception.
       log_warning()
-	<< format(_("%1% chroot: personality \"%2%\" is unknown.\n"))
+	<< format(_("%1% chroot: personality '%2%' is unknown.\n"))
 	% get_name() % persona;
       log_info()
 	<< format(_("Valid personalities: %1%\n")) % plist.str();
diff --git a/sbuild/sbuild-dirstream.cc b/sbuild/sbuild-dirstream.cc
index 64ee83ad..620861c2 100644
--- a/sbuild/sbuild-dirstream.cc
+++ b/sbuild/sbuild-dirstream.cc
@@ -37,8 +37,8 @@ namespace
    */
   emap init_errors[] =
     {
-      emap(dirstream::DIR_OPEN,    N_("Failed to open directory \"%1%\"")),
-      emap(dirstream::DIR_READ,    N_("Failed to read directory \"%1%\""))
+      emap(dirstream::DIR_OPEN,    N_("Failed to open directory '%1%'")),
+      emap(dirstream::DIR_READ,    N_("Failed to read directory '%1%'"))
     };
 
 }
diff --git a/sbuild/sbuild-keyfile.cc b/sbuild/sbuild-keyfile.cc
index 40cb7fea..febbec37 100644
--- a/sbuild/sbuild-keyfile.cc
+++ b/sbuild/sbuild-keyfile.cc
@@ -39,14 +39,14 @@ namespace
    */
   emap init_errors[] =
     {
-      emap(keyfile::BAD_FILE,          N_("Can't open file \"%4%\"")),
-      emap(keyfile::DISALLOWED_KEY,    N_("line %1% [%2%]: Disallowed key \"%4%\" used")),
-      emap(keyfile::DISALLOWED_KEY_NL, N_("[%2%]: Disallowed key \"%4%\" used")),
-      emap(keyfile::DUPLICATE_GROUP,   N_("line %1%: Duplicate group \"%4%\"")),
-      emap(keyfile::DUPLICATE_KEY,     N_("line %1% [%2%]: Duplicate key \"%4%\"")),
+      emap(keyfile::BAD_FILE,          N_("Can't open file '%4%'")),
+      emap(keyfile::DISALLOWED_KEY,    N_("line %1% [%2%]: Disallowed key '%4%' used")),
+      emap(keyfile::DISALLOWED_KEY_NL, N_("[%2%]: Disallowed key '%4%' used")),
+      emap(keyfile::DUPLICATE_GROUP,   N_("line %1%: Duplicate group '%4%'")),
+      emap(keyfile::DUPLICATE_KEY,     N_("line %1% [%2%]: Duplicate key '%4%'")),
       emap(keyfile::INVALID_GROUP,     N_("line %1%: Invalid group: \"%4%\"")),
       emap(keyfile::INVALID_LINE,      N_("line %1%: Invalid line: \"%4%\"")),
-      emap(keyfile::MISSING_KEY,       N_("[%1%]: Required key \"%4%\" is missing")),
+      emap(keyfile::MISSING_KEY,       N_("[%1%]: Required key '%4%' is missing")),
       emap(keyfile::NO_GROUP,          N_("line %1%: No group specified: \"%4%\"")),
       emap(keyfile::NO_KEY,            N_("line %1%: No key specified: \"%4%\"")),
       emap(keyfile::PASSTHROUGH_GK,    N_("[%1%] %2%: %4%")),
@@ -425,7 +425,7 @@ keyfile::check_priority (std::string const& group,
 	{
 	case PRIORITY_DEPRECATED:
 	  log_warning()
-	    << format(_("%1% chroot: A deprecated parameter \"%2%\" has been specified."))
+	    << format(_("%1% chroot: A deprecated parameter '%2%' has been specified."))
 	    % group % key
 	    << std::endl;
 	  log_info()
@@ -433,7 +433,7 @@ keyfile::check_priority (std::string const& group,
 	  break;
 	case PRIORITY_OBSOLETE:
 	  log_warning()
-	    << format(_("%1% chroot: An obsolete parameter \"%2%\" has been specified."))
+	    << format(_("%1% chroot: An obsolete parameter '%2%' has been specified."))
 	    % group % key
 	    << std::endl;
 	  log_info()
diff --git a/sbuild/sbuild-parse-value.cc b/sbuild/sbuild-parse-value.cc
index 6e309a4f..2e5f9e95 100644
--- a/sbuild/sbuild-parse-value.cc
+++ b/sbuild/sbuild-parse-value.cc
@@ -34,7 +34,7 @@ namespace
    */
   emap init_errors[] =
     {
-      emap(BAD_VALUE, N_("Could not parse value \"%1%\""))
+      emap(BAD_VALUE, N_("Could not parse value '%1%'"))
     };
 
 }
diff --git a/sbuild/sbuild-personality.cc b/sbuild/sbuild-personality.cc
index 045dbc3a..112f7ccf 100644
--- a/sbuild/sbuild-personality.cc
+++ b/sbuild/sbuild-personality.cc
@@ -45,7 +45,7 @@ namespace
    */
   emap init_errors[] =
     {
-      emap(sbuild::personality::SET, N_("Failed to set personality \"%1%\""))
+      emap(sbuild::personality::SET, N_("Failed to set personality '%1%'"))
     };
 
   typedef std::pair<std::string,sbuild::personality::type> pmap;
diff --git a/sbuild/sbuild-run-parts.cc b/sbuild/sbuild-run-parts.cc
index b702192f..8dd16446 100644
--- a/sbuild/sbuild-run-parts.cc
+++ b/sbuild/sbuild-run-parts.cc
@@ -47,7 +47,7 @@ namespace
     {
       emap(run_parts::CHILD_FORK, N_("Failed to fork child")),
       emap(run_parts::CHILD_WAIT, N_("Wait for child failed")),
-      emap(run_parts::EXEC,       N_("Failed to execute \"%1%\""))
+      emap(run_parts::EXEC,       N_("Failed to execute '%1%'"))
     };
 
 }
@@ -172,7 +172,7 @@ run_parts::run_child (std::string const& file,
   else if (pid == 0)
     {
       if (this->verbose)
-	log_info() << format(_("Executing %1%"))
+	log_info() << format(_("Executing '%1%'"))
 	  % string_list_to_string(command, " ")
 		   << std::endl;
       ::umask(this->umask);
diff --git a/sbuild/sbuild-session.cc b/sbuild/sbuild-session.cc
index b95fcd78..69f6229a 100644
--- a/sbuild/sbuild-session.cc
+++ b/sbuild/sbuild-session.cc
@@ -58,33 +58,33 @@ namespace
    */
   emap init_errors[] =
     {
-      emap(session::CHDIR,          N_("Failed to change to directory \"%1%\"")),
-      emap(session::CHDIR_FB,       N_("Falling back to directory \"%4%\"")),
+      emap(session::CHDIR,          N_("Failed to change to directory '%1%'")),
+      emap(session::CHDIR_FB,       N_("Falling back to directory '%4%'")),
       emap(session::CHILD_CORE,     N_("Child dumped core")),
       emap(session::CHILD_FAIL,     N_("Child exited abnormally (reason unknown; not a signal or core dump)")),
       emap(session::CHILD_FORK,     N_("Failed to fork child")),
-      emap(session::CHILD_SIGNAL,   N_("Child terminated by signal \"%4%\"")),
+      emap(session::CHILD_SIGNAL,   N_("Child terminated by signal '%4%'")),
       emap(session::CHILD_WAIT,     N_("Wait for child failed")),
-      emap(session::CHROOT,         N_("Failed to change root to directory \"%1%\"")),
-      emap(session::CHROOT_ALIAS,   N_("No chroot found matching name or alias \"%1%\"")),
+      emap(session::CHROOT,         N_("Failed to change root to directory '%1%'")),
+      emap(session::CHROOT_ALIAS,   N_("No chroot found matching name or alias '%1%'")),
       emap(session::CHROOT_LOCK,    N_("Failed to lock chroot")),
       emap(session::CHROOT_SETUP,   N_("Chroot setup failed")),
-      emap(session::CHROOT_UNKNOWN, N_("Failed to find chroot \"%1%\"")),
+      emap(session::CHROOT_UNKNOWN, N_("Failed to find chroot '%1%'")),
       emap(session::CHROOT_UNLOCK,  N_("Failed to unlock chroot")),
       emap(session::COMMAND_ABS,    N_("Command \"%1%\" must have an absolute path")),
       emap(session::EXEC,           N_("Failed to execute \"%1%\"")),
       emap(session::GROUP_GET_SUP,  N_("Failed to get supplementary groups")),
       emap(session::GROUP_GET_SUPC, N_("Failed to get supplementary group count")),
-      emap(session::GROUP_SET,      N_("Failed to set group \"%1%\"")),
+      emap(session::GROUP_SET,      N_("Failed to set group '%1%'")),
       emap(session::GROUP_SET_SUP,  N_("Failed to set supplementary groups")),
-      emap(session::GROUP_UNKNOWN,  N_("Group \"%1%\" not found")),
+      emap(session::GROUP_UNKNOWN,  N_("Group '%1%' not found")),
       emap(session::PAM,            N_("PAM error")),
       emap(session::ROOT_DROP,      N_("Failed to drop root permissions")),
-      emap(session::SHELL,          N_("Shell \"%1%\" not available")),
-      emap(session::SHELL_FB,       N_("Falling back to shell \"%4%\"")),
+      emap(session::SHELL,          N_("Shell '%1%' not available")),
+      emap(session::SHELL_FB,       N_("Falling back to shell '%4%'")),
       emap(session::SIGHUP_CATCH,   N_("Caught hangup signal")),
       emap(session::SIGHUP_SET,     N_("Failed to set hangup signal handler")),
-      emap(session::USER_SET,       N_("Failed to set user \"%1%\"")),
+      emap(session::USER_SET,       N_("Failed to set user '%1%'")),
       emap(session::USER_SWITCH,    N_("User switching is not permitted")),
     };
 
@@ -626,7 +626,7 @@ session::get_login_command (sbuild::chroot::ptr& session_chroot,
       log_debug(DEBUG_NOTICE)
 	<< format("Running login shell: %1%") % shell << endl;
       syslog(LOG_USER|LOG_NOTICE,
-	     "[%s chroot] (%s->%s) Running login shell: \"%s\"",
+	     "[%s chroot] (%s->%s) Running login shell: '%s'",
 	     session_chroot->get_name().c_str(),
 	     get_ruser().c_str(), get_user().c_str(),
 	     shell.c_str());
@@ -637,7 +637,7 @@ session::get_login_command (sbuild::chroot::ptr& session_chroot,
       log_debug(DEBUG_NOTICE)
 	<< format("Running shell: %1%") % shell << endl;
       syslog(LOG_USER|LOG_NOTICE,
-	     "[%s chroot] (%s->%s) Running shell: \"%s\"",
+	     "[%s chroot] (%s->%s) Running shell: '%s'",
 	     session_chroot->get_name().c_str(),
 	     get_ruser().c_str(), get_user().c_str(),
 	     shell.c_str());
@@ -650,17 +650,17 @@ session::get_login_command (sbuild::chroot::ptr& session_chroot,
 	{
 	  if (get_environment().empty() &&
 	      session_chroot->get_command_prefix().empty())
-	    format_string = _("[%1% chroot] Running login shell: \"%4%\"");
+	    format_string = _("[%1% chroot] Running login shell: '%4%'");
 	  else
-	    format_string = _("[%1% chroot] Running shell: \"%4%\"");
+	    format_string = _("[%1% chroot] Running shell: '%4%'");
 	}
       else
 	{
 	  if (get_environment().empty() &&
 	      session_chroot->get_command_prefix().empty())
-	    format_string = _("[%1% chroot] (%2%->%3%) Running login shell: \"%4%\"");
+	    format_string = _("[%1% chroot] (%2%->%3%) Running login shell: '%4%'");
 	  else
-	    format_string = _("[%1% chroot] (%2%->%3%) Running shell: \"%4%\"");
+	    format_string = _("[%1% chroot] (%2%->%3%) Running shell: '%4%'");
 	}
 
       format fmt(format_string);
@@ -801,7 +801,7 @@ session::setup_chroot (sbuild::chroot::ptr&       session_chroot,
 	verbosity = "verbose";
 	break;
       default:
-	log_debug(DEBUG_CRITICAL) << format("Invalid verbosity level: %1%, falling back to \"normal\"")
+	log_debug(DEBUG_CRITICAL) << format("Invalid verbosity level: %1%, falling back to 'normal'")
 	  % static_cast<int>(get_verbosity())
 		     << endl;
 	verbosity = "normal";
diff --git a/schroot/schroot-base-main.cc b/schroot/schroot-base-main.cc
index f139b82c..edef3b6e 100644
--- a/schroot/schroot-base-main.cc
+++ b/schroot/schroot-base-main.cc
@@ -61,8 +61,8 @@ main::action_version (std::ostream& stream)
   fmt % this->program_name % VERSION % sbuild::gmdate(RELEASE_DATE);
 
   stream << fmt
-	 << _("Written by Roger Leigh\n\n")
-	 << _("Copyright (C) 2004-2006 Roger Leigh\n")
+	 << _("Written by Roger Leigh") << '\n' << '\n'
+	 << _("Copyright (C) 2004-2006 Roger Leigh") << '\n'
 	 << _("This is free software; see the source for copying conditions.  There is NO\n"
 	      "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n")
 	 << std::flush;
diff --git a/schroot/schroot-listmounts-main.cc b/schroot/schroot-listmounts-main.cc
index e0da1fe7..a933fcfa 100644
--- a/schroot/schroot-listmounts-main.cc
+++ b/schroot/schroot-listmounts-main.cc
@@ -64,7 +64,7 @@ main::list_mounts (std::string const& mountfile) const
   std::FILE *mntdb = std::fopen(mountfile.c_str(), "r");
   if (mntdb == 0)
     {
-      format fmt(_("%1%: Failed to open: %2%"));
+      format fmt(_("Failed to open '%1%': %2%"));
       fmt % mountfile % std::strerror(errno);
       throw std::runtime_error(fmt.str());
     }
@@ -87,7 +87,7 @@ main::list_mounts (std::string const& mountfile) const
 
   if (std::fclose(mntdb) == EOF)
     {
-      format fmt(_("%1%: Failed to close: %2%"));
+      format fmt(_("Failed to close '%1%': %2%"));
       fmt % mountfile % std::strerror(errno);
       throw std::runtime_error(fmt.str());
     }
diff --git a/schroot/schroot-main-base.cc b/schroot/schroot-main-base.cc
index a599c1f6..e5978319 100644
--- a/schroot/schroot-main-base.cc
+++ b/schroot/schroot-main-base.cc
@@ -152,7 +152,7 @@ main_base::run_impl ()
       if (this->options->load_chroots == true &&
 	  this->options->load_sessions == true)
 	sbuild::log_warning()
-	  << format(_("No chroots are defined in %1% or %2%"))
+	  << format(_("No chroots are defined in '%1%' or '%2%'"))
 	  % SCHROOT_CONF % SCHROOT_SESSION_DIR
 	  << endl;
       else
@@ -160,7 +160,7 @@ main_base::run_impl ()
 	  const char *cfile = (this->options->load_sessions)
 	    ? SCHROOT_CONF : SCHROOT_SESSION_DIR;
 	  sbuild::log_warning()
-	    << format(_("No chroots are defined in %1%")) % cfile
+	    << format(_("No chroots are defined in '%1%'")) % cfile
 	    << endl;
 	}
     }
@@ -177,7 +177,7 @@ main_base::run_impl ()
   if (this->chroots.empty())
     {
       sbuild::log_error()
-	<< format(_("The specified chroots are not defined in %1%"))
+	<< format(_("The specified chroots are not defined in '%1%'"))
 	% SCHROOT_CONF
 	<< endl;
       exit (EXIT_FAILURE);
diff --git a/schroot/schroot-releaselock-main.cc b/schroot/schroot-releaselock-main.cc
index d16413cf..27f72bfc 100644
--- a/schroot/schroot-releaselock-main.cc
+++ b/schroot/schroot-releaselock-main.cc
@@ -65,7 +65,7 @@ main::action_releaselock ()
   if (stat(this->options->device.c_str(), &statbuf) == -1)
     {
       sbuild::log_error()
-	<< format(_("Failed to stat device %1%: %2%"))
+	<< format(_("Failed to stat device '%1%': %2%"))
 	% this->options->device % strerror(errno)
 	<< endl;
       exit (EXIT_FAILURE);
@@ -73,7 +73,7 @@ main::action_releaselock ()
   if (!S_ISBLK(statbuf.st_mode))
     {
       sbuild::log_error()
-	<< format(_("%1% is not a block device")) % this->options->device
+	<< format(_("'%1%' is not a block device")) % this->options->device
 	<< endl;
       exit (EXIT_FAILURE);
     }
diff --git a/schroot/schroot.conf.5.in b/schroot/schroot.conf.5.in
index cd5c1535..e9965446 100644
--- a/schroot/schroot.conf.5.in
+++ b/schroot/schroot.conf.5.in
@@ -50,7 +50,7 @@ or omitted, the default type is \[oq]plain\[cq].
 A short description of the chroot.  This may be localised for different
 languages; see the section \[lq]\fILocalisation\fP\[rq] below.
 .TP
-\f[CBI] priority=\fP\f[CI]number\fP
+\f[CBI]priority=\fP\f[CI]number\fP
 Set the priority of a chroot.  \f[CI]number\fP is a positive integer indicating
 whether a distribution is older than another.  For example, \[lq]oldstable\[rq]
 and \[lq]oldstable-security\[rq] might be \[oq]0\[cq], while \[lq]stable\[rq]
@@ -59,35 +59,35 @@ and \[lq]unstable\[rq] is \[oq]3\[cq].  The values are not important, but the
 difference between them is.  This is used by sbuild when using the schroot
 chroot mode.
 .TP
-\f[CBI] users=\fP\f[CI]user1,user2,...\fP
+\f[CBI]users=\fP\f[CI]user1,user2,...\fP
 A comma-separated list of users which are allowed access to the chroot.  If
 empty or omitted, no users will be allowed access (unless a group they belong
 to is also specified in \f[CI]groups\fP).
 .TP
-\f[CBI] groups=\fP\f[CI]group1,group2,...\fP
+\f[CBI]groups=\fP\f[CI]group1,group2,...\fP
 A comma-separated list of groups which are allowed access to the chroot.  If
 empty or omitted, no groups of users will be allowed access.
 .TP
-\f[CBI] root\-users=\fP\f[CI]user1,user2,...\fP
+\f[CBI]root\-users=\fP\f[CI]user1,user2,...\fP
 A comma-separated list of users which are allowed \fBpassword-less\fP root
 access to the chroot.  If empty or omitted, no users will be allowed root
 access without a password (but if a user or a group they belong to is in
 \f[CI]users\fP or \f[CI]groups\fP, respectively, they may gain access with a
 password).
 .TP
-\f[CBI] root\-groups=\fP\f[CI]group1,group2,...\fP
+\f[CBI]root\-groups=\fP\f[CI]group1,group2,...\fP
 A comma-separated list of groups which are allowed \fBpassword-less\fP root
 access to the chroot.  If empty or omitted, no users will be allowed root
 access without a password (but if a user or a group they belong to is in
 \f[CI]users\fP or \f[CI]groups\fP, respectively, they may gain access with a
 password).
 .TP
-\f[CBI] aliases=\fP\f[CI]alias1,alias2,...\fP
+\f[CBI]aliases=\fP\f[CI]alias1,alias2,...\fP
 A comma-separated list of aliases (alternate names) for this chroot.  For
 example, a chroot named \[lq]sid\[rq] might have an \[oq]unstable\[cq] alias
 for convenience.
 .TP
-\f[CBI] run\-setup\-scripts=\fP\f[CI]true\fP|\f[CI]false\fP
+\f[CBI]run\-setup\-scripts=\fP\f[CI]true\fP|\f[CI]false\fP
 Set whether chroot setup scripts will be run.  The default is not to run setup
 scripts (\[oq]false\[cq]), for safety reasons (so it won't clobber your passwd
 and other critical files).  The default for session-managed chroots
@@ -99,16 +99,16 @@ the chroot environment.  If enabled for a \[oq]plain\[cq] or
 (not true session management, because it does not make a copy of the chroot).
 If your chroots are exclusively controlled by schroot, set to \[oq]true\[cq].
 .TP
-\f[CBI] run\-exec\-scripts=\fP\f[CI]true\fP|\f[CI]false\fP
+\f[CBI]run\-exec\-scripts=\fP\f[CI]true\fP|\f[CI]false\fP
 Set whether chroot execution scripts will be run.  The default is the same as
 the default for the \f[CI]run-setup-scripts\fP key.  This option was called
 \f[CI]run\-session\-scripts\fP in versions prior to 0.2.5.
 .TP
-\f[CBI] command\-prefix=\fP\f[CI]command,option1,option2,...\fP
+\f[CBI]command\-prefix=\fP\f[CI]command,option1,option2,...\fP
 A comma-separated list of a command and the options for the command.  This
 command and its options will be prefixed to all commands run inside the chroot.
 .TP
-\f[CBI] personality=\fP\f[CI]persona\fP
+\f[CBI]personality=\fP\f[CI]persona\fP
 Set the personality (process execution domain) to use.  This option is useful
 when using a 32-bit chroot on 64-bit system, for example.  Valid options on
 Linux are \[oq]bsd\[cq], \[oq]hpux\[cq], \[oq]irix32\[cq], \[oq]irix64\[cq],
@@ -130,7 +130,7 @@ that if \f[CI]run-setup-scripts\fP is set to \[oq]true\[cq] for \[oq]plain\[cq]
 chroots, filesystem mounting is disabled.  They have an additional (mandatory)
 configuration option:
 .TP
-\f[CBI] location=\fP\f[CI]directory\fP
+\f[CBI]location=\fP\f[CI]directory\fP
 The directory containing the chroot environment.  This is where the root will
 be changed to when executing a login shell or a command.  The directory must
 exist and have read and execute permissions to allow users access to it.
@@ -142,7 +142,7 @@ an archive of the chroot files.  They implement the \fBsource chroot\fP options
 (see \[lq]\fISource chroot options\fP\[rq], below) and have an additional
 (mandatory) configuration option:
 .TP
-\f[CBI] file=\fP\f[CI]filename\fP
+\f[CBI]file=\fP\f[CI]filename\fP
 The file containing the archived chroot environment.  This must be a tar (tape
 archive), optionally compressed with gzip or bzip2, or a zip archive.  The file
 extensions used to determine the type are are \fI.tar\fP, \fI.tar.gz\fP,
@@ -155,15 +155,15 @@ Chroots of type \[oq]block\-device\[cq] are a filesystem available on an
 unmounted block device.  The device will be mounted and unmounted on demand.
 They have additional options:
 .TP
-\f[CBI] device=\fP\f[CI]device\fP
+\f[CBI]device=\fP\f[CI]device\fP
 This is the device name of the block device, including the absolute path.  For
 example, \[lq]/dev/sda5\[rq].
 .TP
-\f[CBI] mount-options=\fP\f[CI]mount_options\fP
+\f[CBI]mount-options=\fP\f[CI]mount_options\fP
 Mount options for the block device.  These are additional options to pass to
 mount(8).  For example, \[lq]\-o atime,sync,user_xattr\[rq].
 .TP
-\f[CBI] location=\fP\f[CI]path\fP
+\f[CBI]location=\fP\f[CI]path\fP
 This is the path to the chroot \fIinside\fP the filesystem on the device.  For
 example, if the filesystem contains a chroot in \fI/chroot/sid\fP, you would
 specify \[lq]/chroot/sid\[rq] here.  If the chroot is the only thing on the
@@ -184,7 +184,7 @@ They implement the \fBsource chroot\fP options (see \[lq]\fISource chroot
 options\fP\[rq], below), and all the options for \[oq]block\-device\[cq], plus
 an additional option:
 .TP
-\f[CBI] lvm-snapshot-options=\fP\f[CI]snapshot_options\fP
+\f[CBI]lvm-snapshot-options=\fP\f[CI]snapshot_options\fP
 Snapshot options.  These are additional options to pass to lvcreate(8).  For
 example, \[lq]\-L 2g\[rq] to create a snapshot 2 GiB in size.
 .B Note:
@@ -198,24 +198,24 @@ chroots also provide an additional chroot with a \fI\-source\fP suffix added to
 their name, to allow access to the original data, and to aid in chroot
 maintenance.  These chroots provide the following additional options:
 .TP
-\f[CBI] source\-users=\fP\f[CI]user1,user2,...\fP
+\f[CBI]source\-users=\fP\f[CI]user1,user2,...\fP
 A comma-separated list of users which are allowed access to the source chroot.
 If empty or omitted, no users will be allowed access.  This will become the
 \f[CI]users\fP option in the source chroot.
 .TP
-\f[CBI] source\-groups=\fP\f[CI]group1,group2,...\fP
+\f[CBI]source\-groups=\fP\f[CI]group1,group2,...\fP
 A comma-separated list of groups which are allowed access to the source chroot.
 If empty or omitted, no users will be allowed access.  This will become the
 \f[CI]groups\fP option in the source chroot.
 .TP
-\f[CBI] source\-root\-users=\fP\f[CI]user1,user2,...\fP
+\f[CBI]source\-root\-users=\fP\f[CI]user1,user2,...\fP
  A comma-separated list of users which are allowed \fBpassword-less\fP root
 access to the source chroot.  If empty or omitted, no users will be allowed
 root access without a password (but if a user is in \f[CI]users\fP, they may
 gain access with a password).  This will become the \f[CI]root\-users\fP option
 in the source chroot.
 .TP
-\f[CBI] source\-root\-groups=\fP\f[CI]group1,group2,...\fP
+\f[CBI]source\-root\-groups=\fP\f[CI]group1,group2,...\fP
  A comma-separated list of groups which are allowed \fBpassword-less\fP root
 access to the source chroot.  If empty or omitted, no users will be allowed
 root access without a password (but if a user's group is in \f[CI]groups\fP,