* Move sbuild sources into an sbuild subdirectory, dchroot sources

  into a dchroot subdirectory and dchroot-dsa sources into a
  dchroot-dsa subdirectory.

110 files changed, 1892 insertions, 1361 deletions

diff --git a/ChangeLog b/ChangeLog
index 1dec4ff5..4898d4d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-24  Roger Leigh  <rleigh@debian.org>
+
+	* Move sbuild sources into an sbuild subdirectory, dchroot sources
+	into a dchroot subdirectory and dchroot-dsa sources into a
+	dchroot-dsa subdirectory.
+
 2006-06-23  Roger Leigh  <rleigh@debian.org>
 
 	* The include order of all includes has been reviewed.  Local
diff --git a/Makefile.am b/Makefile.am
index 7b0d05fd..2358e609 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 #
 #####################################################################
 
-SUBDIRS = schroot test doc po
+SUBDIRS = sbuild schroot dchroot dchroot-dsa test doc po
 
 # Remove junk from the generated tarball.
 dist-hook:
diff --git a/configure.ac b/configure.ac
index 040716da..f04d282d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,12 +25,12 @@ dnl bug-reporting address.
 AC_INIT([schroot], [0.99.1], [buildd-tools-devel@lists.alioth.debian.org])
 dnl For safety, check we are in the right directory by
 dnl checking for a known unique file.
-AC_CONFIG_SRCDIR([schroot/sbuild-session.cc])
+AC_CONFIG_SRCDIR([sbuild/sbuild-session.cc])
 dnl Place auxilliary scripts here.
 AC_CONFIG_AUX_DIR([scripts])
 dnl Put macro definitions here.
 AC_CONFIG_HEADER([config.h])
-AC_CONFIG_HEADER([schroot/sbuild-config.h])
+AC_CONFIG_HEADER([sbuild/sbuild-config.h])
 
 dnl Initialise automake stuff.
 AM_INIT_AUTOMAKE([1.9 gnu check-news dist-bzip2 no-dist-gzip tar-ustar])
