merge conflict

8 files changed, 539 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 5501660..f7aa97f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,47 @@
-pbuilder (0.180~1.gbpc3466a) UNRELEASED; urgency=low
+pbuilder (0.181) unstable; urgency=low
 
-  ** SNAPSHOT build @c3466a506e0ff1ce36d4f5fe545558f5b2e34f17 **
+  [ Esko Arajärvi ]
+  * Finnish translation of the debconf templates (closes: #482108)
 
-  * UNRELEASED
+  [ Jordà Polo ]
+  * Catalan debconf templates translation update (closes: #481930)
 
- -- Junichi Uekawa <dancer@debian.org>  Sat, 29 Mar 2008 16:03:01 +0900
+  [ xabier bilbao ]
+  * Basque translation (closes: #481842)
+
+  [ Yuri Kozlov ]
+  * Russian debconf templates translation (closes: #481711)
+
+  [ Miroslav Kure ]
+  * Czech translation of pbuilder debconf messages (closes: #481627)
+
+  [ Jacobo Tarrio ]
+  * Galician debconf template translation (closes: #481118)
+
+  [ Junichi Uekawa ]
+  * documentation .po files changed.
+
+ -- Junichi Uekawa <dancer@debian.org>  Sat, 24 May 2008 22:09:39 +0900
+
+pbuilder (0.180) unstable; urgency=low
+
+  [ Sylvain Beucler ]
+  * lvmpbuilder is not complete in the binary packages (closes: #475363)
+
+  [ Sandro Tosi ]
+  * pbuilder: html doc enhancement (closes: #478021)
+
+  [ Junichi Uekawa ]
+  * umount on failed bind-mount (closes: #474771)
+  * [INTL:de] initial German debconf translation (closes: #475046)
+  * pbuilder: French debconf templates translation (closes: #474567)
+  * pbuilder: [INTL:pt] Portuguese translation for debconf messages
+    (closes: 473825)
+  * --create with --basetgz will not fail file does not exist (closes:
+    #451835)
+  * add po4a build-dependency (closes: #480633)
+
+ -- Junichi Uekawa <dancer@debian.org>  Mon, 12 May 2008 08:12:52 +0900
 
 pbuilder (0.179) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2110a71..567d0b8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: extra
 Maintainer: Debian pbuilder maintenance team <pbuilder-maint@lists.alioth.debian.org>
 Uploaders: Junichi Uekawa <dancer@debian.org>, Matt Kraai <kraai@debian.org>
-Build-Depends: debhelper (>= 4.1.16), docbook-xsl, ldp-docbook-xsl (>= 0.0.20040321-0.1), xsltproc, dpkg-dev (>= 1.13.19), dblatex, rootstrap [i386 amd64], debconf|debconf-2.0, po-debconf
+Build-Depends: debhelper (>= 4.1.16), docbook-xsl, ldp-docbook-xsl (>= 0.0.20040321-0.1), xsltproc, dpkg-dev (>= 1.13.19), dblatex, rootstrap [i386 amd64], debconf|debconf-2.0, po-debconf, po4a
 Standards-Version: 3.7.2
 Vcs-Git: git://git.debian.org/git/pbuilder/pbuilder.git
 Vcs-Browser: http://git.debian.org/?p=pbuilder/pbuilder.git
diff --git a/debian/po/ca.po b/debian/po/ca.po
new file mode 100644
index 0000000..653b032
--- /dev/null
+++ b/debian/po/ca.po
@@ -0,0 +1,87 @@
+#
+# Catalan translation for pbuilder package.
+# Copyright (C) 2008 Debian pbuilder maintenance team.
+# This file is distributed under the same license as the pbuilder package.
+#
+# Jordà Polo <jorda@ettin.org>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.179\n"
+"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-07 00:09+0900\n"
+"PO-Revision-Date: 2008-05-11 17:03+0200\n"
+"Last-Translator: Jordà Polo <jorda@ettin.org>\n"
+"Language-Team: Català <debian-l10n-catalan@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Default mirror site:"
+msgstr "Lloc de la rèplica predeterminada:"
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Please enter the default mirror you want to be used by pbuilder."
+msgstr "Introduïu la rèplica que pbuilder utilitzarà per defecte."
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid ""
+"If you leave this field blank, there will be one attempt to autodetect this "
+"information. If this attempt fails, you will be prompted again to insert "
+"some valid mirror information."
+msgstr ""
+"Si deixeu aquest camp en blanc s'intentarà detectar aquesta informació "
+"automàticament. Si aquesta detecció falla, un indicador us tornarà a demanar "
+"una rèplica vàlida."
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Here is a valid mirror example: http://cdn.debian.net/debian"
+msgstr "Un exemple de rèplica vàlida seria: http://cdn.debian.net/debian"
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Default mirror not found"
+msgstr "No s'ha trobat la rèplica predeterminada"
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid ""
+"Mirror information detection failed and the user provided no mirror "
+"information."
+msgstr ""
+"Ha fallat la detecció de la rèplica i l'usuari no ha introduït informació "
+"sobre aquesta."
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Please enter valid mirror information."
+msgstr "Introduïu una rèplica vàlida."
+
+#. Type: boolean
+#. Description
+#: ../pbuilder.templates:3001
+msgid "Overwrite current configuration?"
+msgstr "Voleu sobreescriure la configuració actual?"
+
+#. Type: boolean
+#. Description
+#: ../pbuilder.templates:3001
+msgid ""
+"Your system seems to have already pbuilder configuration. Proceeding might "
+"discard or overwrite part or the entire pbuilder's configuration."
+msgstr ""
+"Ja hi ha una configuració de pbuilder al sistema. Continuar aquesta operació "
+"pot descartar o sobreescriure la configuració de pbuilder parcial o "
+"completament."
diff --git a/debian/po/cs.po b/debian/po/cs.po
new file mode 100644
index 0000000..4b16e05
--- /dev/null
+++ b/debian/po/cs.po
@@ -0,0 +1,83 @@
+# Czech translation of pbuilder debconf messages.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the pbuilder package.
+# Miroslav Kure <kurem@debian.cz>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pbuilder\n"
+"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-07 00:09+0900\n"
+"PO-Revision-Date: 2008-05-17 13:43+0200\n"
+"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Default mirror site:"
+msgstr "Výchozí zrcadlo:"
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Please enter the default mirror you want to be used by pbuilder."
+msgstr "Zadejte prosím výchozí zrcadlo, které má pbuilder používat."
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid ""
+"If you leave this field blank, there will be one attempt to autodetect this "
+"information. If this attempt fails, you will be prompted again to insert "
+"some valid mirror information."
+msgstr ""
+"Ponecháte-li pole prázdné, zkusím tuto informaci zjistit sám. Pokud se to g"
+"nepovede, budete znovu dotázáni na zadání platného zrcadla."
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Here is a valid mirror example: http://cdn.debian.net/debian"
+msgstr "Příklad platného zrcadla: http://cdn.debian.net/debian"
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Default mirror not found"
+msgstr "Výchozí zrcadlo nenalezeno"
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid ""
+"Mirror information detection failed and the user provided no mirror "
+"information."
+msgstr ""
+"Automatické rozpoznání zrcadla selhalo a uživatel neposkytnul žádné "
+"informace."
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Please enter valid mirror information."
+msgstr "Zadejte prosím platné zrcadlo."
+
+#. Type: boolean
+#. Description
+#: ../pbuilder.templates:3001
+msgid "Overwrite current configuration?"
+msgstr "Přepsat stávající konfiguraci?"
+
+#. Type: boolean
+#. Description
+#: ../pbuilder.templates:3001
+msgid ""
+"Your system seems to have already pbuilder configuration. Proceeding might "
+"discard or overwrite part or the entire pbuilder's configuration."
+msgstr ""
+"Zdá se, že se na vašem systému již nachází konfigurace pbuilderu. Budete-li "
+"pokračovat, může se stát, že přepíšete část nastavení pbuilderu."
diff --git a/debian/po/eu.po b/debian/po/eu.po
new file mode 100644
index 0000000..0b2d689
--- /dev/null
+++ b/debian/po/eu.po
@@ -0,0 +1,87 @@
+# translation of xb-pbuilder-templates-eu.po to basque
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# xabier bilbao <xabidu@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: xb-pbuilder-templates-eu\n"
+"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-07 00:09+0900\n"
+"PO-Revision-Date: 2008-05-17 21:46+0200\n"
+"Last-Translator: xabier bilbao <xabidu@gmail.com>\n"
+"Language-Team: basque <debian-l10n-basque@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Default mirror site:"
+msgstr "Ispilu-gune lehenetsia:"
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Please enter the default mirror you want to be used by pbuilder."
+msgstr "Sartu mesedez pbuilder-ek lehenetsi gisa erabiltzea nahi duzun ispilu-gunea."
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid ""
+"If you leave this field blank, there will be one attempt to autodetect this "
+"information. If this attempt fails, you will be prompted again to insert "
+"some valid mirror information."
+msgstr ""
+"Eremu hau hutsik uzten baduzu, informazio hau automatikoki atzemateko "
+"saio bat egingo da. Saio honek huts egiten baldin badu, berriro "
+"eskatuko zaizu baliozko ispilu baten informazioa sartzeko."
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Here is a valid mirror example: http://cdn.debian.net/debian"
+msgstr "Hau da baliozko ispilu baten adibidea: http://cdn.debian.net/debian"
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Default mirror not found"
+msgstr "Ispilu lehenetsia ez da aurkitu"
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid ""
+"Mirror information detection failed and the user provided no mirror "
+"information."
+msgstr ""
+"Ispiluaren informazioa atzemateko saioak huts egin du, eta erabiltzaileak ez "
+"du eman ispiluaren informaziorik."
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Please enter valid mirror information."
+msgstr "Sartu mesedez baliozko ispilu informazioa."
+
+#. Type: boolean
+#. Description
+#: ../pbuilder.templates:3001
+msgid "Overwrite current configuration?"
+msgstr "Dagoen konfigurazioa gainidatzi?"
+
+#. Type: boolean
+#. Description
+#: ../pbuilder.templates:3001
+msgid ""
+"Your system seems to have already pbuilder configuration. Proceeding might "
+"discard or overwrite part or the entire pbuilder's configuration."
+msgstr ""
+"Zure sistemak pbuilder konfigurazioa baduela dirudi. Aurrera jarraituz gero, "
+"baliteke pbuilder-en konfigurazio osoa edo zati bat baztertzea edo "
+"gainidaztea."
+
diff --git a/debian/po/fi.po b/debian/po/fi.po
new file mode 100644
index 0000000..92a9875
--- /dev/null
+++ b/debian/po/fi.po
@@ -0,0 +1,68 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: pbuilder\n"
+"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-07 00:09+0900\n"
+"PO-Revision-Date: 2008-05-20 22:26+0200\n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Finnish\n"
+"X-Poedit-Country: FINLAND\n"
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Default mirror site:"
+msgstr "Oletuspeilisivusto:"
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Please enter the default mirror you want to be used by pbuilder."
+msgstr "Valitse peili, jota pbuilderin tulisi oletuksena käyttää."
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "If you leave this field blank, there will be one attempt to autodetect this information. If this attempt fails, you will be prompted again to insert some valid mirror information."
+msgstr "Jos tämä kenttä jätetään tyhjäksi, yritetään tieto löytää kerran automaattisesti. Jos tämä epäonnistuu, pyydetään kelvollista peiliä uudelleen."
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Here is a valid mirror example: http://cdn.debian.net/debian"
+msgstr "Esimerkki kelvollisesta peilistä: http://cdn.debian.net/debian"
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Default mirror not found"
+msgstr "Oletuspeiliä ei löytynyt"
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Mirror information detection failed and the user provided no mirror information."
+msgstr "Peilitietojen etsintä epäonnistui, eikä käyttäjä antanut peilitietoja."
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Please enter valid mirror information."
+msgstr "Anna kelvollinen peili."
+
+#. Type: boolean
+#. Description
+#: ../pbuilder.templates:3001
+msgid "Overwrite current configuration?"
+msgstr "Kirjoitetaanko nykyisten asetusten päälle?"
+
+#. Type: boolean
+#. Description
+#: ../pbuilder.templates:3001
+msgid "Your system seems to have already pbuilder configuration. Proceeding might discard or overwrite part or the entire pbuilder's configuration."
+msgstr "Järjestelmässä on jo pbuilder-asetukset. Jatkaminen saattaa hävittää tai kirjoittaa yli osan tai kaikki pbuilderin aiemmista asetuksista."
+
diff --git a/debian/po/gl.po b/debian/po/gl.po
new file mode 100644
index 0000000..98325a4
--- /dev/null
+++ b/debian/po/gl.po
@@ -0,0 +1,84 @@
+# Galician translation of pbuilder's debconf templates
+# This file is distributed under the same license as the pbuilder package.
+# Jacobo Tarrio <jtarrio@debian.org>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pbuilder\n"
+"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-07 00:09+0900\n"
+"PO-Revision-Date: 2008-05-13 20:51+0100\n"
+"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Default mirror site:"
+msgstr "Réplica por defecto:"
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Please enter the default mirror you want to be used by pbuilder."
+msgstr "Introduza a réplica que pbuilder debe empregar por defecto."
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid ""
+"If you leave this field blank, there will be one attempt to autodetect this "
+"information. If this attempt fails, you will be prompted again to insert "
+"some valid mirror information."
+msgstr ""
+"Se deixa este campo baleiro hase facer unha tentativa de autodetectar esta "
+"información. Se esta tentativa falla, háselle pedir outra vez que introduza "
+"información válida sobre as réplicas."
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Here is a valid mirror example: http://cdn.debian.net/debian"
+msgstr "Velaquí un exemplo dunha réplica válida: http://cdn.debian.net/debian"
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Default mirror not found"
+msgstr "Non se atopou a réplica por defecto"
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid ""
+"Mirror information detection failed and the user provided no mirror "
+"information."
+msgstr ""
+"A detección da información das réplicas fallou, e o usuario non forneceu "
+"información sobre as réplicas."
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Please enter valid mirror information."
+msgstr "Introduza información válida sobre as réplicas."
+
+#. Type: boolean
+#. Description
+#: ../pbuilder.templates:3001
+msgid "Overwrite current configuration?"
+msgstr "¿Sobrescribir a configuración actual?"
+
+#. Type: boolean
+#. Description
+#: ../pbuilder.templates:3001
+msgid ""
+"Your system seems to have already pbuilder configuration. Proceeding might "
+"discard or overwrite part or the entire pbuilder's configuration."
+msgstr ""
+"Semella que o sistema xa ten unha configuración de pbuilder. Se continúa "
+"pódese sobrescribir ou eliminar parcial ou totalmente a configuración de "
+"pbuilder."
diff --git a/debian/po/ru.po b/debian/po/ru.po
new file mode 100644
index 0000000..843e31f
--- /dev/null
+++ b/debian/po/ru.po
@@ -0,0 +1,88 @@
+# translation of ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <kozlov.y@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: pbuilder new\n"
+"Report-Msgid-Bugs-To: pbuilder@packages.debian.org\n"
+"POT-Creation-Date: 2008-03-07 00:09+0900\n"
+"PO-Revision-Date: 2008-05-18 09:10+0400\n"
+"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Default mirror site:"
+msgstr "Сервер-зеркало по умолчанию:"
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Please enter the default mirror you want to be used by pbuilder."
+msgstr "Укажите сервер-зеркало, который будет использовать pbuilder по умолчанию."
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid ""
+"If you leave this field blank, there will be one attempt to autodetect this "
+"information. If this attempt fails, you will be prompted again to insert "
+"some valid mirror information."
+msgstr ""
+"Если оставить поле пустым, то будет сделана попытка определить сервер "
+"автоматически. Если она окажется неудачной, то вас снова попросят указать "
+"правильную информацию о сервере-зеркале."
+
+#. Type: string
+#. Description
+#: ../pbuilder.templates:1001
+msgid "Here is a valid mirror example: http://cdn.debian.net/debian"
+msgstr "Пример задания сервера-зеркала: http://cdn.debian.net/debian"
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Default mirror not found"
+msgstr "Сервер-зеркало по умолчанию не найден"
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid ""
+"Mirror information detection failed and the user provided no mirror "
+"information."
+msgstr ""
+"Не удалось определить сервер-зеркало и пользователь также "
+"не ввёл эту информацию."
+
+#. Type: error
+#. Description
+#: ../pbuilder.templates:2001
+msgid "Please enter valid mirror information."
+msgstr "Укажите рабочий сервер-зеркало."
+
+#. Type: boolean
+#. Description
+#: ../pbuilder.templates:3001
+msgid "Overwrite current configuration?"
+msgstr "Изменить имеющуюся настройку?"
+
+#. Type: boolean
+#. Description
+#: ../pbuilder.templates:3001
+msgid ""
+"Your system seems to have already pbuilder configuration. Proceeding might "
+"discard or overwrite part or the entire pbuilder's configuration."
+msgstr ""
+"Кажется, что в вашей системе уже выполнена настройка pbuilder. "
+"Продолжение работы может стереть или изменить часть или всю "
+"настройку pbuilder."
+