summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--README4
-rw-r--r--debian/changelog2
-rw-r--r--po/cs.po105
-rw-r--r--po/de.po105
-rw-r--r--po/en.po105
-rw-r--r--po/eu.po107
-rw-r--r--po/fr.po105
-rw-r--r--po/pt.po105
-rw-r--r--po/schroot.pot102
-rw-r--r--po/sv.po105
-rw-r--r--po/vi.po105
-rw-r--r--po/zh_CN.po117
13 files changed, 528 insertions, 542 deletions
diff --git a/NEWS b/NEWS
index 06c2f91b..c8a0cc4f 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,9 @@ configuration.
to the "block-device" type, but allows for loopback mounting of
filesystems contained within regular files.
+ 2) "lvm-snapshot" chroot types now clean up correctly in the case of
+ failures during setup.
+
* Major changes in 1.2.0:
1) In addition to /etc/schroot/schroot.conf, chroot definitions may
diff --git a/README b/README
index 41289e3d..6a762d8f 100644
--- a/README
+++ b/README
@@ -18,7 +18,7 @@ for dchroot and DSA dchroot are provided.
Build Dependencies
------------------
-An ISO C++ compiler supporting TR1 (e.g. GCC 4.0), or an ISO C++
+An ISO C++ compiler supporting TR1 (e.g. GCC 4.x), or an ISO C++
compiler and the Boost libraries
libstdc++ (GNU libstdc++)
libpam0g-dev (Linux-PAM)
@@ -29,7 +29,7 @@ libboost-regex-dev }
uuid-dev (e2fsprogs)
If building from GIT, you will also need:
-gettext (0.15)
+gettext (0.16)
doxygen
diff --git a/debian/changelog b/debian/changelog
index b1cdd38b..e23da28a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,7 +25,7 @@ schroot (1.2.1-1) unstable; urgency=low
* New "loopback" chroot type allows loopback mounting of files
(Closes: #475515).
- -- Roger Leigh <rleigh@debian.org> Tue, 01 Jul 2008 23:26:09 +0100
+ -- Roger Leigh <rleigh@debian.org> Sat, 05 Jul 2008 10:02:54 +0100
schroot (1.2.0-1) unstable; urgency=low
diff --git a/po/cs.po b/po/cs.po
index c74293ff..9b6a7029 100644
--- a/po/cs.po
+++ b/po/cs.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: 2008-05-04 16:46+0100\n"
+"POT-Creation-Date: 2008-07-05 10:10+0100\n"
"PO-Revision-Date: 2006-10-04 18:04+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -15,172 +15,172 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: sbuild/sbuild-chroot.cc:55
+#: sbuild/sbuild-chroot.cc:56
msgid "Chroot creation failed"
msgstr "Vytváření chrootu selhalo"
-#: sbuild/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:57
msgid "Device name not set"
msgstr "Jméno zařízení není nastaveno"
#. TRANSLATORS: %1% = chroot type name
-#: sbuild/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:59
#, boost-format
msgid "Unknown chroot type '%1%'"
msgstr "Neznámý typ chrootu '%1%'"
-#: sbuild/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:60
msgid "Device must have an absolute path"
msgstr "Zařízení musí být zadáno absolutně"
-#: sbuild/sbuild-chroot.cc:60 sbuild/sbuild-lock.cc:57
+#: sbuild/sbuild-chroot.cc:61 sbuild/sbuild-lock.cc:57
msgid "Failed to lock device"
msgstr "Zařízení se nepodařilo zamknout"
-#: sbuild/sbuild-chroot.cc:61 bin/csbuild/csbuild-main.cc:52
+#: sbuild/sbuild-chroot.cc:62 bin/csbuild/csbuild-main.cc:52
#: bin/schroot-releaselock/schroot-releaselock-main.cc:54
msgid "File is not a block device"
msgstr "Soubor není blokovým zařízením"
-#: sbuild/sbuild-chroot.cc:62 sbuild/sbuild-lock.cc:62
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-lock.cc:62
msgid "Failed to unlock device"
msgstr "Zařízení se nepodařilo odemknout"
-#: sbuild/sbuild-chroot.cc:63
+#: sbuild/sbuild-chroot.cc:64
msgid "File must have an absolute path"
msgstr "Soubor musí být zadán absolutně"
-#: sbuild/sbuild-chroot.cc:64
+#: sbuild/sbuild-chroot.cc:65
msgid "Failed to acquire file lock"
msgstr "Nepodařilo se získat zámek souboru"
-#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:61
msgid "File is not a regular file"
msgstr "Soubor není běžným souborem"
-#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:63
+#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:63
msgid "File is not owned by user root"
msgstr "Soubor není vlastněn uživatelem root"
-#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:64
+#: sbuild/sbuild-chroot.cc:68 sbuild/sbuild-chroot-config.cc:64
msgid "File has write permissions for others"
msgstr "Soubor má oprávnění zápisu pro ostatní"
-#: sbuild/sbuild-chroot.cc:68
+#: sbuild/sbuild-chroot.cc:69
msgid "Failed to discard file lock"
msgstr "Nepodařilo se zrušit zámek souboru"
-#: sbuild/sbuild-chroot.cc:69
+#: sbuild/sbuild-chroot.cc:70
msgid "Location must have an absolute path"
msgstr "Umístění musí být zadáno absolutně"
#. TRANSLATORS: unlink refers to the C function which removes a file
-#: sbuild/sbuild-chroot.cc:71
+#: sbuild/sbuild-chroot.cc:72
msgid "Failed to unlink session file"
msgstr "Nepodařilo se smazat soubor se sezením"
-#: sbuild/sbuild-chroot.cc:72
+#: sbuild/sbuild-chroot.cc:73
msgid "Failed to write session file"
msgstr "Nepodařilo se zapsat do souboru se sezením"
-#: sbuild/sbuild-chroot.cc:470
+#: sbuild/sbuild-chroot.cc:473
msgid "Name"
msgstr "Jméno"
-#: sbuild/sbuild-chroot.cc:471
+#: sbuild/sbuild-chroot.cc:474
msgid "Description"
msgstr "Popis"
-#: sbuild/sbuild-chroot.cc:472
+#: sbuild/sbuild-chroot.cc:475
msgid "Type"
msgstr "Typ"
-#: sbuild/sbuild-chroot.cc:473
+#: sbuild/sbuild-chroot.cc:476
msgid "Priority"
msgstr "Priorita"
-#: sbuild/sbuild-chroot.cc:474
+#: sbuild/sbuild-chroot.cc:477
msgid "Users"
msgstr "Uživatelé"
-#: sbuild/sbuild-chroot.cc:475
+#: sbuild/sbuild-chroot.cc:478
msgid "Groups"
msgstr "Skupiny"
-#: sbuild/sbuild-chroot.cc:476
+#: sbuild/sbuild-chroot.cc:479
msgid "Root Users"
msgstr "Uživatelé root"
-#: sbuild/sbuild-chroot.cc:477
+#: sbuild/sbuild-chroot.cc:480
msgid "Root Groups"
msgstr "Skupiny root"
-#: sbuild/sbuild-chroot.cc:478
+#: sbuild/sbuild-chroot.cc:481
msgid "Aliases"
msgstr "Aliasy"
-#: sbuild/sbuild-chroot.cc:479
+#: sbuild/sbuild-chroot.cc:482
msgid "Environment Filter"
msgstr ""
-#: sbuild/sbuild-chroot.cc:480
+#: sbuild/sbuild-chroot.cc:483
msgid "Run Setup Scripts"
msgstr "Nastavovací skripty"
-#: sbuild/sbuild-chroot.cc:481
+#: sbuild/sbuild-chroot.cc:484
msgid "Run Execution Scripts"
msgstr "Prováděcí skripty"
-#: sbuild/sbuild-chroot.cc:482
+#: sbuild/sbuild-chroot.cc:485
msgid "Script Configuration"
msgstr ""
-#: sbuild/sbuild-chroot.cc:483
+#: sbuild/sbuild-chroot.cc:486
msgid "Session Managed"
msgstr "Spravované sezení"
-#: sbuild/sbuild-chroot.cc:485
+#: sbuild/sbuild-chroot.cc:488
#, fuzzy
msgid "Session Cloned"
msgstr "Spravované sezení"
-#: sbuild/sbuild-chroot.cc:487
+#: sbuild/sbuild-chroot.cc:490
#, fuzzy
msgid "Session Purged"
msgstr "Spravované sezení"
-#: sbuild/sbuild-chroot.cc:491
+#: sbuild/sbuild-chroot.cc:494
msgid "Command Prefix"
msgstr "Prefix příkazu"
#. TRANSLATORS: "Personality" is the Linux kernel personality
#. (process execution domain). See schroot.conf(5).
-#: sbuild/sbuild-chroot.cc:495
+#: sbuild/sbuild-chroot.cc:498
msgid "Personality"
msgstr "Personalita"
-#: sbuild/sbuild-chroot.cc:499
+#: sbuild/sbuild-chroot.cc:502
msgid "Location"
msgstr "Umístění"
-#: sbuild/sbuild-chroot.cc:501
+#: sbuild/sbuild-chroot.cc:504
msgid "Mount Location"
msgstr "Přípojný bod"
-#: sbuild/sbuild-chroot.cc:503
+#: sbuild/sbuild-chroot.cc:506
msgid "Path"
msgstr "Cesta"
#. TRANSLATORS: The system device node to mount containing the chroot
-#: sbuild/sbuild-chroot.cc:506
+#: sbuild/sbuild-chroot.cc:509
msgid "Mount Device"
msgstr "Přípojit zařízení"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Session"
msgstr "Sezení"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Chroot"
msgstr "Chroot"
@@ -549,14 +549,10 @@ msgstr "Soubor"
msgid "File Repack"
msgstr "Zabalit soubor"
-#: sbuild/sbuild-chroot-block-device.cc:174
+#: sbuild/sbuild-chroot-block-device.cc:160
msgid "Device"
msgstr "Zařízení"
-#: sbuild/sbuild-chroot-block-device.cc:176
-msgid "Mount Options"
-msgstr "Volby připojení"
-
#. TRANSLATORS: %1% = chroot alias name
#. TRANSLATORS: %4% = chroot name
#: sbuild/sbuild-chroot-config.cc:57
@@ -664,11 +660,11 @@ msgid ""
msgstr ""
"Odemčení zařízení selhalo (čas vypršel po %4% sekundách; zámek drží PID %5%)"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:195
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:207
msgid "LVM Snapshot Device"
msgstr "Zařízení pro snímky LVM"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:197
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:209
msgid "LVM Snapshot Options"
msgstr "Volby pro snímky LVM"
@@ -836,23 +832,23 @@ msgstr "Nepodařilo se zjistit stav souboru"
msgid "Failed to stat file descriptor"
msgstr "Nepodařilo se zjistit stav souboru"
-#: sbuild/sbuild-chroot-source.cc:51
+#: sbuild/sbuild-chroot-source.cc:50
msgid "(source chroot)"
msgstr "(zdrojový chroot)"
-#: sbuild/sbuild-chroot-source.cc:142
+#: sbuild/sbuild-chroot-source.cc:141
msgid "Source Users"
msgstr "Zdrojoví uživatelé"
-#: sbuild/sbuild-chroot-source.cc:143
+#: sbuild/sbuild-chroot-source.cc:142
msgid "Source Groups"
msgstr "Zdrojové skupiny"
-#: sbuild/sbuild-chroot-source.cc:144
+#: sbuild/sbuild-chroot-source.cc:143
msgid "Source Root Users"
msgstr "Zdrojoví uživatelé root"
-#: sbuild/sbuild-chroot-source.cc:145
+#: sbuild/sbuild-chroot-source.cc:144
msgid "Source Root Groups"
msgstr "Zdrojové skupiny root"
@@ -1463,6 +1459,9 @@ msgstr ""
msgid "fstab file to read (full path)"
msgstr "Přípojný bod pro kontrolu (celá cesta)"
+#~ msgid "Mount Options"
+#~ msgstr "Volby připojení"
+
#~ msgid "Failed to open '%1%'"
#~ msgstr "Nepodařilo se otevřít '%1%'"
diff --git a/po/de.po b/po/de.po
index 394030eb..423ddbfe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: schroot 1.1.6\n"
"Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2008-05-04 16:46+0100\n"
+"POT-Creation-Date: 2008-07-05 10:10+0100\n"
"PO-Revision-Date: 2008-02-19 18:41+0100\n"
"Last-Translator: Jens Seidel <jensseidel@users.sf.net>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -15,172 +15,172 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: sbuild/sbuild-chroot.cc:55
+#: sbuild/sbuild-chroot.cc:56
msgid "Chroot creation failed"
msgstr "Erstellung des Chroot schlug fehl"
-#: sbuild/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:57
msgid "Device name not set"
msgstr "Gerätename wurde nicht gesetzt"
#. TRANSLATORS: %1% = chroot type name
-#: sbuild/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:59
#, boost-format
msgid "Unknown chroot type '%1%'"
msgstr "Unbekannter Chroot-Typ »%1%«"
-#: sbuild/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:60
msgid "Device must have an absolute path"
msgstr "Das Gerät muss einen absoluten Pfad haben"
-#: sbuild/sbuild-chroot.cc:60 sbuild/sbuild-lock.cc:57
+#: sbuild/sbuild-chroot.cc:61 sbuild/sbuild-lock.cc:57
msgid "Failed to lock device"
msgstr "Gerät konnte nicht gesperrt werden"
-#: sbuild/sbuild-chroot.cc:61 bin/csbuild/csbuild-main.cc:52
+#: sbuild/sbuild-chroot.cc:62 bin/csbuild/csbuild-main.cc:52
#: bin/schroot-releaselock/schroot-releaselock-main.cc:54
msgid "File is not a block device"
msgstr "Datei ist kein Blockgerät"
-#: sbuild/sbuild-chroot.cc:62 sbuild/sbuild-lock.cc:62
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-lock.cc:62
msgid "Failed to unlock device"
msgstr "Gerät konnte nicht entsperrt werden"
-#: sbuild/sbuild-chroot.cc:63
+#: sbuild/sbuild-chroot.cc:64
msgid "File must have an absolute path"
msgstr "Die Datei muss einen absoluten Pfad haben"
# CHECKME
-#: sbuild/sbuild-chroot.cc:64
+#: sbuild/sbuild-chroot.cc:65
msgid "Failed to acquire file lock"
msgstr "Datei konnte nicht gesperrt werden"
-#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:61
msgid "File is not a regular file"
msgstr "Die Datei ist keine reguläre Datei"
-#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:63
+#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:63
msgid "File is not owned by user root"
msgstr "Die Datei gehört nicht root"
# CHECKME: oder "andere"?
-#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:64
+#: sbuild/sbuild-chroot.cc:68 sbuild/sbuild-chroot-config.cc:64
msgid "File has write permissions for others"
msgstr "Die Datei hat Schreibrechte für Andere"
-#: sbuild/sbuild-chroot.cc:68
+#: sbuild/sbuild-chroot.cc:69
msgid "Failed to discard file lock"
msgstr "Datei konnte nicht entsperrt werden"
-#: sbuild/sbuild-chroot.cc:69
+#: sbuild/sbuild-chroot.cc:70
msgid "Location must have an absolute path"
msgstr "Ein absoluter Pfad muss angegeben werden"
#. TRANSLATORS: unlink refers to the C function which removes a file
-#: sbuild/sbuild-chroot.cc:71
+#: sbuild/sbuild-chroot.cc:72
msgid "Failed to unlink session file"
msgstr "Konnte Sitzungsdatei nicht entfernen"
-#: sbuild/sbuild-chroot.cc:72
+#: sbuild/sbuild-chroot.cc:73
msgid "Failed to write session file"
msgstr "Konnte Sitzungsdatei nicht schreiben"
-#: sbuild/sbuild-chroot.cc:470
+#: sbuild/sbuild-chroot.cc:473
msgid "Name"
msgstr "Name"
-#: sbuild/sbuild-chroot.cc:471
+#: sbuild/sbuild-chroot.cc:474
msgid "Description"
msgstr "Beschreibung"
-#: sbuild/sbuild-chroot.cc:472
+#: sbuild/sbuild-chroot.cc:475
msgid "Type"
msgstr "Typ"
-#: sbuild/sbuild-chroot.cc:473
+#: sbuild/sbuild-chroot.cc:476
msgid "Priority"
msgstr "Priorität"
-#: sbuild/sbuild-chroot.cc:474
+#: sbuild/sbuild-chroot.cc:477
msgid "Users"
msgstr "Benutzer"
-#: sbuild/sbuild-chroot.cc:475
+#: sbuild/sbuild-chroot.cc:478
msgid "Groups"
msgstr "Gruppen"
-#: sbuild/sbuild-chroot.cc:476
+#: sbuild/sbuild-chroot.cc:479
msgid "Root Users"
msgstr "Root-Benutzer"
-#: sbuild/sbuild-chroot.cc:477
+#: sbuild/sbuild-chroot.cc:480
msgid "Root Groups"
msgstr "Root-Gruppen"
-#: sbuild/sbuild-chroot.cc:478
+#: sbuild/sbuild-chroot.cc:481
msgid "Aliases"
msgstr "Aliase"
-#: sbuild/sbuild-chroot.cc:479
+#: sbuild/sbuild-chroot.cc:482
msgid "Environment Filter"
msgstr "Umgebungsfilter"
-#: sbuild/sbuild-chroot.cc:480
+#: sbuild/sbuild-chroot.cc:483
msgid "Run Setup Scripts"
msgstr "Einrichtungsskripte ausführen"
-#: sbuild/sbuild-chroot.cc:481
+#: sbuild/sbuild-chroot.cc:484
msgid "Run Execution Scripts"
msgstr "Ausführungsskripte ausführen"
-#: sbuild/sbuild-chroot.cc:482
+#: sbuild/sbuild-chroot.cc:485
msgid "Script Configuration"
msgstr "Skript-Konfiguration"
-#: sbuild/sbuild-chroot.cc:483
+#: sbuild/sbuild-chroot.cc:486
msgid "Session Managed"
msgstr "Verwaltete Sitzung"
-#: sbuild/sbuild-chroot.cc:485
+#: sbuild/sbuild-chroot.cc:488
msgid "Session Cloned"
msgstr "Sitzung wurde geklont"
-#: sbuild/sbuild-chroot.cc:487
+#: sbuild/sbuild-chroot.cc:490
msgid "Session Purged"
msgstr "Sitzung wurde restlos entfernt"
-#: sbuild/sbuild-chroot.cc:491
+#: sbuild/sbuild-chroot.cc:494
msgid "Command Prefix"
msgstr "Kommandopräfix"
#. TRANSLATORS: "Personality" is the Linux kernel personality
#. (process execution domain). See schroot.conf(5).
-#: sbuild/sbuild-chroot.cc:495
+#: sbuild/sbuild-chroot.cc:498
msgid "Personality"
msgstr "Persönlichkeit"
-#: sbuild/sbuild-chroot.cc:499
+#: sbuild/sbuild-chroot.cc:502
msgid "Location"
msgstr "Ort"
-#: sbuild/sbuild-chroot.cc:501
+#: sbuild/sbuild-chroot.cc:504
msgid "Mount Location"
msgstr "Einhängeort"
-#: sbuild/sbuild-chroot.cc:503
+#: sbuild/sbuild-chroot.cc:506
msgid "Path"
msgstr "Pfad"
#. TRANSLATORS: The system device node to mount containing the chroot
-#: sbuild/sbuild-chroot.cc:506
+#: sbuild/sbuild-chroot.cc:509
msgid "Mount Device"
msgstr "Einzubindendes Gerät"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Session"
msgstr "Sitzung"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Chroot"
msgstr "Chroot"
@@ -557,14 +557,10 @@ msgstr "Datei"
msgid "File Repack"
msgstr "Datei neupacken"
-#: sbuild/sbuild-chroot-block-device.cc:174
+#: sbuild/sbuild-chroot-block-device.cc:160
msgid "Device"
msgstr "Gerät"
-#: sbuild/sbuild-chroot-block-device.cc:176
-msgid "Mount Options"
-msgstr "Einhängeoptionen"
-
#. TRANSLATORS: %1% = chroot alias name
#. TRANSLATORS: %4% = chroot name
#: sbuild/sbuild-chroot-config.cc:57
@@ -674,11 +670,11 @@ msgstr ""
"Konnte Gerät nicht entsperren (Zeit lief nach %4% Sekunden ab; Sperre wird "
"von PID %5% gehalten)"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:195
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:207
msgid "LVM Snapshot Device"
msgstr "LVM-Schnappschuss-Gerät"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:197
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:209
msgid "LVM Snapshot Options"
msgstr "LVM-Schnappschuss-Optionen"
@@ -846,24 +842,24 @@ msgstr "Datei konnte nicht mit »stat« abgefragt werden"
msgid "Failed to stat file descriptor"
msgstr "Dateideskriptor konnte nicht mit »stat« abgefragt werden"
-#: sbuild/sbuild-chroot-source.cc:51
+#: sbuild/sbuild-chroot-source.cc:50
msgid "(source chroot)"
msgstr "(Quell-Chroot)"
# CHECKME
-#: sbuild/sbuild-chroot-source.cc:142
+#: sbuild/sbuild-chroot-source.cc:141
msgid "Source Users"
msgstr "Quellbenutzer"
-#: sbuild/sbuild-chroot-source.cc:143
+#: sbuild/sbuild-chroot-source.cc:142
msgid "Source Groups"
msgstr "Quellgruppen"
-#: sbuild/sbuild-chroot-source.cc:144
+#: sbuild/sbuild-chroot-source.cc:143
msgid "Source Root Users"
msgstr "Quell-Root-Benutzer"
-#: sbuild/sbuild-chroot-source.cc:145
+#: sbuild/sbuild-chroot-source.cc:144
msgid "Source Root Groups"
msgstr "Quell-Root-Gruppen"
@@ -1483,5 +1479,8 @@ msgstr "Eine Simulation der durchzuführenden Aktionen starten"
msgid "fstab file to read (full path)"
msgstr "Einzulesende fstab-Datei (voller Pfad)"
+#~ msgid "Mount Options"
+#~ msgstr "Einhängeoptionen"
+
#~ msgid "The CTTY FD_CLOEXEC flag could not be set"
#~ msgstr "Das Flag CTTY FD_CLOEXEC konnte nicht gesetzt werden"
diff --git a/po/en.po b/po/en.po
index 212194d3..f56d7685 100644
--- a/po/en.po
+++ b/po/en.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: 2008-05-04 16:46+0100\n"
+"POT-Creation-Date: 2008-07-05 10:10+0100\n"
"PO-Revision-Date: 2008-02-26 23:16+0000\n"
"Last-Translator: Roger Leigh <rleigh@debian.org>\n"
"Language-Team: English <rleigh@debian.org>\n"
@@ -14,170 +14,170 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: sbuild/sbuild-chroot.cc:55
+#: sbuild/sbuild-chroot.cc:56
msgid "Chroot creation failed"
msgstr "Chroot creation failed"
-#: sbuild/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:57
msgid "Device name not set"
msgstr "Device name not set"
#. TRANSLATORS: %1% = chroot type name
-#: sbuild/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:59
#, boost-format
msgid "Unknown chroot type '%1%'"
msgstr "Unknown chroot type ‘%1%’"
-#: sbuild/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:60
msgid "Device must have an absolute path"
msgstr "Device must have an absolute path"
-#: sbuild/sbuild-chroot.cc:60 sbuild/sbuild-lock.cc:57
+#: sbuild/sbuild-chroot.cc:61 sbuild/sbuild-lock.cc:57
msgid "Failed to lock device"
msgstr "Failed to lock device"
-#: sbuild/sbuild-chroot.cc:61 bin/csbuild/csbuild-main.cc:52
+#: sbuild/sbuild-chroot.cc:62 bin/csbuild/csbuild-main.cc:52
#: bin/schroot-releaselock/schroot-releaselock-main.cc:54
msgid "File is not a block device"
msgstr "File is not a block device"
-#: sbuild/sbuild-chroot.cc:62 sbuild/sbuild-lock.cc:62
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-lock.cc:62
msgid "Failed to unlock device"
msgstr "Failed to unlock device"
-#: sbuild/sbuild-chroot.cc:63
+#: sbuild/sbuild-chroot.cc:64
msgid "File must have an absolute path"
msgstr "File must have an absolute path"
-#: sbuild/sbuild-chroot.cc:64
+#: sbuild/sbuild-chroot.cc:65
msgid "Failed to acquire file lock"
msgstr "Failed to acquire file lock"
-#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:61
msgid "File is not a regular file"
msgstr "File is not a regular file"
-#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:63
+#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:63
msgid "File is not owned by user root"
msgstr "File is not owned by user root"
-#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:64
+#: sbuild/sbuild-chroot.cc:68 sbuild/sbuild-chroot-config.cc:64
msgid "File has write permissions for others"
msgstr "File has write permissions for others"
-#: sbuild/sbuild-chroot.cc:68
+#: sbuild/sbuild-chroot.cc:69
msgid "Failed to discard file lock"
msgstr "Failed to discard file lock"
-#: sbuild/sbuild-chroot.cc:69
+#: sbuild/sbuild-chroot.cc:70
msgid "Location must have an absolute path"
msgstr "Location must have an absolute path"
#. TRANSLATORS: unlink refers to the C function which removes a file
-#: sbuild/sbuild-chroot.cc:71
+#: sbuild/sbuild-chroot.cc:72
msgid "Failed to unlink session file"
msgstr "Failed to unlink session file"
-#: sbuild/sbuild-chroot.cc:72
+#: sbuild/sbuild-chroot.cc:73
msgid "Failed to write session file"
msgstr "Failed to write session file"
-#: sbuild/sbuild-chroot.cc:470
+#: sbuild/sbuild-chroot.cc:473
msgid "Name"
msgstr "Name"
-#: sbuild/sbuild-chroot.cc:471
+#: sbuild/sbuild-chroot.cc:474
msgid "Description"
msgstr "Description"
-#: sbuild/sbuild-chroot.cc:472
+#: sbuild/sbuild-chroot.cc:475
msgid "Type"
msgstr "Type"
-#: sbuild/sbuild-chroot.cc:473
+#: sbuild/sbuild-chroot.cc:476
msgid "Priority"
msgstr "Priority"
-#: sbuild/sbuild-chroot.cc:474
+#: sbuild/sbuild-chroot.cc:477
msgid "Users"
msgstr "Users"
-#: sbuild/sbuild-chroot.cc:475
+#: sbuild/sbuild-chroot.cc:478
msgid "Groups"
msgstr "Groups"
-#: sbuild/sbuild-chroot.cc:476
+#: sbuild/sbuild-chroot.cc:479
msgid "Root Users"
msgstr "Root Users"
-#: sbuild/sbuild-chroot.cc:477
+#: sbuild/sbuild-chroot.cc:480
msgid "Root Groups"
msgstr "Root Groups"
-#: sbuild/sbuild-chroot.cc:478
+#: sbuild/sbuild-chroot.cc:481
msgid "Aliases"
msgstr "Aliases"
-#: sbuild/sbuild-chroot.cc:479
+#: sbuild/sbuild-chroot.cc:482
msgid "Environment Filter"
msgstr "Environment Filter"
-#: sbuild/sbuild-chroot.cc:480
+#: sbuild/sbuild-chroot.cc:483
msgid "Run Setup Scripts"
msgstr "Run Setup Scripts"
-#: sbuild/sbuild-chroot.cc:481
+#: sbuild/sbuild-chroot.cc:484
msgid "Run Execution Scripts"
msgstr "Run Execution Scripts"
-#: sbuild/sbuild-chroot.cc:482
+#: sbuild/sbuild-chroot.cc:485
msgid "Script Configuration"
msgstr "Script Configuration"
-#: sbuild/sbuild-chroot.cc:483
+#: sbuild/sbuild-chroot.cc:486
msgid "Session Managed"
msgstr "Session Managed"
-#: sbuild/sbuild-chroot.cc:485
+#: sbuild/sbuild-chroot.cc:488
msgid "Session Cloned"
msgstr "Session Cloned"
-#: sbuild/sbuild-chroot.cc:487
+#: sbuild/sbuild-chroot.cc:490
msgid "Session Purged"
msgstr "Session Purged"
-#: sbuild/sbuild-chroot.cc:491
+#: sbuild/sbuild-chroot.cc:494
msgid "Command Prefix"
msgstr "Command Prefix"
#. TRANSLATORS: "Personality" is the Linux kernel personality
#. (process execution domain). See schroot.conf(5).
-#: sbuild/sbuild-chroot.cc:495
+#: sbuild/sbuild-chroot.cc:498
msgid "Personality"
msgstr "Personality"
-#: sbuild/sbuild-chroot.cc:499
+#: sbuild/sbuild-chroot.cc:502
msgid "Location"
msgstr "Location"
-#: sbuild/sbuild-chroot.cc:501
+#: sbuild/sbuild-chroot.cc:504
msgid "Mount Location"
msgstr "Mount Location"
-#: sbuild/sbuild-chroot.cc:503
+#: sbuild/sbuild-chroot.cc:506
msgid "Path"
msgstr "Path"
#. TRANSLATORS: The system device node to mount containing the chroot
-#: sbuild/sbuild-chroot.cc:506
+#: sbuild/sbuild-chroot.cc:509
msgid "Mount Device"
msgstr "Mount Device"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Session"
msgstr "Session"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Chroot"
msgstr "Chroot"
@@ -547,14 +547,10 @@ msgstr "File"
msgid "File Repack"
msgstr "File Repack"
-#: sbuild/sbuild-chroot-block-device.cc:174
+#: sbuild/sbuild-chroot-block-device.cc:160
msgid "Device"
msgstr "Device"
-#: sbuild/sbuild-chroot-block-device.cc:176
-msgid "Mount Options"
-msgstr "Mount Options"
-
#. TRANSLATORS: %1% = chroot alias name
#. TRANSLATORS: %4% = chroot name
#: sbuild/sbuild-chroot-config.cc:57
@@ -661,11 +657,11 @@ msgid ""
msgstr ""
"Failed to unlock device (timed out after %4% seconds; lock held by PID %5%)"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:195
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:207
msgid "LVM Snapshot Device"
msgstr "LVM Snapshot Device"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:197
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:209
msgid "LVM Snapshot Options"
msgstr "LVM Snapshot Options"
@@ -832,23 +828,23 @@ msgstr "Failed to stat file"
msgid "Failed to stat file descriptor"
msgstr "Failed to stat file descriptor"
-#: sbuild/sbuild-chroot-source.cc:51
+#: sbuild/sbuild-chroot-source.cc:50
msgid "(source chroot)"
msgstr "(source chroot)"
-#: sbuild/sbuild-chroot-source.cc:142
+#: sbuild/sbuild-chroot-source.cc:141
msgid "Source Users"
msgstr "Source Users"
-#: sbuild/sbuild-chroot-source.cc:143
+#: sbuild/sbuild-chroot-source.cc:142
msgid "Source Groups"
msgstr "Source Groups"
-#: sbuild/sbuild-chroot-source.cc:144
+#: sbuild/sbuild-chroot-source.cc:143
msgid "Source Root Users"
msgstr "Source Root Users"
-#: sbuild/sbuild-chroot-source.cc:145
+#: sbuild/sbuild-chroot-source.cc:144
msgid "Source Root Groups"
msgstr "Source Root Groups"
@@ -1445,3 +1441,6 @@ msgstr "Perform a simulation of actions which would be taken"
#: bin/schroot-mount/schroot-mount-options.cc:67
msgid "fstab file to read (full path)"
msgstr "fstab file to read (full path)"
+
+#~ msgid "Mount Options"
+#~ msgstr "Mount Options"
diff --git a/po/eu.po b/po/eu.po
index 37951ed7..070f9929 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: eu\n"
"Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2008-05-04 16:46+0100\n"
-"PO-Revision-Date: 2008-05-04 22:59+0100\n"
+"POT-Creation-Date: 2008-07-05 10:10+0100\n"
+"PO-Revision-Date: 2008-05-05 09:24+0200\n"
"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
"Language-Team: Euskara <Librezale@librezale.org>\n"
"MIME-Version: 1.0\n"
@@ -16,170 +16,170 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: sbuild/sbuild-chroot.cc:55
+#: sbuild/sbuild-chroot.cc:56
msgid "Chroot creation failed"
msgstr "Huts chroot-a sortzean"
-#: sbuild/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:57
msgid "Device name not set"
msgstr "Ez da gailu izena ezarri"
#. TRANSLATORS: %1% = chroot type name
-#: sbuild/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:59
#, boost-format
msgid "Unknown chroot type '%1%'"
msgstr "Chroot '%1%' mota ezezaguna"
-#: sbuild/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:60
msgid "Device must have an absolute path"
msgstr "Gailuak bide absolutu bat izan behar du"
-#: sbuild/sbuild-chroot.cc:60 sbuild/sbuild-lock.cc:57
+#: sbuild/sbuild-chroot.cc:61 sbuild/sbuild-lock.cc:57
msgid "Failed to lock device"
msgstr "Huts egin du gailua blokeatzerakoan"
-#: sbuild/sbuild-chroot.cc:61 bin/csbuild/csbuild-main.cc:52
+#: sbuild/sbuild-chroot.cc:62 bin/csbuild/csbuild-main.cc:52
#: bin/schroot-releaselock/schroot-releaselock-main.cc:54
msgid "File is not a block device"
msgstr "Fitxategia da ez bloke gailu bat"
-#: sbuild/sbuild-chroot.cc:62 sbuild/sbuild-lock.cc:62
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-lock.cc:62
msgid "Failed to unlock device"
msgstr "Huts egin du gailua desblokeatzean"
-#: sbuild/sbuild-chroot.cc:63
+#: sbuild/sbuild-chroot.cc:64
msgid "File must have an absolute path"
msgstr "Fitxategia bide absolutua izan behar du"
-#: sbuild/sbuild-chroot.cc:64
+#: sbuild/sbuild-chroot.cc:65
msgid "Failed to acquire file lock"
msgstr "Huts egin du fitxategi blokeoa atzitzean"
-#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:61
msgid "File is not a regular file"
msgstr "Fitxategia ez da fitxategia erregular bat"
-#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:63
+#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:63
msgid "File is not owned by user root"
msgstr "Fitxategia ez da root erabiltzailearena"
-#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:64
+#: sbuild/sbuild-chroot.cc:68 sbuild/sbuild-chroot-config.cc:64
msgid "File has write permissions for others"
msgstr "Fitxategiak beste batzuentzat idazketa baimenak ditu"
-#: sbuild/sbuild-chroot.cc:68
+#: sbuild/sbuild-chroot.cc:69
msgid "Failed to discard file lock"
msgstr "Huts egin du fitxategi blokeoa baztertzean"
-#: sbuild/sbuild-chroot.cc:69
+#: sbuild/sbuild-chroot.cc:70
msgid "Location must have an absolute path"
msgstr "Kokalekuak bide absolutua izan behar du"
#. TRANSLATORS: unlink refers to the C function which removes a file
-#: sbuild/sbuild-chroot.cc:71
+#: sbuild/sbuild-chroot.cc:72
msgid "Failed to unlink session file"
msgstr "Huts egin du saio fitxategia askatzerakoan"
-#: sbuild/sbuild-chroot.cc:72
+#: sbuild/sbuild-chroot.cc:73
msgid "Failed to write session file"
msgstr "Huts saio fitxategia idaztean"
-#: sbuild/sbuild-chroot.cc:470
+#: sbuild/sbuild-chroot.cc:473
msgid "Name"
msgstr "Izena"
-#: sbuild/sbuild-chroot.cc:471
+#: sbuild/sbuild-chroot.cc:474
msgid "Description"
msgstr "Azalpena"
-#: sbuild/sbuild-chroot.cc:472
+#: sbuild/sbuild-chroot.cc:475
msgid "Type"
msgstr "Mota"
-#: sbuild/sbuild-chroot.cc:473
+#: sbuild/sbuild-chroot.cc:476
msgid "Priority"
msgstr "Lehentasuna"
-#: sbuild/sbuild-chroot.cc:474
+#: sbuild/sbuild-chroot.cc:477
msgid "Users"
msgstr "Erabiltzaileak"
-#: sbuild/sbuild-chroot.cc:475
+#: sbuild/sbuild-chroot.cc:478
msgid "Groups"
msgstr "Taldeak"
-#: sbuild/sbuild-chroot.cc:476
+#: sbuild/sbuild-chroot.cc:479
msgid "Root Users"
msgstr "Root Erabiltzaileak"
-#: sbuild/sbuild-chroot.cc:477
+#: sbuild/sbuild-chroot.cc:480
msgid "Root Groups"
msgstr "Root Taldeak"
-#: sbuild/sbuild-chroot.cc:478
+#: sbuild/sbuild-chroot.cc:481
msgid "Aliases"
msgstr "Ezizenak"
-#: sbuild/sbuild-chroot.cc:479
+#: sbuild/sbuild-chroot.cc:482
msgid "Environment Filter"
msgstr "Ingurune Iragazkia"
-#: sbuild/sbuild-chroot.cc:480
+#: sbuild/sbuild-chroot.cc:483
msgid "Run Setup Scripts"
msgstr "Abiarazi Konfigurazio script-ak"
-#: sbuild/sbuild-chroot.cc:481
+#: sbuild/sbuild-chroot.cc:484
msgid "Run Execution Scripts"
msgstr "Abiarazi exekuzio script-ak"
-#: sbuild/sbuild-chroot.cc:482
+#: sbuild/sbuild-chroot.cc:485
msgid "Script Configuration"
msgstr "Script konfigurazioa"
-#: sbuild/sbuild-chroot.cc:483
+#: sbuild/sbuild-chroot.cc:486
msgid "Session Managed"
msgstr "Saioa kudeatua"
-#: sbuild/sbuild-chroot.cc:485
+#: sbuild/sbuild-chroot.cc:488
msgid "Session Cloned"
msgstr "Saioa bikoiztua"
-#: sbuild/sbuild-chroot.cc:487
+#: sbuild/sbuild-chroot.cc:490
msgid "Session Purged"
msgstr "Saioa garbitua"
-#: sbuild/sbuild-chroot.cc:491
+#: sbuild/sbuild-chroot.cc:494
msgid "Command Prefix"
msgstr "Komando aurrizkia"
#. TRANSLATORS: "Personality" is the Linux kernel personality
#. (process execution domain). See schroot.conf(5).
-#: sbuild/sbuild-chroot.cc:495
+#: sbuild/sbuild-chroot.cc:498
msgid "Personality"
msgstr "Pertsonalitatea"
-#: sbuild/sbuild-chroot.cc:499
+#: sbuild/sbuild-chroot.cc:502
msgid "Location"
msgstr "Kokalekua"
-#: sbuild/sbuild-chroot.cc:501
+#: sbuild/sbuild-chroot.cc:504
msgid "Mount Location"
msgstr "Muntatze kokalekua"
-#: sbuild/sbuild-chroot.cc:503
+#: sbuild/sbuild-chroot.cc:506
msgid "Path"
msgstr "Bidea"
#. TRANSLATORS: The system device node to mount containing the chroot
-#: sbuild/sbuild-chroot.cc:506
+#: sbuild/sbuild-chroot.cc:509
msgid "Mount Device"
msgstr "Muntatu gailua"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Session"
msgstr "Saioa"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Chroot"
msgstr "Chroot"
@@ -553,14 +553,10 @@ msgstr "Fitxategia"
msgid "File Repack"
msgstr "Fitxategi birpaketatzea"
-#: sbuild/sbuild-chroot-block-device.cc:174
+#: sbuild/sbuild-chroot-block-device.cc:160
msgid "Device"
msgstr "Gailua"
-#: sbuild/sbuild-chroot-block-device.cc:176
-msgid "Mount Options"
-msgstr "Muntatze aukerak"
-
#. TRANSLATORS: %1% = chroot alias name
#. TRANSLATORS: %4% = chroot name
#: sbuild/sbuild-chroot-config.cc:57
@@ -671,11 +667,11 @@ msgstr ""
"Huts egin du gailua desblokeatzean (denboraz kanpo %4% segundu ondoren; "
"blokeoa %5% PID-ak mantendua)"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:195
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:207
msgid "LVM Snapshot Device"
msgstr "LVM egoera-argazki gailua"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:197
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:209
msgid "LVM Snapshot Options"
msgstr "LVM egoera-argazki aukerak"
@@ -842,23 +838,23 @@ msgstr "Huts egin du fitxategi egoera eskuratzean"
msgid "Failed to stat file descriptor"
msgstr "Huts egin du fitxategia deskriptorea egoera eskuratzean"
-#: sbuild/sbuild-chroot-source.cc:51
+#: sbuild/sbuild-chroot-source.cc:50
msgid "(source chroot)"
msgstr "(iturburu chroot-a)"
-#: sbuild/sbuild-chroot-source.cc:142
+#: sbuild/sbuild-chroot-source.cc:141
msgid "Source Users"
msgstr "Iturburua erabiltzaileak"
-#: sbuild/sbuild-chroot-source.cc:143
+#: sbuild/sbuild-chroot-source.cc:142
msgid "Source Groups"
msgstr "Iturburua taldeak"
-#: sbuild/sbuild-chroot-source.cc:144
+#: sbuild/sbuild-chroot-source.cc:143
msgid "Source Root Users"
msgstr "Iturburua erro erabiltzaileak"
-#: sbuild/sbuild-chroot-source.cc:145
+#: sbuild/sbuild-chroot-source.cc:144
msgid "Source Root Groups"
msgstr "Iturburu erro taldeak"
@@ -1466,3 +1462,6 @@ msgstr "Egin egingo lirateken ekintzen simulazio bat"
#: bin/schroot-mount/schroot-mount-options.cc:67
msgid "fstab file to read (full path)"
msgstr "irakurtzeko fstab fitxategia (bide osoa)"
+
+#~ msgid "Mount Options"
+#~ msgstr "Muntatze aukerak"
diff --git a/po/fr.po b/po/fr.po
index 19f6ef48..a26e2185 100644
--- a/po/fr.po
+++ b/po/fr.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: 2008-05-04 16:46+0100\n"
+"POT-Creation-Date: 2008-07-05 10:10+0100\n"
"PO-Revision-Date: 2008-05-08 13:45+0200\n"
"Last-Translator: Nicolas François <nicolas.francois@centraliens.net>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -15,170 +15,170 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: sbuild/sbuild-chroot.cc:55
+#: sbuild/sbuild-chroot.cc:56
msgid "Chroot creation failed"
msgstr "Échec lors de la création du chroot"
-#: sbuild/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:57
msgid "Device name not set"
msgstr "Nom du périphérique non défini"
#. TRANSLATORS: %1% = chroot type name
-#: sbuild/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:59
#, boost-format
msgid "Unknown chroot type '%1%'"
msgstr "Type de chroot inconnu : « %1% »"
-#: sbuild/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:60
msgid "Device must have an absolute path"
msgstr "Le périphérique doit être précisé avec un chemin absolu"
-#: sbuild/sbuild-chroot.cc:60 sbuild/sbuild-lock.cc:57
+#: sbuild/sbuild-chroot.cc:61 sbuild/sbuild-lock.cc:57
msgid "Failed to lock device"
msgstr "Échec lors du verrouillage du périphérique"
-#: sbuild/sbuild-chroot.cc:61 bin/csbuild/csbuild-main.cc:52
+#: sbuild/sbuild-chroot.cc:62 bin/csbuild/csbuild-main.cc:52
#: bin/schroot-releaselock/schroot-releaselock-main.cc:54
msgid "File is not a block device"
msgstr "Le fichier n'est pas un périphérique de type bloc"
-#: sbuild/sbuild-chroot.cc:62 sbuild/sbuild-lock.cc:62
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-lock.cc:62
msgid "Failed to unlock device"
msgstr "Échec lors du déverrouillage du périphérique"
-#: sbuild/sbuild-chroot.cc:63
+#: sbuild/sbuild-chroot.cc:64
msgid "File must have an absolute path"
msgstr "Le fichier doit être précisé avec un chemin absolu"
-#: sbuild/sbuild-chroot.cc:64
+#: sbuild/sbuild-chroot.cc:65
msgid "Failed to acquire file lock"
msgstr "Échec lors du verrouillage du fichier"
-#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:61
msgid "File is not a regular file"
msgstr "Le fichier n'est pas un fichier régulier"
-#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:63
+#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:63
msgid "File is not owned by user root"
msgstr "Le propriétaire du fichier n'est pas root"
-#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:64
+#: sbuild/sbuild-chroot.cc:68 sbuild/sbuild-chroot-config.cc:64
msgid "File has write permissions for others"
msgstr "Le fichier est accessible en écriture pour les autres"
-#: sbuild/sbuild-chroot.cc:68
+#: sbuild/sbuild-chroot.cc:69
msgid "Failed to discard file lock"
msgstr "Échec lors du déverrouillage du fichier"
-#: sbuild/sbuild-chroot.cc:69
+#: sbuild/sbuild-chroot.cc:70
msgid "Location must have an absolute path"
msgstr "L'emplacement doit être précisé avec un chemin absolu"
#. TRANSLATORS: unlink refers to the C function which removes a file
-#: sbuild/sbuild-chroot.cc:71
+#: sbuild/sbuild-chroot.cc:72
msgid "Failed to unlink session file"
msgstr "Échec lors de la suppression (« unlink ») du fichier de session"
-#: sbuild/sbuild-chroot.cc:72
+#: sbuild/sbuild-chroot.cc:73
msgid "Failed to write session file"
msgstr "Échec lors de l'écriture du fichier de session"
-#: sbuild/sbuild-chroot.cc:470
+#: sbuild/sbuild-chroot.cc:473
msgid "Name"
msgstr "Nom"
-#: sbuild/sbuild-chroot.cc:471
+#: sbuild/sbuild-chroot.cc:474
msgid "Description"
msgstr "Description"
-#: sbuild/sbuild-chroot.cc:472
+#: sbuild/sbuild-chroot.cc:475
msgid "Type"
msgstr "Type"
-#: sbuild/sbuild-chroot.cc:473
+#: sbuild/sbuild-chroot.cc:476
msgid "Priority"
msgstr "Priorité"
-#: sbuild/sbuild-chroot.cc:474
+#: sbuild/sbuild-chroot.cc:477
msgid "Users"
msgstr "Utilisateurs"
-#: sbuild/sbuild-chroot.cc:475
+#: sbuild/sbuild-chroot.cc:478
msgid "Groups"
msgstr "Groupes"
-#: sbuild/sbuild-chroot.cc:476
+#: sbuild/sbuild-chroot.cc:479
msgid "Root Users"
msgstr "Utilisateurs root"
-#: sbuild/sbuild-chroot.cc:477
+#: sbuild/sbuild-chroot.cc:480
msgid "Root Groups"
msgstr "Groupes root"
-#: sbuild/sbuild-chroot.cc:478
+#: sbuild/sbuild-chroot.cc:481
msgid "Aliases"
msgstr "Alias"
-#: sbuild/sbuild-chroot.cc:479
+#: sbuild/sbuild-chroot.cc:482
msgid "Environment Filter"
msgstr "Filtre d'environnement"
-#: sbuild/sbuild-chroot.cc:480
+#: sbuild/sbuild-chroot.cc:483
msgid "Run Setup Scripts"
msgstr "Exécuter les scripts de configuration (« Setup Scripts »)"
-#: sbuild/sbuild-chroot.cc:481
+#: sbuild/sbuild-chroot.cc:484
msgid "Run Execution Scripts"
msgstr "Exécuter les scripts d'exécution (« Execution Scripts »)"
-#: sbuild/sbuild-chroot.cc:482
+#: sbuild/sbuild-chroot.cc:485
msgid "Script Configuration"
msgstr "Script de configuration"
-#: sbuild/sbuild-chroot.cc:483
+#: sbuild/sbuild-chroot.cc:486
msgid "Session Managed"
msgstr "Session gérée (« Session Managed »)"
-#: sbuild/sbuild-chroot.cc:485
+#: sbuild/sbuild-chroot.cc:488
msgid "Session Cloned"
msgstr "Session clonée (« Session Cloned »)"
-#: sbuild/sbuild-chroot.cc:487
+#: sbuild/sbuild-chroot.cc:490
msgid "Session Purged"
msgstr "Session nettoyée (« Session Purged »)"
-#: sbuild/sbuild-chroot.cc:491
+#: sbuild/sbuild-chroot.cc:494
msgid "Command Prefix"
msgstr "Préfixe des commandes"
#. TRANSLATORS: "Personality" is the Linux kernel personality
#. (process execution domain). See schroot.conf(5).
-#: sbuild/sbuild-chroot.cc:495
+#: sbuild/sbuild-chroot.cc:498
msgid "Personality"
msgstr "Personnalité"
-#: sbuild/sbuild-chroot.cc:499
+#: sbuild/sbuild-chroot.cc:502
msgid "Location"
msgstr "Emplacement"
-#: sbuild/sbuild-chroot.cc:501
+#: sbuild/sbuild-chroot.cc:504
msgid "Mount Location"
msgstr "Point de montage"
-#: sbuild/sbuild-chroot.cc:503
+#: sbuild/sbuild-chroot.cc:506
msgid "Path"
msgstr "Chemin"
#. TRANSLATORS: The system device node to mount containing the chroot
-#: sbuild/sbuild-chroot.cc:506
+#: sbuild/sbuild-chroot.cc:509
msgid "Mount Device"
msgstr "Périphérique à monter"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Session"
msgstr "Session"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Chroot"
msgstr "Chroot"
@@ -558,14 +558,10 @@ msgstr "Fichier"
msgid "File Repack"
msgstr "Ré-archivage dans un fichier (« Repack »)"
-#: sbuild/sbuild-chroot-block-device.cc:174
+#: sbuild/sbuild-chroot-block-device.cc:160
msgid "Device"
msgstr "Périphérique"
-#: sbuild/sbuild-chroot-block-device.cc:176
-msgid "Mount Options"
-msgstr "Options de montage"
-
#. TRANSLATORS: %1% = chroot alias name
#. TRANSLATORS: %4% = chroot name
#: sbuild/sbuild-chroot-config.cc:57
@@ -678,11 +674,11 @@ msgstr ""
"Échec lors du déverrouillage du périphérique (temporisation écoulée après %"
"4% secondes ; le verrou est toujours tenu par le PID %5%)"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:195
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:207
msgid "LVM Snapshot Device"
msgstr "Périphérique de cliché LVM"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:197
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:209
msgid "LVM Snapshot Options"
msgstr "Options pour les clichés LVM"
@@ -850,23 +846,23 @@ msgstr "Échec lors de l'exécution de « stat » sur le fichier"
msgid "Failed to stat file descriptor"
msgstr "Échec lors de l'exécution de « stat » sur le descripteur de fichier"
-#: sbuild/sbuild-chroot-source.cc:51
+#: sbuild/sbuild-chroot-source.cc:50
msgid "(source chroot)"
msgstr "(chroot source)"
-#: sbuild/sbuild-chroot-source.cc:142
+#: sbuild/sbuild-chroot-source.cc:141
msgid "Source Users"
msgstr "Utilisateurs des sources"
-#: sbuild/sbuild-chroot-source.cc:143
+#: sbuild/sbuild-chroot-source.cc:142
msgid "Source Groups"
msgstr "Groupes des sources"
-#: sbuild/sbuild-chroot-source.cc:144
+#: sbuild/sbuild-chroot-source.cc:143
msgid "Source Root Users"
msgstr "Utilisateurs superutilisateurs des sources"
-#: sbuild/sbuild-chroot-source.cc:145
+#: sbuild/sbuild-chroot-source.cc:144
msgid "Source Root Groups"
msgstr "Groupes superutilisateurs des sources"
@@ -1484,3 +1480,6 @@ msgstr "Faire une simulation des actions à effectuer"
#: bin/schroot-mount/schroot-mount-options.cc:67
msgid "fstab file to read (full path)"
msgstr "Fichier fstab à lire (chemin complet)"
+
+#~ msgid "Mount Options"
+#~ msgstr "Options de montage"
diff --git a/po/pt.po b/po/pt.po
index 9e5da676..1c1a030e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: schroot 1.1.6-1\n"
"Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2008-05-04 16:46+0100\n"
+"POT-Creation-Date: 2008-07-05 10:10+0100\n"
"PO-Revision-Date: 2008-05-04 23:00+0100\n"
"Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -18,170 +18,170 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: sbuild/sbuild-chroot.cc:55
+#: sbuild/sbuild-chroot.cc:56
msgid "Chroot creation failed"
msgstr "Falhou a criação da chroot"
-#: sbuild/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:57
msgid "Device name not set"
msgstr "Nome de dispositivo em falta"
#. TRANSLATORS: %1% = chroot type name
-#: sbuild/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:59
#, boost-format
msgid "Unknown chroot type '%1%'"
msgstr "Tipo de chroot '%1%' desconhecido"
-#: sbuild/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:60
msgid "Device must have an absolute path"
msgstr "O dispositivo tem que ter um caminho absoluto"
-#: sbuild/sbuild-chroot.cc:60 sbuild/sbuild-lock.cc:57
+#: sbuild/sbuild-chroot.cc:61 sbuild/sbuild-lock.cc:57
msgid "Failed to lock device"
msgstr "Falhou o bloqueio do dispositivo"
-#: sbuild/sbuild-chroot.cc:61 bin/csbuild/csbuild-main.cc:52
+#: sbuild/sbuild-chroot.cc:62 bin/csbuild/csbuild-main.cc:52
#: bin/schroot-releaselock/schroot-releaselock-main.cc:54
msgid "File is not a block device"
msgstr "O ficheiro não é um dispositivo de blocos"
-#: sbuild/sbuild-chroot.cc:62 sbuild/sbuild-lock.cc:62
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-lock.cc:62
msgid "Failed to unlock device"
msgstr "Falhou desbloquear o dispositivo"
-#: sbuild/sbuild-chroot.cc:63
+#: sbuild/sbuild-chroot.cc:64
msgid "File must have an absolute path"
msgstr "O ficheiro tem que ter um caminho absoluto"
-#: sbuild/sbuild-chroot.cc:64
+#: sbuild/sbuild-chroot.cc:65
msgid "Failed to acquire file lock"
msgstr "Falhou a aquisição de bloqueio do ficheiro"
-#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:61
msgid "File is not a regular file"
msgstr "O ficheiro não é um ficheiro regular"
-#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:63
+#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:63
msgid "File is not owned by user root"
msgstr "O ficheiro não pertence ao utilizador root"
-#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:64
+#: sbuild/sbuild-chroot.cc:68 sbuild/sbuild-chroot-config.cc:64
msgid "File has write permissions for others"
msgstr "O ficheiro tem permissões de escrita para outros"
-#: sbuild/sbuild-chroot.cc:68
+#: sbuild/sbuild-chroot.cc:69
msgid "Failed to discard file lock"
msgstr "Falhou a libertação do bloqueio do ficheiro"
-#: sbuild/sbuild-chroot.cc:69
+#: sbuild/sbuild-chroot.cc:70
msgid "Location must have an absolute path"
msgstr "A localização tem que ter um caminho absoluto"
#. TRANSLATORS: unlink refers to the C function which removes a file
-#: sbuild/sbuild-chroot.cc:71
+#: sbuild/sbuild-chroot.cc:72
msgid "Failed to unlink session file"
msgstr "Falhou a remoção do ficheiro de sessão"
-#: sbuild/sbuild-chroot.cc:72
+#: sbuild/sbuild-chroot.cc:73
msgid "Failed to write session file"
msgstr "Falhou a escrita do ficheiro de sessão"
-#: sbuild/sbuild-chroot.cc:470
+#: sbuild/sbuild-chroot.cc:473
msgid "Name"
msgstr "Nome"
-#: sbuild/sbuild-chroot.cc:471
+#: sbuild/sbuild-chroot.cc:474
msgid "Description"
msgstr "Descrição"
-#: sbuild/sbuild-chroot.cc:472
+#: sbuild/sbuild-chroot.cc:475
msgid "Type"
msgstr "Tipo"
-#: sbuild/sbuild-chroot.cc:473
+#: sbuild/sbuild-chroot.cc:476
msgid "Priority"
msgstr "Prioridade"
-#: sbuild/sbuild-chroot.cc:474
+#: sbuild/sbuild-chroot.cc:477
msgid "Users"
msgstr "Utilizadores"
-#: sbuild/sbuild-chroot.cc:475
+#: sbuild/sbuild-chroot.cc:478
msgid "Groups"
msgstr "Grupos"
-#: sbuild/sbuild-chroot.cc:476
+#: sbuild/sbuild-chroot.cc:479
msgid "Root Users"
msgstr "Utilizadores Root"
-#: sbuild/sbuild-chroot.cc:477
+#: sbuild/sbuild-chroot.cc:480
msgid "Root Groups"
msgstr "Grupos Root"
-#: sbuild/sbuild-chroot.cc:478
+#: sbuild/sbuild-chroot.cc:481
msgid "Aliases"
msgstr "Aliases"
-#: sbuild/sbuild-chroot.cc:479
+#: sbuild/sbuild-chroot.cc:482
msgid "Environment Filter"
msgstr "Filtro de Ambiente"
-#: sbuild/sbuild-chroot.cc:480
+#: sbuild/sbuild-chroot.cc:483
msgid "Run Setup Scripts"
msgstr "Correr Scripts de Configuração"
-#: sbuild/sbuild-chroot.cc:481
+#: sbuild/sbuild-chroot.cc:484
msgid "Run Execution Scripts"
msgstr "Correr Scripts de Execução"
-#: sbuild/sbuild-chroot.cc:482
+#: sbuild/sbuild-chroot.cc:485
msgid "Script Configuration"
msgstr "Configuração de Scripts"
-#: sbuild/sbuild-chroot.cc:483
+#: sbuild/sbuild-chroot.cc:486
msgid "Session Managed"
msgstr "Sessão Gerida"
-#: sbuild/sbuild-chroot.cc:485
+#: sbuild/sbuild-chroot.cc:488
msgid "Session Cloned"
msgstr "Sessão Clonada"
-#: sbuild/sbuild-chroot.cc:487
+#: sbuild/sbuild-chroot.cc:490
msgid "Session Purged"
msgstr "Sessão Purgada"
-#: sbuild/sbuild-chroot.cc:491
+#: sbuild/sbuild-chroot.cc:494
msgid "Command Prefix"
msgstr "Prefixo de Comando"
#. TRANSLATORS: "Personality" is the Linux kernel personality
#. (process execution domain). See schroot.conf(5).
-#: sbuild/sbuild-chroot.cc:495
+#: sbuild/sbuild-chroot.cc:498
msgid "Personality"
msgstr "Personalidade"
-#: sbuild/sbuild-chroot.cc:499
+#: sbuild/sbuild-chroot.cc:502
msgid "Location"
msgstr "Localização"
-#: sbuild/sbuild-chroot.cc:501
+#: sbuild/sbuild-chroot.cc:504
msgid "Mount Location"
msgstr "Localização do Ponto de Montagem"
-#: sbuild/sbuild-chroot.cc:503
+#: sbuild/sbuild-chroot.cc:506
msgid "Path"
msgstr "Caminho"
#. TRANSLATORS: The system device node to mount containing the chroot
-#: sbuild/sbuild-chroot.cc:506
+#: sbuild/sbuild-chroot.cc:509
msgid "Mount Device"
msgstr "Dispositivo a Montar"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Session"
msgstr "Sessão"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Chroot"
msgstr "Chroot"
@@ -555,14 +555,10 @@ msgstr "Ficheiro"
msgid "File Repack"
msgstr "Re-empacotamento do Ficheiro"
-#: sbuild/sbuild-chroot-block-device.cc:174
+#: sbuild/sbuild-chroot-block-device.cc:160
msgid "Device"
msgstr "Dispositivo"
-#: sbuild/sbuild-chroot-block-device.cc:176
-msgid "Mount Options"
-msgstr "Opções de Montagem"
-
#. TRANSLATORS: %1% = chroot alias name
#. TRANSLATORS: %4% = chroot name
#: sbuild/sbuild-chroot-config.cc:57
@@ -671,11 +667,11 @@ msgstr ""
"Falhou o desbloqueio do dispositivo (acabou o tempo após %4% segundos; "
"bloqueado pelo PID %5%)"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:195
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:207
msgid "LVM Snapshot Device"
msgstr "Dispositivo de Snapshot LVM"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:197
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:209
msgid "LVM Snapshot Options"
msgstr "Opções de Snapshot LVM"
@@ -842,23 +838,23 @@ msgstr "Falhou o 'stat' ao ficheiro"
msgid "Failed to stat file descriptor"
msgstr "Falhou a obtenção do estado do descriptor de ficheiro"
-#: sbuild/sbuild-chroot-source.cc:51
+#: sbuild/sbuild-chroot-source.cc:50
msgid "(source chroot)"
msgstr "(chroot de origem)"
-#: sbuild/sbuild-chroot-source.cc:142
+#: sbuild/sbuild-chroot-source.cc:141
msgid "Source Users"
msgstr "Utilizadores na Origem"
-#: sbuild/sbuild-chroot-source.cc:143
+#: sbuild/sbuild-chroot-source.cc:142
msgid "Source Groups"
msgstr "Grupos na Origem"
-#: sbuild/sbuild-chroot-source.cc:144
+#: sbuild/sbuild-chroot-source.cc:143
msgid "Source Root Users"
msgstr "Utilizadores Root na Origem"
-#: sbuild/sbuild-chroot-source.cc:145
+#: sbuild/sbuild-chroot-source.cc:144
msgid "Source Root Groups"
msgstr "Grupos Root na Origem"
@@ -1464,5 +1460,8 @@ msgstr "Fazer uma simulação das acções a efectuar"
msgid "fstab file to read (full path)"
msgstr "ficheiro fstab a ler (caminho completo)"
+#~ msgid "Mount Options"
+#~ msgstr "Opções de Montagem"
+
#~ msgid "The CTTY FD_CLOEXEC flag could not be set"
#~ msgstr "A flag CTTY FD_CLOEXEC não pôde ser definida"
diff --git a/po/schroot.pot b/po/schroot.pot
index 0da7a154..cc736e12 100644
--- a/po/schroot.pot
+++ b/po/schroot.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2008-05-04 16:46+0100\n"
+"POT-Creation-Date: 2008-07-05 10:10+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,170 +16,170 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: sbuild/sbuild-chroot.cc:55
+#: sbuild/sbuild-chroot.cc:56
msgid "Chroot creation failed"
msgstr ""
-#: sbuild/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:57
msgid "Device name not set"
msgstr ""
#. TRANSLATORS: %1% = chroot type name
-#: sbuild/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:59
#, boost-format
msgid "Unknown chroot type '%1%'"
msgstr ""
-#: sbuild/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:60
msgid "Device must have an absolute path"
msgstr ""
-#: sbuild/sbuild-chroot.cc:60 sbuild/sbuild-lock.cc:57
+#: sbuild/sbuild-chroot.cc:61 sbuild/sbuild-lock.cc:57
msgid "Failed to lock device"
msgstr ""
-#: sbuild/sbuild-chroot.cc:61 bin/csbuild/csbuild-main.cc:52
+#: sbuild/sbuild-chroot.cc:62 bin/csbuild/csbuild-main.cc:52
#: bin/schroot-releaselock/schroot-releaselock-main.cc:54
msgid "File is not a block device"
msgstr ""
-#: sbuild/sbuild-chroot.cc:62 sbuild/sbuild-lock.cc:62
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-lock.cc:62
msgid "Failed to unlock device"
msgstr ""
-#: sbuild/sbuild-chroot.cc:63
+#: sbuild/sbuild-chroot.cc:64
msgid "File must have an absolute path"
msgstr ""
-#: sbuild/sbuild-chroot.cc:64
+#: sbuild/sbuild-chroot.cc:65
msgid "Failed to acquire file lock"
msgstr ""
-#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:61
msgid "File is not a regular file"
msgstr ""
-#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:63
+#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:63
msgid "File is not owned by user root"
msgstr ""
-#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:64
+#: sbuild/sbuild-chroot.cc:68 sbuild/sbuild-chroot-config.cc:64
msgid "File has write permissions for others"
msgstr ""
-#: sbuild/sbuild-chroot.cc:68
+#: sbuild/sbuild-chroot.cc:69
msgid "Failed to discard file lock"
msgstr ""
-#: sbuild/sbuild-chroot.cc:69
+#: sbuild/sbuild-chroot.cc:70
msgid "Location must have an absolute path"
msgstr ""
#. TRANSLATORS: unlink refers to the C function which removes a file
-#: sbuild/sbuild-chroot.cc:71
+#: sbuild/sbuild-chroot.cc:72
msgid "Failed to unlink session file"
msgstr ""
-#: sbuild/sbuild-chroot.cc:72
+#: sbuild/sbuild-chroot.cc:73
msgid "Failed to write session file"
msgstr ""
-#: sbuild/sbuild-chroot.cc:470
+#: sbuild/sbuild-chroot.cc:473
msgid "Name"
msgstr ""
-#: sbuild/sbuild-chroot.cc:471
+#: sbuild/sbuild-chroot.cc:474
msgid "Description"
msgstr ""
-#: sbuild/sbuild-chroot.cc:472
+#: sbuild/sbuild-chroot.cc:475
msgid "Type"
msgstr ""
-#: sbuild/sbuild-chroot.cc:473
+#: sbuild/sbuild-chroot.cc:476
msgid "Priority"
msgstr ""
-#: sbuild/sbuild-chroot.cc:474
+#: sbuild/sbuild-chroot.cc:477
msgid "Users"
msgstr ""
-#: sbuild/sbuild-chroot.cc:475
+#: sbuild/sbuild-chroot.cc:478
msgid "Groups"
msgstr ""
-#: sbuild/sbuild-chroot.cc:476
+#: sbuild/sbuild-chroot.cc:479
msgid "Root Users"
msgstr ""
-#: sbuild/sbuild-chroot.cc:477
+#: sbuild/sbuild-chroot.cc:480
msgid "Root Groups"
msgstr ""
-#: sbuild/sbuild-chroot.cc:478
+#: sbuild/sbuild-chroot.cc:481
msgid "Aliases"
msgstr ""
-#: sbuild/sbuild-chroot.cc:479
+#: sbuild/sbuild-chroot.cc:482
msgid "Environment Filter"
msgstr ""
-#: sbuild/sbuild-chroot.cc:480
+#: sbuild/sbuild-chroot.cc:483
msgid "Run Setup Scripts"
msgstr ""
-#: sbuild/sbuild-chroot.cc:481
+#: sbuild/sbuild-chroot.cc:484
msgid "Run Execution Scripts"
msgstr ""
-#: sbuild/sbuild-chroot.cc:482
+#: sbuild/sbuild-chroot.cc:485
msgid "Script Configuration"
msgstr ""
-#: sbuild/sbuild-chroot.cc:483
+#: sbuild/sbuild-chroot.cc:486
msgid "Session Managed"
msgstr ""
-#: sbuild/sbuild-chroot.cc:485
+#: sbuild/sbuild-chroot.cc:488
msgid "Session Cloned"
msgstr ""
-#: sbuild/sbuild-chroot.cc:487
+#: sbuild/sbuild-chroot.cc:490
msgid "Session Purged"
msgstr ""
-#: sbuild/sbuild-chroot.cc:491
+#: sbuild/sbuild-chroot.cc:494
msgid "Command Prefix"
msgstr ""
#. TRANSLATORS: "Personality" is the Linux kernel personality
#. (process execution domain). See schroot.conf(5).
-#: sbuild/sbuild-chroot.cc:495
+#: sbuild/sbuild-chroot.cc:498
msgid "Personality"
msgstr ""
-#: sbuild/sbuild-chroot.cc:499
+#: sbuild/sbuild-chroot.cc:502
msgid "Location"
msgstr ""
-#: sbuild/sbuild-chroot.cc:501
+#: sbuild/sbuild-chroot.cc:504
msgid "Mount Location"
msgstr ""
-#: sbuild/sbuild-chroot.cc:503
+#: sbuild/sbuild-chroot.cc:506
msgid "Path"
msgstr ""
#. TRANSLATORS: The system device node to mount containing the chroot
-#: sbuild/sbuild-chroot.cc:506
+#: sbuild/sbuild-chroot.cc:509
msgid "Mount Device"
msgstr ""
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Session"
msgstr ""
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Chroot"
msgstr ""
@@ -548,14 +548,10 @@ msgstr ""
msgid "File Repack"
msgstr ""
-#: sbuild/sbuild-chroot-block-device.cc:174
+#: sbuild/sbuild-chroot-block-device.cc:160
msgid "Device"
msgstr ""
-#: sbuild/sbuild-chroot-block-device.cc:176
-msgid "Mount Options"
-msgstr ""
-
#. TRANSLATORS: %1% = chroot alias name
#. TRANSLATORS: %4% = chroot name
#: sbuild/sbuild-chroot-config.cc:57
@@ -660,11 +656,11 @@ msgid ""
"Failed to unlock device (timed out after %4% seconds; lock held by PID %5%)"
msgstr ""
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:195
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:207
msgid "LVM Snapshot Device"
msgstr ""
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:197
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:209
msgid "LVM Snapshot Options"
msgstr ""
@@ -831,23 +827,23 @@ msgstr ""
msgid "Failed to stat file descriptor"
msgstr ""
-#: sbuild/sbuild-chroot-source.cc:51
+#: sbuild/sbuild-chroot-source.cc:50
msgid "(source chroot)"
msgstr ""
-#: sbuild/sbuild-chroot-source.cc:142
+#: sbuild/sbuild-chroot-source.cc:141
msgid "Source Users"
msgstr ""
-#: sbuild/sbuild-chroot-source.cc:143
+#: sbuild/sbuild-chroot-source.cc:142
msgid "Source Groups"
msgstr ""
-#: sbuild/sbuild-chroot-source.cc:144
+#: sbuild/sbuild-chroot-source.cc:143
msgid "Source Root Users"
msgstr ""
-#: sbuild/sbuild-chroot-source.cc:145
+#: sbuild/sbuild-chroot-source.cc:144
msgid "Source Root Groups"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 50310773..72a2422d 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: 2008-05-04 16:46+0100\n"
+"POT-Creation-Date: 2008-07-05 10:10+0100\n"
"PO-Revision-Date: 2008-05-04 23:01+0100\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -15,173 +15,173 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: sbuild/sbuild-chroot.cc:55
+#: sbuild/sbuild-chroot.cc:56
msgid "Chroot creation failed"
msgstr "Skapandet av chroot misslyckades"
-#: sbuild/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:57
msgid "Device name not set"
msgstr "Enhetsnamnet är inte inställt"
#. TRANSLATORS: %1% = chroot type name
-#: sbuild/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:59
#, boost-format
msgid "Unknown chroot type '%1%'"
msgstr "Okänd chroot-typ \"%1%\""
-#: sbuild/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:60
msgid "Device must have an absolute path"
msgstr "Enheten måste ha en absolut sökväg"
-#: sbuild/sbuild-chroot.cc:60 sbuild/sbuild-lock.cc:57
+#: sbuild/sbuild-chroot.cc:61 sbuild/sbuild-lock.cc:57
msgid "Failed to lock device"
msgstr "Misslyckades med att låsa enheten"
-#: sbuild/sbuild-chroot.cc:61 bin/csbuild/csbuild-main.cc:52
+#: sbuild/sbuild-chroot.cc:62 bin/csbuild/csbuild-main.cc:52
#: bin/schroot-releaselock/schroot-releaselock-main.cc:54
msgid "File is not a block device"
msgstr "Filen är inte en blockenhet"
-#: sbuild/sbuild-chroot.cc:62 sbuild/sbuild-lock.cc:62
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-lock.cc:62
msgid "Failed to unlock device"
msgstr "Misslyckades med att låsa upp enheten"
-#: sbuild/sbuild-chroot.cc:63
+#: sbuild/sbuild-chroot.cc:64
msgid "File must have an absolute path"
msgstr "Filen måste ha en absolut sökväg"
-#: sbuild/sbuild-chroot.cc:64
+#: sbuild/sbuild-chroot.cc:65
msgid "Failed to acquire file lock"
msgstr "Misslyckades med att skaffa enhetslås"
-#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:61
msgid "File is not a regular file"
msgstr "Filen är inte en vanlig fil"
-#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:63
+#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:63
msgid "File is not owned by user root"
msgstr "Filen ägs inte av användaren root"
-#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:64
+#: sbuild/sbuild-chroot.cc:68 sbuild/sbuild-chroot-config.cc:64
msgid "File has write permissions for others"
msgstr "Filen har skrivrättigheter för andra"
-#: sbuild/sbuild-chroot.cc:68
+#: sbuild/sbuild-chroot.cc:69
msgid "Failed to discard file lock"
msgstr "Misslyckades med att kasta enhetslåset"
-#: sbuild/sbuild-chroot.cc:69
+#: sbuild/sbuild-chroot.cc:70
msgid "Location must have an absolute path"
msgstr "Platsen måste ha en absolut sökväg"
#. TRANSLATORS: unlink refers to the C function which removes a file
-#: sbuild/sbuild-chroot.cc:71
+#: sbuild/sbuild-chroot.cc:72
msgid "Failed to unlink session file"
msgstr "Misslyckades med att ta bort sessionsfilen"
-#: sbuild/sbuild-chroot.cc:72
+#: sbuild/sbuild-chroot.cc:73
msgid "Failed to write session file"
msgstr "Misslyckades med att skriva till sessionsfilen"
-#: sbuild/sbuild-chroot.cc:470
+#: sbuild/sbuild-chroot.cc:473
msgid "Name"
msgstr "Namn"
-#: sbuild/sbuild-chroot.cc:471
+#: sbuild/sbuild-chroot.cc:474
msgid "Description"
msgstr "Beskrivning"
-#: sbuild/sbuild-chroot.cc:472
+#: sbuild/sbuild-chroot.cc:475
msgid "Type"
msgstr "Typ"
-#: sbuild/sbuild-chroot.cc:473
+#: sbuild/sbuild-chroot.cc:476
msgid "Priority"
msgstr "Prioritet"
-#: sbuild/sbuild-chroot.cc:474
+#: sbuild/sbuild-chroot.cc:477
msgid "Users"
msgstr "Användare"
-#: sbuild/sbuild-chroot.cc:475
+#: sbuild/sbuild-chroot.cc:478
msgid "Groups"
msgstr "Grupper"
-#: sbuild/sbuild-chroot.cc:476
+#: sbuild/sbuild-chroot.cc:479
msgid "Root Users"
msgstr "Rootanvändare"
-#: sbuild/sbuild-chroot.cc:477
+#: sbuild/sbuild-chroot.cc:480
msgid "Root Groups"
msgstr "Rotgrupper"
-#: sbuild/sbuild-chroot.cc:478
+#: sbuild/sbuild-chroot.cc:481
msgid "Aliases"
msgstr "Alias"
-#: sbuild/sbuild-chroot.cc:479
+#: sbuild/sbuild-chroot.cc:482
msgid "Environment Filter"
msgstr ""
-#: sbuild/sbuild-chroot.cc:480
+#: sbuild/sbuild-chroot.cc:483
msgid "Run Setup Scripts"
msgstr "Kör konfigurationsskript"
# Borde det bli "Kör körskript"? Kaka på kaka?
-#: sbuild/sbuild-chroot.cc:481
+#: sbuild/sbuild-chroot.cc:484
msgid "Run Execution Scripts"
msgstr "Kör skript"
-#: sbuild/sbuild-chroot.cc:482
+#: sbuild/sbuild-chroot.cc:485
msgid "Script Configuration"
msgstr ""
-#: sbuild/sbuild-chroot.cc:483
+#: sbuild/sbuild-chroot.cc:486
msgid "Session Managed"
msgstr "Session hanterad"
-#: sbuild/sbuild-chroot.cc:485
+#: sbuild/sbuild-chroot.cc:488
#, fuzzy
msgid "Session Cloned"
msgstr "Session hanterad"
-#: sbuild/sbuild-chroot.cc:487
+#: sbuild/sbuild-chroot.cc:490
#, fuzzy
msgid "Session Purged"
msgstr "Session hanterad"
-#: sbuild/sbuild-chroot.cc:491
+#: sbuild/sbuild-chroot.cc:494
msgid "Command Prefix"
msgstr "Kommandoprefix"
#. TRANSLATORS: "Personality" is the Linux kernel personality
#. (process execution domain). See schroot.conf(5).
-#: sbuild/sbuild-chroot.cc:495
+#: sbuild/sbuild-chroot.cc:498
msgid "Personality"
msgstr "Personlighet"
-#: sbuild/sbuild-chroot.cc:499
+#: sbuild/sbuild-chroot.cc:502
msgid "Location"
msgstr "Plats"
-#: sbuild/sbuild-chroot.cc:501
+#: sbuild/sbuild-chroot.cc:504
msgid "Mount Location"
msgstr "Montera plats"
-#: sbuild/sbuild-chroot.cc:503
+#: sbuild/sbuild-chroot.cc:506
msgid "Path"
msgstr "Sökväg"
#. TRANSLATORS: The system device node to mount containing the chroot
-#: sbuild/sbuild-chroot.cc:506
+#: sbuild/sbuild-chroot.cc:509
msgid "Mount Device"
msgstr "Montera enhet"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Session"
msgstr "Session"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Chroot"
msgstr "Chroot"
@@ -553,14 +553,10 @@ msgstr "Fil"
msgid "File Repack"
msgstr "Filompackning"
-#: sbuild/sbuild-chroot-block-device.cc:174
+#: sbuild/sbuild-chroot-block-device.cc:160
msgid "Device"
msgstr "Enhet"
-#: sbuild/sbuild-chroot-block-device.cc:176
-msgid "Mount Options"
-msgstr "Monteringsflaggor"
-
#. TRANSLATORS: %1% = chroot alias name
#. TRANSLATORS: %4% = chroot name
#: sbuild/sbuild-chroot-config.cc:57
@@ -670,12 +666,12 @@ msgstr ""
"Misslyckades med att låsa upp enheten (tidsgränsen nådd efter %4% sekunder; "
"låset hålls av pid %5%)"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:195
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:207
msgid "LVM Snapshot Device"
msgstr "Enhet för LVM-snapshot"
# Finns det ett svenskt ord för snapshot?
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:197
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:209
msgid "LVM Snapshot Options"
msgstr "Flaggor för LVM-snapshot"
@@ -843,23 +839,23 @@ msgstr "Misslyckades med att läsa status på filen"
msgid "Failed to stat file descriptor"
msgstr "Misslyckades med att läsa status på filen"
-#: sbuild/sbuild-chroot-source.cc:51
+#: sbuild/sbuild-chroot-source.cc:50
msgid "(source chroot)"
msgstr "(käll-chroot)"
-#: sbuild/sbuild-chroot-source.cc:142
+#: sbuild/sbuild-chroot-source.cc:141
msgid "Source Users"
msgstr "Källanvändare"
-#: sbuild/sbuild-chroot-source.cc:143
+#: sbuild/sbuild-chroot-source.cc:142
msgid "Source Groups"
msgstr "Källgrupper"
-#: sbuild/sbuild-chroot-source.cc:144
+#: sbuild/sbuild-chroot-source.cc:143
msgid "Source Root Users"
msgstr "Källrootanvändare"
-#: sbuild/sbuild-chroot-source.cc:145
+#: sbuild/sbuild-chroot-source.cc:144
msgid "Source Root Groups"
msgstr "Källrotgrupper"
@@ -1474,6 +1470,9 @@ msgstr ""
msgid "fstab file to read (full path)"
msgstr "Monteringspunkt att kontrollera (fullständig sökväg)"
+#~ msgid "Mount Options"
+#~ msgstr "Monteringsflaggor"
+
#~ msgid "Failed to open '%1%'"
#~ msgstr "Misslyckades med att öppna \"%1%\""
diff --git a/po/vi.po b/po/vi.po
index 6aa407c9..838029df 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: schroot 1.2.0-1\n"
"Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2008-05-04 16:46+0100\n"
+"POT-Creation-Date: 2008-07-05 10:10+0100\n"
"PO-Revision-Date: 2008-05-06 22:30+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -16,171 +16,171 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: LocFactoryEditor 1.7b3\n"
-#: sbuild/sbuild-chroot.cc:55
+#: sbuild/sbuild-chroot.cc:56
msgid "Chroot creation failed"
msgstr "Lỗi tạo chroot"
-#: sbuild/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:57
msgid "Device name not set"
msgstr "Chưa đặt tên thiết bị"
#. TRANSLATORS: %1% = chroot type name
-#: sbuild/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:59
#, boost-format
msgid "Unknown chroot type '%1%'"
msgstr "Không rõ kiểu chroot « %1% »"
-#: sbuild/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:60
msgid "Device must have an absolute path"
msgstr "Thiết bị phải có đường dẫn tuyệt đối"
-#: sbuild/sbuild-chroot.cc:60 sbuild/sbuild-lock.cc:57
+#: sbuild/sbuild-chroot.cc:61 sbuild/sbuild-lock.cc:57
msgid "Failed to lock device"
msgstr "Lỗi khoá thiết bị"
-#: sbuild/sbuild-chroot.cc:61 bin/csbuild/csbuild-main.cc:52
+#: sbuild/sbuild-chroot.cc:62 bin/csbuild/csbuild-main.cc:52
#: bin/schroot-releaselock/schroot-releaselock-main.cc:54
msgid "File is not a block device"
msgstr "Tập tin không phải là thiết bị khối"
-#: sbuild/sbuild-chroot.cc:62 sbuild/sbuild-lock.cc:62
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-lock.cc:62
msgid "Failed to unlock device"
msgstr "Lỗi mở khoá thiết bị"
-#: sbuild/sbuild-chroot.cc:63
+#: sbuild/sbuild-chroot.cc:64
msgid "File must have an absolute path"
msgstr "Tập tin phải có đường dẫn tuyệt đối"
-#: sbuild/sbuild-chroot.cc:64
+#: sbuild/sbuild-chroot.cc:65
msgid "Failed to acquire file lock"
msgstr "Lỗi giành khoá tập tin"
-#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:61
msgid "File is not a regular file"
msgstr "Tập tin không phải là tập tin chuẩn"
-#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:63
+#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:63
msgid "File is not owned by user root"
msgstr "Người dùng chủ không sở hữu tập tin này"
-#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:64
+#: sbuild/sbuild-chroot.cc:68 sbuild/sbuild-chroot-config.cc:64
msgid "File has write permissions for others"
msgstr "Người khác có quyền ghi tập tin này"
-#: sbuild/sbuild-chroot.cc:68
+#: sbuild/sbuild-chroot.cc:69
msgid "Failed to discard file lock"
msgstr "Lỗi hủy khoá tập tin"
-#: sbuild/sbuild-chroot.cc:69
+#: sbuild/sbuild-chroot.cc:70
msgid "Location must have an absolute path"
msgstr "Vị trí phải có đường dẫn tuyệt đối"
#. TRANSLATORS: unlink refers to the C function which removes a file
-#: sbuild/sbuild-chroot.cc:71
+#: sbuild/sbuild-chroot.cc:72
msgid "Failed to unlink session file"
msgstr "Lỗi bỏ liên kết tập tin phiên chạy"
-#: sbuild/sbuild-chroot.cc:72
+#: sbuild/sbuild-chroot.cc:73
msgid "Failed to write session file"
msgstr "Lỗi ghi tập tin phiên chạy"
-#: sbuild/sbuild-chroot.cc:470
+#: sbuild/sbuild-chroot.cc:473
msgid "Name"
msgstr "Tên"
-#: sbuild/sbuild-chroot.cc:471
+#: sbuild/sbuild-chroot.cc:474
msgid "Description"
msgstr "Mô tả"
-#: sbuild/sbuild-chroot.cc:472
+#: sbuild/sbuild-chroot.cc:475
msgid "Type"
msgstr "Kiểu"
-#: sbuild/sbuild-chroot.cc:473
+#: sbuild/sbuild-chroot.cc:476
msgid "Priority"
msgstr "Ưu tiên"
-#: sbuild/sbuild-chroot.cc:474
+#: sbuild/sbuild-chroot.cc:477
msgid "Users"
msgstr "Người dùng"
-#: sbuild/sbuild-chroot.cc:475
+#: sbuild/sbuild-chroot.cc:478
msgid "Groups"
msgstr "Nhóm"
-#: sbuild/sbuild-chroot.cc:476
+#: sbuild/sbuild-chroot.cc:479
msgid "Root Users"
msgstr "Người dùng chủ"
-#: sbuild/sbuild-chroot.cc:477
+#: sbuild/sbuild-chroot.cc:480
msgid "Root Groups"
msgstr "Nhóm chủ"
-#: sbuild/sbuild-chroot.cc:478
+#: sbuild/sbuild-chroot.cc:481
msgid "Aliases"
msgstr "Bí danh"
-#: sbuild/sbuild-chroot.cc:479
+#: sbuild/sbuild-chroot.cc:482
msgid "Environment Filter"
msgstr "Lọc môi trường"
-#: sbuild/sbuild-chroot.cc:480
+#: sbuild/sbuild-chroot.cc:483
msgid "Run Setup Scripts"
msgstr "Chạy các văn lệnh thiết lập"
-#: sbuild/sbuild-chroot.cc:481
+#: sbuild/sbuild-chroot.cc:484
msgid "Run Execution Scripts"
msgstr "Chạy các văn lệnh thực hiện"
-#: sbuild/sbuild-chroot.cc:482
+#: sbuild/sbuild-chroot.cc:485
msgid "Script Configuration"
msgstr "Cấu hình Văn lệnh"
-#: sbuild/sbuild-chroot.cc:483
+#: sbuild/sbuild-chroot.cc:486
msgid "Session Managed"
msgstr "Phiên chạy đã quản lý"
-#: sbuild/sbuild-chroot.cc:485
+#: sbuild/sbuild-chroot.cc:488
msgid "Session Cloned"
msgstr "Phiên chạy đã nhân đôi"
-#: sbuild/sbuild-chroot.cc:487
+#: sbuild/sbuild-chroot.cc:490
msgid "Session Purged"
msgstr "Phiên chạy bị tẩy"
-#: sbuild/sbuild-chroot.cc:491
+#: sbuild/sbuild-chroot.cc:494
msgid "Command Prefix"
msgstr "Tiền tố lệnh"
#. TRANSLATORS: "Personality" is the Linux kernel personality
#. (process execution domain). See schroot.conf(5).
-#: sbuild/sbuild-chroot.cc:495
+#: sbuild/sbuild-chroot.cc:498
msgid "Personality"
msgstr "Cá tính"
-#: sbuild/sbuild-chroot.cc:499
+#: sbuild/sbuild-chroot.cc:502
msgid "Location"
msgstr "Vị trí"
-#: sbuild/sbuild-chroot.cc:501
+#: sbuild/sbuild-chroot.cc:504
msgid "Mount Location"
msgstr "Vị trí lắp"
-#: sbuild/sbuild-chroot.cc:503
+#: sbuild/sbuild-chroot.cc:506
msgid "Path"
msgstr "Đường dẫn"
#. TRANSLATORS: The system device node to mount containing the chroot
-#: sbuild/sbuild-chroot.cc:506
+#: sbuild/sbuild-chroot.cc:509
msgid "Mount Device"
msgstr "Thiết bị lắp"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Session"
msgstr "Phiên chạy"
# Literal: don't translate / Nghĩa chữ: đừng dịch
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Chroot"
msgstr "Chroot"
@@ -554,14 +554,10 @@ msgstr "Tập tin"
msgid "File Repack"
msgstr "Nén lại tập tin"
-#: sbuild/sbuild-chroot-block-device.cc:174
+#: sbuild/sbuild-chroot-block-device.cc:160
msgid "Device"
msgstr "Thiết bị"
-#: sbuild/sbuild-chroot-block-device.cc:176
-msgid "Mount Options"
-msgstr "Tùy chọn lắp"
-
#. TRANSLATORS: %1% = chroot alias name
#. TRANSLATORS: %4% = chroot name
#: sbuild/sbuild-chroot-config.cc:57
@@ -666,11 +662,11 @@ msgid ""
"Failed to unlock device (timed out after %4% seconds; lock held by PID %5%)"
msgstr "Lỗi mở khoá thiết bị (quá hạn sau %4% giây; khoá được giữ bởi PID %5%)"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:195
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:207
msgid "LVM Snapshot Device"
msgstr "Thiết bị hiện trạng Bộ Quản lý Khối tin Hợp lý"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:197
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:209
msgid "LVM Snapshot Options"
msgstr "Tùy chọn hiện trạng Bộ Quản lý Khối tin Hợp lý"
@@ -837,23 +833,23 @@ msgstr "Lỗi lấy trạng thái về tập tin này"
msgid "Failed to stat file descriptor"
msgstr "Lỗi lấy trạng thái về bộ mô tả tập tin"
-#: sbuild/sbuild-chroot-source.cc:51
+#: sbuild/sbuild-chroot-source.cc:50
msgid "(source chroot)"
msgstr "(chroot nguồn)"
-#: sbuild/sbuild-chroot-source.cc:142
+#: sbuild/sbuild-chroot-source.cc:141
msgid "Source Users"
msgstr "Người dùng nguồn"
-#: sbuild/sbuild-chroot-source.cc:143
+#: sbuild/sbuild-chroot-source.cc:142
msgid "Source Groups"
msgstr "Nhóm nguồn"
-#: sbuild/sbuild-chroot-source.cc:144
+#: sbuild/sbuild-chroot-source.cc:143
msgid "Source Root Users"
msgstr "Người dùng chủ nguồn"
-#: sbuild/sbuild-chroot-source.cc:145
+#: sbuild/sbuild-chroot-source.cc:144
msgid "Source Root Groups"
msgstr "Nhóm chủ nguồn"
@@ -1460,3 +1456,6 @@ msgstr "Mô phỏng các hành động cần làm"
#: bin/schroot-mount/schroot-mount-options.cc:67
msgid "fstab file to read (full path)"
msgstr "Tập tin fstab cần đọc (đường dẫn đầy đủ)"
+
+#~ msgid "Mount Options"
+#~ msgstr "Tùy chọn lắp"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d53b6dd2..c2b1de84 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: schroot VERSION\n"
"Report-Msgid-Bugs-To: Roger Leigh <rleigh@debian.org>\n"
-"POT-Creation-Date: 2008-05-04 16:46+0100\n"
+"POT-Creation-Date: 2008-07-05 10:10+0100\n"
"PO-Revision-Date: 2008-05-19 11:02+0800\n"
"Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
"Language-Team: Chinese\n"
@@ -15,170 +15,170 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: sbuild/sbuild-chroot.cc:55
+#: sbuild/sbuild-chroot.cc:56
msgid "Chroot creation failed"
msgstr "创建 chroot 环境失败"
-#: sbuild/sbuild-chroot.cc:56
+#: sbuild/sbuild-chroot.cc:57
msgid "Device name not set"
msgstr "未设置设备名"
#. TRANSLATORS: %1% = chroot type name
-#: sbuild/sbuild-chroot.cc:58
+#: sbuild/sbuild-chroot.cc:59
#, boost-format
msgid "Unknown chroot type '%1%'"
msgstr "未知的 chroot 类型 ‘%1%’"
-#: sbuild/sbuild-chroot.cc:59
+#: sbuild/sbuild-chroot.cc:60
msgid "Device must have an absolute path"
msgstr "设备名必须带上绝对路径"
-#: sbuild/sbuild-chroot.cc:60 sbuild/sbuild-lock.cc:57
+#: sbuild/sbuild-chroot.cc:61 sbuild/sbuild-lock.cc:57
msgid "Failed to lock device"
msgstr "无法锁定设备"
-#: sbuild/sbuild-chroot.cc:61 bin/csbuild/csbuild-main.cc:52
+#: sbuild/sbuild-chroot.cc:62 bin/csbuild/csbuild-main.cc:52
#: bin/schroot-releaselock/schroot-releaselock-main.cc:54
msgid "File is not a block device"
msgstr "文件不是一个块设备"
-#: sbuild/sbuild-chroot.cc:62 sbuild/sbuild-lock.cc:62
+#: sbuild/sbuild-chroot.cc:63 sbuild/sbuild-lock.cc:62
msgid "Failed to unlock device"
msgstr "无法解锁设备"
-#: sbuild/sbuild-chroot.cc:63
+#: sbuild/sbuild-chroot.cc:64
msgid "File must have an absolute path"
msgstr "文件名必须带上绝对路径"
-#: sbuild/sbuild-chroot.cc:64
+#: sbuild/sbuild-chroot.cc:65
msgid "Failed to acquire file lock"
msgstr "无法获取文件锁"
-#: sbuild/sbuild-chroot.cc:65 sbuild/sbuild-chroot-config.cc:61
+#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:61
msgid "File is not a regular file"
msgstr "文件不是普通文件"
-#: sbuild/sbuild-chroot.cc:66 sbuild/sbuild-chroot-config.cc:63
+#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:63
msgid "File is not owned by user root"
msgstr "文件所有者不是 root 用户"
-#: sbuild/sbuild-chroot.cc:67 sbuild/sbuild-chroot-config.cc:64
+#: sbuild/sbuild-chroot.cc:68 sbuild/sbuild-chroot-config.cc:64
msgid "File has write permissions for others"
msgstr "其他用户拥有文件写权"
-#: sbuild/sbuild-chroot.cc:68
+#: sbuild/sbuild-chroot.cc:69
msgid "Failed to discard file lock"
msgstr "无法释放文件锁"
-#: sbuild/sbuild-chroot.cc:69
+#: sbuild/sbuild-chroot.cc:70
msgid "Location must have an absolute path"
msgstr "位置必须带上绝对路径"
#. TRANSLATORS: unlink refers to the C function which removes a file
-#: sbuild/sbuild-chroot.cc:71
+#: sbuild/sbuild-chroot.cc:72
msgid "Failed to unlink session file"
msgstr "无法删除会话文件"
-#: sbuild/sbuild-chroot.cc:72
+#: sbuild/sbuild-chroot.cc:73
msgid "Failed to write session file"
msgstr "无法写会话文件"
-#: sbuild/sbuild-chroot.cc:470
+#: sbuild/sbuild-chroot.cc:473
msgid "Name"
msgstr "名字"
-#: sbuild/sbuild-chroot.cc:471
+#: sbuild/sbuild-chroot.cc:474
msgid "Description"
msgstr "描述"
-#: sbuild/sbuild-chroot.cc:472
+#: sbuild/sbuild-chroot.cc:475
msgid "Type"
msgstr "类型"
-#: sbuild/sbuild-chroot.cc:473
+#: sbuild/sbuild-chroot.cc:476
msgid "Priority"
msgstr "优先权"
-#: sbuild/sbuild-chroot.cc:474
+#: sbuild/sbuild-chroot.cc:477
msgid "Users"
msgstr "用户"
-#: sbuild/sbuild-chroot.cc:475
+#: sbuild/sbuild-chroot.cc:478
msgid "Groups"
msgstr "用户组"
-#: sbuild/sbuild-chroot.cc:476
+#: sbuild/sbuild-chroot.cc:479
msgid "Root Users"
msgstr "根用户"
-#: sbuild/sbuild-chroot.cc:477
+#: sbuild/sbuild-chroot.cc:480
msgid "Root Groups"
msgstr "根用户组"
-#: sbuild/sbuild-chroot.cc:478
+#: sbuild/sbuild-chroot.cc:481
msgid "Aliases"
msgstr "别名"
-#: sbuild/sbuild-chroot.cc:479
+#: sbuild/sbuild-chroot.cc:482
msgid "Environment Filter"
msgstr "环境变量过滤器"
-#: sbuild/sbuild-chroot.cc:480
+#: sbuild/sbuild-chroot.cc:483
msgid "Run Setup Scripts"
msgstr "运行安装脚本"
-#: sbuild/sbuild-chroot.cc:481
+#: sbuild/sbuild-chroot.cc:484
msgid "Run Execution Scripts"
msgstr "运行执行脚本"
-#: sbuild/sbuild-chroot.cc:482
+#: sbuild/sbuild-chroot.cc:485
msgid "Script Configuration"
msgstr "脚本配置"
-#: sbuild/sbuild-chroot.cc:483
+#: sbuild/sbuild-chroot.cc:486
msgid "Session Managed"
msgstr "受控的会话"
-#: sbuild/sbuild-chroot.cc:485
+#: sbuild/sbuild-chroot.cc:488
msgid "Session Cloned"
msgstr "克隆的会话"
-#: sbuild/sbuild-chroot.cc:487
+#: sbuild/sbuild-chroot.cc:490
msgid "Session Purged"
msgstr "删除的会话"
-#: sbuild/sbuild-chroot.cc:491
+#: sbuild/sbuild-chroot.cc:494
msgid "Command Prefix"
msgstr "命令前缀"
#. TRANSLATORS: "Personality" is the Linux kernel personality
#. (process execution domain). See schroot.conf(5).
-#: sbuild/sbuild-chroot.cc:495
+#: sbuild/sbuild-chroot.cc:498
msgid "Personality"
msgstr "进程私有空间"
-#: sbuild/sbuild-chroot.cc:499
+#: sbuild/sbuild-chroot.cc:502
msgid "Location"
msgstr "位置"
-#: sbuild/sbuild-chroot.cc:501
+#: sbuild/sbuild-chroot.cc:504
msgid "Mount Location"
msgstr "挂载点"
-#: sbuild/sbuild-chroot.cc:503
+#: sbuild/sbuild-chroot.cc:506
msgid "Path"
msgstr "路径"
#. TRANSLATORS: The system device node to mount containing the chroot
-#: sbuild/sbuild-chroot.cc:506
+#: sbuild/sbuild-chroot.cc:509
msgid "Mount Device"
msgstr "挂载设备"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Session"
msgstr "会话"
-#: sbuild/sbuild-chroot.cc:512
+#: sbuild/sbuild-chroot.cc:515
msgid "Chroot"
msgstr "Chroot"
@@ -381,8 +381,7 @@ msgstr "无法放弃根用户权限"
#, boost-format
msgid ""
"%1%: Chroot does not support setting a session ID; ignoring session ID '%4%'"
-msgstr ""
-"%1%: Chroot 不支持设置会话 ID;忽略会话 ID ‘%4%’"
+msgstr "%1%: Chroot 不支持设置会话 ID;忽略会话 ID ‘%4%’"
#. TRANSLATORS: %1% = command
#: sbuild/sbuild-session.cc:109
@@ -548,14 +547,10 @@ msgstr "文件"
msgid "File Repack"
msgstr "重打包文件"
-#: sbuild/sbuild-chroot-block-device.cc:174
+#: sbuild/sbuild-chroot-block-device.cc:160
msgid "Device"
msgstr "设备"
-#: sbuild/sbuild-chroot-block-device.cc:176
-msgid "Mount Options"
-msgstr "挂载选项"
-
#. TRANSLATORS: %1% = chroot alias name
#. TRANSLATORS: %4% = chroot name
#: sbuild/sbuild-chroot-config.cc:57
@@ -646,8 +641,7 @@ msgstr "无法解锁文件( %4% 秒后超时)"
#, boost-format
msgid ""
"Failed to lock device (timed out after %4% seconds; lock held by PID %5%)"
-msgstr ""
-"无法锁定设备( %4% 秒后超时;进程号为 %5% 的程序拥有此锁定)"
+msgstr "无法锁定设备( %4% 秒后超时;进程号为 %5% 的程序拥有此锁定)"
#: sbuild/sbuild-lock.cc:61
msgid "Failed to test device lock"
@@ -659,14 +653,13 @@ msgstr "无法测试设备锁"
#, boost-format
msgid ""
"Failed to unlock device (timed out after %4% seconds; lock held by PID %5%)"
-msgstr ""
-"无法解锁设备( %4% 秒后超时;进程号为 %5% 的程序拥有此锁定)"
+msgstr "无法解锁设备( %4% 秒后超时;进程号为 %5% 的程序拥有此锁定)"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:195
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:207
msgid "LVM Snapshot Device"
msgstr "LVM 快照设备"
-#: sbuild/sbuild-chroot-lvm-snapshot.cc:197
+#: sbuild/sbuild-chroot-lvm-snapshot.cc:209
msgid "LVM Snapshot Options"
msgstr "LVM 快照选项"
@@ -833,23 +826,23 @@ msgstr "无法获取文件状态"
msgid "Failed to stat file descriptor"
msgstr "无法统计文件描述符"
-#: sbuild/sbuild-chroot-source.cc:51
+#: sbuild/sbuild-chroot-source.cc:50
msgid "(source chroot)"
msgstr "(源chroot)"
-#: sbuild/sbuild-chroot-source.cc:142
+#: sbuild/sbuild-chroot-source.cc:141
msgid "Source Users"
msgstr "源用户"
-#: sbuild/sbuild-chroot-source.cc:143
+#: sbuild/sbuild-chroot-source.cc:142
msgid "Source Groups"
msgstr "源用户组"
-#: sbuild/sbuild-chroot-source.cc:144
+#: sbuild/sbuild-chroot-source.cc:143
msgid "Source Root Users"
msgstr "源根用户"
-#: sbuild/sbuild-chroot-source.cc:145
+#: sbuild/sbuild-chroot-source.cc:144
msgid "Source Root Groups"
msgstr "源根用户组"
@@ -1077,8 +1070,7 @@ msgstr "允许用户访问 chroots,使用用户或用户组密钥。"
#: bin/dchroot/dchroot-main-base.cc:80
msgid ""
"To allow password-less root access, use the root-users or root-groups keys."
-msgstr ""
-"允许无密码根用户访问,使用根用户或根用户组密钥。"
+msgstr "允许无密码根用户访问,使用根用户或根用户组密钥。"
#. TRANSLATORS: %1% = file
#: bin/dchroot/dchroot-main-base.cc:83 bin/dchroot/dchroot-main-base.cc:144
@@ -1446,3 +1438,6 @@ msgstr "对将要进行的操作实行一次模拟动作"
#: bin/schroot-mount/schroot-mount-options.cc:67
msgid "fstab file to read (full path)"
msgstr "要读取的 fstab 文件(完整路径)"
+
+#~ msgid "Mount Options"
+#~ msgstr "挂载选项"