@@ -62,6 +62,8 @@ AC_ARG_ENABLE([dchroot-dsa], [AS_HELP_STRING([--enable-dchroot], [Enable dchroot
                 esac])
 AC_MSG_RESULT([$enable_dchroot_dsa_compat])
 AM_CONDITIONAL([BUILD_DCHROOT_DSA], [test "$enable_dchroot_dsa_compat" = "yes"])
+AM_CONDITIONAL([BUILD_LIBDCHROOT], [test "$enable_dchroot_compat" = "yes" || test "$enable_dchroot_dsa_compat" = "yes"])
+
 
 AC_MSG_CHECKING([whether to enable debugging messages])
 enable_debug="no"
@@ -312,15 +314,18 @@ dnl Configure which files to generate.
 AC_CONFIG_FILES([doc/Makefile])
 AC_CONFIG_FILES([doc/schroot.dox])
 AC_CONFIG_FILES([po/Makefile.in])
+AC_CONFIG_FILES([sbuild/Makefile])
 AC_CONFIG_FILES([schroot/Makefile])
 AC_CONFIG_FILES([schroot/pam/Makefile])
 AC_CONFIG_FILES([schroot/exec/Makefile])
 AC_CONFIG_FILES([schroot/setup/Makefile])
-AC_CONFIG_FILES([schroot/dchroot.1])
-AC_CONFIG_FILES([schroot/dchroot-dsa.1])
 AC_CONFIG_FILES([schroot/schroot.1])
 AC_CONFIG_FILES([schroot/schroot-setup.5])
 AC_CONFIG_FILES([schroot/schroot.conf.5])
+AC_CONFIG_FILES([dchroot/Makefile])
+AC_CONFIG_FILES([dchroot/dchroot.1])
+AC_CONFIG_FILES([dchroot-dsa/Makefile])
+AC_CONFIG_FILES([dchroot-dsa/dchroot-dsa.1])
 AC_CONFIG_FILES([test/Makefile])
 AC_CONFIG_FILES([Makefile])
 dnl Output the generated config.status script.
diff --git a/dchroot-dsa/Makefile.am b/dchroot-dsa/Makefile.am
new file mode 100644
index 00000000..ad82f717
--- /dev/null
+++ b/dchroot-dsa/Makefile.am
@@ -0,0 +1,60 @@
+# schroot Makefile template
+#
+#
+# Copyright © 2004-2006  Roger Leigh <rleigh@debian.org>
+#
+# schroot 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.
+#
+# schroot 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
+#
+#####################################################################
+
+localedir = $(datadir)/locale
+pkglibexecdir = $(SCHROOT_LIBEXEC_DIR)
+
+AM_CXXFLAGS = $(SCHROOT_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
+#  -Weffc++ causes too many warnings in standard headers; -Wextra is not
+#  supported by GCC 3.4.
+
+DEFS = -DGETTEXT_PACKAGE=\"schroot\" -DLOCALEDIR=\"$(localedir)\" -D_GNU_SOURCE
+
+if BUILD_DCHROOT_DSA
+dchroot_dsa = dchroot-dsa
+endif
+
+bin_PROGRAMS = $(dchroot_dsa)
+
+dchroot_dsa_SOURCES =			\
+	dchroot-dsa-chroot-config.h	\
+	dchroot-dsa-chroot-config.cc	\
+	dchroot-dsa-session.h		\
+	dchroot-dsa-session.cc		\
+	dchroot-dsa-options.h		\
+	dchroot-dsa-options.cc		\
+	dchroot-dsa-main.h		\
+	dchroot-dsa-main.cc		\
+	dchroot-dsa.cc
+dchroot_dsa_LDADD = $(top_builddir)/dchroot/libdchroot.la
+
+if BUILD_DCHROOT_DSA
+dchroot_dsa_mans = dchroot-dsa.1
+endif
+
+man_MANS = $(dchroot_dsa_mans)
+
+install-exec-hook:
+# Install setuid root.
+	if [ -f "$(DESTDIR)$(bindir)/dchroot-dsa" ]; then \
+	  chmod 4755 "$(DESTDIR)$(bindir)/dchroot-dsa"; \
+	fi
diff --git a/schroot/dchroot-dsa-chroot-config.cc b/dchroot-dsa/dchroot-dsa-chroot-config.cc
index 6cac3420..79fc2651 100644
--- a/schroot/dchroot-dsa-chroot-config.cc
+++ b/dchroot-dsa/dchroot-dsa-chroot-config.cc
@@ -19,7 +19,8 @@
 
 #include <config.h>
 
-#include "sbuild-parse-error.h"
+#include <sbuild/sbuild-chroot-plain.h>
+#include <sbuild/sbuild-parse-error.h>
 
 #include "dchroot-dsa-chroot-config.h"
 
diff --git a/schroot/dchroot-dsa-chroot-config.h b/dchroot-dsa/dchroot-dsa-chroot-config.h
index b9d05c42..f0addb78 100644
--- a/schroot/dchroot-dsa-chroot-config.h
+++ b/dchroot-dsa/dchroot-dsa-chroot-config.h
@@ -20,7 +20,7 @@
 #ifndef DCHROOT_DSA_CHROOT_CONFIG_H
 #define DCHROOT_DSA_CHROOT_CONFIG_H
 
-#include "sbuild-chroot-config.h"
+#include <sbuild/sbuild-chroot-config.h>
 
 #include <map>
 #include <ostream>
diff --git a/schroot/dchroot-dsa-main.cc b/dchroot-dsa/dchroot-dsa-main.cc
index 11e82367..aff3bc8b 100644
--- a/schroot/dchroot-dsa-main.cc
+++ b/dchroot-dsa/dchroot-dsa-main.cc
@@ -27,6 +27,8 @@
 #include <iostream>
 #include <locale>
 
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <termios.h>
 #include <unistd.h>
 
diff --git a/schroot/dchroot-dsa-main.h b/dchroot-dsa/dchroot-dsa-main.h
index 9664bcd2..57849982 100644
--- a/schroot/dchroot-dsa-main.h
+++ b/dchroot-dsa/dchroot-dsa-main.h
@@ -20,7 +20,7 @@
 #ifndef DCHROOT_DSA_MAIN_H
 #define DCHROOT_DSA_MAIN_H
 
-#include "schroot-main.h"
+#include <schroot/schroot-main.h>
 
 namespace dchroot_dsa
 {
diff --git a/schroot/dchroot-dsa-options.cc b/dchroot-dsa/dchroot-dsa-options.cc
index e5f04323..e5f04323 100644
--- a/schroot/dchroot-dsa-options.cc
+++ b/dchroot-dsa/dchroot-dsa-options.cc
diff --git a/schroot/dchroot-dsa-options.h b/dchroot-dsa/dchroot-dsa-options.h
index 41352cf2..cde1e7e4 100644
--- a/schroot/dchroot-dsa-options.h
+++ b/dchroot-dsa/dchroot-dsa-options.h
@@ -20,7 +20,7 @@
 #ifndef DCHROOT_DSA_OPTIONS_H
 #define DCHROOT_DSA_OPTIONS_H
 
-#include "schroot-options-base.h"
+#include <schroot/schroot-options-base.h>
 
 namespace dchroot_dsa
 {
diff --git a/schroot/dchroot-dsa-session.cc b/dchroot-dsa/dchroot-dsa-session.cc
index 31fe7b14..31fe7b14 100644
--- a/schroot/dchroot-dsa-session.cc
+++ b/dchroot-dsa/dchroot-dsa-session.cc
diff --git a/schroot/dchroot-dsa-session.h b/dchroot-dsa/dchroot-dsa-session.h
index 23ab0170..c8f5abd0 100644
--- a/schroot/dchroot-dsa-session.h
+++ b/dchroot-dsa/dchroot-dsa-session.h
@@ -20,7 +20,7 @@
 #ifndef DCHROOT_DSA_SESSION_H
 #define DCHROOT_DSA_SESSION_H
 
-#include "dchroot-session-base.h"
+#include <dchroot/dchroot-session-base.h>
 
 #include <string>
 
diff --git a/schroot/dchroot-dsa.1.in b/dchroot-dsa/dchroot-dsa.1.in
index ebb207ae..ebb207ae 100644
--- a/schroot/dchroot-dsa.1.in
+++ b/dchroot-dsa/dchroot-dsa.1.in
diff --git a/schroot/dchroot-dsa.cc b/dchroot-dsa/dchroot-dsa.cc
index 737a8eb9..737a8eb9 100644
--- a/schroot/dchroot-dsa.cc
+++ b/dchroot-dsa/dchroot-dsa.cc
diff --git a/dchroot/Makefile.am b/dchroot/Makefile.am
new file mode 100644
index 00000000..5bc36cb9
--- /dev/null
+++ b/dchroot/Makefile.am
@@ -0,0 +1,69 @@
+# schroot Makefile template
+#
+#
+# Copyright © 2004-2006  Roger Leigh <rleigh@debian.org>
+#
+# schroot 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.
+#
+# schroot 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
+#
+#####################################################################
+
+localedir = $(datadir)/locale
+pkglibexecdir = $(SCHROOT_LIBEXEC_DIR)
+
+AM_CXXFLAGS = $(SCHROOT_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
+#  -Weffc++ causes too many warnings in standard headers; -Wextra is not
+#  supported by GCC 3.4.
+
+DEFS = -DGETTEXT_PACKAGE=\"schroot\" -DLOCALEDIR=\"$(localedir)\" -D_GNU_SOURCE
+
+if BUILD_LIBDCHROOT
+noinst_LTLIBRARIES = libdchroot.la
+endif
+
+if BUILD_DCHROOT
+dchroot = dchroot
+endif
+
+bin_PROGRAMS = $(dchroot)
+
+libdchroot_la_SOURCES =			\
+	dchroot-session-base.h		\
+	dchroot-session-base.cc
+libdchroot_la_LIBADD = $(top_builddir)/schroot/libschroot.la
+
+dchroot_SOURCES =			\
+	dchroot-chroot-config.h		\
+	dchroot-chroot-config.cc	\
+	dchroot-session.h		\
+	dchroot-session.cc		\
+	dchroot-options.h		\
+	dchroot-options.cc		\
+	dchroot-main.h			\
+	dchroot-main.cc			\
+	dchroot.cc
+dchroot_LDADD = libdchroot.la
+
+if BUILD_DCHROOT
+dchroot_mans = dchroot.1
+endif
+
+man_MANS = $(dchroot_mans)
+
+install-exec-hook:
+# Install setuid root.
+	if [ -f "$(DESTDIR)$(bindir)/dchroot" ]; then \
+	  chmod 4755 "$(DESTDIR)$(bindir)/dchroot"; \
+	fi
diff --git a/schroot/dchroot-chroot-config.cc b/dchroot/dchroot-chroot-config.cc
index 769159fe..3a3a16b2 100644
--- a/schroot/dchroot-chroot-config.cc
+++ b/dchroot/dchroot-chroot-config.cc
@@ -19,7 +19,8 @@
 
 #include <config.h>
 
-#include "sbuild-parse-error.h"
+#include <sbuild/sbuild-chroot-plain.h>
+#include <sbuild/sbuild-parse-error.h>
 
 #include "dchroot-chroot-config.h"
 
diff --git a/schroot/dchroot-chroot-config.h b/dchroot/dchroot-chroot-config.h
index e5dbec9d..f36c72ed 100644
--- a/schroot/dchroot-chroot-config.h
+++ b/dchroot/dchroot-chroot-config.h
@@ -20,7 +20,7 @@
 #ifndef DCHROOT_CHROOT_CONFIG_H
 #define DCHROOT_CHROOT_CONFIG_H
 
-#include "sbuild-chroot-config.h"
+#include <sbuild/sbuild-chroot-config.h>
 
 #include <map>
 #include <ostream>
diff --git a/schroot/dchroot-main.cc b/dchroot/dchroot-main.cc
index 9d53d979..cbcc1f4c 100644
--- a/schroot/dchroot-main.cc
+++ b/dchroot/dchroot-main.cc
@@ -27,6 +27,8 @@
 #include <iostream>
 #include <locale>
 
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <termios.h>
 #include <unistd.h>
 
diff --git a/schroot/dchroot-main.h b/dchroot/dchroot-main.h
index 77912795..8e5ab155 100644
--- a/schroot/dchroot-main.h
+++ b/dchroot/dchroot-main.h
@@ -20,7 +20,7 @@
 #ifndef DCHROOT_MAIN_H
 #define DCHROOT_MAIN_H
 
-#include "schroot-main.h"
+#include <schroot/schroot-main.h>
 
 namespace dchroot
 {
diff --git a/schroot/dchroot-options.cc b/dchroot/dchroot-options.cc
index 998e257a..998e257a 100644
--- a/schroot/dchroot-options.cc
+++ b/dchroot/dchroot-options.cc
diff --git a/schroot/dchroot-options.h b/dchroot/dchroot-options.h
index 592f24a8..51da9555 100644
--- a/schroot/dchroot-options.h
+++ b/dchroot/dchroot-options.h
@@ -20,7 +20,7 @@
 #ifndef DCHROOT_OPTIONS_H
 #define DCHROOT_OPTIONS_H
 
-#include "schroot-options-base.h"
+#include <schroot/schroot-options-base.h>
 
 namespace dchroot
 {
diff --git a/schroot/dchroot-session-base.cc b/dchroot/dchroot-session-base.cc
index 01fca798..01fca798 100644
--- a/schroot/dchroot-session-base.cc
+++ b/dchroot/dchroot-session-base.cc
diff --git a/schroot/dchroot-session-base.h b/dchroot/dchroot-session-base.h
index 59fdae43..cd442518 100644
--- a/schroot/dchroot-session-base.h
+++ b/dchroot/dchroot-session-base.h
@@ -20,7 +20,7 @@
 #ifndef DCHROOT_SESSION_BASE_H
 #define DCHROOT_SESSION_BASE_H
 
-#include "sbuild-session.h"
+#include <sbuild/sbuild-session.h>
 
 #include <string>
 
diff --git a/schroot/dchroot-session.cc b/dchroot/dchroot-session.cc
index 09c5e8aa..09c5e8aa 100644
--- a/schroot/dchroot-session.cc
+++ b/dchroot/dchroot-session.cc
diff --git a/schroot/dchroot-session.h b/dchroot/dchroot-session.h
index 9a733e7a..5953b833 100644
--- a/schroot/dchroot-session.h
+++ b/dchroot/dchroot-session.h
@@ -20,7 +20,7 @@
 #ifndef DCHROOT_SESSION_H
 #define DCHROOT_SESSION_H
 
-#include "dchroot-session-base.h"
+#include <dchroot/dchroot-session-base.h>
 
 #include <string>
 
diff --git a/schroot/dchroot.1.in b/dchroot/dchroot.1.in
index 247a29b5..247a29b5 100644
--- a/schroot/dchroot.1.in
+++ b/dchroot/dchroot.1.in
diff --git a/schroot/dchroot.cc b/dchroot/dchroot.cc
index d7495849..d7495849 100644
--- a/schroot/dchroot.cc
+++ b/dchroot/dchroot.cc
diff --git a/doc/schroot.dox.in b/doc/schroot.dox.in
index 9d75579e..996a86ee 100644
--- a/doc/schroot.dox.in
+++ b/doc/schroot.dox.in
@@ -459,7 +459,7 @@ WARN_LOGFILE           = schroot.log
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = @top_srcdir@/schroot
+INPUT                  = @top_srcdir@/sbuild @top_srcdir@/schroot @top_srcdir@/dchroot @top_srcdir@/dchroot-dsa
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index df2506b3..87ba54c5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,30 +1,41 @@
-schroot/dchroot-chroot-config.cc
-schroot/dchroot-session.cc
-schroot/sbuild-auth.cc
-schroot/sbuild-auth-conv.cc
-schroot/sbuild-auth-conv-tty.cc
-schroot/sbuild-auth-message.cc
-schroot/sbuild-chroot-block-device.cc
-schroot/sbuild-chroot.cc
-schroot/sbuild-chroot-config.cc
-schroot/sbuild-chroot-file.cc
-schroot/sbuild-chroot-lvm-snapshot.cc
-schroot/sbuild-chroot-plain.cc
-schroot/sbuild-chroot-source.cc
-schroot/sbuild-environment.cc
-schroot/sbuild-format-detail.cc
-schroot/sbuild-keyfile.cc
-schroot/sbuild-lock.cc
-schroot/sbuild-log.cc
-schroot/sbuild-nostream.cc
-schroot/sbuild-parse-error.cc
-schroot/sbuild-parse-value.cc
-schroot/sbuild-personality.cc
-schroot/sbuild-session.cc
-schroot/sbuild-util.cc
+dchroot/dchroot.cc
+dchroot/dchroot-chroot-config.cc
+dchroot/dchroot-main.cc
+dchroot/dchroot-options.cc
+dchroot/dchroot-session-base.cc
+dchroot/dchroot-session.cc
+dchroot-dsa/dchroot-dsa.cc
+dchroot-dsa/dchroot-dsa-chroot-config.cc
+dchroot-dsa/dchroot-dsa-main.cc
+dchroot-dsa/dchroot-dsa-options.cc
+dchroot-dsa/dchroot-dsa-session.cc
+sbuild/sbuild-auth.cc
+sbuild/sbuild-auth-conv.cc
+sbuild/sbuild-auth-conv-tty.cc
+sbuild/sbuild-auth-message.cc
+sbuild/sbuild-chroot-block-device.cc
+sbuild/sbuild-chroot.cc
+sbuild/sbuild-chroot-config.cc
+sbuild/sbuild-chroot-file.cc
+sbuild/sbuild-chroot-lvm-snapshot.cc
+sbuild/sbuild-chroot-plain.cc
+sbuild/sbuild-chroot-source.cc
+sbuild/sbuild-environment.cc
+sbuild/sbuild-format-detail.cc
+sbuild/sbuild-keyfile.cc
+sbuild/sbuild-lock.cc
+sbuild/sbuild-log.cc
+sbuild/sbuild-nostream.cc
+sbuild/sbuild-parse-error.cc
+sbuild/sbuild-parse-value.cc
+sbuild/sbuild-personality.cc
+sbuild/sbuild-session.cc
+sbuild/sbuild-util.cc
 schroot/schroot.cc
 schroot/schroot-listmounts.cc
 schroot/schroot-listmounts-options.cc
+schroot/schroot-main.cc
+schroot/schroot-options-base.cc
 schroot/schroot-options.cc
 schroot/schroot-releaselock.cc
 schroot/schroot-releaselock-options.cc
diff --git a/po/en_GB.po b/po/en_GB.po
index 0c570e89..0491d0e0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: schroot 0.1.2\n"
 "Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2006-06-23 16:39+0100\n"
+"POT-Creation-Date: 2006-06-24 00:38+0100\n"
 "PO-Revision-Date: 2006-06-23 16:45+0100\n"
 "Last-Translator: Roger Leigh <rleigh@debian.org>\n"
 "Language-Team: English <rleigh@debian.org>\n"
@@ -14,669 +14,837 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: schroot/dchroot-chroot-config.cc:124
+#: dchroot/dchroot.cc:68 dchroot-dsa/dchroot-dsa.cc:68 schroot/schroot.cc:68
 #, fuzzy
+msgid "An unknown exception occured"
+msgstr "Unknown action specified"
+
+#: dchroot/dchroot-chroot-config.cc:123
+#, fuzzy, boost-format
 msgid "%1% chroot (dchroot compatibility)"
 msgstr "Running schroot in dchroot compatibility mode"
 
-#: schroot/dchroot-session.cc:118
+#: dchroot/dchroot-main.cc:59 dchroot-dsa/dchroot-dsa-main.cc:58
+#: schroot/schroot-main.cc:73
+#, boost-format
+msgid "schroot configuration generated by %1% %2%"
+msgstr "schroot configuration generated by %1% %2%"
+
+#: dchroot/dchroot-main.cc:65 dchroot-dsa/dchroot-dsa-main.cc:64
+msgid "To allow users access to the chroots, use the users or groups keys."
+msgstr "To allow users access to the chroots, use the users or groups keys."
+
+#: dchroot/dchroot-main.cc:67 dchroot-dsa/dchroot-dsa-main.cc:66
+msgid ""
+"To allow passwordless root access, use the root-users or root-groups keys."
+msgstr ""
+"To allow passwordless root access, use the root-users or root-groups keys."
+
+#: dchroot/dchroot-main.cc:69 dchroot/dchroot-main.cc:132
+#: dchroot-dsa/dchroot-dsa-main.cc:68 dchroot-dsa/dchroot-dsa-main.cc:124
+#, boost-format
+msgid "Remove '%1%' to use the new configuration."
+msgstr "Remove ‘%1%’ to use the new configuration."
+
+#: dchroot/dchroot-main.cc:96 dchroot-dsa/dchroot-dsa-main.cc:87
+#, fuzzy
+msgid "Running schroot in dchroot compatibility mode"
+msgstr "Running schroot in dchroot compatibility mode"
+
+#: dchroot/dchroot-main.cc:99 dchroot-dsa/dchroot-dsa-main.cc:90
+msgid "Run 'schroot' for full capabilities"
+msgstr "Run ‘schroot’ for full capabilities"
+
+#: dchroot/dchroot-main.cc:116 dchroot-dsa/dchroot-dsa-main.cc:108
+#, fuzzy, boost-format
+msgid "Using %1% configuration file: "
+msgstr "Using dchroot configuration file: "
+
+#: dchroot/dchroot-main.cc:121 dchroot-dsa/dchroot-dsa-main.cc:113
+#, boost-format
+msgid "Run '%1%'"
+msgstr "Run ‘%1%’"
+
+#: dchroot/dchroot-main.cc:125 dchroot-dsa/dchroot-dsa-main.cc:117
+msgid "to migrate to a schroot configuration."
+msgstr "to migrate to a schroot configuration."
+
+#: dchroot/dchroot-main.cc:128 dchroot-dsa/dchroot-dsa-main.cc:120
+#, boost-format
+msgid "Edit '%1%' to add appropriate group access."
+msgstr "Edit ‘%1%’ to add appropriate group access."
+
+#: dchroot/dchroot-options.cc:56
+msgid "Print path to selected chroot"
+msgstr "Print path to selected chroot"
+
+#: dchroot/dchroot-options.cc:60 dchroot-dsa/dchroot-dsa-options.cc:60
+#: schroot/schroot-options.cc:62
+msgid "Select all chroots"
+msgstr "Select all chroots"
+
+#: dchroot/dchroot-options.cc:64 schroot/schroot-options.cc:70
+msgid "Preserve user environment"
+msgstr "Preserve user environment"
+
+#: dchroot/dchroot-options.cc:73 dchroot-dsa/dchroot-dsa-options.cc:69
+#: schroot/schroot-listmounts-options.cc:64 schroot/schroot-options.cc:92
+#: schroot/schroot-releaselock-options.cc:67
+msgid "Usage:"
+msgstr "Usage:"
+
+#: dchroot/dchroot-options.cc:76 schroot/schroot-options.cc:95
+#, fuzzy
+msgid "[OPTION...] [COMMAND] - run command or shell in a chroot"
+msgstr " [OPTION...] [COMMAND] - run command or shell in a chroot"
+
+#: dchroot/dchroot-options.cc:99 dchroot-dsa/dchroot-dsa-options.cc:102
+#, fuzzy
+msgid "Only one command may be specified"
+msgstr "Only one action may be specified"
+
+#: dchroot/dchroot-options.cc:104 schroot/schroot-options-base.cc:157
+msgid "--quiet and --verbose may not be used at the same time"
+msgstr "--quiet and --verbose may not be used at the same time"
+
+#: dchroot/dchroot-options.cc:106 schroot/schroot-options-base.cc:159
+msgid "Using verbose output"
+msgstr "Using verbose output"
+
+#: dchroot/dchroot-options.cc:112 schroot/schroot-options-base.cc:165
+msgid "--chroot and --all may not be used at the same time"
+msgstr "--chroot and --all may not be used at the same time"
+
+#: dchroot/dchroot-options.cc:114 schroot/schroot-options-base.cc:167
+msgid "Using --chroots only"
+msgstr "Using --chroots only"
+
+#: dchroot/dchroot-session-base.cc:76
+#, boost-format
+msgid "(%1%->%2%): dchroot sessions do not support user switching"
+msgstr "(%1%->%2%): dchroot sessions do not support user switching"
+
+#: dchroot/dchroot-session-base.cc:78
+msgid "dchroot session restriction"
+msgstr "dchroot session restriction"
+
+#: dchroot/dchroot-session.cc:116 dchroot-dsa/dchroot-dsa-session.cc:132
+#, boost-format
 msgid "[%1% chroot] Running command: \"%2%\""
 msgstr "[%1% chroot] Running command: “%2%”"
 
-#: schroot/sbuild-auth.cc:52
+#: dchroot-dsa/dchroot-dsa-chroot-config.cc:110
+#, fuzzy, boost-format
+msgid "%1% chroot (dchroot-dsa compatibility)"
+msgstr "Running schroot in dchroot compatibility mode"
+
+#: dchroot-dsa/dchroot-dsa-options.cc:56
+msgid "Print paths to available chroots"
+msgstr "Print paths to available chroots"
+
+#: dchroot-dsa/dchroot-dsa-options.cc:72
+#, fuzzy
+msgid "[OPTION...] chroot [COMMAND] - run command or shell in a chroot"
+msgstr " [OPTION...] chroot [COMMAND] - run command or shell in a chroot"
+
+#: dchroot-dsa/dchroot-dsa-session.cc:116
+#, boost-format
+msgid "%1%: Command must have an absolute path"
+msgstr ""
+
+#: sbuild/sbuild-auth.cc:53
 msgid "Failed to get hostname"
 msgstr "Failed to get hostname"
 
-#: schroot/sbuild-auth.cc:53
+#: sbuild/sbuild-auth.cc:54
 msgid "User not found"
 msgstr "User not found"
 
-#: schroot/sbuild-auth.cc:54
+#: sbuild/sbuild-auth.cc:55
 msgid "Access not authorised"
 msgstr "Access not authorised"
 
-#: schroot/sbuild-auth.cc:55
+#: sbuild/sbuild-auth.cc:56
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: schroot/sbuild-auth.cc:56
+#: sbuild/sbuild-auth.cc:57
 msgid "PAM is already initialised"
 msgstr "PAM is already initialised"
 
-#: schroot/sbuild-auth.cc:57
+#: sbuild/sbuild-auth.cc:58
 msgid "PAM error"
 msgstr "PAM error"
 
-#: schroot/sbuild-auth.cc:420
+#: sbuild/sbuild-auth.cc:421
 msgid "Set RUSER"
 msgstr "Set RUSER"
 
-#: schroot/sbuild-auth.cc:436
+#: sbuild/sbuild-auth.cc:437
 msgid "Set RHOST"
 msgstr "Set RHOST"
 
-#: schroot/sbuild-auth.cc:449
+#: sbuild/sbuild-auth.cc:450
 msgid "Set TTY"
 msgstr "Set TTY"
 
-#: schroot/sbuild-auth.cc:461
+#: sbuild/sbuild-auth.cc:462
 msgid "Set USER"
 msgstr "Set USER"
 
-#: schroot/sbuild-auth.cc:479
+#: sbuild/sbuild-auth.cc:480
+#, boost-format
 msgid "You do not have permission to access the %1% service."
 msgstr "You do not have permission to access the %1% service."
 
-#: schroot/sbuild-auth.cc:482
+#: sbuild/sbuild-auth.cc:483
 msgid "This failure will be reported."
 msgstr "This failure will be reported."
 
-#: schroot/sbuild-auth-conv-tty.cc:47
+#: sbuild/sbuild-auth-conv-tty.cc:48
 msgid "Timed out"
 msgstr "Timed out"
 
-#: schroot/sbuild-auth-conv-tty.cc:48
+#: sbuild/sbuild-auth-conv-tty.cc:49
 msgid "Time is running out..."
 msgstr "Time is running out..."
 
-#: schroot/sbuild-auth-conv-tty.cc:49
+#: sbuild/sbuild-auth-conv-tty.cc:50
 msgid "Failed to get terminal settings"
 msgstr "Failed to get terminal settings"
 
-#: schroot/sbuild-auth-conv-tty.cc:50
+#: sbuild/sbuild-auth-conv-tty.cc:51
 msgid "Unsupported conversation type"
 msgstr "Unsupported conversation type"
 
-#: schroot/sbuild-chroot-block-device.cc:176
+#: sbuild/sbuild-chroot-block-device.cc:179
 msgid "Device"
 msgstr "Device"
 
-#: schroot/sbuild-chroot-block-device.cc:178
+#: sbuild/sbuild-chroot-block-device.cc:181
 msgid "Mount Options"
 msgstr "Mount Options"
 
-#: schroot/sbuild-chroot.cc:47
+#: sbuild/sbuild-chroot.cc:58
 msgid "Unknown chroot type"
 msgstr "Unknown chroot type"
 
-#: schroot/sbuild-chroot.cc:48
+#: sbuild/sbuild-chroot.cc:59
 msgid "Chroot creation failed"
 msgstr "Chroot creation failed"
 
-#: schroot/sbuild-chroot.cc:49
+#: sbuild/sbuild-chroot.cc:60
 msgid "Device name not set"
 msgstr "Device name not set"
 
-#: schroot/sbuild-chroot.cc:50
+#: sbuild/sbuild-chroot.cc:61
 msgid "Failed to write session file"
 msgstr "Failed to write session file"
 
-#: schroot/sbuild-chroot.cc:51
+#: sbuild/sbuild-chroot.cc:62
 msgid "Failed to unlink session file"
 msgstr "Failed to unlink session file"
 
-#: schroot/sbuild-chroot.cc:52 schroot/sbuild-chroot-config.cc:56
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-chroot-config.cc:58
 msgid "Failed to stat file"
 msgstr "Failed to stat file"
 
-#: schroot/sbuild-chroot.cc:53 schroot/sbuild-chroot-config.cc:58
+#: sbuild/sbuild-chroot.cc:64 sbuild/sbuild-chroot-config.cc:60
 msgid "File is not owned by user root"
 msgstr "File is not owned by user root"
 
-#: schroot/sbuild-chroot.cc:54 schroot/sbuild-chroot-config.cc:59
+#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
 msgid "File has write permissions for others"
 msgstr "File has write permissions for others"
 
-#: schroot/sbuild-chroot.cc:55 schroot/sbuild-chroot-config.cc:60
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:62
 msgid "File is not a regular file"
 msgstr "File is not a regular file"
 
-#: schroot/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:67
 msgid "Failed to acquire file lock"
 msgstr "Failed to acquire file lock"
 
-#: schroot/sbuild-chroot.cc:57
+#: sbuild/sbuild-chroot.cc:68
 msgid "Failed to discard file lock"
 msgstr "Failed to discard file lock"
 
-#: schroot/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:69
 msgid "Failed to stat device"
 msgstr "Failed to stat device"
 
-#: schroot/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:70
 msgid "File is not a block device"
 msgstr "File is not a block device"
 
-#: schroot/sbuild-chroot.cc:60
+#: sbuild/sbuild-chroot.cc:71
 msgid "Failed to lock device"
 msgstr "Failed to lock device"
 
-#: schroot/sbuild-chroot.cc:61
+#: sbuild/sbuild-chroot.cc:72
 msgid "Failed to unlock device"
 msgstr "Failed to unlock device"
 
-#: schroot/sbuild-chroot.cc:403
+#: sbuild/sbuild-chroot.cc:414
 #, fuzzy
 msgid "--- Session ---\n"
 msgstr "  ——— Session ———\n"
 
-#: schroot/sbuild-chroot.cc:405
+#: sbuild/sbuild-chroot.cc:416
 #, fuzzy
 msgid "--- Chroot ---\n"
 msgstr "  ——— Chroot ———\n"
 
-#: schroot/sbuild-chroot.cc:406
+#: sbuild/sbuild-chroot.cc:417
 msgid "Name"
 msgstr "Name"
 
-#: schroot/sbuild-chroot.cc:407
+#: sbuild/sbuild-chroot.cc:418
 msgid "Description"
 msgstr "Description"
 
-#: schroot/sbuild-chroot.cc:408
+#: sbuild/sbuild-chroot.cc:419
 msgid "Type"
 msgstr "Type"
 
-#: schroot/sbuild-chroot.cc:409
+#: sbuild/sbuild-chroot.cc:420
 msgid "Priority"
 msgstr "Priority"
 
-#: schroot/sbuild-chroot.cc:410
+#: sbuild/sbuild-chroot.cc:421
 msgid "Users"
 msgstr "Users"
 
-#: schroot/sbuild-chroot.cc:411
+#: sbuild/sbuild-chroot.cc:422
 msgid "Groups"
 msgstr "Groups"
 
-#: schroot/sbuild-chroot.cc:412
+#: sbuild/sbuild-chroot.cc:423
 msgid "Root Users"
 msgstr "Root Users"
 
-#: schroot/sbuild-chroot.cc:413
+#: sbuild/sbuild-chroot.cc:424
 msgid "Root Groups"
 msgstr "Root Groups"
 
-#: schroot/sbuild-chroot.cc:414
+#: sbuild/sbuild-chroot.cc:425
 msgid "Aliases"
 msgstr "Aliases"
 
-#: schroot/sbuild-chroot.cc:415
+#: sbuild/sbuild-chroot.cc:426
 msgid "Run Setup Scripts"
 msgstr "Run Setup Scripts"
 
-#: schroot/sbuild-chroot.cc:416
+#: sbuild/sbuild-chroot.cc:427
 msgid "Run Execution Scripts"
 msgstr "Run Execution Scripts"
 
-#: schroot/sbuild-chroot.cc:418
+#: sbuild/sbuild-chroot.cc:429
 msgid "Session Managed"
 msgstr "Session Managed"
 
-#: schroot/sbuild-chroot.cc:423
+#: sbuild/sbuild-chroot.cc:434
 msgid "Command Prefix"
 msgstr "Command Prefix"
 
-#: schroot/sbuild-chroot.cc:425
+#: sbuild/sbuild-chroot.cc:436
 msgid "Personality"
 msgstr "Personality"
 
-#: schroot/sbuild-chroot.cc:429
+#: sbuild/sbuild-chroot.cc:440
 msgid "Location"
 msgstr "Location"
 
-#: schroot/sbuild-chroot.cc:432
+#: sbuild/sbuild-chroot.cc:443
 msgid "Mount Location"
 msgstr "Mount Location"
 
-#: schroot/sbuild-chroot.cc:435
+#: sbuild/sbuild-chroot.cc:446
 msgid "Path"
 msgstr "Path"
 
-#: schroot/sbuild-chroot.cc:438
+#: sbuild/sbuild-chroot.cc:449
 msgid "Mount Device"
 msgstr "Mount Device"
 
-#: schroot/sbuild-chroot.cc:597
+#: sbuild/sbuild-chroot.cc:608
+#, boost-format
 msgid "%1% chroot: personality \"%2%\" is unknown.\n"
 msgstr "%1% chroot: personality “%2%” is unknown.\n"
 
-#: schroot/sbuild-chroot.cc:600
+#: sbuild/sbuild-chroot.cc:611
+#, boost-format
 msgid "Valid personalities: %1%\n"
 msgstr "Valid personalities: %1%\n"
 
-#: schroot/sbuild-chroot-config.cc:55
+#: sbuild/sbuild-chroot-config.cc:57
 msgid "Failed to open directory"
 msgstr "Failed to open directory"
 
-#: schroot/sbuild-chroot-config.cc:57
+#: sbuild/sbuild-chroot-config.cc:59
 msgid "Failed to open file"
 msgstr "Failed to open file"
 
-#: schroot/sbuild-chroot-config.cc:180
-#, fuzzy
+#: sbuild/sbuild-chroot-config.cc:182
+#, fuzzy, boost-format
 msgid "%1% chroot: Alias '%2%' already associated with '%3%' chroot"
 msgstr "%1% chroot: alias ‘%2%’ already associated with ‘%3%’ chroot"
 
-#: schroot/sbuild-chroot-config.cc:188
-#, fuzzy
+#: sbuild/sbuild-chroot-config.cc:190
+#, fuzzy, boost-format
 msgid "%1% chroot: Alias '%2%' already associated with another chroot"
 msgstr "%1% chroot: alias ‘%2%’ already associated with another chroot"
 
-#: schroot/sbuild-chroot-config.cc:198
-#, fuzzy
+#: sbuild/sbuild-chroot-config.cc:200
+#, fuzzy, boost-format
 msgid "%1% chroot: A chroot or alias already exists by this name"
 msgstr "%1% chroot: a chroot or alias already exists by this name"
 
-#: schroot/sbuild-chroot-config.cc:201
-#, fuzzy
+#: sbuild/sbuild-chroot-config.cc:203
+#, fuzzy, boost-format
 msgid "%1% chroot: Duplicate names are not allowed"
 msgstr "%1% chroot: duplicate names are not allowed"
 
-#: schroot/sbuild-chroot-config.cc:280
+#: sbuild/sbuild-chroot-config.cc:282
 msgid "Available chroots: "
 msgstr "Available chroots: "
 
-#: schroot/sbuild-chroot-config.cc:325 schroot/sbuild-chroot-config.cc:344
-#: schroot/sbuild-chroot-config.cc:367
+#: sbuild/sbuild-chroot-config.cc:327 sbuild/sbuild-chroot-config.cc:346
+#: sbuild/sbuild-chroot-config.cc:369 schroot/schroot-main.cc:138
+#, boost-format
 msgid "%1%: No such chroot"
 msgstr "%1%: No such chroot"
 
-#: schroot/sbuild-chroot-file.cc:143
+#: sbuild/sbuild-chroot-file.cc:146
 msgid "File"
 msgstr "File"
 
-#: schroot/sbuild-chroot-file.cc:144
+#: sbuild/sbuild-chroot-file.cc:147
 msgid "File Repack"
 msgstr "File Repack"
 
-#: schroot/sbuild-chroot-lvm-snapshot.cc:201
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:203
 msgid "LVM Snapshot Device"
 msgstr "LVM Snapshot Device"
 
-#: schroot/sbuild-chroot-lvm-snapshot.cc:204
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:206
 msgid "LVM Snapshot Options"
 msgstr "LVM Snapshot Options"
 
-#: schroot/sbuild-chroot-source.cc:45
+#: sbuild/sbuild-chroot-source.cc:47
 #, fuzzy
 msgid "(source chroot)"
 msgstr " (source chroot)"
 
-#: schroot/sbuild-chroot-source.cc:115
+#: sbuild/sbuild-chroot-source.cc:117
 msgid "Source Users"
 msgstr "Source Users"
 
-#: schroot/sbuild-chroot-source.cc:116
+#: sbuild/sbuild-chroot-source.cc:118
 msgid "Source Groups"
 msgstr "Source Groups"
 
-#: schroot/sbuild-chroot-source.cc:117
+#: sbuild/sbuild-chroot-source.cc:119
 msgid "Source Root Users"
 msgstr "Source Root Users"
 
-#: schroot/sbuild-chroot-source.cc:118
+#: sbuild/sbuild-chroot-source.cc:120
 msgid "Source Root Groups"
 msgstr "Source Root Groups"
 
-#: schroot/sbuild-format-detail.cc:34
+#: sbuild/sbuild-format-detail.cc:34
 msgid "true"
 msgstr "true"
 
-#: schroot/sbuild-format-detail.cc:36
+#: sbuild/sbuild-format-detail.cc:36
 msgid "false"
 msgstr "false"
 
-#: schroot/sbuild-keyfile.cc:363
+#: sbuild/sbuild-keyfile.cc:363
+#, boost-format
 msgid "%1% chroot: A deprecated parameter \"%2%\" has been specified."
 msgstr "%1% chroot: A deprecated parameter “%2%” has been specified."
 
-#: schroot/sbuild-keyfile.cc:367
+#: sbuild/sbuild-keyfile.cc:367
 msgid "This option will be removed in the future."
 msgstr "This option will be removed in the future."
 
-#: schroot/sbuild-keyfile.cc:371
+#: sbuild/sbuild-keyfile.cc:371
+#, boost-format
 msgid "%1% chroot: An obsolete parameter \"%2%\" has been specified."
 msgstr "%1% chroot: An obsolete parameter “%2%” has been specified."
 
-#: schroot/sbuild-keyfile.cc:375
+#: sbuild/sbuild-keyfile.cc:375
 msgid "This option has been removed, and no longer has any effect."
 msgstr "This option has been removed, and no longer has any effect."
 
-#: schroot/sbuild-lock.cc:48
+#: sbuild/sbuild-lock.cc:49
 msgid "Failed to set timeout handler"
 msgstr "Failed to set timeout handler"
 
-#: schroot/sbuild-lock.cc:49
+#: sbuild/sbuild-lock.cc:50
 msgid "Failed to set timeout"
 msgstr "Failed to set timeout"
 
-#: schroot/sbuild-lock.cc:50
+#: sbuild/sbuild-lock.cc:51
 msgid "Failed to cancel timeout"
 msgstr "Failed to cancel timeout"
 
-#: schroot/sbuild-lock.cc:51
+#: sbuild/sbuild-lock.cc:52
 msgid "Failed to acquire lock (timed out)"
 msgstr "Failed to acquire lock (timed out)"
 
-#: schroot/sbuild-lock.cc:52
+#: sbuild/sbuild-lock.cc:53
 msgid "Failed to acquire lock"
 msgstr "Failed to acquire lock"
 
-#: schroot/sbuild-lock.cc:53
+#: sbuild/sbuild-lock.cc:54
 msgid "Failed to acquire device lock"
 msgstr "Failed to acquire device lock"
 
-#: schroot/sbuild-lock.cc:54
+#: sbuild/sbuild-lock.cc:55
 msgid "Failed to acquire device lock (timed out)"
 msgstr "Failed to acquire device lock (timed out)"
 
-#: schroot/sbuild-lock.cc:55
+#: sbuild/sbuild-lock.cc:56
 msgid "Failed to test device lock"
 msgstr "Failed to test device lock"
 
-#: schroot/sbuild-lock.cc:56
+#: sbuild/sbuild-lock.cc:57
 msgid "Failed to release device lock"
 msgstr "Failed to release device lock"
 
-#: schroot/sbuild-lock.cc:57
+#: sbuild/sbuild-lock.cc:58
 msgid "Failed to release device lock (timed out)"
 msgstr "Failed to release device lock (timed out)"
 
-#: schroot/sbuild-lock.cc:274
+#: sbuild/sbuild-lock.cc:275
+#, boost-format
 msgid "lock held by pid %1%"
 msgstr "lock held by pid %1%"
 
-#: schroot/sbuild-parse-error.cc:41
+#: sbuild/sbuild-parse-error.cc:41
 #, fuzzy
 msgid "No error"
 msgstr "no error"
 
-#: schroot/sbuild-parse-error.cc:42
+#: sbuild/sbuild-parse-error.cc:42
 #, fuzzy
 msgid "Can't open file"
 msgstr "can't open file"
 
-#: schroot/sbuild-parse-error.cc:43
+#: sbuild/sbuild-parse-error.cc:43
 #, fuzzy
 msgid "Could not parse value"
 msgstr "could not parse value"
 
-#: schroot/sbuild-parse-error.cc:44
+#: sbuild/sbuild-parse-error.cc:44
 #, fuzzy
 msgid "Invalid line"
 msgstr "invalid line"
 
-#: schroot/sbuild-parse-error.cc:45
+#: sbuild/sbuild-parse-error.cc:45
 #, fuzzy
 msgid "No group specified"
 msgstr "no group specified"
 
-#: schroot/sbuild-parse-error.cc:46
+#: sbuild/sbuild-parse-error.cc:46
 #, fuzzy
 msgid "Invalid group"
 msgstr "invalid group"
 
-#: schroot/sbuild-parse-error.cc:47
+#: sbuild/sbuild-parse-error.cc:47
 #, fuzzy
 msgid "Duplicate group"
 msgstr "duplicate group"
 
-#: schroot/sbuild-parse-error.cc:48
+#: sbuild/sbuild-parse-error.cc:48
 #, fuzzy
 msgid "No key specified"
 msgstr "no key specified"
 
-#: schroot/sbuild-parse-error.cc:49
+#: sbuild/sbuild-parse-error.cc:49
 #, fuzzy
 msgid "Duplicate key"
 msgstr "duplicate key"
 
-#: schroot/sbuild-parse-error.cc:50
+#: sbuild/sbuild-parse-error.cc:50
 #, fuzzy
 msgid "Required key is missing"
 msgstr "required key is missing"
 
-#: schroot/sbuild-parse-error.cc:51
+#: sbuild/sbuild-parse-error.cc:51
 #, fuzzy
 msgid "Disallowed key used"
 msgstr "disallowed key used"
 
-#: schroot/sbuild-parse-error.cc:116
+#: sbuild/sbuild-parse-error.cc:116
 #, fuzzy
 msgid "Unknown error"
 msgstr "unknown error"
 
-#: schroot/sbuild-parse-error.cc:127
+#: sbuild/sbuild-parse-error.cc:127
+#, boost-format
 msgid "%1% \"%2%\""
 msgstr "%1% “%2%”\""
 
-#: schroot/sbuild-parse-error.cc:143
+#: sbuild/sbuild-parse-error.cc:143
+#, boost-format
 msgid "line %1%: %3%"
 msgstr "line %1%: %3%"
 
-#: schroot/sbuild-parse-error.cc:144
+#: sbuild/sbuild-parse-error.cc:144
+#, boost-format
 msgid "line %1%: %2% \"%3%\""
 msgstr "line %1%: %2% “%3%”"
 
-#: schroot/sbuild-parse-error.cc:150
+#: sbuild/sbuild-parse-error.cc:150
+#, boost-format
 msgid "line %1%: %2%"
 msgstr "line %1%: %2%"
 
-#: schroot/sbuild-parse-error.cc:165
+#: sbuild/sbuild-parse-error.cc:165
+#, boost-format
 msgid "line %1% [%2%]: %4%"
 msgstr "line %1% [%2%]: %4%"
 
-#: schroot/sbuild-parse-error.cc:166
+#: sbuild/sbuild-parse-error.cc:166
+#, boost-format
 msgid "line %1% [%2%]: %3% \"%4%\""
 msgstr "line %1% [%2%]: %3% “%4%”"
 
-#: schroot/sbuild-parse-error.cc:172
+#: sbuild/sbuild-parse-error.cc:172
+#, boost-format
 msgid "line %1% [%2%]: %3%"
 msgstr "line %1% [%2%]: %3%"
 
-#: schroot/sbuild-parse-error.cc:188
+#: sbuild/sbuild-parse-error.cc:188
+#, boost-format
 msgid "line %1% [%2%] %3%: %5%"
 msgstr "line %1% [%2%] %3%: %5%"
 
-#: schroot/sbuild-parse-error.cc:189
+#: sbuild/sbuild-parse-error.cc:189
+#, boost-format
 msgid "line %1% [%2%] %3%: %4% \"%5%\""
 msgstr "line %1% [%2%] %3%: %4% “%5%”"
 
-#: schroot/sbuild-parse-error.cc:195
+#: sbuild/sbuild-parse-error.cc:195
+#, boost-format
 msgid "line %1% [%2%] %3%: %4%"
 msgstr "line %1% [%2%] %3%: %4%"
 
-#: schroot/sbuild-parse-error.cc:209
+#: sbuild/sbuild-parse-error.cc:209
+#, boost-format
 msgid "[%1%]: %3%"
 msgstr "[%1%]: %3%"
 
-#: schroot/sbuild-parse-error.cc:210
+#: sbuild/sbuild-parse-error.cc:210
+#, boost-format
 msgid "[%1%]: %2% \"%3%\""
 msgstr "[%1%]: %2% “%3%”"
 
-#: schroot/sbuild-parse-error.cc:216
+#: sbuild/sbuild-parse-error.cc:216
+#, boost-format
 msgid "[%1%]: %2%"
 msgstr "[%1%]: %2%"
 
-#: schroot/sbuild-parse-error.cc:231
+#: sbuild/sbuild-parse-error.cc:231
+#, boost-format
 msgid "[%1%] %2%: %4%"
 msgstr "[%1%] %2%: %4%"
 
-#: schroot/sbuild-parse-error.cc:232
+#: sbuild/sbuild-parse-error.cc:232
+#, boost-format
 msgid "[%1%] %2%: %3% \"%4%\""
 msgstr "[%1%] %2%: %3% “%4%”"
 
-#: schroot/sbuild-parse-error.cc:238
+#: sbuild/sbuild-parse-error.cc:238
+#, boost-format
 msgid "[%1%] %2%: %3%"
 msgstr "[%1%] %2%: %3%"
 
-#: schroot/sbuild-personality.cc:48
+#: sbuild/sbuild-personality.cc:48
 msgid "Failed to set personality"
 msgstr "Failed to set personality"
 
-#: schroot/sbuild-session.cc:57
+#: sbuild/sbuild-session.cc:59
 msgid "Failed to find chroot"
 msgstr "Failed to find chroot"
 
-#: schroot/sbuild-session.cc:58
+#: sbuild/sbuild-session.cc:60
 msgid "Failed to lock chroot"
 msgstr "Failed to lock chroot"
 
-#: schroot/sbuild-session.cc:59
+#: sbuild/sbuild-session.cc:61
 msgid "Failed to unlock chroot"
 msgstr "Failed to unlock chroot"
 
-#: schroot/sbuild-session.cc:60
+#: sbuild/sbuild-session.cc:62
 msgid "Chroot setup failed"
 msgstr "Chroot setup failed"
 
-#: schroot/sbuild-session.cc:61
+#: sbuild/sbuild-session.cc:63
 msgid "Failed to set hangup signal handler"
 msgstr "Failed to set hangup signal handler"
 
-#: schroot/sbuild-session.cc:62
+#: sbuild/sbuild-session.cc:64
 msgid "Caught hangup signal"
 msgstr "Caught hangup signal"
 
-#: schroot/sbuild-session.cc:63
+#: sbuild/sbuild-session.cc:65
 msgid "Failed to fork child"
 msgstr "Failed to fork child"
 
-#: schroot/sbuild-session.cc:64
+#: sbuild/sbuild-session.cc:66
 msgid "Wait for child failed"
 msgstr "Wait for child failed"
 
-#: schroot/sbuild-session.cc:65
+#: sbuild/sbuild-session.cc:67
 msgid "Child terminated by signal"
 msgstr "Child terminated by signal"
 
-#: schroot/sbuild-session.cc:66
+#: sbuild/sbuild-session.cc:68
 msgid "Child dumped core"
 msgstr "Child dumped core"
 
-#: schroot/sbuild-session.cc:67
+#: sbuild/sbuild-session.cc:69
 msgid "Child exited abnormally (reason unknown; not a signal or core dump)"
 msgstr "Child exited abnormally (reason unknown; not a signal or core dump)"
 
-#: schroot/sbuild-session.cc:68
+#: sbuild/sbuild-session.cc:70
 msgid "User switching is not permitted"
 msgstr "User switching is not permitted"
 
-#: schroot/sbuild-session.cc:106
+#: sbuild/sbuild-session.cc:108
+#, boost-format
 msgid "%1%: Group not found"
 msgstr "%1%: Group not found"
 
-#: schroot/sbuild-session.cc:108
+#: sbuild/sbuild-session.cc:110
+#, boost-format
 msgid "%1%: Group not found: %2%"
 msgstr "%1%: Group not found: %2%"
 
-#: schroot/sbuild-session.cc:124
+#: sbuild/sbuild-session.cc:126
+#, boost-format
 msgid "Can't get supplementary group count: %1%"
 msgstr "Can't get supplementary group count: %1%"
 
-#: schroot/sbuild-session.cc:134
+#: sbuild/sbuild-session.cc:136
+#, boost-format
 msgid "Can't get supplementary groups: %1%"
 msgstr "Can't get supplementary groups: %1%"
 
-#: schroot/sbuild-session.cc:364
+#: sbuild/sbuild-session.cc:366
+#, boost-format
 msgid "No chroot found matching alias '%1%'"
 msgstr "No chroot found matching alias ‘%1%’"
 
-#: schroot/sbuild-session.cc:571
+#: sbuild/sbuild-session.cc:573
+#, boost-format
 msgid "%1%: Shell not available: %2%"
 msgstr "%1%: Shell not available: %2%"
 
-#: schroot/sbuild-session.cc:574
-#, fuzzy
+#: sbuild/sbuild-session.cc:576
+#, fuzzy, boost-format
 msgid "Falling back to %1%"
 msgstr "Falling back to ‘%1%’"
 
-#: schroot/sbuild-session.cc:640
-#, fuzzy
+#: sbuild/sbuild-session.cc:642
+#, fuzzy, boost-format
 msgid "[%1% chroot] Running login shell: \"%4%\""
 msgstr "[%1% chroot] Running login shell: “%2%”"
 
-#: schroot/sbuild-session.cc:642
-#, fuzzy
+#: sbuild/sbuild-session.cc:644
+#, fuzzy, boost-format
 msgid "[%1% chroot] Running shell: \"%4%\""
 msgstr "[%1% chroot] Running shell: “%2%”"
 
-#: schroot/sbuild-session.cc:648
+#: sbuild/sbuild-session.cc:650
+#, boost-format
 msgid "[%1% chroot] (%2%->%3%) Running login shell: \"%4%\""
 msgstr "[%1% chroot] (%2%→%3%) Running login shell: “%4%”"
 
-#: schroot/sbuild-session.cc:650
+#: sbuild/sbuild-session.cc:652
+#, boost-format
 msgid "[%1% chroot] (%2%->%3%) Running shell: \"%4%\""
 msgstr "[%1% chroot] (%2%→%3%) Running shell: “%4%”"
 
-#: schroot/sbuild-session.cc:685
-#, fuzzy
+#: sbuild/sbuild-session.cc:687
+#, fuzzy, boost-format
 msgid "[%1% chroot] Running command: \"%4%\""
 msgstr "[%1% chroot] Running command: “%2%”"
 
-#: schroot/sbuild-session.cc:687
+#: sbuild/sbuild-session.cc:689
+#, boost-format
 msgid "[%1% chroot] (%2%->%3%) Running command: \"%4%\""
 msgstr "[%1% chroot] (%2%→%3%) Running command: “%4%”"
 
-#: schroot/sbuild-session.cc:809
+#: sbuild/sbuild-session.cc:811
+#, boost-format
 msgid "Invalid verbosity level: %1%, falling back to \"normal\""
 msgstr "Invalid verbosity level: %1%, falling back to “normal”"
 
-#: schroot/sbuild-session.cc:845 schroot/sbuild-session.cc:1020
+#: sbuild/sbuild-session.cc:847 sbuild/sbuild-session.cc:1022
+#, boost-format
 msgid "Could not exec \"%1%\": %2%"
 msgstr "Could not exec “%1%”: %2%"
 
-#: schroot/sbuild-session.cc:871
+#: sbuild/sbuild-session.cc:873
+#, boost-format
 msgid "stage=%1%"
 msgstr "stage=%1%"
 
-#: schroot/sbuild-session.cc:900
+#: sbuild/sbuild-session.cc:902
+#, boost-format
 msgid "PAM error: %1%"
 msgstr "PAM error: %1%"
 
-#: schroot/sbuild-session.cc:908
+#: sbuild/sbuild-session.cc:910
+#, boost-format
 msgid "Could not set gid to '%1%'"
 msgstr "Could not set gid to ‘%1%’"
 
-#: schroot/sbuild-session.cc:914
+#: sbuild/sbuild-session.cc:916
 msgid "Could not set supplementary group IDs"
 msgstr "Could not set supplementary group IDs"
 
-#: schroot/sbuild-session.cc:932 schroot/sbuild-session.cc:980
+#: sbuild/sbuild-session.cc:934 sbuild/sbuild-session.cc:982
+#, boost-format
 msgid "Could not chdir to '%1%': %2%"
 msgstr "Could not chdir to ‘%1%’: %2%"
 
-#: schroot/sbuild-session.cc:939
+#: sbuild/sbuild-session.cc:941
+#, boost-format
 msgid "Could not chroot to '%1%': %2%"
 msgstr "Could not chroot to ‘%1%’: %2%"
 
-#: schroot/sbuild-session.cc:948
+#: sbuild/sbuild-session.cc:950
+#, boost-format
 msgid "Could not set uid to '%1%'"
 msgstr "Could not set uid to ‘%1%’"
 
-#: schroot/sbuild-session.cc:954
+#: sbuild/sbuild-session.cc:956
 msgid "Failed to drop root permissions."
 msgstr "Failed to drop root permissions."
 
-#: schroot/sbuild-session.cc:987
+#: sbuild/sbuild-session.cc:989
+#, boost-format
 msgid "Falling back to '%1%'"
 msgstr "Falling back to ‘%1%’"
 
-#: schroot/sbuild-session.cc:1042
+#: sbuild/sbuild-session.cc:1044
 msgid "Caught hangup signal, terminating..."
 msgstr "Caught hangup signal, terminating..."
 
-#: schroot/schroot.cc:68
-#, fuzzy
-msgid "An unknown exception occured"
-msgstr "Unknown action specified"
+#: schroot/schroot-listmounts.cc:61 schroot/schroot-main.cc:58
+#: schroot/schroot-releaselock.cc:56
+#, fuzzy, boost-format
+msgid "%1% (Debian sbuild) %2% (%3%)\n"
+msgstr "%1% (Debian sbuild) %2%\n"
 
-#: schroot/schroot-listmounts.cc:57
-msgid "schroot-listmounts (Debian sbuild) %1%\n"
-msgstr "schroot-listmounts (Debian sbuild) %1%\n"
-
-#: schroot/schroot-listmounts.cc:58 schroot/schroot-releaselock.cc:55
+#: schroot/schroot-listmounts.cc:65 schroot/schroot-main.cc:62
+#: schroot/schroot-releaselock.cc:60
 msgid ""
 "Written by Roger Leigh\n"
 "\n"
@@ -684,11 +852,13 @@ msgstr ""
 "Written by Roger Leigh\n"
 "\n"
 
-#: schroot/schroot-listmounts.cc:59 schroot/schroot-releaselock.cc:56
+#: schroot/schroot-listmounts.cc:66 schroot/schroot-main.cc:63
+#: schroot/schroot-releaselock.cc:61
 msgid "Copyright (C) 2004-2006 Roger Leigh\n"
 msgstr "Copyright © 2004-2006 Roger Leigh\n"
 
-#: schroot/schroot-listmounts.cc:60 schroot/schroot-releaselock.cc:57
+#: schroot/schroot-listmounts.cc:67 schroot/schroot-main.cc:64
+#: schroot/schroot-releaselock.cc:62
 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"
@@ -696,147 +866,225 @@ 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-listmounts.cc:82
+#: schroot/schroot-listmounts.cc:89
+#, boost-format
 msgid "%1%: Failed to open: %2%"
 msgstr "%1%: failed to open directory: %2%"
 
-#: schroot/schroot-listmounts.cc:105
+#: schroot/schroot-listmounts.cc:112
+#, boost-format
 msgid "%1%: Failed to close: %2%"
 msgstr "%1%: Failed to close: %2%"
 
-#: schroot/schroot-listmounts.cc:151
+#: schroot/schroot-listmounts.cc:158
 msgid "No mountpoint specified"
 msgstr "No mountpoint specified"
 
-#: schroot/schroot-listmounts-options.cc:43
-#: schroot/schroot-releaselock-options.cc:44
+#: schroot/schroot-listmounts-options.cc:42 schroot/schroot-options-base.cc:48
+#: schroot/schroot-releaselock-options.cc:43
 msgid "General options"
 msgstr "General options"
 
-#: schroot/schroot-listmounts-options.cc:45
-#: schroot/schroot-releaselock-options.cc:46
+#: schroot/schroot-listmounts-options.cc:44 schroot/schroot-options-base.cc:69
+#: schroot/schroot-releaselock-options.cc:45
 msgid "Show help options"
 msgstr "Show help options"
 
-#: schroot/schroot-listmounts-options.cc:47
-#: schroot/schroot-releaselock-options.cc:48
+#: schroot/schroot-listmounts-options.cc:46 schroot/schroot-options-base.cc:71
+#: schroot/schroot-releaselock-options.cc:47
 msgid "Print version information"
 msgstr "Print version information"
 
-#: schroot/schroot-listmounts-options.cc:49
-#: schroot/schroot-releaselock-options.cc:50
+#: schroot/schroot-listmounts-options.cc:48
+#: schroot/schroot-releaselock-options.cc:49
 msgid "Lock options"
 msgstr "Lock options"
 
-#: schroot/schroot-listmounts-options.cc:52
+#: schroot/schroot-listmounts-options.cc:51
 msgid "Mountpoint to check (full path)"
 msgstr "Mountpoint to check (full path)"
 
-#: schroot/schroot-listmounts-options.cc:65 schroot/schroot-options.cc:95
-#: schroot/schroot-releaselock-options.cc:68
-msgid "Usage:"
-msgstr "Usage:"
-
-#: schroot/schroot-listmounts-options.cc:66
+#: schroot/schroot-listmounts-options.cc:65
 #, fuzzy
 msgid "schroot-listmounts [OPTION...] - list mounts"
 msgstr "  schroot-listmounts [OPTION...] - list mounts"
 
-#: schroot/schroot-options.cc:59
+#: schroot/schroot-main.cc:194
+msgid "Error saving terminal settings"
+msgstr "Error saving terminal settings"
+
+#: schroot/schroot-main.cc:226
+#, boost-format
+msgid "No chroots are defined in %1% or %2%"
+msgstr "No chroots are defined in %1% or %2%"
+
+#: schroot/schroot-main.cc:234
+#, boost-format
+msgid "No chroots are defined in %1%"
+msgstr "No chroots are defined in %1%"
+
+#: schroot/schroot-main.cc:251
+#, boost-format
+msgid "The specified chroots are not defined in %1%"
+msgstr "The specified chroots are not defined in %1%"
+
+#: schroot/schroot-main.cc:278
+msgid "Only one chroot may be specified when beginning a session"
+msgstr "Only one chroot may be specified when beginning a session"
+
+#: schroot/schroot-main.cc:335 schroot/schroot-main.cc:351
+msgid "Error restoring terminal settings"
+msgstr "Error restoring terminal settings"
+
+#: schroot/schroot-options-base.cc:49
+msgid "Chroot selection"
+msgstr "Chroot selection"
+
+#: schroot/schroot-options-base.cc:50
+msgid "Chroot environment"
+msgstr "Chroot environment"
+
+#: schroot/schroot-options-base.cc:51
+msgid "Session management"
+msgstr "Session management"
+
+#: schroot/schroot-options-base.cc:52
+msgid "Hidden options"
+msgstr "Hidden options"
+
+#: schroot/schroot-options-base.cc:73
+msgid "Show less output"
+msgstr "Show less output"
+
+#: schroot/schroot-options-base.cc:75
+msgid "Show more output"
+msgstr "Show more output"
+
+#: schroot/schroot-options-base.cc:77
+msgid "List available chroots"
+msgstr "List available chroots"
+
+#: schroot/schroot-options-base.cc:79
+msgid "Show information about selected chroots"
+msgstr "Show information about selected chroots"
+
+#: schroot/schroot-options-base.cc:81
+msgid "Dump configuration of selected chroots"
+msgstr "Dump configuration of selected chroots"
+
+#: schroot/schroot-options-base.cc:85
+msgid "Use specified chroot"
+msgstr "Use specified chroot"
+
+#: schroot/schroot-options-base.cc:89
+msgid "Command to run"
+msgstr "Command to run"
+
+#: schroot/schroot-options-base.cc:91
+msgid "Enable debugging messages"
+msgstr ""
+
+#: schroot/schroot-options-base.cc:190
+msgid ""
+"Only one chroot may be specified when recovering, running or ending a session"
+msgstr ""
+"Only one chroot may be specified when recovering, running or ending a session"
+
+#: schroot/schroot-options-base.cc:215
+msgid "--chroot may not be used with --list"
+msgstr "--chroot may not be used with --list"
+
+#: schroot/schroot-options-base.cc:237
+#, fuzzy
+msgid "Unknown action specified"
+msgstr "Only one action may be specified"
+
+#: schroot/schroot-options-base.cc:245
+msgid "Only one action may be specified"
+msgstr "Only one action may be specified"
+
+#: schroot/schroot-options.cc:56
 msgid "Print location of selected chroots"
 msgstr "Print location of selected chroots"
 
-#: schroot/schroot-options.cc:63
+#: schroot/schroot-options.cc:60
 msgid "Select all chroots and active sessions"
 msgstr "Select all chroots and active sessions"
 
-#: schroot/schroot-options.cc:65
-msgid "Select all chroots"
-msgstr "Select all chroots"
-
-#: schroot/schroot-options.cc:67
+#: schroot/schroot-options.cc:64
 msgid "Select all active sessions"
 msgstr "Select all active sessions"
 
-#: schroot/schroot-options.cc:71
+#: schroot/schroot-options.cc:68
 msgid "Username (default current user)"
 msgstr "Username (default current user)"
 
-#: schroot/schroot-options.cc:73
-msgid "Preserve user environment"
-msgstr "Preserve user environment"
-
-#: schroot/schroot-options.cc:77
+#: schroot/schroot-options.cc:74
 msgid "Begin a session; returns a session ID"
 msgstr "Begin a session; returns a session ID"
 
-#: schroot/schroot-options.cc:79
+#: schroot/schroot-options.cc:76
 msgid "Recover an existing session"
 msgstr "Recover an existing session"
 
-#: schroot/schroot-options.cc:81
+#: schroot/schroot-options.cc:78
 msgid "Run an existing session"
 msgstr "Run an existing session"
 
-#: schroot/schroot-options.cc:83
+#: schroot/schroot-options.cc:80
 msgid "End an existing session"
 msgstr "End an existing session"
 
-#: schroot/schroot-options.cc:85
+#: schroot/schroot-options.cc:82
 msgid "Force operation, even if it fails"
 msgstr "Force operation, even if it fails"
 
-#: schroot/schroot-options.cc:98
-#, fuzzy
-msgid "[OPTION...] [COMMAND] - run command or shell in a chroot"
-msgstr " [OPTION...] [COMMAND] - run command or shell in a chroot"
-
-#: schroot/schroot-releaselock.cc:54
-msgid "schroot-releaselock (Debian sbuild) %1%\n"
-msgstr "schroot-releaselock (Debian sbuild) %1%\n"
-
-#: schroot/schroot-releaselock.cc:100
+#: schroot/schroot-releaselock.cc:105
 msgid "No device specified"
 msgstr "No device specified"
 
-#: schroot/schroot-releaselock.cc:106
+#: schroot/schroot-releaselock.cc:111
 msgid "No pid specified; forcing release of lock"
 msgstr "No pid specified; forcing release of lock"
 
-#: schroot/schroot-releaselock.cc:115
+#: schroot/schroot-releaselock.cc:120
+#, boost-format
 msgid "Failed to stat device %1%: %2%"
 msgstr "Failed to stat device %1%: %2%"
 
-#: schroot/schroot-releaselock.cc:123
+#: schroot/schroot-releaselock.cc:128
+#, boost-format
 msgid "%1% is not a block device"
 msgstr "%1% is not a block device"
 
-#: schroot/schroot-releaselock.cc:131
+#: schroot/schroot-releaselock.cc:136
+#, boost-format
 msgid "%1%: failed to release device lock"
 msgstr "%1%: failed to release device lock"
 
-#: schroot/schroot-releaselock.cc:138
+#: schroot/schroot-releaselock.cc:143
+#, boost-format
 msgid "%1%: failed to release device lock owned by pid %2%"
 msgstr "%1%: failed to release device lock owned by pid %2%"
 
-#: schroot/schroot-releaselock-options.cc:53
+#: schroot/schroot-releaselock-options.cc:52
 msgid "Device to unlock (full path)"
 msgstr "Device to unlock (full path)"
 
-#: schroot/schroot-releaselock-options.cc:55
+#: schroot/schroot-releaselock-options.cc:54
 msgid "Process ID owning the lock"
 msgstr "Process ID owning the lock"
 
-#: schroot/schroot-releaselock-options.cc:69
+#: schroot/schroot-releaselock-options.cc:68
 #, fuzzy
 msgid "schroot-releaselock [OPTION...] - release a device lock"
 msgstr "  schroot-releaselock [OPTION...] - release a device lock"
 
-#~ msgid "(%1%->%2%): dchroot sessions do not support user switching"
-#~ msgstr "(%1%->%2%): dchroot sessions do not support user switching"
+#~ msgid "schroot-listmounts (Debian sbuild) %1%\n"
+#~ msgstr "schroot-listmounts (Debian sbuild) %1%\n"
 
-#~ msgid "dchroot session restriction"
-#~ msgstr "dchroot session restriction"
+#~ msgid "schroot-releaselock (Debian sbuild) %1%\n"
+#~ msgstr "schroot-releaselock (Debian sbuild) %1%\n"
 
 #~ msgid "%1%: not a regular file"
 #~ msgstr "%1%: not a regular file"
@@ -844,122 +1092,5 @@ msgstr "  schroot-releaselock [OPTION...] - release a device lock"
 #~ msgid "Falling back to home directory '%1%'"
 #~ msgstr "Falling back to home directory ‘%1%’"
 
-#~ msgid "%1% (Debian sbuild) %2%\n"
-#~ msgstr "%1% (Debian sbuild) %2%\n"
-
-#~ msgid "Error saving terminal settings"
-#~ msgstr "Error saving terminal settings"
-
-#~ msgid "Run 'schroot' for full capabilities"
-#~ msgstr "Run ‘schroot’ for full capabilities"
-
-#~ msgid "Using dchroot configuration file: "
-#~ msgstr "Using dchroot configuration file: "
-
-#~ msgid "Run '%1%'"
-#~ msgstr "Run ‘%1%’"
-
-#~ msgid "to migrate to a schroot configuration."
-#~ msgstr "to migrate to a schroot configuration."
-
-#~ msgid "Edit '%1%' to add appropriate group access."
-#~ msgstr "Edit ‘%1%’ to add appropriate group access."
-
-#~ msgid "Remove '%1%' to use the new configuration."
-#~ msgstr "Remove ‘%1%’ to use the new configuration."
-
-#~ msgid "No chroots are defined in %1% or %2%"
-#~ msgstr "No chroots are defined in %1% or %2%"
-
-#~ msgid "No chroots are defined in %1%"
-#~ msgstr "No chroots are defined in %1%"
-
-#~ msgid "The specified chroots are not defined in %1%"
-#~ msgstr "The specified chroots are not defined in %1%"
-
-#~ msgid "schroot configuration generated by %1% %2%"
-#~ msgstr "schroot configuration generated by %1% %2%"
-
-#~ msgid "To allow users access to the chroots, use the users or groups keys."
-#~ msgstr "To allow users access to the chroots, use the users or groups keys."
-
-#~ msgid ""
-#~ "To allow passwordless root access, use the root-users or root-groups keys."
-#~ msgstr ""
-#~ "To allow passwordless root access, use the root-users or root-groups keys."
-
-#~ msgid "Only one chroot may be specified when beginning a session"
-#~ msgstr "Only one chroot may be specified when beginning a session"
-
 #~ msgid "Session failure: %1%"
 #~ msgstr "Session failure: %1%"
-
-#~ msgid "Error restoring terminal settings"
-#~ msgstr "Error restoring terminal settings"
-
-#~ msgid "Show less output"
-#~ msgstr "Show less output"
-
-#~ msgid "Show more output"
-#~ msgstr "Show more output"
-
-#~ msgid "List available chroots"
-#~ msgstr "List available chroots"
-
-#~ msgid "Show information about selected chroots"
-#~ msgstr "Show information about selected chroots"
-
-#~ msgid "Print path to selected chroot"
-#~ msgstr "Print path to selected chroot"
-
-#~ msgid "Print paths to available chroots"
-#~ msgstr "Print paths to available chroots"
-
-#~ msgid "Dump configuration of selected chroots"
-#~ msgstr "Dump configuration of selected chroots"
-
-#~ msgid "Chroot selection"
-#~ msgstr "Chroot selection"
-
-#~ msgid "Use specified chroot"
-#~ msgstr "Use specified chroot"
-
-#~ msgid "Chroot environment"
-#~ msgstr "Chroot environment"
-
-#~ msgid "Session management"
-#~ msgstr "Session management"
-
-#~ msgid "Hidden options"
-#~ msgstr "Hidden options"
-
-#~ msgid "Command to run"
-#~ msgstr "Command to run"
-
-#~ msgid " [OPTION...] chroot [COMMAND] - run command or shell in a chroot"
-#~ msgstr " [OPTION...] chroot [COMMAND] - run command or shell in a chroot"
-
-#~ msgid "--quiet and --verbose may not be used at the same time"
-#~ msgstr "--quiet and --verbose may not be used at the same time"
-
-#~ msgid "Using verbose output"
-#~ msgstr "Using verbose output"
-
-#~ msgid "--chroot and --all may not be used at the same time"
-#~ msgstr "--chroot and --all may not be used at the same time"
-
-#~ msgid "Using --chroots only"
-#~ msgstr "Using --chroots only"
-
-#~ msgid ""
-#~ "Only one chroot may be specified when recovering, running or ending a "
-#~ "session"
-#~ msgstr ""
-#~ "Only one chroot may be specified when recovering, running or ending a "
-#~ "session"
-
-#~ msgid "--chroot may not be used with --list"
-#~ msgstr "--chroot may not be used with --list"
-
-#~ msgid "Only one action may be specified"
-#~ msgstr "Only one action may be specified"
diff --git a/po/sv.po b/po/sv.po
index 821c5665..11a1530f 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-06-23 16:39+0100\n"
+"POT-Creation-Date: 2006-06-24 00:38+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"
@@ -15,727 +15,898 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: schroot/dchroot-chroot-config.cc:124
+#: dchroot/dchroot.cc:68 dchroot-dsa/dchroot-dsa.cc:68 schroot/schroot.cc:68
 #, fuzzy
+msgid "An unknown exception occured"
+msgstr "Okänd åtgärd angiven"
+
+#: dchroot/dchroot-chroot-config.cc:123
+#, fuzzy, boost-format
 msgid "%1% chroot (dchroot compatibility)"
 msgstr "Kör schroot i dchroot-kompatibelt läge"
 
-#: schroot/dchroot-session.cc:118
+#: dchroot/dchroot-main.cc:59 dchroot-dsa/dchroot-dsa-main.cc:58
+#: schroot/schroot-main.cc:73
+#, boost-format
+msgid "schroot configuration generated by %1% %2%"
+msgstr "schroot-konfiguration genererad av %1% %2%"
+
+#: dchroot/dchroot-main.cc:65 dchroot-dsa/dchroot-dsa-main.cc:64
+#, fuzzy
+msgid "To allow users access to the chroots, use the users or groups keys."
+msgstr ""
+"För att tillåta användare att komma åt chrootmiljöerna, lägg till deras "
+"grupper till gruppnycklarna."
+
+#: dchroot/dchroot-main.cc:67 dchroot-dsa/dchroot-dsa-main.cc:66
+#, fuzzy
+msgid ""
+"To allow passwordless 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.cc:69 dchroot/dchroot-main.cc:132
+#: dchroot-dsa/dchroot-dsa-main.cc:68 dchroot-dsa/dchroot-dsa-main.cc:124
+#, boost-format
+msgid "Remove '%1%' to use the new configuration."
+msgstr "Ta bort \"%1%\" för att använda den nya konfigurationen."
+
+#: dchroot/dchroot-main.cc:96 dchroot-dsa/dchroot-dsa-main.cc:87
+#, fuzzy
+msgid "Running schroot in dchroot compatibility mode"
+msgstr "Kör schroot i dchroot-kompatibelt läge"
+
+#: dchroot/dchroot-main.cc:99 dchroot-dsa/dchroot-dsa-main.cc:90
+#, fuzzy
+msgid "Run 'schroot' for full capabilities"
+msgstr "Kör \"schroot\" för fullständiga färdigheter"
+
+#: dchroot/dchroot-main.cc:116 dchroot-dsa/dchroot-dsa-main.cc:108
+#, fuzzy, boost-format
+msgid "Using %1% configuration file: "
+msgstr "Använder dchroots konfigurationsfil: "
+
+#: dchroot/dchroot-main.cc:121 dchroot-dsa/dchroot-dsa-main.cc:113
+#, boost-format
+msgid "Run '%1%'"
+msgstr "Kör \"%1%\""
+
+#: dchroot/dchroot-main.cc:125 dchroot-dsa/dchroot-dsa-main.cc:117
+msgid "to migrate to a schroot configuration."
+msgstr "för att migrera till en schroot-konfiguration."
+
+#: dchroot/dchroot-main.cc:128 dchroot-dsa/dchroot-dsa-main.cc:120
+#, boost-format
+msgid "Edit '%1%' to add appropriate group access."
+msgstr "Redigera \"%1%\" för att lägga till lämplig gruppåtkomst."
+
+#: dchroot/dchroot-options.cc:56
+msgid "Print path to selected chroot"
+msgstr "Skriv ut sökvägen till valda chroot"
+
+#: dchroot/dchroot-options.cc:60 dchroot-dsa/dchroot-dsa-options.cc:60
+#: schroot/schroot-options.cc:62
+msgid "Select all chroots"
+msgstr "Välj alla chroot"
+
+#: dchroot/dchroot-options.cc:64 schroot/schroot-options.cc:70
+msgid "Preserve user environment"
+msgstr "Behåll användarens miljövariabler"
+
+#: dchroot/dchroot-options.cc:73 dchroot-dsa/dchroot-dsa-options.cc:69
+#: schroot/schroot-listmounts-options.cc:64 schroot/schroot-options.cc:92
+#: schroot/schroot-releaselock-options.cc:67
+msgid "Usage:"
+msgstr "Användning:"
+
+#: dchroot/dchroot-options.cc:76 schroot/schroot-options.cc:95
+#, fuzzy
+msgid "[OPTION...] [COMMAND] - run command or shell in a chroot"
+msgstr " [FLAGGA...] [KOMMANDO] - kör kommando eller skal i ett chroot"
+
+#: dchroot/dchroot-options.cc:99 dchroot-dsa/dchroot-dsa-options.cc:102
+#, fuzzy
+msgid "Only one command may be specified"
+msgstr "Endast en åtgärd får anges"
+
+#: dchroot/dchroot-options.cc:104 schroot/schroot-options-base.cc:157
+msgid "--quiet and --verbose may not be used at the same time"
+msgstr "--quiet och --verbose får inte användas samtidigt"
+
+#: dchroot/dchroot-options.cc:106 schroot/schroot-options-base.cc:159
+msgid "Using verbose output"
+msgstr "Använder informativ utskrift"
+
+#: dchroot/dchroot-options.cc:112 schroot/schroot-options-base.cc:165
+msgid "--chroot and --all may not be used at the same time"
+msgstr "--chroot och --all kan inte användas samtidigt"
+
+#: dchroot/dchroot-options.cc:114 schroot/schroot-options-base.cc:167
+msgid "Using --chroots only"
+msgstr "Använder endast --chroots"
+
+#: dchroot/dchroot-session-base.cc:76
+#, boost-format
+msgid "(%1%->%2%): dchroot sessions do not support user switching"
+msgstr "(%1%->%2%): dchroot-sessioner har inte stöd för byte av användare"
+
+#: dchroot/dchroot-session-base.cc:78
+#, fuzzy
+msgid "dchroot session restriction"
+msgstr "Val av chroot"
+
+#: dchroot/dchroot-session.cc:116 dchroot-dsa/dchroot-dsa-session.cc:132
+#, boost-format
 msgid "[%1% chroot] Running command: \"%2%\""
 msgstr "[%1% chroot] Kör kommando: \"%2%\""
 
-#: schroot/sbuild-auth.cc:52
+#: dchroot-dsa/dchroot-dsa-chroot-config.cc:110
+#, fuzzy, boost-format
+msgid "%1% chroot (dchroot-dsa compatibility)"
+msgstr "Kör schroot i dchroot-kompatibelt läge"
+
+#: dchroot-dsa/dchroot-dsa-options.cc:56
+#, fuzzy
+msgid "Print paths to available chroots"
+msgstr "Lista tillgängliga chroot"
+
+#: dchroot-dsa/dchroot-dsa-options.cc:72
+#, fuzzy
+msgid "[OPTION...] chroot [COMMAND] - run command or shell in a chroot"
+msgstr " [FLAGGA...] [KOMMANDO] - kör kommando eller skal i ett chroot"
+
+#: dchroot-dsa/dchroot-dsa-session.cc:116
+#, boost-format
+msgid "%1%: Command must have an absolute path"
+msgstr ""
+
+#: sbuild/sbuild-auth.cc:53
 #, fuzzy
 msgid "Failed to get hostname"
 msgstr "Misslyckades med att hämta värdnamn: %1%"
 
-#: schroot/sbuild-auth.cc:53
+#: sbuild/sbuild-auth.cc:54
 #, fuzzy
 msgid "User not found"
 msgstr "%1%: användaren hittades inte: %2%"
 
-#: schroot/sbuild-auth.cc:54
+#: sbuild/sbuild-auth.cc:55
 #, fuzzy
 msgid "Access not authorised"
 msgstr "tillgång inte auktoriserad"
 
-#: schroot/sbuild-auth.cc:55
+#: sbuild/sbuild-auth.cc:56
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Autentisering via PAM misslyckades: %1%"
 
-#: schroot/sbuild-auth.cc:56
+#: sbuild/sbuild-auth.cc:57
 #, fuzzy
 msgid "PAM is already initialised"
 msgstr "PAM-fel: PAM är redan initierad"
 
-#: schroot/sbuild-auth.cc:57
+#: sbuild/sbuild-auth.cc:58
 #, fuzzy
 msgid "PAM error"
 msgstr "PAM-fel: %1%"
 
-#: schroot/sbuild-auth.cc:420
+#: sbuild/sbuild-auth.cc:421
 msgid "Set RUSER"
 msgstr ""
 
-#: schroot/sbuild-auth.cc:436
+#: sbuild/sbuild-auth.cc:437
 msgid "Set RHOST"
 msgstr ""
 
-#: schroot/sbuild-auth.cc:449
+#: sbuild/sbuild-auth.cc:450
 msgid "Set TTY"
 msgstr ""
 
-#: schroot/sbuild-auth.cc:461
+#: sbuild/sbuild-auth.cc:462
 msgid "Set USER"
 msgstr ""
 
-#: schroot/sbuild-auth.cc:479
+#: sbuild/sbuild-auth.cc:480
+#, boost-format
 msgid "You do not have permission to access the %1% service."
 msgstr "Du har inte behörighet att komma åt %1%-tjänsten."
 
-#: schroot/sbuild-auth.cc:482
+#: sbuild/sbuild-auth.cc:483
 msgid "This failure will be reported."
 msgstr "Det här felet kommer att rapporteras."
 
-#: schroot/sbuild-auth-conv-tty.cc:47
+#: sbuild/sbuild-auth-conv-tty.cc:48
 msgid "Timed out"
 msgstr "Tidsgräns överstigen"
 
-#: schroot/sbuild-auth-conv-tty.cc:48
+#: sbuild/sbuild-auth-conv-tty.cc:49
 msgid "Time is running out..."
 msgstr "Tiden rinner iväg..."
 
-#: schroot/sbuild-auth-conv-tty.cc:49
+#: sbuild/sbuild-auth-conv-tty.cc:50
 msgid "Failed to get terminal settings"
 msgstr "Misslyckades med att få tag på terminalinställningar"
 
-#: schroot/sbuild-auth-conv-tty.cc:50
+#: sbuild/sbuild-auth-conv-tty.cc:51
 #, fuzzy
 msgid "Unsupported conversation type"
 msgstr "Konversationstypen %1% stöds ej"
 
-#: schroot/sbuild-chroot-block-device.cc:176
+#: sbuild/sbuild-chroot-block-device.cc:179
 msgid "Device"
 msgstr "Enhet"
 
-#: schroot/sbuild-chroot-block-device.cc:178
+#: sbuild/sbuild-chroot-block-device.cc:181
 msgid "Mount Options"
 msgstr "Monteringsflaggor"
 
-#: schroot/sbuild-chroot.cc:47
+#: sbuild/sbuild-chroot.cc:58
 #, fuzzy
 msgid "Unknown chroot type"
 msgstr "okänd chroot-typ \"%1%\""
 
-#: schroot/sbuild-chroot.cc:48
+#: sbuild/sbuild-chroot.cc:59
 #, fuzzy
 msgid "Chroot creation failed"
 msgstr "skapandet av chroot misslyckades"
 
-#: schroot/sbuild-chroot.cc:49
+#: sbuild/sbuild-chroot.cc:60
 #, fuzzy
 msgid "Device name not set"
 msgstr "%1% chroot: enhetsnamn ej inställt"
 
-#: schroot/sbuild-chroot.cc:50
+#: sbuild/sbuild-chroot.cc:61
 #, fuzzy
 msgid "Failed to write session file"
 msgstr "%1%: misslyckades med att skapa sessionsfil: %2%\n"
 
-#: schroot/sbuild-chroot.cc:51
+#: sbuild/sbuild-chroot.cc:62
 #, fuzzy
 msgid "Failed to unlink session file"
 msgstr "%1%: misslyckades med att avlänka sessionsfil: %2%\n"
 
-#: schroot/sbuild-chroot.cc:52 schroot/sbuild-chroot-config.cc:56
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-chroot-config.cc:58
 #, fuzzy
 msgid "Failed to stat file"
 msgstr "misslyckades med att läsa status på fil: %1%"
 
-#: schroot/sbuild-chroot.cc:53 schroot/sbuild-chroot-config.cc:58
+#: sbuild/sbuild-chroot.cc:64 sbuild/sbuild-chroot-config.cc:60
 #, fuzzy
 msgid "File is not owned by user root"
 msgstr "ägs inte av användaren root"
 
-#: schroot/sbuild-chroot.cc:54 schroot/sbuild-chroot-config.cc:59
+#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
 #, fuzzy
 msgid "File has write permissions for others"
 msgstr "andra har skrivrättighet"
 
-#: schroot/sbuild-chroot.cc:55 schroot/sbuild-chroot-config.cc:60
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:62
 #, fuzzy
 msgid "File is not a regular file"
 msgstr "inte en vanlig fil"
 
-#: schroot/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:67
 #, fuzzy
 msgid "Failed to acquire file lock"
 msgstr "misslyckades med att skaffa ett enhetslås"
 
-#: schroot/sbuild-chroot.cc:57
+#: sbuild/sbuild-chroot.cc:68
 #, fuzzy
 msgid "Failed to discard file lock"
 msgstr "misslyckades med att testa enhetslås"
 
-#: schroot/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:69
 #, fuzzy
 msgid "Failed to stat device"
 msgstr "Misslyckades med att läsa status på enhet %1%: %2%"
 
-#: schroot/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:70
 #, fuzzy
 msgid "File is not a block device"
 msgstr "%1% är inte en blockenhet"
 
-#: schroot/sbuild-chroot.cc:60
+#: sbuild/sbuild-chroot.cc:71
 #, fuzzy
 msgid "Failed to lock device"
 msgstr "%1%: misslyckades med att låsa enhet: %2%"
 
-#: schroot/sbuild-chroot.cc:61
+#: sbuild/sbuild-chroot.cc:72
 #, fuzzy
 msgid "Failed to unlock device"
 msgstr "%1%: misslyckades med att låsa upp enhet: %2%"
 
-#: schroot/sbuild-chroot.cc:403
+#: sbuild/sbuild-chroot.cc:414
 #, fuzzy
 msgid "--- Session ---\n"
 msgstr "  --- Session ---\n"
 
-#: schroot/sbuild-chroot.cc:405
+#: sbuild/sbuild-chroot.cc:416
 #, fuzzy
 msgid "--- Chroot ---\n"
 msgstr "  --- Chroot ---\n"
 
-#: schroot/sbuild-chroot.cc:406
+#: sbuild/sbuild-chroot.cc:417
 msgid "Name"
 msgstr "Namn"
 
-#: schroot/sbuild-chroot.cc:407
+#: sbuild/sbuild-chroot.cc:418
 msgid "Description"
 msgstr "Beskrivning"
 
-#: schroot/sbuild-chroot.cc:408
+#: sbuild/sbuild-chroot.cc:419
 msgid "Type"
 msgstr "Typ"
 
-#: schroot/sbuild-chroot.cc:409
+#: sbuild/sbuild-chroot.cc:420
 msgid "Priority"
 msgstr "Prioritet"
 
-#: schroot/sbuild-chroot.cc:410
+#: sbuild/sbuild-chroot.cc:421
 msgid "Users"
 msgstr ""
 
-#: schroot/sbuild-chroot.cc:411
+#: sbuild/sbuild-chroot.cc:422
 msgid "Groups"
 msgstr "Grupper"
 
-#: schroot/sbuild-chroot.cc:412
+#: sbuild/sbuild-chroot.cc:423
 #, fuzzy
 msgid "Root Users"
 msgstr "Rotgrupper"
 
-#: schroot/sbuild-chroot.cc:413
+#: sbuild/sbuild-chroot.cc:424
 msgid "Root Groups"
 msgstr "Rotgrupper"
 
-#: schroot/sbuild-chroot.cc:414
+#: sbuild/sbuild-chroot.cc:425
 msgid "Aliases"
 msgstr "Alias"
 
-#: schroot/sbuild-chroot.cc:415
+#: sbuild/sbuild-chroot.cc:426
 msgid "Run Setup Scripts"
 msgstr "Kör konfigurationsskript"
 
 # Borde det bli "Kör körskript"? Kaka på kaka?
-#: schroot/sbuild-chroot.cc:416
+#: sbuild/sbuild-chroot.cc:427
 msgid "Run Execution Scripts"
 msgstr "Kör skript"
 
-#: schroot/sbuild-chroot.cc:418
+#: sbuild/sbuild-chroot.cc:429
 msgid "Session Managed"
 msgstr "Session hanterad"
 
-#: schroot/sbuild-chroot.cc:423
+#: sbuild/sbuild-chroot.cc:434
 msgid "Command Prefix"
 msgstr "Kommandoprefix"
 
-#: schroot/sbuild-chroot.cc:425
+#: sbuild/sbuild-chroot.cc:436
 msgid "Personality"
 msgstr "Personlighet"
 
-#: schroot/sbuild-chroot.cc:429
+#: sbuild/sbuild-chroot.cc:440
 msgid "Location"
 msgstr "Plats"
 
-#: schroot/sbuild-chroot.cc:432
+#: sbuild/sbuild-chroot.cc:443
 msgid "Mount Location"
 msgstr "Montera plats"
 
-#: schroot/sbuild-chroot.cc:435
+#: sbuild/sbuild-chroot.cc:446
 msgid "Path"
 msgstr "Sökväg"
 
-#: schroot/sbuild-chroot.cc:438
+#: sbuild/sbuild-chroot.cc:449
 msgid "Mount Device"
 msgstr "Montera enhet"
 
-#: schroot/sbuild-chroot.cc:597
+#: sbuild/sbuild-chroot.cc:608
+#, boost-format
 msgid "%1% chroot: personality \"%2%\" is unknown.\n"
 msgstr "%1% chroot: personligheten \"%2%\" är okänd.\n"
 
-#: schroot/sbuild-chroot.cc:600
+#: sbuild/sbuild-chroot.cc:611
+#, boost-format
 msgid "Valid personalities: %1%\n"
 msgstr "Giltiga personligheter: %1%\n"
 
-#: schroot/sbuild-chroot-config.cc:55
+#: sbuild/sbuild-chroot-config.cc:57
 #, fuzzy
 msgid "Failed to open directory"
 msgstr "%1%: misslyckades med att öppna katalog: %2%"
 
-#: schroot/sbuild-chroot-config.cc:57
+#: sbuild/sbuild-chroot-config.cc:59
 #, fuzzy
 msgid "Failed to open file"
 msgstr "kan inte öppna fil"
 
-#: schroot/sbuild-chroot-config.cc:180
-#, fuzzy
+#: sbuild/sbuild-chroot-config.cc:182
+#, fuzzy, boost-format
 msgid "%1% chroot: Alias '%2%' already associated with '%3%' chroot"
 msgstr "%1% chroot: alias \"%2%\" är redan associerat med chroot \"%3%\""
 
-#: schroot/sbuild-chroot-config.cc:188
-#, fuzzy
+#: sbuild/sbuild-chroot-config.cc:190
+#, fuzzy, boost-format
 msgid "%1% chroot: Alias '%2%' already associated with another chroot"
 msgstr "%1% chroot: alias \"%2%\" är redan associerat med ett annat chroot"
 
-#: schroot/sbuild-chroot-config.cc:198
-#, fuzzy
+#: sbuild/sbuild-chroot-config.cc:200
+#, fuzzy, boost-format
 msgid "%1% chroot: A chroot or alias already exists by this name"
 msgstr "%1% chroot: ett chroot eller alias existerar redan med det här namnet"
 
-#: schroot/sbuild-chroot-config.cc:201
-#, fuzzy
+#: sbuild/sbuild-chroot-config.cc:203
+#, fuzzy, boost-format
 msgid "%1% chroot: Duplicate names are not allowed"
 msgstr "%1% chroot: dubbletta namn tillåts inte"
 
-#: schroot/sbuild-chroot-config.cc:280
+#: sbuild/sbuild-chroot-config.cc:282
 msgid "Available chroots: "
 msgstr "Tillgängliga chroot: "
 
-#: schroot/sbuild-chroot-config.cc:325 schroot/sbuild-chroot-config.cc:344
-#: schroot/sbuild-chroot-config.cc:367
+#: sbuild/sbuild-chroot-config.cc:327 sbuild/sbuild-chroot-config.cc:346
+#: sbuild/sbuild-chroot-config.cc:369 schroot/schroot-main.cc:138
+#, boost-format
 msgid "%1%: No such chroot"
 msgstr "%1%: Inget sådant chroot"
 
-#: schroot/sbuild-chroot-file.cc:143
+#: sbuild/sbuild-chroot-file.cc:146
 msgid "File"
 msgstr "Fil"
 
-#: schroot/sbuild-chroot-file.cc:144
+#: sbuild/sbuild-chroot-file.cc:147
 msgid "File Repack"
 msgstr "Filompackning"
 
-#: schroot/sbuild-chroot-lvm-snapshot.cc:201
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:203
 msgid "LVM Snapshot Device"
 msgstr "Enhet för LVM-snapshot"
 
 # Finns det ett svenskt ord för snapshot?
-#: schroot/sbuild-chroot-lvm-snapshot.cc:204
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:206
 msgid "LVM Snapshot Options"
 msgstr "Flaggor för LVM-snapshot"
 
-#: schroot/sbuild-chroot-source.cc:45
+#: sbuild/sbuild-chroot-source.cc:47
 #, fuzzy
 msgid "(source chroot)"
 msgstr " (käll-chroot)"
 
-#: schroot/sbuild-chroot-source.cc:115
+#: sbuild/sbuild-chroot-source.cc:117
 #, fuzzy
 msgid "Source Users"
 msgstr "Källgrupper"
 
-#: schroot/sbuild-chroot-source.cc:116
+#: sbuild/sbuild-chroot-source.cc:118
 msgid "Source Groups"
 msgstr "Källgrupper"
 
-#: schroot/sbuild-chroot-source.cc:117
+#: sbuild/sbuild-chroot-source.cc:119
 #, fuzzy
 msgid "Source Root Users"
 msgstr "Källrotgrupper"
 
-#: schroot/sbuild-chroot-source.cc:118
+#: sbuild/sbuild-chroot-source.cc:120
 msgid "Source Root Groups"
 msgstr "Källrotgrupper"
 
-#: schroot/sbuild-format-detail.cc:34
+#: sbuild/sbuild-format-detail.cc:34
 msgid "true"
 msgstr "sant"
 
-#: schroot/sbuild-format-detail.cc:36
+#: sbuild/sbuild-format-detail.cc:36
 msgid "false"
 msgstr "falskt"
 
-#: schroot/sbuild-keyfile.cc:363
+#: sbuild/sbuild-keyfile.cc:363
+#, boost-format
 msgid "%1% chroot: A deprecated parameter \"%2%\" has been specified."
 msgstr "%1% chroot: En gammal parameter \"%2%\" har angivits."
 
-#: schroot/sbuild-keyfile.cc:367
+#: sbuild/sbuild-keyfile.cc:367
 msgid "This option will be removed in the future."
 msgstr "Den här flaggan kommer att tas bort i framtiden."
 
-#: schroot/sbuild-keyfile.cc:371
+#: sbuild/sbuild-keyfile.cc:371
+#, boost-format
 msgid "%1% chroot: An obsolete parameter \"%2%\" has been specified."
 msgstr "%1% chroot: En föråldrad parameter \"%2%\" har angivits."
 
-#: schroot/sbuild-keyfile.cc:375
+#: sbuild/sbuild-keyfile.cc:375
 msgid "This option has been removed, and no longer has any effect."
 msgstr "Den här flaggan har tagits bort och har inte längre någon effekt."
 
-#: schroot/sbuild-lock.cc:48
+#: sbuild/sbuild-lock.cc:49
 #, fuzzy
 msgid "Failed to set timeout handler"
 msgstr "misslyckades med att ställa in tidsgränshandtag: %1%"
 
-#: schroot/sbuild-lock.cc:49
+#: sbuild/sbuild-lock.cc:50
 #, fuzzy
 msgid "Failed to set timeout"
 msgstr "misslyckades med att ställa in tidsgräns: %1%"
 
-#: schroot/sbuild-lock.cc:50
+#: sbuild/sbuild-lock.cc:51
 #, fuzzy
 msgid "Failed to cancel timeout"
 msgstr "misslyckades med att ta bort tidsgräns: %1%"
 
-#: schroot/sbuild-lock.cc:51
+#: sbuild/sbuild-lock.cc:52
 #, fuzzy
 msgid "Failed to acquire lock (timed out)"
 msgstr "misslyckades med att skaffa ett lås (tidsgräns är %1% sekunder)"
 
-#: schroot/sbuild-lock.cc:52
+#: sbuild/sbuild-lock.cc:53
 #, fuzzy
 msgid "Failed to acquire lock"
 msgstr "misslyckades med att skaffa ett lås: %1%"
 
-#: schroot/sbuild-lock.cc:53
+#: sbuild/sbuild-lock.cc:54
 #, fuzzy
 msgid "Failed to acquire device lock"
 msgstr "misslyckades med att skaffa ett enhetslås"
 
-#: schroot/sbuild-lock.cc:54
+#: sbuild/sbuild-lock.cc:55
 #, fuzzy
 msgid "Failed to acquire device lock (timed out)"
 msgstr "misslyckades med att skaffa ett enhetslås"
 
-#: schroot/sbuild-lock.cc:55
+#: sbuild/sbuild-lock.cc:56
 #, fuzzy
 msgid "Failed to test device lock"
 msgstr "misslyckades med att testa enhetslås"
 
-#: schroot/sbuild-lock.cc:56
+#: sbuild/sbuild-lock.cc:57
 #, fuzzy
 msgid "Failed to release device lock"
 msgstr "misslyckades med att släppa enhetslås"
 
-#: schroot/sbuild-lock.cc:57
+#: sbuild/sbuild-lock.cc:58
 #, fuzzy
 msgid "Failed to release device lock (timed out)"
 msgstr "misslyckades med att släppa enhetslås"
 
-#: schroot/sbuild-lock.cc:274
+#: sbuild/sbuild-lock.cc:275
+#, boost-format
 msgid "lock held by pid %1%"
 msgstr ""
 
-#: schroot/sbuild-parse-error.cc:41
+#: sbuild/sbuild-parse-error.cc:41
 #, fuzzy
 msgid "No error"
 msgstr "inga fel"
 
-#: schroot/sbuild-parse-error.cc:42
+#: sbuild/sbuild-parse-error.cc:42
 #, fuzzy
 msgid "Can't open file"
 msgstr "kan inte öppna fil"
 
-#: schroot/sbuild-parse-error.cc:43
+#: sbuild/sbuild-parse-error.cc:43
 #, fuzzy
 msgid "Could not parse value"
 msgstr "kunde inte tolka värde"
 
-#: schroot/sbuild-parse-error.cc:44
+#: sbuild/sbuild-parse-error.cc:44
 #, fuzzy
 msgid "Invalid line"
 msgstr "ogiltig rad"
 
-#: schroot/sbuild-parse-error.cc:45
+#: sbuild/sbuild-parse-error.cc:45
 #, fuzzy
 msgid "No group specified"
 msgstr "ingen grupp angiven"
 
-#: schroot/sbuild-parse-error.cc:46
+#: sbuild/sbuild-parse-error.cc:46
 #, fuzzy
 msgid "Invalid group"
 msgstr "ogiltig grupp"
 
-#: schroot/sbuild-parse-error.cc:47
+#: sbuild/sbuild-parse-error.cc:47
 #, fuzzy
 msgid "Duplicate group"
 msgstr "dubblett av grupp"
 
-#: schroot/sbuild-parse-error.cc:48
+#: sbuild/sbuild-parse-error.cc:48
 #, fuzzy
 msgid "No key specified"
 msgstr "ingen nyckel angiven"
 
-#: schroot/sbuild-parse-error.cc:49
+#: sbuild/sbuild-parse-error.cc:49
 #, fuzzy
 msgid "Duplicate key"
 msgstr "dubblett av nyckel"
 
-#: schroot/sbuild-parse-error.cc:50
+#: sbuild/sbuild-parse-error.cc:50
 #, fuzzy
 msgid "Required key is missing"
 msgstr "nödvändig nyckel saknas"
 
-#: schroot/sbuild-parse-error.cc:51
+#: sbuild/sbuild-parse-error.cc:51
 #, fuzzy
 msgid "Disallowed key used"
 msgstr "ej tillåten nyckel användes"
 
-#: schroot/sbuild-parse-error.cc:116
+#: sbuild/sbuild-parse-error.cc:116
 #, fuzzy
 msgid "Unknown error"
 msgstr "okänt fel"
 
-#: schroot/sbuild-parse-error.cc:127
+#: sbuild/sbuild-parse-error.cc:127
+#, boost-format
 msgid "%1% \"%2%\""
 msgstr "%1% \"%2%\""
 
-#: schroot/sbuild-parse-error.cc:143
+#: sbuild/sbuild-parse-error.cc:143
+#, boost-format
 msgid "line %1%: %3%"
 msgstr "rad %1%: %3%"
 
-#: schroot/sbuild-parse-error.cc:144
+#: sbuild/sbuild-parse-error.cc:144
+#, boost-format
 msgid "line %1%: %2% \"%3%\""
 msgstr "rad %1%: %2% \"%3%\""
 
-#: schroot/sbuild-parse-error.cc:150
+#: sbuild/sbuild-parse-error.cc:150
+#, boost-format
 msgid "line %1%: %2%"
 msgstr "rad %1%: %2%"
 
-#: schroot/sbuild-parse-error.cc:165
+#: sbuild/sbuild-parse-error.cc:165
+#, boost-format
 msgid "line %1% [%2%]: %4%"
 msgstr "rad %1% [%2%]: %4%"
 
-#: schroot/sbuild-parse-error.cc:166
+#: sbuild/sbuild-parse-error.cc:166
+#, boost-format
 msgid "line %1% [%2%]: %3% \"%4%\""
 msgstr "rad %1% [%2%]: %3% \"%4%\""
 
-#: schroot/sbuild-parse-error.cc:172
+#: sbuild/sbuild-parse-error.cc:172
+#, boost-format
 msgid "line %1% [%2%]: %3%"
 msgstr "rad %1% [%2%]: %3%"
 
-#: schroot/sbuild-parse-error.cc:188
+#: sbuild/sbuild-parse-error.cc:188
+#, boost-format
 msgid "line %1% [%2%] %3%: %5%"
 msgstr "rad %1% [%2%] %3%: %5%"
 
-#: schroot/sbuild-parse-error.cc:189
+#: sbuild/sbuild-parse-error.cc:189
+#, boost-format
 msgid "line %1% [%2%] %3%: %4% \"%5%\""
 msgstr "rad %1% [%2%] %3%: %4% \"%5%\""
 
-#: schroot/sbuild-parse-error.cc:195
+#: sbuild/sbuild-parse-error.cc:195
+#, boost-format
 msgid "line %1% [%2%] %3%: %4%"
 msgstr "rad %1% [%2%] %3%: %4%"
 
-#: schroot/sbuild-parse-error.cc:209
+#: sbuild/sbuild-parse-error.cc:209
+#, boost-format
 msgid "[%1%]: %3%"
 msgstr "[%1%]: %3%"
 
-#: schroot/sbuild-parse-error.cc:210
+#: sbuild/sbuild-parse-error.cc:210
+#, boost-format
 msgid "[%1%]: %2% \"%3%\""
 msgstr "[%1%]: %2% \"%3%\""
 
-#: schroot/sbuild-parse-error.cc:216
+#: sbuild/sbuild-parse-error.cc:216
+#, boost-format
 msgid "[%1%]: %2%"
 msgstr "[%1%]: %2%"
 
-#: schroot/sbuild-parse-error.cc:231
+#: sbuild/sbuild-parse-error.cc:231
+#, boost-format
 msgid "[%1%] %2%: %4%"
 msgstr "[%1%] %2%: %4%"
 
-#: schroot/sbuild-parse-error.cc:232
+#: sbuild/sbuild-parse-error.cc:232
+#, boost-format
 msgid "[%1%] %2%: %3% \"%4%\""
 msgstr "[%1%] %2%: %3% \"%4%\""
 
-#: schroot/sbuild-parse-error.cc:238
+#: sbuild/sbuild-parse-error.cc:238
+#, boost-format
 msgid "[%1%] %2%: %3%"
 msgstr "[%1%] %2%: %3%"
 
-#: schroot/sbuild-personality.cc:48
+#: sbuild/sbuild-personality.cc:48
 #, fuzzy
 msgid "Failed to set personality"
 msgstr "Misslyckades med att få tag på terminalinställningar"
 
-#: schroot/sbuild-session.cc:57
+#: sbuild/sbuild-session.cc:59
 #, fuzzy
 msgid "Failed to find chroot"
 msgstr "%1%: Misslyckades med att hitta chroot"
 
-#: schroot/sbuild-session.cc:58
+#: sbuild/sbuild-session.cc:60
 #, fuzzy
 msgid "Failed to lock chroot"
 msgstr "%1%: Misslyckades med att hitta chroot"
 
-#: schroot/sbuild-session.cc:59
+#: sbuild/sbuild-session.cc:61
 #, fuzzy
 msgid "Failed to unlock chroot"
 msgstr "%1%: Misslyckades med att hitta chroot"
 
-#: schroot/sbuild-session.cc:60
+#: sbuild/sbuild-session.cc:62
 #, fuzzy
 msgid "Chroot setup failed"
 msgstr "skapandet av chroot misslyckades"
 
-#: schroot/sbuild-session.cc:61
+#: sbuild/sbuild-session.cc:63
 #, fuzzy
 msgid "Failed to set hangup signal handler"
 msgstr "misslyckades med att ställa in påläggningshanterare: %1%"
 
-#: schroot/sbuild-session.cc:62
+#: sbuild/sbuild-session.cc:64
 #, fuzzy
 msgid "Caught hangup signal"
 msgstr "fångade påläggningssignal, terminerar..."
 
-#: schroot/sbuild-session.cc:63
+#: sbuild/sbuild-session.cc:65
 #, fuzzy
 msgid "Failed to fork child"
 msgstr "Misslyckades med att grena process: %1%"
 
-#: schroot/sbuild-session.cc:64
+#: sbuild/sbuild-session.cc:66
 #, fuzzy
 msgid "Wait for child failed"
 msgstr "väntan på barnprocess misslyckades: %1%"
 
-#: schroot/sbuild-session.cc:65
+#: sbuild/sbuild-session.cc:67
 #, fuzzy
 msgid "Child terminated by signal"
 msgstr "Barnprocess terminerades av signal \"%1%\""
 
-#: schroot/sbuild-session.cc:66
+#: sbuild/sbuild-session.cc:68
 msgid "Child dumped core"
 msgstr "Barnprocess dumpade minnet"
 
 # coredump? Bättre ord?
-#: schroot/sbuild-session.cc:67
+#: sbuild/sbuild-session.cc:69
 msgid "Child exited abnormally (reason unknown; not a signal or core dump)"
 msgstr ""
 "Barnprocess avslutades onormalt (anledning är okänd; inte en signal eller "
 "minnesdump)"
 
-#: schroot/sbuild-session.cc:68
+#: sbuild/sbuild-session.cc:70
 msgid "User switching is not permitted"
 msgstr ""
 
-#: schroot/sbuild-session.cc:106
-#, fuzzy
+#: sbuild/sbuild-session.cc:108
+#, fuzzy, boost-format
 msgid "%1%: Group not found"
 msgstr "%1%: grupp hittades inte"
 
-#: schroot/sbuild-session.cc:108
-#, fuzzy
+#: sbuild/sbuild-session.cc:110
+#, fuzzy, boost-format
 msgid "%1%: Group not found: %2%"
 msgstr "%1%: grupp hittades inte: %2%"
 
-#: schroot/sbuild-session.cc:124
-#, fuzzy
+#: sbuild/sbuild-session.cc:126
+#, fuzzy, boost-format
 msgid "Can't get supplementary group count: %1%"
 msgstr "kan inte hämta antalet tilläggsgrupper: %1%"
 
-#: schroot/sbuild-session.cc:134
-#, fuzzy
+#: sbuild/sbuild-session.cc:136
+#, fuzzy, boost-format
 msgid "Can't get supplementary groups: %1%"
 msgstr "kan inte hämta tilläggsgrupper: %1%"
 
-#: schroot/sbuild-session.cc:364
+#: sbuild/sbuild-session.cc:366
+#, boost-format
 msgid "No chroot found matching alias '%1%'"
 msgstr "Inget chroot hittades som matchar alias \"%1%\""
 
-#: schroot/sbuild-session.cc:571
-#, fuzzy
+#: sbuild/sbuild-session.cc:573
+#, fuzzy, boost-format
 msgid "%1%: Shell not available: %2%"
 msgstr "%1%: misslyckades med att läsa status på fil: %2%"
 
-#: schroot/sbuild-session.cc:574
-#, fuzzy
+#: sbuild/sbuild-session.cc:576
+#, fuzzy, boost-format
 msgid "Falling back to %1%"
 msgstr "Faller tillbaka på \"%1%\""
 
-#: schroot/sbuild-session.cc:640
-#, fuzzy
+#: sbuild/sbuild-session.cc:642
+#, fuzzy, boost-format
 msgid "[%1% chroot] Running login shell: \"%4%\""
 msgstr "[%1% chroot] Kör inloggningsskal: \"%2%\""
 
-#: schroot/sbuild-session.cc:642
-#, fuzzy
+#: sbuild/sbuild-session.cc:644
+#, fuzzy, boost-format
 msgid "[%1% chroot] Running shell: \"%4%\""
 msgstr "[%1% chroot] Kör skal: \"%2%\""
 
-#: schroot/sbuild-session.cc:648
+#: sbuild/sbuild-session.cc:650
+#, boost-format
 msgid "[%1% chroot] (%2%->%3%) Running login shell: \"%4%\""
 msgstr "[%1% chroot] (%2%->%3%) Kör inloggningsskal: \"%4%\""
 
-#: schroot/sbuild-session.cc:650
+#: sbuild/sbuild-session.cc:652
+#, boost-format
 msgid "[%1% chroot] (%2%->%3%) Running shell: \"%4%\""
 msgstr "[%1% chroot] (%2%->%3%) Kör skal: \"%4%\""
 
-#: schroot/sbuild-session.cc:685
-#, fuzzy
+#: sbuild/sbuild-session.cc:687
+#, fuzzy, boost-format
 msgid "[%1% chroot] Running command: \"%4%\""
 msgstr "[%1% chroot] Kör kommando: \"%2%\""
 
-#: schroot/sbuild-session.cc:687
+#: sbuild/sbuild-session.cc:689
+#, boost-format
 msgid "[%1% chroot] (%2%->%3%) Running command: \"%4%\""
 msgstr "[%1% chroot] (%2%->%3%) Kör kommando: \"%4%\""
 
-#: schroot/sbuild-session.cc:809
+#: sbuild/sbuild-session.cc:811
+#, boost-format
 msgid "Invalid verbosity level: %1%, falling back to \"normal\""
 msgstr "Ogiltig informationsnivå: %1%, faller tillbaka till \"normal\""
 
-#: schroot/sbuild-session.cc:845 schroot/sbuild-session.cc:1020
+#: sbuild/sbuild-session.cc:847 sbuild/sbuild-session.cc:1022
+#, boost-format
 msgid "Could not exec \"%1%\": %2%"
 msgstr "Kunde inte starta \"%1%\": %2%"
 
-#: schroot/sbuild-session.cc:871
+#: sbuild/sbuild-session.cc:873
+#, boost-format
 msgid "stage=%1%"
 msgstr ""
 
-#: schroot/sbuild-session.cc:900
+#: sbuild/sbuild-session.cc:902
+#, boost-format
 msgid "PAM error: %1%"
 msgstr "PAM-fel: %1%"
 
-#: schroot/sbuild-session.cc:908
+#: sbuild/sbuild-session.cc:910
+#, boost-format
 msgid "Could not set gid to '%1%'"
 msgstr "Kunde inte sätta gid till \"%1%\""
 
-#: schroot/sbuild-session.cc:914
+#: sbuild/sbuild-session.cc:916
 msgid "Could not set supplementary group IDs"
 msgstr "Kunde inte sätta id för tilläggsgrupper"
 
-#: schroot/sbuild-session.cc:932 schroot/sbuild-session.cc:980
+#: sbuild/sbuild-session.cc:934 sbuild/sbuild-session.cc:982
+#, boost-format
 msgid "Could not chdir to '%1%': %2%"
 msgstr "Kunde inte byta katalog till \"%1%\": %2%"
 
-#: schroot/sbuild-session.cc:939
+#: sbuild/sbuild-session.cc:941
+#, boost-format
 msgid "Could not chroot to '%1%': %2%"
 msgstr "Kunde inte chroot till \"%1%\": %2%"
 
-#: schroot/sbuild-session.cc:948
+#: sbuild/sbuild-session.cc:950
+#, boost-format
 msgid "Could not set uid to '%1%'"
 msgstr "Kunde inte sätta uid till \"%1%\""
 
-#: schroot/sbuild-session.cc:954
+#: sbuild/sbuild-session.cc:956
 msgid "Failed to drop root permissions."
 msgstr "Misslyckades med att släppa root-rättigheter."
 
-#: schroot/sbuild-session.cc:987
+#: sbuild/sbuild-session.cc:989
+#, boost-format
 msgid "Falling back to '%1%'"
 msgstr "Faller tillbaka på \"%1%\""
 
-#: schroot/sbuild-session.cc:1042
+#: sbuild/sbuild-session.cc:1044
 #, fuzzy
 msgid "Caught hangup signal, terminating..."
 msgstr "fångade påläggningssignal, terminerar..."
 
-#: schroot/schroot.cc:68
-#, fuzzy
-msgid "An unknown exception occured"
-msgstr "Okänd åtgärd angiven"
-
-#: schroot/schroot-listmounts.cc:57
-msgid "schroot-listmounts (Debian sbuild) %1%\n"
-msgstr "schroot-listmounts (Debian sbuild) %1%\n"
+#: schroot/schroot-listmounts.cc:61 schroot/schroot-main.cc:58
+#: schroot/schroot-releaselock.cc:56
+#, fuzzy, boost-format
+msgid "%1% (Debian sbuild) %2% (%3%)\n"
+msgstr "%1% (Debian sbuild) %2%\n"
 
-#: schroot/schroot-listmounts.cc:58 schroot/schroot-releaselock.cc:55
+#: schroot/schroot-listmounts.cc:65 schroot/schroot-main.cc:62
+#: schroot/schroot-releaselock.cc:60
 msgid ""
 "Written by Roger Leigh\n"
 "\n"
@@ -743,11 +914,13 @@ msgstr ""
 "Skriven av Roger Leigh\n"
 "\n"
 
-#: schroot/schroot-listmounts.cc:59 schroot/schroot-releaselock.cc:56
+#: schroot/schroot-listmounts.cc:66 schroot/schroot-main.cc:63
+#: schroot/schroot-releaselock.cc:61
 msgid "Copyright (C) 2004-2006 Roger Leigh\n"
 msgstr "Copyright © 2004-2005 Roger Leigh\n"
 
-#: schroot/schroot-listmounts.cc:60 schroot/schroot-releaselock.cc:57
+#: schroot/schroot-listmounts.cc:67 schroot/schroot-main.cc:64
+#: schroot/schroot-releaselock.cc:62
 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"
@@ -756,148 +929,226 @@ msgstr ""
 "INGEN GARANTI;\n"
 "inte ens för SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL.\n"
 
-#: schroot/schroot-listmounts.cc:82
+#: schroot/schroot-listmounts.cc:89
+#, boost-format
 msgid "%1%: Failed to open: %2%"
 msgstr "%1%: Misslyckades med att öppna: %2%"
 
-#: schroot/schroot-listmounts.cc:105
+#: schroot/schroot-listmounts.cc:112
+#, boost-format
 msgid "%1%: Failed to close: %2%"
 msgstr "%1%: Misslyckades med att stänga: %2%"
 
-#: schroot/schroot-listmounts.cc:151
+#: schroot/schroot-listmounts.cc:158
 msgid "No mountpoint specified"
 msgstr "Ingen monteringspunkt angiven"
 
-#: schroot/schroot-listmounts-options.cc:43
-#: schroot/schroot-releaselock-options.cc:44
+#: schroot/schroot-listmounts-options.cc:42 schroot/schroot-options-base.cc:48
+#: schroot/schroot-releaselock-options.cc:43
 msgid "General options"
 msgstr "Allmänna flaggor"
 
-#: schroot/schroot-listmounts-options.cc:45
-#: schroot/schroot-releaselock-options.cc:46
+#: schroot/schroot-listmounts-options.cc:44 schroot/schroot-options-base.cc:69
+#: schroot/schroot-releaselock-options.cc:45
 msgid "Show help options"
 msgstr "Visa hjälpflaggor"
 
-#: schroot/schroot-listmounts-options.cc:47
-#: schroot/schroot-releaselock-options.cc:48
+#: schroot/schroot-listmounts-options.cc:46 schroot/schroot-options-base.cc:71
+#: schroot/schroot-releaselock-options.cc:47
 msgid "Print version information"
 msgstr "Skriv ut versionsinformation"
 
-#: schroot/schroot-listmounts-options.cc:49
-#: schroot/schroot-releaselock-options.cc:50
+#: schroot/schroot-listmounts-options.cc:48
+#: schroot/schroot-releaselock-options.cc:49
 msgid "Lock options"
 msgstr "Låsflaggor"
 
-#: schroot/schroot-listmounts-options.cc:52
+#: schroot/schroot-listmounts-options.cc:51
 msgid "Mountpoint to check (full path)"
 msgstr "Monteringspunkt att kontrollera (fullständig sökväg)"
 
-#: schroot/schroot-listmounts-options.cc:65 schroot/schroot-options.cc:95
-#: schroot/schroot-releaselock-options.cc:68
-msgid "Usage:"
-msgstr "Användning:"
-
-#: schroot/schroot-listmounts-options.cc:66
+#: schroot/schroot-listmounts-options.cc:65
 #, fuzzy
 msgid "schroot-listmounts [OPTION...] - list mounts"
 msgstr "  schroot-listmounts [FLAGGA...] - lista monteringar"
 
-#: schroot/schroot-options.cc:59
+#: schroot/schroot-main.cc:194
+msgid "Error saving terminal settings"
+msgstr "Fel vid sparandet av terminalinställningar"
+
+#: schroot/schroot-main.cc:226
+#, boost-format
+msgid "No chroots are defined in %1% or %2%"
+msgstr "Inga chroot angivna i %1% eller %2%"
+
+#: schroot/schroot-main.cc:234
+#, boost-format
+msgid "No chroots are defined in %1%"
+msgstr "Inga chroot angivna i %1%"
+
+#: schroot/schroot-main.cc:251
+#, boost-format
+msgid "The specified chroots are not defined in %1%"
+msgstr "De angivna chroot finns inte angivna i %1%"
+
+#: schroot/schroot-main.cc:278
+msgid "Only one chroot may be specified when beginning a session"
+msgstr "Endast en chroot får anges vid början av en session"
+
+#: schroot/schroot-main.cc:335 schroot/schroot-main.cc:351
+msgid "Error restoring terminal settings"
+msgstr "Fel vid återställandet av terminalinställningar"
+
+#: schroot/schroot-options-base.cc:49
+msgid "Chroot selection"
+msgstr "Val av chroot"
+
+#: schroot/schroot-options-base.cc:50
+msgid "Chroot environment"
+msgstr "Chroot-miljö"
+
+#: schroot/schroot-options-base.cc:51
+msgid "Session management"
+msgstr "Sessionshantering"
+
+#: schroot/schroot-options-base.cc:52
+msgid "Hidden options"
+msgstr "Dolda flaggor"
+
+#: schroot/schroot-options-base.cc:73
+msgid "Show less output"
+msgstr "Visa mindre utdata"
+
+#: schroot/schroot-options-base.cc:75
+msgid "Show more output"
+msgstr "Visa mer utdata"
+
+#: schroot/schroot-options-base.cc:77
+msgid "List available chroots"
+msgstr "Lista tillgängliga chroot"
+
+#: schroot/schroot-options-base.cc:79
+msgid "Show information about selected chroots"
+msgstr "Visa information om valda chroot"
+
+#: schroot/schroot-options-base.cc:81
+msgid "Dump configuration of selected chroots"
+msgstr "Dumpa konfigurationen för valda chroot"
+
+#: schroot/schroot-options-base.cc:85
+msgid "Use specified chroot"
+msgstr "Använd angiven chroot"
+
+#: schroot/schroot-options-base.cc:89
+msgid "Command to run"
+msgstr "Kommando att köra"
+
+#: schroot/schroot-options-base.cc:91
+msgid "Enable debugging messages"
+msgstr ""
+
+#: schroot/schroot-options-base.cc:190
+msgid ""
+"Only one chroot may be specified when recovering, running or ending a session"
+msgstr ""
+"Endast ett chroot får anges vid återhämtning, körning eller avslutning av en "
+"session"
+
+#: schroot/schroot-options-base.cc:215
+msgid "--chroot may not be used with --list"
+msgstr "--chroot får inte användas med --list"
+
+#: schroot/schroot-options-base.cc:237
+#, fuzzy
+msgid "Unknown action specified"
+msgstr "Endast en åtgärd får anges"
+
+#: schroot/schroot-options-base.cc:245
+msgid "Only one action may be specified"
+msgstr "Endast en åtgärd får anges"
+
+#: schroot/schroot-options.cc:56
 msgid "Print location of selected chroots"
 msgstr "Skriv ut platsen för valda chroot"
 
-#: schroot/schroot-options.cc:63
+#: schroot/schroot-options.cc:60
 msgid "Select all chroots and active sessions"
 msgstr "Välj alla chroot och aktiva sessioner"
 
-#: schroot/schroot-options.cc:65
-msgid "Select all chroots"
-msgstr "Välj alla chroot"
-
-#: schroot/schroot-options.cc:67
+#: schroot/schroot-options.cc:64
 msgid "Select all active sessions"
 msgstr "Välj alla aktiva sessioner"
 
-#: schroot/schroot-options.cc:71
+#: schroot/schroot-options.cc:68
 msgid "Username (default current user)"
 msgstr "Användarnamn (förval är nuvarande användare)"
 
-#: schroot/schroot-options.cc:73
-msgid "Preserve user environment"
-msgstr "Behåll användarens miljövariabler"
-
-#: schroot/schroot-options.cc:77
+#: schroot/schroot-options.cc:74
 msgid "Begin a session; returns a session ID"
 msgstr "Börja en session; returnerar ett sessions-id"
 
-#: schroot/schroot-options.cc:79
+#: schroot/schroot-options.cc:76
 msgid "Recover an existing session"
 msgstr "Återhämta en existerande session"
 
-#: schroot/schroot-options.cc:81
+#: schroot/schroot-options.cc:78
 msgid "Run an existing session"
 msgstr "Kör en existerande session"
 
-#: schroot/schroot-options.cc:83
+#: schroot/schroot-options.cc:80
 msgid "End an existing session"
 msgstr "Avsluta en existerande session"
 
-#: schroot/schroot-options.cc:85
+#: schroot/schroot-options.cc:82
 msgid "Force operation, even if it fails"
 msgstr "Tvinga operation, även om den misslyckas"
 
-#: schroot/schroot-options.cc:98
-#, fuzzy
-msgid "[OPTION...] [COMMAND] - run command or shell in a chroot"
-msgstr " [FLAGGA...] [KOMMANDO] - kör kommando eller skal i ett chroot"
-
-#: schroot/schroot-releaselock.cc:54
-msgid "schroot-releaselock (Debian sbuild) %1%\n"
-msgstr "schroot-releaselock (Debian sbuild) %1%\n"
-
-#: schroot/schroot-releaselock.cc:100
+#: schroot/schroot-releaselock.cc:105
 msgid "No device specified"
 msgstr "Ingen enhet angiven"
 
-#: schroot/schroot-releaselock.cc:106
+#: schroot/schroot-releaselock.cc:111
 msgid "No pid specified; forcing release of lock"
 msgstr "Ingen pid angiven; tvingar släpp av lås"
 
-#: schroot/schroot-releaselock.cc:115
+#: schroot/schroot-releaselock.cc:120
+#, boost-format
 msgid "Failed to stat device %1%: %2%"
 msgstr "Misslyckades med att läsa status på enhet %1%: %2%"
 
-#: schroot/schroot-releaselock.cc:123
+#: schroot/schroot-releaselock.cc:128
+#, boost-format
 msgid "%1% is not a block device"
 msgstr "%1% är inte en blockenhet"
 
-#: schroot/schroot-releaselock.cc:131
+#: schroot/schroot-releaselock.cc:136
+#, boost-format
 msgid "%1%: failed to release device lock"
 msgstr "%1%: misslyckades med att släppa enhetslås"
 
-#: schroot/schroot-releaselock.cc:138
+#: schroot/schroot-releaselock.cc:143
+#, boost-format
 msgid "%1%: failed to release device lock owned by pid %2%"
 msgstr "%1%: misslyckades med att släppa enhetslås som ägs av pid %2%"
 
-#: schroot/schroot-releaselock-options.cc:53
+#: schroot/schroot-releaselock-options.cc:52
 msgid "Device to unlock (full path)"
 msgstr "Enhet att låsa upp (full sökväg)"
 
-#: schroot/schroot-releaselock-options.cc:55
+#: schroot/schroot-releaselock-options.cc:54
 msgid "Process ID owning the lock"
 msgstr "Process-id som äger låset"
 
-#: schroot/schroot-releaselock-options.cc:69
+#: schroot/schroot-releaselock-options.cc:68
 #, fuzzy
 msgid "schroot-releaselock [OPTION...] - release a device lock"
 msgstr "  schroot-releaselock [FLAGGA...] - släpp ett enhetslås"
 
-#~ msgid "(%1%->%2%): dchroot sessions do not support user switching"
-#~ msgstr "(%1%->%2%): dchroot-sessioner har inte stöd för byte av användare"
+#~ msgid "schroot-listmounts (Debian sbuild) %1%\n"
+#~ msgstr "schroot-listmounts (Debian sbuild) %1%\n"
 
-#, fuzzy
-#~ msgid "dchroot session restriction"
-#~ msgstr "Val av chroot"
+#~ msgid "schroot-releaselock (Debian sbuild) %1%\n"
+#~ msgstr "schroot-releaselock (Debian sbuild) %1%\n"
 
 #~ msgid "%1%: not a regular file"
 #~ msgstr "%1%: inte en vanlig fil"
@@ -905,134 +1156,9 @@ msgstr "  schroot-releaselock [FLAGGA...] - släpp ett enhetslås"
 #~ msgid "Falling back to home directory '%1%'"
 #~ msgstr "Faller tillbaka på hemkatalogen \"%1%\""
 
-#~ msgid "%1% (Debian sbuild) %2%\n"
-#~ msgstr "%1% (Debian sbuild) %2%\n"
-
-#~ msgid "Error saving terminal settings"
-#~ msgstr "Fel vid sparandet av terminalinställningar"
-
-#, fuzzy
-#~ msgid "Run 'schroot' for full capabilities"
-#~ msgstr "Kör \"schroot\" för fullständiga färdigheter"
-
-#~ msgid "Using dchroot configuration file: "
-#~ msgstr "Använder dchroots konfigurationsfil: "
-
-#~ msgid "Run '%1%'"
-#~ msgstr "Kör \"%1%\""
-
-#~ msgid "to migrate to a schroot configuration."
-#~ msgstr "för att migrera till en schroot-konfiguration."
-
-#~ msgid "Edit '%1%' to add appropriate group access."
-#~ msgstr "Redigera \"%1%\" för att lägga till lämplig gruppåtkomst."
-
-#~ msgid "Remove '%1%' to use the new configuration."
-#~ msgstr "Ta bort \"%1%\" för att använda den nya konfigurationen."
-
-#~ msgid "No chroots are defined in %1% or %2%"
-#~ msgstr "Inga chroot angivna i %1% eller %2%"
-
-#~ msgid "No chroots are defined in %1%"
-#~ msgstr "Inga chroot angivna i %1%"
-
-#~ msgid "The specified chroots are not defined in %1%"
-#~ msgstr "De angivna chroot finns inte angivna i %1%"
-
-#~ msgid "schroot configuration generated by %1% %2%"
-#~ msgstr "schroot-konfiguration genererad av %1% %2%"
-
-#, fuzzy
-#~ msgid "To allow users access to the chroots, use the users or groups keys."
-#~ msgstr ""
-#~ "För att tillåta användare att komma åt chrootmiljöerna, lägg till deras "
-#~ "grupper till gruppnycklarna."
-
-#, fuzzy
-#~ msgid ""
-#~ "To allow passwordless 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."
-
-#~ msgid "Only one chroot may be specified when beginning a session"
-#~ msgstr "Endast en chroot får anges vid början av en session"
-
 #~ msgid "Session failure: %1%"
 #~ msgstr "Sessionsfel: %1%"
 
-#~ msgid "Error restoring terminal settings"
-#~ msgstr "Fel vid återställandet av terminalinställningar"
-
-#~ msgid "Show less output"
-#~ msgstr "Visa mindre utdata"
-
-#~ msgid "Show more output"
-#~ msgstr "Visa mer utdata"
-
-#~ msgid "List available chroots"
-#~ msgstr "Lista tillgängliga chroot"
-
-#~ msgid "Show information about selected chroots"
-#~ msgstr "Visa information om valda chroot"
-
-#~ msgid "Print path to selected chroot"
-#~ msgstr "Skriv ut sökvägen till valda chroot"
-
-#, fuzzy
-#~ msgid "Print paths to available chroots"
-#~ msgstr "Lista tillgängliga chroot"
-
-#~ msgid "Dump configuration of selected chroots"
-#~ msgstr "Dumpa konfigurationen för valda chroot"
-
-#~ msgid "Chroot selection"
-#~ msgstr "Val av chroot"
-
-#~ msgid "Use specified chroot"
-#~ msgstr "Använd angiven chroot"
-
-#~ msgid "Chroot environment"
-#~ msgstr "Chroot-miljö"
-
-#~ msgid "Session management"
-#~ msgstr "Sessionshantering"
-
-#~ msgid "Hidden options"
-#~ msgstr "Dolda flaggor"
-
-#~ msgid "Command to run"
-#~ msgstr "Kommando att köra"
-
-#, fuzzy
-#~ msgid " [OPTION...] chroot [COMMAND] - run command or shell in a chroot"
-#~ msgstr " [FLAGGA...] [KOMMANDO] - kör kommando eller skal i ett chroot"
-
-#~ msgid "--quiet and --verbose may not be used at the same time"
-#~ msgstr "--quiet och --verbose får inte användas samtidigt"
-
-#~ msgid "Using verbose output"
-#~ msgstr "Använder informativ utskrift"
-
-#~ msgid "--chroot and --all may not be used at the same time"
-#~ msgstr "--chroot och --all kan inte användas samtidigt"
-
-#~ msgid "Using --chroots only"
-#~ msgstr "Använder endast --chroots"
-
-#~ msgid ""
-#~ "Only one chroot may be specified when recovering, running or ending a "
-#~ "session"
-#~ msgstr ""
-#~ "Endast ett chroot får anges vid återhämtning, körning eller avslutning av "
-#~ "en session"
-
-#~ msgid "--chroot may not be used with --list"
-#~ msgstr "--chroot får inte användas med --list"
-
-#~ msgid "Only one action may be specified"
-#~ msgstr "Endast en åtgärd får anges"
-
 #~ msgid "line %1%: invalid line: %2%"
 #~ msgstr "rad %1%: ogiltig rad: %2%"
 
diff --git a/po/vi.po b/po/vi.po
index fb1b61ec..e49ac913 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-06-23 16:39+0100\n"
+"POT-Creation-Date: 2006-06-24 00:38+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"
@@ -16,725 +16,900 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.6a7\n"
 
-#: schroot/dchroot-chroot-config.cc:124
+#: dchroot/dchroot.cc:68 dchroot-dsa/dchroot-dsa.cc:68 schroot/schroot.cc:68
 #, fuzzy
+msgid "An unknown exception occured"
+msgstr "Đã ghi rõ một hành động không rõ"
+
+#: dchroot/dchroot-chroot-config.cc:123
+#, fuzzy, boost-format
 msgid "%1% chroot (dchroot compatibility)"
 msgstr "Đang chạy schroot trong chế độ tương thích"
 
-#: schroot/dchroot-session.cc:118
+#: dchroot/dchroot-main.cc:59 dchroot-dsa/dchroot-dsa-main.cc:58
+#: schroot/schroot-main.cc:73
+#, boost-format
+msgid "schroot configuration generated by %1% %2%"
+msgstr "Cấu hình schroot được tạo ra bởi %1% %2%"
+
+#: dchroot/dchroot-main.cc:65 dchroot-dsa/dchroot-dsa-main.cc:64
+#, fuzzy
+msgid "To allow users access to the chroots, use the users or groups keys."
+msgstr ""
+"Để cho phép người dùng truy cập những chroot này, hãy thêm các nhóm của họ "
+"vào những khoá nhóm (groups)."
+
+#: dchroot/dchroot-main.cc:67 dchroot-dsa/dchroot-dsa-main.cc:66
+#, fuzzy
+msgid ""
+"To allow passwordless 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.cc:69 dchroot/dchroot-main.cc:132
+#: dchroot-dsa/dchroot-dsa-main.cc:68 dchroot-dsa/dchroot-dsa-main.cc:124
+#, boost-format
+msgid "Remove '%1%' to use the new configuration."
+msgstr "Gỡ bỏ « %1% » để sử dụng cấu hình mới."
+
+#: dchroot/dchroot-main.cc:96 dchroot-dsa/dchroot-dsa-main.cc:87
+#, fuzzy
+msgid "Running schroot in dchroot compatibility mode"
+msgstr "Đang chạy schroot trong chế độ tương thích"
+
+#: dchroot/dchroot-main.cc:99 dchroot-dsa/dchroot-dsa-main.cc:90
+#, fuzzy
+msgid "Run 'schroot' for full capabilities"
+msgstr "Chạy « schroot » để có khả năng đầy đủ"
+
+#: dchroot/dchroot-main.cc:116 dchroot-dsa/dchroot-dsa-main.cc:108
+#, fuzzy, boost-format
+msgid "Using %1% configuration file: "
+msgstr "Đang dùng tập tin cấu hình dchroot: "
+
+#: dchroot/dchroot-main.cc:121 dchroot-dsa/dchroot-dsa-main.cc:113
+#, boost-format
+msgid "Run '%1%'"
+msgstr "Chạy « %1% »"
+
+#: dchroot/dchroot-main.cc:125 dchroot-dsa/dchroot-dsa-main.cc:117
+msgid "to migrate to a schroot configuration."
+msgstr "để nâng cấp lên một cấu hình schroot."
+
+#: dchroot/dchroot-main.cc:128 dchroot-dsa/dchroot-dsa-main.cc:120
+#, boost-format
+msgid "Edit '%1%' to add appropriate group access."
+msgstr "Hiệu chỉnh « %1% » để thêm cách truy cập nhóm thích hợp."
+
+#: dchroot/dchroot-options.cc:56
+msgid "Print path to selected chroot"
+msgstr "In ra đường dẫn đến chroot đã chọn"
+
+#: dchroot/dchroot-options.cc:60 dchroot-dsa/dchroot-dsa-options.cc:60
+#: schroot/schroot-options.cc:62
+msgid "Select all chroots"
+msgstr "Chọn mọi chroot"
+
+#: dchroot/dchroot-options.cc:64 schroot/schroot-options.cc:70
+msgid "Preserve user environment"
+msgstr "Bảo tồn môi trường người dùng"
+
+#: dchroot/dchroot-options.cc:73 dchroot-dsa/dchroot-dsa-options.cc:69
+#: schroot/schroot-listmounts-options.cc:64 schroot/schroot-options.cc:92
+#: schroot/schroot-releaselock-options.cc:67
+msgid "Usage:"
+msgstr "Cách sử dụng:"
+
+#: dchroot/dchroot-options.cc:76 schroot/schroot-options.cc:95
+#, fuzzy
+msgid "[OPTION...] [COMMAND] - run command or shell in a chroot"
+msgstr " [TÙY_CHỌN...] [LỆNH] — chạy lệnh hoặc hệ vỏ trong một chroot"
+
+#: dchroot/dchroot-options.cc:99 dchroot-dsa/dchroot-dsa-options.cc:102
+#, fuzzy
+msgid "Only one command may be specified"
+msgstr "Có thể ghi rõ chỉ một hành động thôi"
+
+#: dchroot/dchroot-options.cc:104 schroot/schroot-options-base.cc:157
+msgid "--quiet and --verbose may not be used at the same time"
+msgstr ""
+"Không cho phép sử dụng tùy chọn cả « --quiet » (xuất ít hơn) lẫn « --verbose "
+"» (xuất nhiều hơn) đều đồng thời."
+
+#: dchroot/dchroot-options.cc:106 schroot/schroot-options-base.cc:159
+msgid "Using verbose output"
+msgstr "Đang xuất nhiều hơn"
+
+#: dchroot/dchroot-options.cc:112 schroot/schroot-options-base.cc:165
+msgid "--chroot and --all may not be used at the same time"
+msgstr ""
+"Không cho phép sử dụng tùy chọn cả « --chroot » lẫn « --all » (tất cả) đều "
+"đồng thời."
+
+#: dchroot/dchroot-options.cc:114 schroot/schroot-options-base.cc:167
+msgid "Using --chroots only"
+msgstr "Đang dùng chỉ tùy chọn « --chroots » thôi"
+
+#: dchroot/dchroot-session-base.cc:76
+#, boost-format
+msgid "(%1%->%2%): dchroot sessions do not support user switching"
+msgstr ""
+"(%1% → %2%): phiên chạy dchroot không hỗ trợ khả năng chuyển đổi người dùng."
+
+#: dchroot/dchroot-session-base.cc:78
+#, fuzzy
+msgid "dchroot session restriction"
+msgstr "Chọn chroot"
+
+#: dchroot/dchroot-session.cc:116 dchroot-dsa/dchroot-dsa-session.cc:132
+#, boost-format
 msgid "[%1% chroot] Running command: \"%2%\""
 msgstr "[%1% chroot] Đang chạy lệnh: « %2% »"
 
-#: schroot/sbuild-auth.cc:52
+#: dchroot-dsa/dchroot-dsa-chroot-config.cc:110
+#, fuzzy, boost-format
+msgid "%1% chroot (dchroot-dsa compatibility)"
+msgstr "Đang chạy schroot trong chế độ tương thích"
+
+#: dchroot-dsa/dchroot-dsa-options.cc:56
+#, fuzzy
+msgid "Print paths to available chroots"
+msgstr "Liệt kê các chroot sẵn sàng"
+
+#: dchroot-dsa/dchroot-dsa-options.cc:72
+#, fuzzy
+msgid "[OPTION...] chroot [COMMAND] - run command or shell in a chroot"
+msgstr " [TÙY_CHỌN...] [LỆNH] — chạy lệnh hoặc hệ vỏ trong một chroot"
+
+#: dchroot-dsa/dchroot-dsa-session.cc:116
+#, boost-format
+msgid "%1%: Command must have an absolute path"
+msgstr ""
+
+#: sbuild/sbuild-auth.cc:53
 #, fuzzy
 msgid "Failed to get hostname"
 msgstr "Việc lấy tên máy bị lỗi: %1%"
 
-#: schroot/sbuild-auth.cc:53
+#: sbuild/sbuild-auth.cc:54
 #, fuzzy
 msgid "User not found"
 msgstr "%1%: không tìm thấy người dùng: %2%"
 
-#: schroot/sbuild-auth.cc:54
+#: sbuild/sbuild-auth.cc:55
 #, fuzzy
 msgid "Access not authorised"
 msgstr "không xác thực truy cập"
 
-#: schroot/sbuild-auth.cc:55
+#: sbuild/sbuild-auth.cc:56
 #, fuzzy
 msgid "Authentication failed"
 msgstr "Việc xác thực kiểu PAM bị lỗi: %1%"
 
-#: schroot/sbuild-auth.cc:56
+#: sbuild/sbuild-auth.cc:57
 #, fuzzy
 msgid "PAM is already initialised"
 msgstr "Lỗi PAM: PAM đã được sở khởi"
 
-#: schroot/sbuild-auth.cc:57
+#: sbuild/sbuild-auth.cc:58
 #, fuzzy
 msgid "PAM error"
 msgstr "Lỗi PAM: %1%"
 
-#: schroot/sbuild-auth.cc:420
+#: sbuild/sbuild-auth.cc:421
 msgid "Set RUSER"
 msgstr ""
 
-#: schroot/sbuild-auth.cc:436
+#: sbuild/sbuild-auth.cc:437
 msgid "Set RHOST"
 msgstr ""
 
-#: schroot/sbuild-auth.cc:449
+#: sbuild/sbuild-auth.cc:450
 msgid "Set TTY"
 msgstr ""
 
-#: schroot/sbuild-auth.cc:461
+#: sbuild/sbuild-auth.cc:462
 msgid "Set USER"
 msgstr ""
 
-#: schroot/sbuild-auth.cc:479
+#: sbuild/sbuild-auth.cc:480
+#, boost-format
 msgid "You do not have permission to access the %1% service."
 msgstr "Bạn không có quyền truy cập dịch vụ %1%."
 
-#: schroot/sbuild-auth.cc:482
+#: sbuild/sbuild-auth.cc:483
 msgid "This failure will be reported."
 msgstr "Sự thất bại này sẽ được thông báo."
 
-#: schroot/sbuild-auth-conv-tty.cc:47
+#: sbuild/sbuild-auth-conv-tty.cc:48
 msgid "Timed out"
 msgstr "Quá giờ"
 
-#: schroot/sbuild-auth-conv-tty.cc:48
+#: sbuild/sbuild-auth-conv-tty.cc:49
 msgid "Time is running out..."
 msgstr "Gần thời hạn..."
 
-#: schroot/sbuild-auth-conv-tty.cc:49
+#: sbuild/sbuild-auth-conv-tty.cc:50
 msgid "Failed to get terminal settings"
 msgstr "Việc lấy thiết lập thiết bị cuối bị lỗi"
 
-#: schroot/sbuild-auth-conv-tty.cc:50
+#: sbuild/sbuild-auth-conv-tty.cc:51
 #, fuzzy
 msgid "Unsupported conversation type"
 msgstr "Kiểu chuyển đổi không được hỗ trợ %1%"
 
-#: schroot/sbuild-chroot-block-device.cc:176
+#: sbuild/sbuild-chroot-block-device.cc:179
 msgid "Device"
 msgstr "Thiết bị"
 
-#: schroot/sbuild-chroot-block-device.cc:178
+#: sbuild/sbuild-chroot-block-device.cc:181
 msgid "Mount Options"
 msgstr "Tùy chọn lắp"
 
-#: schroot/sbuild-chroot.cc:47
+#: sbuild/sbuild-chroot.cc:58
 #, fuzzy
 msgid "Unknown chroot type"
 msgstr "không biết kiểu chroot « %1% »"
 
-#: schroot/sbuild-chroot.cc:48
+#: sbuild/sbuild-chroot.cc:59
 #, fuzzy
 msgid "Chroot creation failed"
 msgstr "việc tạo chroot bị lỗi"
 
-#: schroot/sbuild-chroot.cc:49
+#: sbuild/sbuild-chroot.cc:60
 #, fuzzy
 msgid "Device name not set"
 msgstr "%1% chroot: chưa lập tên thiết bị"
 
-#: schroot/sbuild-chroot.cc:50
+#: sbuild/sbuild-chroot.cc:61
 #, fuzzy
 msgid "Failed to write session file"
 msgstr "%1%: việc tạo tập tin phiên chạy bị lỗi: %2%\n"
 
-#: schroot/sbuild-chroot.cc:51
+#: sbuild/sbuild-chroot.cc:62
 #, fuzzy
 msgid "Failed to unlink session file"
 msgstr "%1%: việc bỏ liên kết tập tin phiên chạy bị lỗi: %2%\n"
 
-#: schroot/sbuild-chroot.cc:52 schroot/sbuild-chroot-config.cc:56
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-chroot-config.cc:58
 #, fuzzy
 msgid "Failed to stat file"
 msgstr "việc lấy các thông tin về tập tin bị lỗi: %1%"
 
-#: schroot/sbuild-chroot.cc:53 schroot/sbuild-chroot-config.cc:58
+#: sbuild/sbuild-chroot.cc:64 sbuild/sbuild-chroot-config.cc:60
 #, fuzzy
 msgid "File is not owned by user root"
 msgstr "người dùng chủ không sở hữu"
 
-#: schroot/sbuild-chroot.cc:54 schroot/sbuild-chroot-config.cc:59
+#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
 #, fuzzy
 msgid "File has write permissions for others"
 msgstr "người khác có quyền ghi"
 
-#: schroot/sbuild-chroot.cc:55 schroot/sbuild-chroot-config.cc:60
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:62
 #, fuzzy
 msgid "File is not a regular file"
 msgstr "không phải là tập tin chuẩn"
 
-#: schroot/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:67
 #, fuzzy
 msgid "Failed to acquire file lock"
 msgstr "không lấy khoá thiết bị được"
 
-#: schroot/sbuild-chroot.cc:57
+#: sbuild/sbuild-chroot.cc:68
 #, fuzzy
 msgid "Failed to discard file lock"
 msgstr "không kiểm tra khoá thiết bị được"
 
-#: schroot/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:69
 #, fuzzy
 msgid "Failed to stat device"
 msgstr "Việc lấy các thông tin về thiết bị %1% bị lỗi: %2%"
 
-#: schroot/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:70
 #, fuzzy
 msgid "File is not a block device"
 msgstr "%1% không phải là thiết bị khối"
 
-#: schroot/sbuild-chroot.cc:60
+#: sbuild/sbuild-chroot.cc:71
 #, fuzzy
 msgid "Failed to lock device"
 msgstr "%1%: không khoá thiết bị được: %2%"
 
-#: schroot/sbuild-chroot.cc:61
+#: sbuild/sbuild-chroot.cc:72
 #, fuzzy
 msgid "Failed to unlock device"
 msgstr "%1%: không mở khoá thiết bị được: %2%"
 
-#: schroot/sbuild-chroot.cc:403
+#: sbuild/sbuild-chroot.cc:414
 #, fuzzy
 msgid "--- Session ---\n"
 msgstr "  ━━━Phiên chạy ━━━\n"
 
-#: schroot/sbuild-chroot.cc:405
+#: sbuild/sbuild-chroot.cc:416
 #, fuzzy
 msgid "--- Chroot ---\n"
 msgstr "  ━━━ Chroot ━━━\n"
 
-#: schroot/sbuild-chroot.cc:406
+#: sbuild/sbuild-chroot.cc:417
 msgid "Name"
 msgstr "Tên"
 
-#: schroot/sbuild-chroot.cc:407
+#: sbuild/sbuild-chroot.cc:418
 msgid "Description"
 msgstr "Mô tả"
 
-#: schroot/sbuild-chroot.cc:408
+#: sbuild/sbuild-chroot.cc:419
 msgid "Type"
 msgstr "Kiểu"
 
-#: schroot/sbuild-chroot.cc:409
+#: sbuild/sbuild-chroot.cc:420
 msgid "Priority"
 msgstr "Ưu tiên"
 
-#: schroot/sbuild-chroot.cc:410
+#: sbuild/sbuild-chroot.cc:421
 msgid "Users"
 msgstr ""
 
-#: schroot/sbuild-chroot.cc:411
+#: sbuild/sbuild-chroot.cc:422
 msgid "Groups"
 msgstr "Nhóm"
 
-#: schroot/sbuild-chroot.cc:412
+#: sbuild/sbuild-chroot.cc:423
 #, fuzzy
 msgid "Root Users"
 msgstr "Nhóm chủ"
 
-#: schroot/sbuild-chroot.cc:413
+#: sbuild/sbuild-chroot.cc:424
 msgid "Root Groups"
 msgstr "Nhóm chủ"
 
-#: schroot/sbuild-chroot.cc:414
+#: sbuild/sbuild-chroot.cc:425
 msgid "Aliases"
 msgstr "Biệt hiệu"
 
-#: schroot/sbuild-chroot.cc:415
+#: sbuild/sbuild-chroot.cc:426
 msgid "Run Setup Scripts"
 msgstr "Chạy các tập lệnh thiết lập"
 
-#: schroot/sbuild-chroot.cc:416
+#: sbuild/sbuild-chroot.cc:427
 msgid "Run Execution Scripts"
 msgstr "Chạy các tập lệnh thực hiện"
 
-#: schroot/sbuild-chroot.cc:418
+#: sbuild/sbuild-chroot.cc:429
 msgid "Session Managed"
 msgstr "Phiên chạy đã quản lý"
 
-#: schroot/sbuild-chroot.cc:423
+#: sbuild/sbuild-chroot.cc:434
 msgid "Command Prefix"
 msgstr "Tiền tố lệnh"
 
-#: schroot/sbuild-chroot.cc:425
+#: sbuild/sbuild-chroot.cc:436
 msgid "Personality"
 msgstr "Cá tính"
 
-#: schroot/sbuild-chroot.cc:429
+#: sbuild/sbuild-chroot.cc:440
 msgid "Location"
 msgstr "Địa điểm"
 
-#: schroot/sbuild-chroot.cc:432
+#: sbuild/sbuild-chroot.cc:443
 msgid "Mount Location"
 msgstr "Địa điểm lắp"
 
-#: schroot/sbuild-chroot.cc:435
+#: sbuild/sbuild-chroot.cc:446
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: schroot/sbuild-chroot.cc:438
+#: sbuild/sbuild-chroot.cc:449
 msgid "Mount Device"
 msgstr "Thiết bị lắp"
 
-#: schroot/sbuild-chroot.cc:597
+#: sbuild/sbuild-chroot.cc:608
+#, boost-format
 msgid "%1% chroot: personality \"%2%\" is unknown.\n"
 msgstr "%1% chroot: không biết cá tính « %2% ».\n"
 
-#: schroot/sbuild-chroot.cc:600
+#: sbuild/sbuild-chroot.cc:611
+#, boost-format
 msgid "Valid personalities: %1%\n"
 msgstr "Cá tính hợp lệ: %1%\n"
 
-#: schroot/sbuild-chroot-config.cc:55
+#: sbuild/sbuild-chroot-config.cc:57
 #, fuzzy
 msgid "Failed to open directory"
 msgstr "%1%: việc mở thư mục bị lỗi: %2%"
 
-#: schroot/sbuild-chroot-config.cc:57
+#: sbuild/sbuild-chroot-config.cc:59
 #, fuzzy
 msgid "Failed to open file"
 msgstr "không thể mở tập tin"
 
-#: schroot/sbuild-chroot-config.cc:180
-#, fuzzy
+#: sbuild/sbuild-chroot-config.cc:182
+#, fuzzy, boost-format
 msgid "%1% chroot: Alias '%2%' already associated with '%3%' chroot"
 msgstr "%1% chroot: biệt hiệu %2% đã tương ứng với chroot %3%"
 
-#: schroot/sbuild-chroot-config.cc:188
-#, fuzzy
+#: sbuild/sbuild-chroot-config.cc:190
+#, fuzzy, boost-format
 msgid "%1% chroot: Alias '%2%' already associated with another chroot"
 msgstr "%1% chroot: biệt hiệu %2% đã tương ứng với chroot khác"
 
-#: schroot/sbuild-chroot-config.cc:198
-#, fuzzy
+#: sbuild/sbuild-chroot-config.cc:200
+#, fuzzy, boost-format
 msgid "%1% chroot: A chroot or alias already exists by this name"
 msgstr "%1% chroot: một chroot hay biệt hiệu tên này đã có"
 
-#: schroot/sbuild-chroot-config.cc:201
-#, fuzzy
+#: sbuild/sbuild-chroot-config.cc:203
+#, fuzzy, boost-format
 msgid "%1% chroot: Duplicate names are not allowed"
 msgstr "%1% chroot: không cho phép tên trùng"
 
-#: schroot/sbuild-chroot-config.cc:280
+#: sbuild/sbuild-chroot-config.cc:282
 msgid "Available chroots: "
 msgstr "Các chroot sẵn sàng: "
 
-#: schroot/sbuild-chroot-config.cc:325 schroot/sbuild-chroot-config.cc:344
-#: schroot/sbuild-chroot-config.cc:367
+#: sbuild/sbuild-chroot-config.cc:327 sbuild/sbuild-chroot-config.cc:346
+#: sbuild/sbuild-chroot-config.cc:369 schroot/schroot-main.cc:138
+#, boost-format
 msgid "%1%: No such chroot"
 msgstr "%1%: Không có chroot như vậy"
 
-#: schroot/sbuild-chroot-file.cc:143
+#: sbuild/sbuild-chroot-file.cc:146
 msgid "File"
 msgstr "Tập tin"
 
-#: schroot/sbuild-chroot-file.cc:144
+#: sbuild/sbuild-chroot-file.cc:147
 msgid "File Repack"
 msgstr "Nén lại tập tin"
 
-#: schroot/sbuild-chroot-lvm-snapshot.cc:201
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:203
 msgid "LVM Snapshot Device"
 msgstr "Thiết bị hiện trạng Bộ Quản lý Khối tin Hợp lý"
 
-#: schroot/sbuild-chroot-lvm-snapshot.cc:204
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:206
 msgid "LVM Snapshot Options"
 msgstr "Tùy chọn hiện trạng Bộ Quản lý Khối tin Hợp lý"
 
-#: schroot/sbuild-chroot-source.cc:45
+#: sbuild/sbuild-chroot-source.cc:47
 #, fuzzy
 msgid "(source chroot)"
 msgstr " (chroot nguồn)"
 
-#: schroot/sbuild-chroot-source.cc:115
+#: sbuild/sbuild-chroot-source.cc:117
 #, fuzzy
 msgid "Source Users"
 msgstr "Nhóm nguồn"
 
-#: schroot/sbuild-chroot-source.cc:116
+#: sbuild/sbuild-chroot-source.cc:118
 msgid "Source Groups"
 msgstr "Nhóm nguồn"
 
-#: schroot/sbuild-chroot-source.cc:117
+#: sbuild/sbuild-chroot-source.cc:119
 #, fuzzy
 msgid "Source Root Users"
 msgstr "Nhóm chủ nguồn"
 
-#: schroot/sbuild-chroot-source.cc:118
+#: sbuild/sbuild-chroot-source.cc:120
 msgid "Source Root Groups"
 msgstr "Nhóm chủ nguồn"
 
-#: schroot/sbuild-format-detail.cc:34
+#: sbuild/sbuild-format-detail.cc:34
 msgid "true"
 msgstr "đúng"
 
-#: schroot/sbuild-format-detail.cc:36
+#: sbuild/sbuild-format-detail.cc:36
 msgid "false"
 msgstr "sai"
 
-#: schroot/sbuild-keyfile.cc:363
+#: sbuild/sbuild-keyfile.cc:363
+#, 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õ."
 
-#: schroot/sbuild-keyfile.cc:367
+#: sbuild/sbuild-keyfile.cc:367
 msgid "This option will be removed in the future."
 msgstr "Tùy chọn này sẽ bị gỡ bỏ trong tương lai."
 
-#: schroot/sbuild-keyfile.cc:371
+#: sbuild/sbuild-keyfile.cc:371
+#, boost-format
 msgid "%1% chroot: An obsolete parameter \"%2%\" has been specified."
 msgstr "%1% chroot: một tham số cũ « %2% » đã được ghi rõ."
 
-#: schroot/sbuild-keyfile.cc:375
+#: sbuild/sbuild-keyfile.cc:375
 msgid "This option has been removed, and no longer has any effect."
 msgstr "Tùy chọn này đã bị gỡ bỏ nên không còn có tác động nào lại."
 
-#: schroot/sbuild-lock.cc:48
+#: sbuild/sbuild-lock.cc:49
 #, fuzzy
 msgid "Failed to set timeout handler"
 msgstr "việc lập bộ quản lý thời hạn bị lỗi: %1%"
 
-#: schroot/sbuild-lock.cc:49
+#: sbuild/sbuild-lock.cc:50
 #, fuzzy
 msgid "Failed to set timeout"
 msgstr "việc lập thời hạn bị lỗi: %1%"
 
-#: schroot/sbuild-lock.cc:50
+#: sbuild/sbuild-lock.cc:51
 #, fuzzy
 msgid "Failed to cancel timeout"
 msgstr "việc bỏ lập thời hạn bị lỗi: %1%"
 
-#: schroot/sbuild-lock.cc:51
+#: sbuild/sbuild-lock.cc:52
 #, fuzzy
 msgid "Failed to acquire lock (timed out)"
 msgstr "việc lấy khoá bị lỗi (quá thời sau %1% giây)"
 
-#: schroot/sbuild-lock.cc:52
+#: sbuild/sbuild-lock.cc:53
 #, fuzzy
 msgid "Failed to acquire lock"
 msgstr "việc lấy khoá bị lỗi: %1%"
 
-#: schroot/sbuild-lock.cc:53
+#: sbuild/sbuild-lock.cc:54
 #, fuzzy
 msgid "Failed to acquire device lock"
 msgstr "không lấy khoá thiết bị được"
 
-#: schroot/sbuild-lock.cc:54
+#: sbuild/sbuild-lock.cc:55
 #, fuzzy
 msgid "Failed to acquire device lock (timed out)"
 msgstr "không lấy khoá thiết bị được"
 
-#: schroot/sbuild-lock.cc:55
+#: sbuild/sbuild-lock.cc:56
 #, fuzzy
 msgid "Failed to test device lock"
 msgstr "không kiểm tra khoá thiết bị được"
 
-#: schroot/sbuild-lock.cc:56
+#: sbuild/sbuild-lock.cc:57
 #, fuzzy
 msgid "Failed to release device lock"
 msgstr "không nhả khoá thiết bị được"
 
-#: schroot/sbuild-lock.cc:57
+#: sbuild/sbuild-lock.cc:58
 #, fuzzy
 msgid "Failed to release device lock (timed out)"
 msgstr "không nhả khoá thiết bị được"
 
-#: schroot/sbuild-lock.cc:274
+#: sbuild/sbuild-lock.cc:275
+#, boost-format
 msgid "lock held by pid %1%"
 msgstr ""
 
-#: schroot/sbuild-parse-error.cc:41
+#: sbuild/sbuild-parse-error.cc:41
 #, fuzzy
 msgid "No error"
 msgstr "không có lỗi"
 
-#: schroot/sbuild-parse-error.cc:42
+#: sbuild/sbuild-parse-error.cc:42
 #, fuzzy
 msgid "Can't open file"
 msgstr "không thể mở tập tin"
 
-#: schroot/sbuild-parse-error.cc:43
+#: sbuild/sbuild-parse-error.cc:43
 #, fuzzy
 msgid "Could not parse value"
 msgstr "không thể phân tách giá trị"
 
-#: schroot/sbuild-parse-error.cc:44
+#: sbuild/sbuild-parse-error.cc:44
 #, fuzzy
 msgid "Invalid line"
 msgstr "dòng không hợp lệ"
 
-#: schroot/sbuild-parse-error.cc:45
+#: sbuild/sbuild-parse-error.cc:45
 #, fuzzy
 msgid "No group specified"
 msgstr "chưa xác định nhóm"
 
-#: schroot/sbuild-parse-error.cc:46
+#: sbuild/sbuild-parse-error.cc:46
 #, fuzzy
 msgid "Invalid group"
 msgstr "nhóm không hợp lệ"
 
-#: schroot/sbuild-parse-error.cc:47
+#: sbuild/sbuild-parse-error.cc:47
 #, fuzzy
 msgid "Duplicate group"
 msgstr "nhóm trùng"
 
-#: schroot/sbuild-parse-error.cc:48
+#: sbuild/sbuild-parse-error.cc:48
 #, fuzzy
 msgid "No key specified"
 msgstr "chưa xác định khoá"
 
-#: schroot/sbuild-parse-error.cc:49
+#: sbuild/sbuild-parse-error.cc:49
 #, fuzzy
 msgid "Duplicate key"
 msgstr "khoá trùng"
 
-#: schroot/sbuild-parse-error.cc:50
+#: sbuild/sbuild-parse-error.cc:50
 #, fuzzy
 msgid "Required key is missing"
 msgstr "thiếu khoá cần thiết"
 
-#: schroot/sbuild-parse-error.cc:51
+#: sbuild/sbuild-parse-error.cc:51
 #, fuzzy
 msgid "Disallowed key used"
 msgstr "dùng khoá bị cấm"
 
-#: schroot/sbuild-parse-error.cc:116
+#: sbuild/sbuild-parse-error.cc:116
 #, fuzzy
 msgid "Unknown error"
 msgstr "lỗi không rõ"
 
-#: schroot/sbuild-parse-error.cc:127
+#: sbuild/sbuild-parse-error.cc:127
+#, boost-format
 msgid "%1% \"%2%\""
 msgstr "%1% \"%2%\""
 
-#: schroot/sbuild-parse-error.cc:143
+#: sbuild/sbuild-parse-error.cc:143
+#, boost-format
 msgid "line %1%: %3%"
 msgstr "dòng %1%: %3%"
 
-#: schroot/sbuild-parse-error.cc:144
+#: sbuild/sbuild-parse-error.cc:144
+#, boost-format
 msgid "line %1%: %2% \"%3%\""
 msgstr "dòng %1%: %2% \"%3%\""
 
-#: schroot/sbuild-parse-error.cc:150
+#: sbuild/sbuild-parse-error.cc:150
+#, boost-format
 msgid "line %1%: %2%"
 msgstr "dòng %1%: %2%"
 
-#: schroot/sbuild-parse-error.cc:165
+#: sbuild/sbuild-parse-error.cc:165
+#, boost-format
 msgid "line %1% [%2%]: %4%"
 msgstr "dòng %1% [%2%]: %4%"
 
-#: schroot/sbuild-parse-error.cc:166
+#: sbuild/sbuild-parse-error.cc:166
+#, boost-format
 msgid "line %1% [%2%]: %3% \"%4%\""
 msgstr "dòng %1% [%2%]: %3% \"%4%\""
 
-#: schroot/sbuild-parse-error.cc:172
+#: sbuild/sbuild-parse-error.cc:172
+#, boost-format
 msgid "line %1% [%2%]: %3%"
 msgstr "dòng %1% [%2%]: %3%"
 
-#: schroot/sbuild-parse-error.cc:188
+#: sbuild/sbuild-parse-error.cc:188
+#, boost-format
 msgid "line %1% [%2%] %3%: %5%"
 msgstr "dòng %1% [%2%] %3%: %5%"
 
-#: schroot/sbuild-parse-error.cc:189
+#: sbuild/sbuild-parse-error.cc:189
+#, boost-format
 msgid "line %1% [%2%] %3%: %4% \"%5%\""
 msgstr "dòng %1% [%2%] %3%: %4% \"%5%\""
 
-#: schroot/sbuild-parse-error.cc:195
+#: sbuild/sbuild-parse-error.cc:195
+#, boost-format
 msgid "line %1% [%2%] %3%: %4%"
 msgstr "dòng %1% [%2%] %3%: %4%"
 
-#: schroot/sbuild-parse-error.cc:209
+#: sbuild/sbuild-parse-error.cc:209
+#, boost-format
 msgid "[%1%]: %3%"
 msgstr "[%1%]: %3%"
 
-#: schroot/sbuild-parse-error.cc:210
+#: sbuild/sbuild-parse-error.cc:210
+#, boost-format
 msgid "[%1%]: %2% \"%3%\""
 msgstr "[%1%]: %2% \"%3%\""
 
-#: schroot/sbuild-parse-error.cc:216
+#: sbuild/sbuild-parse-error.cc:216
+#, boost-format
 msgid "[%1%]: %2%"
 msgstr "[%1%]: %2%"
 
-#: schroot/sbuild-parse-error.cc:231
+#: sbuild/sbuild-parse-error.cc:231
+#, boost-format
 msgid "[%1%] %2%: %4%"
 msgstr "[%1%] %2%: %4%"
 
-#: schroot/sbuild-parse-error.cc:232
+#: sbuild/sbuild-parse-error.cc:232
+#, boost-format
 msgid "[%1%] %2%: %3% \"%4%\""
 msgstr "[%1%] %2%: %3% \"%4%\""
 
-#: schroot/sbuild-parse-error.cc:238
+#: sbuild/sbuild-parse-error.cc:238
+#, boost-format
 msgid "[%1%] %2%: %3%"
 msgstr "[%1%] %2%: %3%"
 
-#: schroot/sbuild-personality.cc:48
+#: sbuild/sbuild-personality.cc:48
 #, fuzzy
 msgid "Failed to set personality"
 msgstr "Việc lấy thiết lập thiết bị cuối bị lỗi"
 
-#: schroot/sbuild-session.cc:57
+#: sbuild/sbuild-session.cc:59
 #, fuzzy
 msgid "Failed to find chroot"
 msgstr "%1%: việc tìm chroot bị lỗi"
 
-#: schroot/sbuild-session.cc:58
+#: sbuild/sbuild-session.cc:60
 #, fuzzy
 msgid "Failed to lock chroot"
 msgstr "%1%: việc tìm chroot bị lỗi"
 
-#: schroot/sbuild-session.cc:59
+#: sbuild/sbuild-session.cc:61
 #, fuzzy
 msgid "Failed to unlock chroot"
 msgstr "%1%: việc tìm chroot bị lỗi"
 
-#: schroot/sbuild-session.cc:60
+#: sbuild/sbuild-session.cc:62
 #, fuzzy
 msgid "Chroot setup failed"
 msgstr "việc tạo chroot bị lỗi"
 
-#: schroot/sbuild-session.cc:61
+#: sbuild/sbuild-session.cc:63
 #, fuzzy
 msgid "Failed to set hangup signal handler"
 msgstr "lỗi lập bộ quản lý ngừng nói : %1%"
 
-#: schroot/sbuild-session.cc:62
+#: sbuild/sbuild-session.cc:64
 #, fuzzy
 msgid "Caught hangup signal"
 msgstr "mới bắt tín hiệu ngừng nói nên kết thúc..."
 
-#: schroot/sbuild-session.cc:63
+#: sbuild/sbuild-session.cc:65
 #, fuzzy
 msgid "Failed to fork child"
 msgstr "Việc tạo tiến trình con của điều con bị lỗi: %1%"
 
-#: schroot/sbuild-session.cc:64
+#: sbuild/sbuild-session.cc:66
 #, fuzzy
 msgid "Wait for child failed"
 msgstr "việc đợi tiến trình con bị lỗi: %1%"
 
-#: schroot/sbuild-session.cc:65
+#: sbuild/sbuild-session.cc:67
 #, fuzzy
 msgid "Child terminated by signal"
 msgstr "Tiến trình con bị chấm dứt do tín hiệu « %1% »"
 
-#: schroot/sbuild-session.cc:66
+#: sbuild/sbuild-session.cc:68
 msgid "Child dumped core"
 msgstr "Tiến trình con đã đổ lõi"
 
-#: schroot/sbuild-session.cc:67
+#: sbuild/sbuild-session.cc:69
 msgid "Child exited abnormally (reason unknown; not a signal or core dump)"
 msgstr ""
 "Tiến trình con đã thoát bất thường (chưa biết sao ; không phải là việc đổ "
 "tín hiệu hay lõi)"
 
-#: schroot/sbuild-session.cc:68
+#: sbuild/sbuild-session.cc:70
 msgid "User switching is not permitted"
 msgstr ""
 
-#: schroot/sbuild-session.cc:106
-#, fuzzy
+#: sbuild/sbuild-session.cc:108
+#, fuzzy, boost-format
 msgid "%1%: Group not found"
 msgstr "%1%: không tìm thấy nhóm"
 
-#: schroot/sbuild-session.cc:108
-#, fuzzy
+#: sbuild/sbuild-session.cc:110
+#, fuzzy, boost-format
 msgid "%1%: Group not found: %2%"
 msgstr "%1%: không tìm thấy nhóm: %2%"
 
-#: schroot/sbuild-session.cc:124
-#, fuzzy
+#: sbuild/sbuild-session.cc:126
+#, fuzzy, boost-format
 msgid "Can't get supplementary group count: %1%"
 msgstr "không thể lấy số đếm nhóm phụ : %1%"
 
-#: schroot/sbuild-session.cc:134
-#, fuzzy
+#: sbuild/sbuild-session.cc:136
+#, fuzzy, boost-format
 msgid "Can't get supplementary groups: %1%"
 msgstr "không thể lấy các nhóm phụ : %1%"
 
-#: schroot/sbuild-session.cc:364
+#: sbuild/sbuild-session.cc:366
+#, boost-format
 msgid "No chroot found matching alias '%1%'"
 msgstr "Không tìm thấy chroot khớp với biệt hiệu « %1% »"
 
-#: schroot/sbuild-session.cc:571
-#, fuzzy
+#: sbuild/sbuild-session.cc:573
+#, fuzzy, boost-format
 msgid "%1%: Shell not available: %2%"
 msgstr "%1%: việc lấy các thông tin về tập tin bị lỗi: %2%"
 
-#: schroot/sbuild-session.cc:574
-#, fuzzy
+#: sbuild/sbuild-session.cc:576
+#, fuzzy, boost-format
 msgid "Falling back to %1%"
 msgstr "Đang dự trữ về « %1 »"
 
-#: schroot/sbuild-session.cc:640
-#, fuzzy
+#: sbuild/sbuild-session.cc:642
+#, fuzzy, boost-format
 msgid "[%1% chroot] Running login shell: \"%4%\""
 msgstr "[%1% chroot] Đang chạy hệ vỏ đăng nhập: « %2% »"
 
-#: schroot/sbuild-session.cc:642
-#, fuzzy
+#: sbuild/sbuild-session.cc:644
+#, fuzzy, boost-format
 msgid "[%1% chroot] Running shell: \"%4%\""
 msgstr "[%1% chroot] Đang chạy hệ vỏ đăng nhập: « %2% »"
 
-#: schroot/sbuild-session.cc:648
+#: sbuild/sbuild-session.cc:650
+#, 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% »"
 
-#: schroot/sbuild-session.cc:650
+#: sbuild/sbuild-session.cc:652
+#, boost-format
 msgid "[%1% chroot] (%2%->%3%) Running shell: \"%4%\""
 msgstr "[%1% chroot] (%2%->%3%) Đang chạy hệ vỏ đăng nhập: « %4% »"
 
-#: schroot/sbuild-session.cc:685
-#, fuzzy
+#: sbuild/sbuild-session.cc:687
+#, fuzzy, boost-format
 msgid "[%1% chroot] Running command: \"%4%\""
 msgstr "[%1% chroot] Đang chạy lệnh: « %2% »"
 
-#: schroot/sbuild-session.cc:687
+#: sbuild/sbuild-session.cc:689
+#, boost-format
 msgid "[%1% chroot] (%2%->%3%) Running command: \"%4%\""
 msgstr "[%1% chroot] (%2%->%3%) Đang chạy lệnh: « %4% »"
 
-#: schroot/sbuild-session.cc:809
+#: sbuild/sbuild-session.cc:811
+#, boost-format
 msgid "Invalid verbosity level: %1%, falling back to \"normal\""
 msgstr "Cấp chi tiết không hợp lệ: %1%, nên dùng « normal » (chuẩn)"
 
-#: schroot/sbuild-session.cc:845 schroot/sbuild-session.cc:1020
+#: sbuild/sbuild-session.cc:847 sbuild/sbuild-session.cc:1022
+#, boost-format
 msgid "Could not exec \"%1%\": %2%"
 msgstr "Không thể thực hiện « %1% »: %2%"
 
-#: schroot/sbuild-session.cc:871
+#: sbuild/sbuild-session.cc:873
+#, boost-format
 msgid "stage=%1%"
 msgstr ""
 
-#: schroot/sbuild-session.cc:900
+#: sbuild/sbuild-session.cc:902
+#, boost-format
 msgid "PAM error: %1%"
 msgstr "Lỗi PAM: %1%"
 
-#: schroot/sbuild-session.cc:908
+#: sbuild/sbuild-session.cc:910
+#, boost-format
 msgid "Could not set gid to '%1%'"
 msgstr "Không thể lập GID thành « %1% »"
 
-#: schroot/sbuild-session.cc:914
+#: sbuild/sbuild-session.cc:916
 msgid "Could not set supplementary group IDs"
 msgstr "Không thể lập các ID nhóm phụ"
 
-#: schroot/sbuild-session.cc:932 schroot/sbuild-session.cc:980
+#: sbuild/sbuild-session.cc:934 sbuild/sbuild-session.cc:982
+#, boost-format
 msgid "Could not chdir to '%1%': %2%"
 msgstr "Không thể chdir (chuyển đổi thư mục) sang « %1% »: %2%"
 
-#: schroot/sbuild-session.cc:939
+#: sbuild/sbuild-session.cc:941
+#, boost-format
 msgid "Could not chroot to '%1%': %2%"
 msgstr "Không thể chroot tới « %1% »: %2%"
 
-#: schroot/sbuild-session.cc:948
+#: sbuild/sbuild-session.cc:950
+#, boost-format
 msgid "Could not set uid to '%1%'"
 msgstr "Không thể lập UID thành « %1% »"
 
-#: schroot/sbuild-session.cc:954
+#: sbuild/sbuild-session.cc:956
 msgid "Failed to drop root permissions."
 msgstr "Việc bỏ quyền chủ bị lỗi."
 
-#: schroot/sbuild-session.cc:987
+#: sbuild/sbuild-session.cc:989
+#, fuzzy, boost-format
 msgid "Falling back to '%1%'"
 msgstr "Đang dự trữ về « %1 »"
 
-#: schroot/sbuild-session.cc:1042
+#: sbuild/sbuild-session.cc:1044
 #, fuzzy
 msgid "Caught hangup signal, terminating..."
 msgstr "mới bắt tín hiệu ngừng nói nên kết thúc..."
 
-#: schroot/schroot.cc:68
-#, fuzzy
-msgid "An unknown exception occured"
-msgstr "Đã ghi rõ một hành động không rõ"
-
-# Literal: don't translate / Nghĩa chữ: đừng dịch
-#: schroot/schroot-listmounts.cc:57
-msgid "schroot-listmounts (Debian sbuild) %1%\n"
-msgstr "schroot-listmounts (Debian sbuild) %1%\n"
+#: schroot/schroot-listmounts.cc:61 schroot/schroot-main.cc:58
+#: schroot/schroot-releaselock.cc:56
+#, fuzzy, boost-format
+msgid "%1% (Debian sbuild) %2% (%3%)\n"
+msgstr "%1% (Debian sbuild) %2%\n"
 
-#: schroot/schroot-listmounts.cc:58 schroot/schroot-releaselock.cc:55
+#: schroot/schroot-listmounts.cc:65 schroot/schroot-main.cc:62
+#: schroot/schroot-releaselock.cc:60
 msgid ""
 "Written by Roger Leigh\n"
 "\n"
@@ -742,11 +917,13 @@ msgstr ""
 "Do Roger Leigh tạo\n"
 "\n"
 
-#: schroot/schroot-listmounts.cc:59 schroot/schroot-releaselock.cc:56
+#: schroot/schroot-listmounts.cc:66 schroot/schroot-main.cc:63
+#: schroot/schroot-releaselock.cc:61
 msgid "Copyright (C) 2004-2006 Roger Leigh\n"
 msgstr "Bản quyền © năm 2004-2006 Roger Leigh\n"
 
-#: schroot/schroot-listmounts.cc:60 schroot/schroot-releaselock.cc:57
+#: schroot/schroot-listmounts.cc:67 schroot/schroot-main.cc:64
+#: schroot/schroot-releaselock.cc:62
 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"
@@ -754,151 +931,233 @@ msgstr ""
 "Đây là phần mềm tự do; hãy xem mã nguồn để tìm thấy điều kiện sao chép.\n"
 "• Không bảo đảm gì cả, dù khă nang bán hay khả năng làm việc dứt khoát. •\n"
 
-#: schroot/schroot-listmounts.cc:82
+#: schroot/schroot-listmounts.cc:89
+#, boost-format
 msgid "%1%: Failed to open: %2%"
 msgstr "%1%: việc mở bị lỗi: %2%"
 
-#: schroot/schroot-listmounts.cc:105
+#: schroot/schroot-listmounts.cc:112
+#, boost-format
 msgid "%1%: Failed to close: %2%"
 msgstr "%1%: việc đóng bị lỗi: %2%"
 
-#: schroot/schroot-listmounts.cc:151
+#: schroot/schroot-listmounts.cc:158
 msgid "No mountpoint specified"
 msgstr "Chưa xác định điểm lắp"
 
-#: schroot/schroot-listmounts-options.cc:43
-#: schroot/schroot-releaselock-options.cc:44
+#: schroot/schroot-listmounts-options.cc:42 schroot/schroot-options-base.cc:48
+#: schroot/schroot-releaselock-options.cc:43
 msgid "General options"
 msgstr "Tùy chọn chung"
 
-#: schroot/schroot-listmounts-options.cc:45
-#: schroot/schroot-releaselock-options.cc:46
+#: schroot/schroot-listmounts-options.cc:44 schroot/schroot-options-base.cc:69
+#: schroot/schroot-releaselock-options.cc:45
 msgid "Show help options"
 msgstr "Hiện tùy chọn trợ giúp"
 
-#: schroot/schroot-listmounts-options.cc:47
-#: schroot/schroot-releaselock-options.cc:48
+#: schroot/schroot-listmounts-options.cc:46 schroot/schroot-options-base.cc:71
+#: schroot/schroot-releaselock-options.cc:47
 msgid "Print version information"
 msgstr "In ra thông tin phiên bản"
 
-#: schroot/schroot-listmounts-options.cc:49
-#: schroot/schroot-releaselock-options.cc:50
+#: schroot/schroot-listmounts-options.cc:48
+#: schroot/schroot-releaselock-options.cc:49
 msgid "Lock options"
 msgstr "Tùy chọn khoá"
 
-#: schroot/schroot-listmounts-options.cc:52
+#: schroot/schroot-listmounts-options.cc:51
 msgid "Mountpoint to check (full path)"
 msgstr "Điểm lắp cần kiểm tra (đường dẫn đầy đủ)"
 
-#: schroot/schroot-listmounts-options.cc:65 schroot/schroot-options.cc:95
-#: schroot/schroot-releaselock-options.cc:68
-msgid "Usage:"
-msgstr "Cách sử dụng:"
-
-#: schroot/schroot-listmounts-options.cc:66
+#: schroot/schroot-listmounts-options.cc:65
 #, fuzzy
 msgid "schroot-listmounts [OPTION...] - list mounts"
 msgstr "  schroot-listmounts [TÙY_CHỌN...] — liệt kê các sự gắn kết"
 
-#: schroot/schroot-options.cc:59
+#: schroot/schroot-main.cc:194
+msgid "Error saving terminal settings"
+msgstr "Gặp lỗi khi lưu thiết lập thiết bị cuối"
+
+#: schroot/schroot-main.cc:226
+#, 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.cc:234
+#, boost-format
+msgid "No chroots are defined in %1%"
+msgstr "Chưa định nghĩa chroot trong %1%"
+
+#: schroot/schroot-main.cc:251
+#, 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.cc:278
+msgid "Only one chroot may be specified when beginning a session"
+msgstr "Có thể ghi rõ chỉ một chroot khi khởi chạy phiên"
+
+#: schroot/schroot-main.cc:335 schroot/schroot-main.cc:351
+msgid "Error restoring terminal settings"
+msgstr "Gặp lỗi khi phục hồi thiết lập thiết bị cuối"
+
+#: schroot/schroot-options-base.cc:49
+msgid "Chroot selection"
+msgstr "Chọn chroot"
+
+#: schroot/schroot-options-base.cc:50
+msgid "Chroot environment"
+msgstr "Môi trường chroot"
+
+#: schroot/schroot-options-base.cc:51
+msgid "Session management"
+msgstr "Quản lý phiên chạy"
+
+#: schroot/schroot-options-base.cc:52
+msgid "Hidden options"
+msgstr "Tùy chọn bị ẩn"
+
+#: schroot/schroot-options-base.cc:73
+msgid "Show less output"
+msgstr "Xuất ít hơn"
+
+#: schroot/schroot-options-base.cc:75
+msgid "Show more output"
+msgstr "Xuất nhiều hơn"
+
+#: schroot/schroot-options-base.cc:77
+msgid "List available chroots"
+msgstr "Liệt kê các chroot sẵn sàng"
+
+#: schroot/schroot-options-base.cc:79
+msgid "Show information about selected chroots"
+msgstr "Hiện thông tin về các chroot được chọn"
+
+#: schroot/schroot-options-base.cc:81
+msgid "Dump configuration of selected chroots"
+msgstr "Đổ cấu hình của các chroot đã chọn"
+
+#: schroot/schroot-options-base.cc:85
+msgid "Use specified chroot"
+msgstr "Dùng chroot đã xác định"
+
+#: schroot/schroot-options-base.cc:89
+msgid "Command to run"
+msgstr "Lệnh cần chạy"
+
+#: schroot/schroot-options-base.cc:91
+msgid "Enable debugging messages"
+msgstr ""
+
+#: schroot/schroot-options-base.cc:190
+msgid ""
+"Only one chroot may be specified when recovering, running or ending a session"
+msgstr ""
+"Có thể ghi rõ chỉ một chroot khi phục hồi, chạy hoặc kết thúc một phiên chạy"
+
+#: schroot/schroot-options-base.cc:215
+msgid "--chroot may not be used with --list"
+msgstr ""
+"Không cho phép sử dụng tùy chọn cả « --chroot » lẫn « --list » (liệt kê) đều "
+"đồng thời."
+
+#: schroot/schroot-options-base.cc:237
+#, fuzzy
+msgid "Unknown action specified"
+msgstr "Có thể ghi rõ chỉ một hành động thôi"
+
+#: schroot/schroot-options-base.cc:245
+msgid "Only one action may be specified"
+msgstr "Có thể ghi rõ chỉ một hành động thôi"
+
+#: schroot/schroot-options.cc:56
 msgid "Print location of selected chroots"
 msgstr "In ra địa điểm của các chroot đã chọn"
 
-#: schroot/schroot-options.cc:63
+#: schroot/schroot-options.cc:60
 msgid "Select all chroots and active sessions"
 msgstr "Chọn mọi chroot và phiên chạy hoạt động đều"
 
-#: schroot/schroot-options.cc:65
-msgid "Select all chroots"
-msgstr "Chọn mọi chroot"
-
-#: schroot/schroot-options.cc:67
+#: schroot/schroot-options.cc:64
 msgid "Select all active sessions"
 msgstr "Chọn mọi phiên chạy hoạt động"
 
-#: schroot/schroot-options.cc:71
+#: schroot/schroot-options.cc:68
 msgid "Username (default current user)"
 msgstr "Tên người dùng (người dùng hiện thời mặc định)"
 
-#: schroot/schroot-options.cc:73
-msgid "Preserve user environment"
-msgstr "Bảo tồn môi trường người dùng"
-
-#: schroot/schroot-options.cc:77
+#: schroot/schroot-options.cc:74
 msgid "Begin a session; returns a session ID"
 msgstr "Khởi chạy phiên; gởi trả một mã nhận diện phiên chạy"
 
-#: schroot/schroot-options.cc:79
+#: schroot/schroot-options.cc:76
 msgid "Recover an existing session"
 msgstr "Phục hồi một phiên chạy đã có"
 
-#: schroot/schroot-options.cc:81
+#: schroot/schroot-options.cc:78
 msgid "Run an existing session"
 msgstr "Chạy một phiên chạy đã có"
 
-#: schroot/schroot-options.cc:83
+#: schroot/schroot-options.cc:80
 msgid "End an existing session"
 msgstr "Kết thúc một phiên chạy đã có"
 
-#: schroot/schroot-options.cc:85
+#: schroot/schroot-options.cc:82
 msgid "Force operation, even if it fails"
 msgstr "Ép buộc thao tác, thậm chí nếu nó bị lỗi"
 
-#: schroot/schroot-options.cc:98
-#, fuzzy
-msgid "[OPTION...] [COMMAND] - run command or shell in a chroot"
-msgstr " [TÙY_CHỌN...] [LỆNH] — chạy lệnh hoặc hệ vỏ trong một chroot"
-
-# Literal: don't translate / Nghĩa chữ: đừng dịch
-#: schroot/schroot-releaselock.cc:54
-msgid "schroot-releaselock (Debian sbuild) %1%\n"
-msgstr "schroot-releaselock (Debian sbuild) %1%\n"
-
-#: schroot/schroot-releaselock.cc:100
+#: schroot/schroot-releaselock.cc:105
 msgid "No device specified"
 msgstr "Chưa ghi rõ thiết bị"
 
-#: schroot/schroot-releaselock.cc:106
+#: schroot/schroot-releaselock.cc:111
 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.cc:115
+#: schroot/schroot-releaselock.cc:120
+#, 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.cc:123
+#: schroot/schroot-releaselock.cc:128
+#, boost-format
 msgid "%1% is not a block device"
 msgstr "%1% không phải là thiết bị khối"
 
-#: schroot/schroot-releaselock.cc:131
+#: schroot/schroot-releaselock.cc:136
+#, boost-format
 msgid "%1%: failed to release device lock"
 msgstr "%1%: không nhả khoá thiết bị được"
 
-#: schroot/schroot-releaselock.cc:138
+#: schroot/schroot-releaselock.cc:143
+#, boost-format
 msgid "%1%: failed to release device lock owned by pid %2%"
 msgstr "%1%: việc nhả khoá thiết bị do PID %2% sở hữư bị lỗi"
 
-#: schroot/schroot-releaselock-options.cc:53
+#: schroot/schroot-releaselock-options.cc:52
 msgid "Device to unlock (full path)"
 msgstr "Thiết bị cần bỏ khoá (đường dẫn đầy đủ)"
 
-#: schroot/schroot-releaselock-options.cc:55
+#: schroot/schroot-releaselock-options.cc:54
 msgid "Process ID owning the lock"
 msgstr "Mã nhận diện tiến trình mà sở hữu khoá đó"
 
-#: schroot/schroot-releaselock-options.cc:69
+#: schroot/schroot-releaselock-options.cc:68
 #, fuzzy
 msgid "schroot-releaselock [OPTION...] - release a device lock"
 msgstr "  schroot-releaselock [TÙY_CHỌN...] — nhả khoá thiết bị"
 
+# Literal: don't translate / Nghĩa chữ: đừng dịch
+#~ msgid "schroot-listmounts (Debian sbuild) %1%\n"
+#~ msgstr "schroot-listmounts (Debian sbuild) %1%\n"
+
+# Literal: don't translate / Nghĩa chữ: đừng dịch
+#~ msgid "schroot-releaselock (Debian sbuild) %1%\n"
+#~ msgstr "schroot-releaselock (Debian sbuild) %1%\n"
+
 #~ msgid "line %1%: invalid line: %2%"
 #~ msgstr "dòng %1%: dòng không hợp lệ: %2%"
 
-#~ msgid "(%1%->%2%): dchroot sessions do not support user switching"
-#~ msgstr ""
-#~ "(%1% → %2%): phiên chạy dchroot không hỗ trợ khả năng chuyển đổi người "
-#~ "dùng."
-
 #~ msgid "PAM set RUSER error: %1%"
 #~ msgstr "Lỗi « PAM set RUSER » (lập máy ở xa): %1%"
 
@@ -969,131 +1228,9 @@ msgstr "  schroot-releaselock [TÙY_CHỌN...] — nhả khoá thiết bị"
 #~ msgid "Child exited abnormally with status '%1%'"
 #~ msgstr "Tiến trình con đã thoát bất thường với trạng thái « %1% »"
 
-#~ msgid "%1% (Debian sbuild) %2%\n"
-#~ msgstr "%1% (Debian sbuild) %2%\n"
-
-#~ msgid "Error saving terminal settings"
-#~ msgstr "Gặp lỗi khi lưu thiết lập thiết bị cuối"
-
-#~ msgid "Run 'schroot' for full capability"
-#~ msgstr "Chạy « schroot » để có khả năng đầy đủ"
-
-#~ msgid "Using dchroot configuration file: "
-#~ msgstr "Đang dùng tập tin cấu hình dchroot: "
-
-#~ msgid "Run '%1%'"
-#~ msgstr "Chạy « %1% »"
-
-#~ msgid "to migrate to a schroot configuration."
-#~ msgstr "để nâng cấp lên một cấu hình schroot."
-
-#~ msgid "Edit '%1%' to add appropriate group access."
-#~ msgstr "Hiệu chỉnh « %1% » để thêm cách truy cập nhóm thích hợp."
-
-#~ msgid "Remove '%1%' to use the new configuration."
-#~ msgstr "Gỡ bỏ « %1% » để sử dụng cấu hình mới."
-
-#~ msgid "No chroots are defined in %1% or %2%"
-#~ msgstr "Chưa định nghĩa chroot trong %1% hay trong %2%"
-
-#~ msgid "No chroots are defined in %1%"
-#~ msgstr "Chưa định nghĩa chroot trong %1%"
-
-#~ msgid "The specified chroots are not defined in %1%"
-#~ msgstr "Chưa định nghĩa những chroot đã ghi rõ trong %1%"
-
-#~ msgid "schroot configuration generated by %1% %2%"
-#~ msgstr "Cấu hình schroot được tạo ra bởi %1% %2%"
-
-#~ msgid ""
-#~ "To allow users access to the chroots, add their groups to the groups keys."
-#~ msgstr ""
-#~ "Để cho phép người dùng truy cập những chroot này, hãy thêm các nhóm của "
-#~ "họ vào những khoá nhóm (groups)."
-
-#~ msgid ""
-#~ "To allow passwordless root access, add their groups to the 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)."
-
-#~ msgid "Only one chroot may be specified when beginning a session"
-#~ msgstr "Có thể ghi rõ chỉ một chroot khi khởi chạy phiên"
-
 #~ msgid "Session failure: %1%"
 #~ msgstr "Phiên bản bị lỗi: %1%"
 
-#~ msgid "Error restoring terminal settings"
-#~ msgstr "Gặp lỗi khi phục hồi thiết lập thiết bị cuối"
-
-#~ msgid "Show less output"
-#~ msgstr "Xuất ít hơn"
-
-#~ msgid "Show more output"
-#~ msgstr "Xuất nhiều hơn"
-
-#~ msgid "List available chroots"
-#~ msgstr "Liệt kê các chroot sẵn sàng"
-
-#~ msgid "Show information about selected chroots"
-#~ msgstr "Hiện thông tin về các chroot được chọn"
-
-#~ msgid "Print path to selected chroot"
-#~ msgstr "In ra đường dẫn đến chroot đã chọn"
-
-#~ msgid "Dump configuration of selected chroots"
-#~ msgstr "Đổ cấu hình của các chroot đã chọn"
-
-#~ msgid "Chroot selection"
-#~ msgstr "Chọn chroot"
-
-#~ msgid "Use specified chroot"
-#~ msgstr "Dùng chroot đã xác định"
-
-#~ msgid "Chroot environment"
-#~ msgstr "Môi trường chroot"
-
-#~ msgid "Session management"
-#~ msgstr "Quản lý phiên chạy"
-
-#~ msgid "Hidden options"
-#~ msgstr "Tùy chọn bị ẩn"
-
-#~ msgid "Command to run"
-#~ msgstr "Lệnh cần chạy"
-
-#~ msgid "--quiet and --verbose may not be used at the same time"
-#~ msgstr ""
-#~ "Không cho phép sử dụng tùy chọn cả « --quiet » (xuất ít hơn) lẫn « --"
-#~ "verbose » (xuất nhiều hơn) đều đồng thời."
-
-#~ msgid "Using verbose output"
-#~ msgstr "Đang xuất nhiều hơn"
-
-#~ msgid "--chroot and --all may not be used at the same time"
-#~ msgstr ""
-#~ "Không cho phép sử dụng tùy chọn cả « --chroot » lẫn « --all » (tất cả) "
-#~ "đều đồng thời."
-
-#~ msgid "Using --chroots only"
-#~ msgstr "Đang dùng chỉ tùy chọn « --chroots » thôi"
-
-#~ msgid ""
-#~ "Only one chroot may be specified when recovering, running or ending a "
-#~ "session"
-#~ msgstr ""
-#~ "Có thể ghi rõ chỉ một chroot khi phục hồi, chạy hoặc kết thúc một phiên "
-#~ "chạy"
-
-#~ msgid "--chroot may not be used with --list"
-#~ msgstr ""
-#~ "Không cho phép sử dụng tùy chọn cả « --chroot » lẫn « --list » (liệt kê) "
-#~ "đều đồng thời."
-
-#~ msgid "Only one action may be specified"
-#~ msgstr "Có thể ghi rõ chỉ một hành động thôi"
-
 #~ msgid "Can't open configuration file %1%"
 #~ msgstr "Không thể mở tập tin cấu hình %1%"
 
diff --git a/sbuild/Makefile.am b/sbuild/Makefile.am
new file mode 100644
index 00000000..3ad981bb
--- /dev/null
+++ b/sbuild/Makefile.am
@@ -0,0 +1,93 @@
+# schroot Makefile template
+#
+#
+# Copyright © 2004-2006  Roger Leigh <rleigh@debian.org>
+#
+# schroot 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.
+#
+# schroot 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
+#
+#####################################################################
+
+localedir = $(datadir)/locale
+
+AM_CXXFLAGS = $(SCHROOT_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Wswitch-default -Wcast-qual -Wunused-variable -Wredundant-decls -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wold-style-cast -Woverloaded-virtual -fstrict-aliasing
+#  -Weffc++ causes too many warnings in standard headers; -Wextra is not
+#  supported by GCC 3.4.
+
+DEFS = -DGETTEXT_PACKAGE=\"schroot\" -DLOCALEDIR=\"$(localedir)\" -D_GNU_SOURCE
+
+noinst_LTLIBRARIES = libsbuild.la
+
+sbuild_public_h_sources =		\
+	sbuild-auth.h			\
+	sbuild-auth-conv.h		\
+	sbuild-auth-conv-tty.h		\
+	sbuild-auth-message.h   	\
+	sbuild-chroot.h			\
+	sbuild-chroot-block-device.h	\
+	sbuild-chroot-file.h		\
+	sbuild-chroot-lvm-snapshot.h	\
+	sbuild-chroot-plain.h		\
+	sbuild-chroot-source.h		\
+	sbuild-chroot-config.h		\
+	sbuild-custom-error.h		\
+	sbuild-custom-error.tcc		\
+	sbuild-environment.h		\
+	sbuild-error.h			\
+	sbuild-format-detail.h		\
+	sbuild-i18n.h			\
+	sbuild-keyfile.h		\
+	sbuild-lock.h			\
+	sbuild-log.h			\
+	sbuild-nostream.h		\
+	sbuild-parse-error.h		\
+	sbuild-parse-value.h		\
+	sbuild-personality.h		\
+	sbuild-session.h		\
+	sbuild-types.h			\
+	sbuild-util.h
+
+sbuild_public_cc_sources =		\
+	sbuild-auth.cc			\
+	sbuild-auth-conv.cc		\
+	sbuild-auth-conv-tty.cc		\
+	sbuild-auth-message.cc		\
+	sbuild-chroot.cc		\
+	sbuild-chroot-block-device.cc	\
+	sbuild-chroot-file.cc		\
+	sbuild-chroot-lvm-snapshot.cc	\
+	sbuild-chroot-plain.cc		\
+	sbuild-chroot-source.cc		\
+	sbuild-chroot-config.cc		\
+	sbuild-environment.cc		\
+	sbuild-format-detail.cc		\
+	sbuild-keyfile.cc		\
+	sbuild-lock.cc			\
+	sbuild-log.cc			\
+	sbuild-nostream.cc		\
+	sbuild-parse-error.cc		\
+	sbuild-parse-value.cc		\
+	sbuild-personality.cc		\
+	sbuild-session.cc		\
+	sbuild-util.cc
+
+libsbuild_la_SOURCES =			\
+	$(sbuild_public_h_sources)	\
+	$(sbuild_public_cc_sources)
+
+nodist_libsbuild_la_SOURCES =	\
+	sbuild-config.h
+
+libsbuild_la_LIBADD = $(UUID_LIBS) $(PAM_LIBS) $(LOCKDEV_LIBS) $(BOOST_LIBS) $(LIBINTL)
diff --git a/schroot/sbuild-auth-conv-tty.cc b/sbuild/sbuild-auth-conv-tty.cc
index 7701fdde..7701fdde 100644
--- a/schroot/sbuild-auth-conv-tty.cc
+++ b/sbuild/sbuild-auth-conv-tty.cc
diff --git a/schroot/sbuild-auth-conv-tty.h b/sbuild/sbuild-auth-conv-tty.h
index 98fc9f64..79cf8b8b 100644
--- a/schroot/sbuild-auth-conv-tty.h
+++ b/sbuild/sbuild-auth-conv-tty.h
@@ -20,8 +20,8 @@
 #ifndef SBUILD_AUTH_CONV_TTY_H
 #define SBUILD_AUTH_CONV_TTY_H
 
-#include "sbuild-auth-conv.h"
-#include "sbuild-custom-error.h"
+#include <sbuild/sbuild-auth-conv.h>
+#include <sbuild/sbuild-custom-error.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/schroot/sbuild-auth-conv.cc b/sbuild/sbuild-auth-conv.cc
index f2314d84..f2314d84 100644
--- a/schroot/sbuild-auth-conv.cc
+++ b/sbuild/sbuild-auth-conv.cc
diff --git a/schroot/sbuild-auth-conv.h b/sbuild/sbuild-auth-conv.h
index c8760c89..13d290ee 100644
--- a/schroot/sbuild-auth-conv.h
+++ b/sbuild/sbuild-auth-conv.h
@@ -20,8 +20,8 @@
 #ifndef SBUILD_AUTH_CONV_H
 #define SBUILD_AUTH_CONV_H
 
-#include "sbuild-auth-message.h"
-#include "sbuild-error.h"
+#include <sbuild/sbuild-auth-message.h>
+#include <sbuild/sbuild-error.h>
 
 #include <security/pam_appl.h>
 
diff --git a/schroot/sbuild-auth-message.cc b/sbuild/sbuild-auth-message.cc
index 732f4ee7..732f4ee7 100644
--- a/schroot/sbuild-auth-message.cc
+++ b/sbuild/sbuild-auth-message.cc
diff --git a/schroot/sbuild-auth-message.h b/sbuild/sbuild-auth-message.h
index a5c23532..a5c23532 100644
--- a/schroot/sbuild-auth-message.h
+++ b/sbuild/sbuild-auth-message.h
diff --git a/schroot/sbuild-auth.cc b/sbuild/sbuild-auth.cc
index 83c9fb86..83c9fb86 100644
--- a/schroot/sbuild-auth.cc
+++ b/sbuild/sbuild-auth.cc
diff --git a/schroot/sbuild-auth.h b/sbuild/sbuild-auth.h
index fa6e0225..9bea0c4f 100644
--- a/schroot/sbuild-auth.h
+++ b/sbuild/sbuild-auth.h
@@ -20,11 +20,11 @@
 #ifndef SBUILD_AUTH_H
 #define SBUILD_AUTH_H
 
-#include "sbuild-config.h"
-#include "sbuild-auth-conv.h"
-#include "sbuild-custom-error.h"
-#include "sbuild-environment.h"
-#include "sbuild-types.h"
+#include <sbuild/sbuild-config.h>
+#include <sbuild/sbuild-auth-conv.h>
+#include <sbuild/sbuild-custom-error.h>
+#include <sbuild/sbuild-environment.h>
+#include <sbuild/sbuild-types.h>
 
 #include <string>
 #include <vector>
diff --git a/schroot/sbuild-chroot-block-device.cc b/sbuild/sbuild-chroot-block-device.cc
index 0fca8020..0fca8020 100644
--- a/schroot/sbuild-chroot-block-device.cc
+++ b/sbuild/sbuild-chroot-block-device.cc
diff --git a/schroot/sbuild-chroot-block-device.h b/sbuild/sbuild-chroot-block-device.h
index 800a3034..7cb8bbe6 100644
--- a/schroot/sbuild-chroot-block-device.h
+++ b/sbuild/sbuild-chroot-block-device.h
@@ -20,7 +20,7 @@
 #ifndef SBUILD_CHROOT_BLOCK_DEVICE_H
 #define SBUILD_CHROOT_BLOCK_DEVICE_H
 
-#include "sbuild-chroot.h"
+#include <sbuild/sbuild-chroot.h>
 
 namespace sbuild
 {
diff --git a/schroot/sbuild-chroot-config.cc b/sbuild/sbuild-chroot-config.cc
index 653c5027..653c5027 100644
--- a/schroot/sbuild-chroot-config.cc
+++ b/sbuild/sbuild-chroot-config.cc
diff --git a/schroot/sbuild-chroot-config.h b/sbuild/sbuild-chroot-config.h
index e50ffd1b..cd1cc31b 100644
--- a/schroot/sbuild-chroot-config.h
+++ b/sbuild/sbuild-chroot-config.h
@@ -20,8 +20,8 @@
 #ifndef SBUILD_CHROOT_CONFIG_H
 #define SBUILD_CHROOT_CONFIG_H
 
-#include "sbuild-chroot.h"
-#include "sbuild-custom-error.h"
+#include <sbuild/sbuild-chroot.h>
+#include <sbuild/sbuild-custom-error.h>
 
 #include <map>
 #include <ostream>
diff --git a/schroot/sbuild-chroot-file.cc b/sbuild/sbuild-chroot-file.cc
index 27b6601a..27b6601a 100644
--- a/schroot/sbuild-chroot-file.cc
+++ b/sbuild/sbuild-chroot-file.cc
diff --git a/schroot/sbuild-chroot-file.h b/sbuild/sbuild-chroot-file.h
index d324d331..8c398075 100644
--- a/schroot/sbuild-chroot-file.h
+++ b/sbuild/sbuild-chroot-file.h
@@ -20,8 +20,8 @@
 #ifndef SBUILD_CHROOT_FILE_H
 #define SBUILD_CHROOT_FILE_H
 
-#include "sbuild-chroot.h"
-#include "sbuild-chroot-source.h"
+#include <sbuild/sbuild-chroot.h>
+#include <sbuild/sbuild-chroot-source.h>
 
 namespace sbuild
 {
diff --git a/schroot/sbuild-chroot-lvm-snapshot.cc b/sbuild/sbuild-chroot-lvm-snapshot.cc
index b7bca908..b7bca908 100644
--- a/schroot/sbuild-chroot-lvm-snapshot.cc
+++ b/sbuild/sbuild-chroot-lvm-snapshot.cc
diff --git a/schroot/sbuild-chroot-lvm-snapshot.h b/sbuild/sbuild-chroot-lvm-snapshot.h
index 743cba3e..6340c54a 100644
--- a/schroot/sbuild-chroot-lvm-snapshot.h
+++ b/sbuild/sbuild-chroot-lvm-snapshot.h
@@ -20,8 +20,8 @@
 #ifndef SBUILD_CHROOT_LVM_SNAPSHOT_H
 #define SBUILD_CHROOT_LVM_SNAPSHOT_H
 
-#include "sbuild-chroot-block-device.h"
-#include "sbuild-chroot-source.h"
+#include <sbuild/sbuild-chroot-block-device.h>
+#include <sbuild/sbuild-chroot-source.h>
 
 namespace sbuild
 {
diff --git a/schroot/sbuild-chroot-plain.cc b/sbuild/sbuild-chroot-plain.cc
index 37d25296..37d25296 100644
--- a/schroot/sbuild-chroot-plain.cc
+++ b/sbuild/sbuild-chroot-plain.cc
diff --git a/schroot/sbuild-chroot-plain.h b/sbuild/sbuild-chroot-plain.h
index f7c9e753..5d4546a0 100644
--- a/schroot/sbuild-chroot-plain.h
+++ b/sbuild/sbuild-chroot-plain.h
@@ -20,7 +20,7 @@
 #ifndef SBUILD_CHROOT_PLAIN_H
 #define SBUILD_CHROOT_PLAIN_H
 
-#include "sbuild-chroot.h"
+#include <sbuild/sbuild-chroot.h>
 
 namespace sbuild
 {
diff --git a/schroot/sbuild-chroot-source.cc b/sbuild/sbuild-chroot-source.cc
index beb96774..beb96774 100644
--- a/schroot/sbuild-chroot-source.cc
+++ b/sbuild/sbuild-chroot-source.cc
diff --git a/schroot/sbuild-chroot-source.h b/sbuild/sbuild-chroot-source.h
index 719a62f8..3436e9c3 100644
--- a/schroot/sbuild-chroot-source.h
+++ b/sbuild/sbuild-chroot-source.h
@@ -20,7 +20,7 @@
 #ifndef SBUILD_CHROOT_SOURCE_H
 #define SBUILD_CHROOT_SOURCE_H
 
-#include "sbuild-chroot.h"
+#include <sbuild/sbuild-chroot.h>
 
 namespace sbuild
 {
diff --git a/schroot/sbuild-chroot.cc b/sbuild/sbuild-chroot.cc
index 27d5ae69..27d5ae69 100644
--- a/schroot/sbuild-chroot.cc
+++ b/sbuild/sbuild-chroot.cc
diff --git a/schroot/sbuild-chroot.h b/sbuild/sbuild-chroot.h
index b4a975e3..fd8a1778 100644
--- a/schroot/sbuild-chroot.h
+++ b/sbuild/sbuild-chroot.h
@@ -20,13 +20,13 @@
 #ifndef SBUILD_CHROOT_H
 #define SBUILD_CHROOT_H
 
-#include "sbuild-config.h"
-#include "sbuild-custom-error.h"
-#include "sbuild-error.h"
-#include "sbuild-environment.h"
-#include "sbuild-keyfile.h"
-#include "sbuild-personality.h"
-#include "sbuild-util.h"
+#include <sbuild/sbuild-config.h>
+#include <sbuild/sbuild-custom-error.h>
+#include <sbuild/sbuild-error.h>
+#include <sbuild/sbuild-environment.h>
+#include <sbuild/sbuild-keyfile.h>
+#include <sbuild/sbuild-personality.h>
+#include <sbuild/sbuild-util.h>
 
 #include <iomanip>
 #include <ostream>
diff --git a/schroot/sbuild-config.h.in b/sbuild/sbuild-config.h.in
index ff4de033..ff4de033 100644
--- a/schroot/sbuild-config.h.in
+++ b/sbuild/sbuild-config.h.in
diff --git a/schroot/sbuild-custom-error.h b/sbuild/sbuild-custom-error.h
index a16566be..0bb077d1 100644
--- a/schroot/sbuild-custom-error.h
+++ b/sbuild/sbuild-custom-error.h
@@ -20,7 +20,7 @@
 #ifndef SBUILD_CUSTOM_ERROR_H
 #define SBUILD_CUSTOM_ERROR_H
 
-#include "sbuild-error.h"
+#include <sbuild/sbuild-error.h>
 
 #include <map>
 #include <string>
diff --git a/schroot/sbuild-custom-error.tcc b/sbuild/sbuild-custom-error.tcc
index 37e5ba8b..37e5ba8b 100644
--- a/schroot/sbuild-custom-error.tcc
+++ b/sbuild/sbuild-custom-error.tcc
diff --git a/schroot/sbuild-environment.cc b/sbuild/sbuild-environment.cc
index ea51724a..ea51724a 100644
--- a/schroot/sbuild-environment.cc
+++ b/sbuild/sbuild-environment.cc
diff --git a/schroot/sbuild-environment.h b/sbuild/sbuild-environment.h
index 1e13e553..56b8b9c8 100644
--- a/schroot/sbuild-environment.h
+++ b/sbuild/sbuild-environment.h
@@ -20,8 +20,8 @@
 #ifndef SBUILD_ENVIRONMENT_H
 #define SBUILD_ENVIRONMENT_H
 
-#include "sbuild-log.h"
-#include "sbuild-parse-value.h"
+#include <sbuild/sbuild-log.h>
+#include <sbuild/sbuild-parse-value.h>
 
 #include <map>
 #include <string>
diff --git a/schroot/sbuild-error.h b/sbuild/sbuild-error.h
index a8609c03..a8609c03 100644
--- a/schroot/sbuild-error.h
+++ b/sbuild/sbuild-error.h
diff --git a/schroot/sbuild-format-detail.cc b/sbuild/sbuild-format-detail.cc
index 7f186087..7f186087 100644
--- a/schroot/sbuild-format-detail.cc
+++ b/sbuild/sbuild-format-detail.cc
diff --git a/schroot/sbuild-format-detail.h b/sbuild/sbuild-format-detail.h
index 6ce89f7a..7239624d 100644
--- a/schroot/sbuild-format-detail.h
+++ b/sbuild/sbuild-format-detail.h
@@ -20,9 +20,9 @@
 #ifndef SBUILD_FORMAT_DETAIL_H
 #define SBUILD_FORMAT_DETAIL_H
 
-#include "sbuild-config.h"
-#include "sbuild-types.h"
-#include "sbuild-util.h"
+#include <sbuild/sbuild-config.h>
+#include <sbuild/sbuild-types.h>
+#include <sbuild/sbuild-util.h>
 
 #include <iomanip>
 #include <ostream>
diff --git a/schroot/sbuild-i18n.h b/sbuild/sbuild-i18n.h
index 3bed0ffb..3bed0ffb 100644
--- a/schroot/sbuild-i18n.h
+++ b/sbuild/sbuild-i18n.h
diff --git a/schroot/sbuild-keyfile.cc b/sbuild/sbuild-keyfile.cc
index f1e7a9db..f1e7a9db 100644
--- a/schroot/sbuild-keyfile.cc
+++ b/sbuild/sbuild-keyfile.cc
diff --git a/schroot/sbuild-keyfile.h b/sbuild/sbuild-keyfile.h
index d94577ba..cc09ecc3 100644
--- a/schroot/sbuild-keyfile.h
+++ b/sbuild/sbuild-keyfile.h
@@ -20,14 +20,14 @@
 #ifndef SBUILD_KEYFILE_H
 #define SBUILD_KEYFILE_H
 
-#include "sbuild-config.h"
-#include "sbuild-error.h"
-#include "sbuild-i18n.h"
-#include "sbuild-log.h"
-#include "sbuild-parse-error.h"
-#include "sbuild-parse-value.h"
-#include "sbuild-types.h"
-#include "sbuild-util.h"
+#include <sbuild/sbuild-config.h>
+#include <sbuild/sbuild-error.h>
+#include <sbuild/sbuild-i18n.h>
+#include <sbuild/sbuild-log.h>
+#include <sbuild/sbuild-parse-error.h>
+#include <sbuild/sbuild-parse-value.h>
+#include <sbuild/sbuild-types.h>
+#include <sbuild/sbuild-util.h>
 
 #include <cassert>
 #include <iostream>
diff --git a/schroot/sbuild-lock.cc b/sbuild/sbuild-lock.cc
index aa0bba84..aa0bba84 100644
--- a/schroot/sbuild-lock.cc
+++ b/sbuild/sbuild-lock.cc
diff --git a/schroot/sbuild-lock.h b/sbuild/sbuild-lock.h
index 090c8f46..71503b78 100644
--- a/schroot/sbuild-lock.h
+++ b/sbuild/sbuild-lock.h
@@ -20,7 +20,7 @@
 #ifndef SBUILD_LOCK_H
 #define SBUILD_LOCK_H
 
-#include "sbuild-custom-error.h"
+#include <sbuild/sbuild-custom-error.h>
 
 #include <string>
 
diff --git a/schroot/sbuild-log.cc b/sbuild/sbuild-log.cc
index af6c8c05..af6c8c05 100644
--- a/schroot/sbuild-log.cc
+++ b/sbuild/sbuild-log.cc
diff --git a/schroot/sbuild-log.h b/sbuild/sbuild-log.h
index ef314959..ef314959 100644
--- a/schroot/sbuild-log.h
+++ b/sbuild/sbuild-log.h
diff --git a/schroot/sbuild-nostream.cc b/sbuild/sbuild-nostream.cc
index e6b34742..e6b34742 100644
--- a/schroot/sbuild-nostream.cc
+++ b/sbuild/sbuild-nostream.cc
diff --git a/schroot/sbuild-nostream.h b/sbuild/sbuild-nostream.h
index b233a7b4..b233a7b4 100644
--- a/schroot/sbuild-nostream.h
+++ b/sbuild/sbuild-nostream.h
diff --git a/schroot/sbuild-parse-error.cc b/sbuild/sbuild-parse-error.cc
index 5045be20..5045be20 100644
--- a/schroot/sbuild-parse-error.cc
+++ b/sbuild/sbuild-parse-error.cc
diff --git a/schroot/sbuild-parse-error.h b/sbuild/sbuild-parse-error.h
index 5bdc7fa1..b0be9713 100644
--- a/schroot/sbuild-parse-error.h
+++ b/sbuild/sbuild-parse-error.h
@@ -20,8 +20,8 @@
 #ifndef SBUILD_PARSE_ERROR_H
 #define SBUILD_PARSE_ERROR_H
 
-#include "sbuild-error.h"
-#include "sbuild-log.h"
+#include <sbuild/sbuild-error.h>
+#include <sbuild/sbuild-log.h>
 
 #include <map>
 #include <string>
diff --git a/schroot/sbuild-parse-value.cc b/sbuild/sbuild-parse-value.cc
index 74aa04fb..74aa04fb 100644
--- a/schroot/sbuild-parse-value.cc
+++ b/sbuild/sbuild-parse-value.cc
diff --git a/schroot/sbuild-parse-value.h b/sbuild/sbuild-parse-value.h
index c403adff..16b5491f 100644
--- a/schroot/sbuild-parse-value.h
+++ b/sbuild/sbuild-parse-value.h
@@ -20,8 +20,8 @@
 #ifndef SBUILD_PARSE_VALUE_H
 #define SBUILD_PARSE_VALUE_H
 
-#include "sbuild-parse-error.h"
-#include "sbuild-log.h"
+#include <sbuild/sbuild-parse-error.h>
+#include <sbuild/sbuild-log.h>
 
 #include <string>
 #include <sstream>
diff --git a/schroot/sbuild-personality.cc b/sbuild/sbuild-personality.cc
index 7d420a88..7d420a88 100644
--- a/schroot/sbuild-personality.cc
+++ b/sbuild/sbuild-personality.cc
diff --git a/schroot/sbuild-personality.h b/sbuild/sbuild-personality.h
index 05a7d17b..500e091b 100644
--- a/schroot/sbuild-personality.h
+++ b/sbuild/sbuild-personality.h
@@ -20,8 +20,8 @@
 #ifndef SBUILD_PERSONALITY_H
 #define SBUILD_PERSONALITY_H
 
-#include "sbuild-config.h"
-#include "sbuild-custom-error.h"
+#include <sbuild/sbuild-config.h>
+#include <sbuild/sbuild-custom-error.h>
 
 #include <map>
 #include <ostream>
diff --git a/schroot/sbuild-session.cc b/sbuild/sbuild-session.cc
index 4940a3c9..4940a3c9 100644
--- a/schroot/sbuild-session.cc
+++ b/sbuild/sbuild-session.cc
diff --git a/schroot/sbuild-session.h b/sbuild/sbuild-session.h
index 8f40278a..2d333f98 100644
--- a/schroot/sbuild-session.h
+++ b/sbuild/sbuild-session.h
@@ -20,9 +20,9 @@
 #ifndef SBUILD_SESSION_H
 #define SBUILD_SESSION_H
 
-#include "sbuild-auth.h"
-#include "sbuild-chroot-config.h"
-#include "sbuild-custom-error.h"
+#include <sbuild/sbuild-auth.h>
+#include <sbuild/sbuild-chroot-config.h>
+#include <sbuild/sbuild-custom-error.h>
 
 #include <string>
 
diff --git a/schroot/sbuild-types.h b/sbuild/sbuild-types.h
index f5f6d6fe..f5f6d6fe 100644
--- a/schroot/sbuild-types.h
+++ b/sbuild/sbuild-types.h
diff --git a/schroot/sbuild-util.cc b/sbuild/sbuild-util.cc
index 58aeff51..58aeff51 100644
--- a/schroot/sbuild-util.cc
+++ b/sbuild/sbuild-util.cc
diff --git a/schroot/sbuild-util.h b/sbuild/sbuild-util.h
index 6837ef3d..caaac966 100644
--- a/schroot/sbuild-util.h
+++ b/sbuild/sbuild-util.h
@@ -20,7 +20,7 @@
 #ifndef SBUILD_UTIL_H
 #define SBUILD_UTIL_H
 
-#include "sbuild-types.h"
+#include <sbuild/sbuild-types.h>
 
 #include <string>
 
diff --git a/schroot/Makefile.am b/schroot/Makefile.am
index 78f3e57d..1d0727e9 100644
--- a/schroot/Makefile.am
+++ b/schroot/Makefile.am
@@ -31,92 +31,17 @@ AM_CXXFLAGS = $(SCHROOT_CFLAGS) -pedantic -Wall -Wcast-align -Wwrite-strings -Ws
 
 DEFS = -DGETTEXT_PACKAGE=\"schroot\" -DLOCALEDIR=\"$(localedir)\" -D_GNU_SOURCE
 
-noinst_LTLIBRARIES = libsbuild.la libschroot.la libdchroot.la
+noinst_LTLIBRARIES = libschroot.la
 
-if BUILD_DCHROOT
-dchroot = dchroot
-endif
-
-if BUILD_DCHROOT_DSA
-dchroot_dsa = dchroot-dsa
-endif
-
-bin_PROGRAMS = $(dchroot) $(dchroot_dsa) schroot
+bin_PROGRAMS = schroot
 pkglibexec_PROGRAMS = schroot-releaselock schroot-listmounts
 
-sbuild_public_h_sources =		\
-	sbuild-auth.h			\
-	sbuild-auth-conv.h		\
-	sbuild-auth-conv-tty.h		\
-	sbuild-auth-message.h   	\
-	sbuild-chroot.h			\
-	sbuild-chroot-block-device.h	\
-	sbuild-chroot-file.h		\
-	sbuild-chroot-lvm-snapshot.h	\
-	sbuild-chroot-plain.h		\
-	sbuild-chroot-source.h		\
-	sbuild-chroot-config.h		\
-	sbuild-custom-error.h		\
-	sbuild-custom-error.tcc		\
-	sbuild-environment.h		\
-	sbuild-error.h			\
-	sbuild-format-detail.h		\
-	sbuild-i18n.h			\
-	sbuild-keyfile.h		\
-	sbuild-lock.h			\
-	sbuild-log.h			\
-	sbuild-nostream.h		\
-	sbuild-parse-error.h		\
-	sbuild-parse-value.h		\
-	sbuild-personality.h		\
-	sbuild-session.h		\
-	sbuild-types.h			\
-	sbuild-util.h
-
-sbuild_public_cc_sources =		\
-	sbuild-auth.cc			\
-	sbuild-auth-conv.cc		\
-	sbuild-auth-conv-tty.cc		\
-	sbuild-auth-message.cc		\
-	sbuild-chroot.cc		\
-	sbuild-chroot-block-device.cc	\
-	sbuild-chroot-file.cc		\
-	sbuild-chroot-lvm-snapshot.cc	\
-	sbuild-chroot-plain.cc		\
-	sbuild-chroot-source.cc		\
-	sbuild-chroot-config.cc		\
-	sbuild-environment.cc		\
-	sbuild-format-detail.cc		\
-	sbuild-keyfile.cc		\
-	sbuild-lock.cc			\
-	sbuild-log.cc			\
-	sbuild-nostream.cc		\
-	sbuild-parse-error.cc		\
-	sbuild-parse-value.cc		\
-	sbuild-personality.cc		\
-	sbuild-session.cc		\
-	sbuild-util.cc
-
-libsbuild_la_SOURCES =			\
-	$(sbuild_public_h_sources)	\
-	$(sbuild_public_cc_sources)
-
-nodist_libsbuild_la_SOURCES =	\
-	sbuild-config.h
-
-libsbuild_la_LIBADD = $(UUID_LIBS) $(PAM_LIBS) $(LOCKDEV_LIBS) $(BOOST_LIBS) $(LIBINTL)
-
 libschroot_la_SOURCES =			\
 	schroot-options-base.h		\
 	schroot-options-base.cc		\
 	schroot-main.h			\
 	schroot-main.cc
-libschroot_la_LIBADD = libsbuild.la
-
-libdchroot_la_SOURCES =			\
-	dchroot-session-base.h		\
-	dchroot-session-base.cc
-libdchroot_la_LIBADD = libschroot.la
+libschroot_la_LIBADD = $(top_builddir)/sbuild/libsbuild.la
 
 schroot_SOURCES =			\
 	schroot-options.h		\
@@ -124,67 +49,29 @@ schroot_SOURCES =			\
 	schroot.cc
 schroot_LDADD = libschroot.la
 
-dchroot_SOURCES =			\
-	dchroot-chroot-config.h		\
-	dchroot-chroot-config.cc	\
-	dchroot-session.h		\
-	dchroot-session.cc		\
-	dchroot-options.h		\
-	dchroot-options.cc		\
-	dchroot-main.h			\
-	dchroot-main.cc			\
-	dchroot.cc
-dchroot_LDADD = libdchroot.la
-
-dchroot_dsa_SOURCES =			\
-	dchroot-dsa-chroot-config.h	\
-	dchroot-dsa-chroot-config.cc	\
-	dchroot-dsa-session.h		\
-	dchroot-dsa-session.cc		\
-	dchroot-dsa-options.h		\
-	dchroot-dsa-options.cc		\
-	dchroot-dsa-main.h		\
-	dchroot-dsa-main.cc		\
-	dchroot-dsa.cc
-dchroot_dsa_LDADD = libdchroot.la
-
 schroot_releaselock_SOURCES = 		\
 	schroot-releaselock-options.h	\
 	schroot-releaselock-options.cc	\
 	schroot-releaselock.cc
-schroot_releaselock_LDADD = libsbuild.la
+schroot_releaselock_LDADD = $(top_builddir)/sbuild/libsbuild.la
 
 schroot_listmounts_SOURCES =		\
 	schroot-listmounts-options.h	\
 	schroot-listmounts-options.cc	\
 	schroot-listmounts.cc
-schroot_listmounts_LDADD = libsbuild.la
+schroot_listmounts_LDADD = $(top_builddir)/sbuild/libsbuild.la
 
 
 pkgsysconfdir = $(PACKAGE_SYSCONF_DIR)
 pkgsysconf_DATA = schroot.conf
 
-if BUILD_DCHROOT
-dchroot_mans = dchroot.1
-endif
-
-if BUILD_DCHROOT_DSA
-dchroot_dsa_mans = dchroot-dsa.1
-endif
-
-man_MANS = $(dchroot_mans) $(dchroot_dsa_mans) schroot.1 schroot-setup.5 schroot.conf.5
+man_MANS = schroot.1 schroot-setup.5 schroot.conf.5
 
 EXTRA_DIST =			\
 	$(pkgsysconf_DATA)
 
 install-exec-hook:
 # Install setuid root.
-	if [ -f "$(DESTDIR)$(bindir)/dchroot" ]; then \
-	  chmod 4755 "$(DESTDIR)$(bindir)/dchroot"; \
-	fi
-	if [ -f "$(DESTDIR)$(bindir)/dchroot-dsa" ]; then \
-	  chmod 4755 "$(DESTDIR)$(bindir)/dchroot-dsa"; \
-	fi
 	chmod 4755 "$(DESTDIR)$(bindir)/schroot"
 
 install-data-hook:
diff --git a/schroot/schroot-listmounts-options.cc b/schroot/schroot-listmounts-options.cc
index 83b95399..46853a22 100644
--- a/schroot/schroot-listmounts-options.cc
+++ b/schroot/schroot-listmounts-options.cc
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include "sbuild-i18n.h"
+#include <sbuild/sbuild-i18n.h>
 
 #include "schroot-listmounts-options.h"
 
diff --git a/schroot/schroot-listmounts.cc b/schroot/schroot-listmounts.cc
index 5480f50a..c99fddd8 100644
--- a/schroot/schroot-listmounts.cc
+++ b/schroot/schroot-listmounts.cc
@@ -19,11 +19,11 @@
 
 #include <config.h>
 
-#include "sbuild-error.h"
-#include "sbuild-i18n.h"
-#include "sbuild-log.h"
-#include "sbuild-types.h"
-#include "sbuild-util.h"
+#include <sbuild/sbuild-error.h>
+#include <sbuild/sbuild-i18n.h>
+#include <sbuild/sbuild-log.h>
+#include <sbuild/sbuild-types.h>
+#include <sbuild/sbuild-util.h>
 
 #include "schroot-listmounts-options.h"
 
diff --git a/schroot/schroot-main.cc b/schroot/schroot-main.cc
index 8e52c4b5..5be08bcc 100644
--- a/schroot/schroot-main.cc
+++ b/schroot/schroot-main.cc
@@ -19,8 +19,8 @@
 
 #include <config.h>
 
-#include "sbuild-auth-conv.h"
-#include "sbuild-auth-conv-tty.h"
+#include <sbuild/sbuild-auth-conv.h>
+#include <sbuild/sbuild-auth-conv-tty.h>
 
 #include "schroot-main.h"
 
diff --git a/schroot/schroot-main.h b/schroot/schroot-main.h
index 5f2b3a1c..eb858b81 100644
--- a/schroot/schroot-main.h
+++ b/schroot/schroot-main.h
@@ -20,7 +20,7 @@
 #ifndef SCHROOT_MAIN_H
 #define SCHROOT_MAIN_H
 
-#include "schroot-options-base.h"
+#include <schroot/schroot-options-base.h>
 
 namespace schroot
 {
diff --git a/schroot/schroot-options-base.h b/schroot/schroot-options-base.h
index ab91323e..bfa59670 100644
--- a/schroot/schroot-options-base.h
+++ b/schroot/schroot-options-base.h
@@ -20,8 +20,8 @@
 #ifndef SCHROOT_OPTIONS_BASE_H
 #define SCHROOT_OPTIONS_BASE_H
 
-#include "sbuild-session.h"
-#include "sbuild-types.h"
+#include <sbuild/sbuild-session.h>
+#include <sbuild/sbuild-types.h>
 
 #include <string>
 #include <vector>
diff --git a/schroot/schroot-options.h b/schroot/schroot-options.h
index ecea381f..b3b9b119 100644
--- a/schroot/schroot-options.h
+++ b/schroot/schroot-options.h
@@ -20,7 +20,7 @@
 #ifndef SCHROOT_OPTIONS_H
 #define SCHROOT_OPTIONS_H
 
-#include "schroot-options-base.h"
+#include <schroot/schroot-options-base.h>
 
 namespace schroot
 {
diff --git a/schroot/schroot-releaselock-options.cc b/schroot/schroot-releaselock-options.cc
index 4d426955..a97f45e6 100644
--- a/schroot/schroot-releaselock-options.cc
+++ b/schroot/schroot-releaselock-options.cc
@@ -19,7 +19,7 @@
 
 #include <config.h>
 
-#include "sbuild-i18n.h"
+#include <sbuild/sbuild-i18n.h>
 
 #include "schroot-releaselock-options.h"
 
diff --git a/schroot/schroot-releaselock.cc b/schroot/schroot-releaselock.cc
index e27fee49..3c45d774 100644
--- a/schroot/schroot-releaselock.cc
+++ b/schroot/schroot-releaselock.cc
@@ -19,9 +19,9 @@
 
 #include <config.h>
 
-#include "sbuild-i18n.h"
-#include "sbuild-log.h"
-#include "sbuild-types.h"
+#include <sbuild/sbuild-i18n.h>
+#include <sbuild/sbuild-log.h>
+#include <sbuild/sbuild-types.h>
 
 #include "schroot-releaselock-options.h"
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 14256b5f..6fb2906f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -55,7 +55,7 @@ endif
 libtest_la_SOURCES = 	\
 	test-helpers.h	\
 	testmain.cc
-libtest_la_LIBADD = ../schroot/libsbuild.la $(CPPUNIT_LIBS)
+libtest_la_LIBADD = $(top_builddir)/sbuild/libsbuild.la $(CPPUNIT_LIBS)
 
 sbuild_chroot_SOURCES = 		\
 	sbuild-chroot.cc		\
diff --git a/test/sbuild-chroot-block-device.cc b/test/sbuild-chroot-block-device.cc
index 397e03c2..0ae4d803 100644
--- a/test/sbuild-chroot-block-device.cc
+++ b/test/sbuild-chroot-block-device.cc
@@ -20,13 +20,13 @@
 #include <algorithm>
 #include <set>
 
-#include <cppunit/extensions/HelperMacros.h>
-
-#include <schroot/sbuild-chroot-block-device.h>
+#include <sbuild/sbuild-chroot-block-device.h>
 
 #include "test-helpers.h"
 #include "test-sbuild-chroot.h"
 
+#include <cppunit/extensions/HelperMacros.h>
+
 using namespace CppUnit;
 
 class chroot_block_device : public sbuild::chroot_block_device
diff --git a/test/sbuild-chroot-config.cc b/test/sbuild-chroot-config.cc
index eeb2e94e..174b9ad9 100644
--- a/test/sbuild-chroot-config.cc
+++ b/test/sbuild-chroot-config.cc
@@ -17,15 +17,15 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-chroot-config.h>
+#include <sbuild/sbuild-nostream.h>
+
 #include <fstream>
 #include <sstream>
 #include <vector>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-chroot-config.h>
-#include <schroot/sbuild-nostream.h>
-
 using namespace CppUnit;
 
 class test_config : public TestFixture
diff --git a/test/sbuild-chroot-file.cc b/test/sbuild-chroot-file.cc
index 0e0b3222..9c7f1939 100644
--- a/test/sbuild-chroot-file.cc
+++ b/test/sbuild-chroot-file.cc
@@ -17,16 +17,16 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-chroot-file.h>
+
+#include "test-helpers.h"
+#include "test-sbuild-chroot.h"
+
 #include <algorithm>
 #include <set>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-chroot-file.h>
-
-#include "test-helpers.h"
-#include "test-sbuild-chroot.h"
-
 using namespace CppUnit;
 
 class chroot_file : public sbuild::chroot_file
diff --git a/test/sbuild-chroot-lvm-snapshot.cc b/test/sbuild-chroot-lvm-snapshot.cc
index fd74c7ee..f0fd21ed 100644
--- a/test/sbuild-chroot-lvm-snapshot.cc
+++ b/test/sbuild-chroot-lvm-snapshot.cc
@@ -17,17 +17,17 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-chroot-lvm-snapshot.h>
+#include <sbuild/sbuild-util.h>
+
+#include "test-helpers.h"
+#include "test-sbuild-chroot.h"
+
 #include <algorithm>
 #include <set>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-chroot-lvm-snapshot.h>
-#include <schroot/sbuild-util.h>
-
-#include "test-helpers.h"
-#include "test-sbuild-chroot.h"
-
 using namespace CppUnit;
 
 class chroot_lvm_snapshot : public sbuild::chroot_lvm_snapshot
diff --git a/test/sbuild-chroot-plain.cc b/test/sbuild-chroot-plain.cc
index ac0df7ca..9a6c441b 100644
--- a/test/sbuild-chroot-plain.cc
+++ b/test/sbuild-chroot-plain.cc
@@ -17,16 +17,16 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-chroot-plain.h>
+
+#include "test-helpers.h"
+#include "test-sbuild-chroot.h"
+
 #include <algorithm>
 #include <set>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-chroot-plain.h>
-
-#include "test-helpers.h"
-#include "test-sbuild-chroot.h"
-
 using namespace CppUnit;
 
 class chroot_plain : public sbuild::chroot_plain
diff --git a/test/sbuild-chroot.cc b/test/sbuild-chroot.cc
index 62e124d4..7fdb6645 100644
--- a/test/sbuild-chroot.cc
+++ b/test/sbuild-chroot.cc
@@ -17,16 +17,16 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-chroot.h>
+
+#include "test-helpers.h"
+#include "test-sbuild-chroot.h"
+
 #include <algorithm>
 #include <set>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-chroot.h>
-
-#include "test-helpers.h"
-#include "test-sbuild-chroot.h"
-
 using namespace CppUnit;
 
 class basic_chroot : public sbuild::chroot
diff --git a/test/sbuild-environment.cc b/test/sbuild-environment.cc
index 7455d184..abad61c5 100644
--- a/test/sbuild-environment.cc
+++ b/test/sbuild-environment.cc
@@ -17,14 +17,14 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-environment.h>
+#include <sbuild/sbuild-util.h>
+
 #include <iostream>
 #include <sstream>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-environment.h>
-#include <schroot/sbuild-util.h>
-
 using namespace CppUnit;
 
 class test_environment : public TestFixture
diff --git a/test/sbuild-keyfile.cc b/test/sbuild-keyfile.cc
index 2688eecd..54664766 100644
--- a/test/sbuild-keyfile.cc
+++ b/test/sbuild-keyfile.cc
@@ -17,14 +17,14 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-keyfile.h>
+
 #include <fstream>
 #include <sstream>
 #include <vector>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-keyfile.h>
-
 using namespace CppUnit;
 
 class test_keyfile : public TestFixture
diff --git a/test/sbuild-lock.cc b/test/sbuild-lock.cc
index 834d8c32..8ce67a50 100644
--- a/test/sbuild-lock.cc
+++ b/test/sbuild-lock.cc
@@ -17,17 +17,17 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-lock.h>
+
 #include <iostream>
 
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <cppunit/extensions/HelperMacros.h>
-
 #include <lockdev.h>
 
-#include <schroot/sbuild-lock.h>
+#include <cppunit/extensions/HelperMacros.h>
 
 using namespace CppUnit;
 
diff --git a/test/sbuild-log.cc b/test/sbuild-log.cc
index f4332103..a6b0ea80 100644
--- a/test/sbuild-log.cc
+++ b/test/sbuild-log.cc
@@ -17,14 +17,14 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-log.h>
+
 #include <iostream>
 #include <ios>
 #include <sstream>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-log.h>
-
 using namespace CppUnit;
 
 class test_log : public TestFixture
diff --git a/test/sbuild-nostream.cc b/test/sbuild-nostream.cc
index 2b3df315..c15010b6 100644
--- a/test/sbuild-nostream.cc
+++ b/test/sbuild-nostream.cc
@@ -17,12 +17,12 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-nostream.h>
+
 #include <cstdlib>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-nostream.h>
-
 using namespace CppUnit;
 
 class test_nostream : public TestCase
diff --git a/test/sbuild-parse-value.cc b/test/sbuild-parse-value.cc
index 95767b9b..d4d90862 100644
--- a/test/sbuild-parse-value.cc
+++ b/test/sbuild-parse-value.cc
@@ -17,9 +17,9 @@
  *
  *********************************************************************/
 
-#include <cppunit/extensions/HelperMacros.h>
+#include <sbuild/sbuild-parse-value.h>
 
-#include <schroot/sbuild-parse-value.h>
+#include <cppunit/extensions/HelperMacros.h>
 
 using namespace CppUnit;
 
diff --git a/test/sbuild-personality.cc b/test/sbuild-personality.cc
index 0d6b723b..c6750856 100644
--- a/test/sbuild-personality.cc
+++ b/test/sbuild-personality.cc
@@ -17,13 +17,13 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-personality.h>
+
 #include <iostream>
 #include <sstream>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-personality.h>
-
 using namespace CppUnit;
 
 class test_personality : public TestCase
diff --git a/test/sbuild-util.cc b/test/sbuild-util.cc
index 07db84c7..2456fd0a 100644
--- a/test/sbuild-util.cc
+++ b/test/sbuild-util.cc
@@ -17,12 +17,12 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-util.h>
+
 #include <cstdlib>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-util.h>
-
 using namespace CppUnit;
 
 class test_util : public TestCase
diff --git a/test/test-helpers.h b/test/test-helpers.h
index 8f5d54b2..4ea7680c 100644
--- a/test/test-helpers.h
+++ b/test/test-helpers.h
@@ -20,12 +20,12 @@
 #ifndef TEST_HELPERS_H
 #define TEST_HELPERS_H
 
+#include <sbuild/sbuild-types.h>
+
 #include <algorithm>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-types.h>
-
 using namespace CppUnit;
 
 template<class T>
diff --git a/test/test-sbuild-chroot.h b/test/test-sbuild-chroot.h
index 256432f5..06baa080 100644
--- a/test/test-sbuild-chroot.h
+++ b/test/test-sbuild-chroot.h
@@ -20,13 +20,13 @@
 #ifndef TEST_SBUILD_CHROOT_H
 #define TEST_SBUILD_CHROOT_H
 
+#include <sbuild/sbuild-chroot.h>
+
 #include <algorithm>
 #include <set>
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <schroot/sbuild-chroot.h>
-
 using namespace CppUnit;
 
 template <class T>
diff --git a/test/testmain.cc b/test/testmain.cc
index d8e17783..dccdda9e 100644
--- a/test/testmain.cc
+++ b/test/testmain.cc
@@ -17,13 +17,13 @@
  *
  *********************************************************************/
 
+#include <sbuild/sbuild-log.h>
+
 #include <cstdlib>
 
 #include <cppunit/ui/text/TestRunner.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
-#include <schroot/sbuild-log.h>
-
 using namespace CppUnit;
 
 int