Merge branch 'debconf-l10n'

14 files changed, 598 insertions, 55 deletions

diff --git a/debian/changelog b/debian/changelog
index 96a90aa..87c98dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 etckeeper (0.7) UNRELEASED; urgency=low
 
+  [ Joey Hess ]
   * Added configuration options for highlevel and lowlevel package managers
     in etckeeper.conf.
   * Only install apt hooks if apt is used.
@@ -9,8 +10,24 @@ etckeeper (0.7) UNRELEASED; urgency=low
   * Use the name of the highlevel package manager in commit messages.
   * Add gnarly conffile renaming code.
   * Add support for frugalware's pacman-g2 package manager. (Miklos Vajna)
-
- -- Joey Hess <joeyh@debian.org>  Thu, 03 Jan 2008 20:43:23 -0500
+  * Stop using git-foo commands (Miklos Vajna)
+
+  [ Christian Perrier ]
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #454774
+  * [Debconf translation updates]
+  * Galician. Closes: #455790
+  * Finnish. Closes: #455967
+  * Italian. Closes: #456509
+  * Portuguese. Closes: #456543
+  * French. Closes: #456920
+  * Vietnamese. Closes: #457307
+  * Czech. Closes: #457678
+  * Dutch. Closes: #457806
+  * Basque. Closes: #457830
+  * Russian. Closes: #457871
+
+ -- Christian Perrier <bubulle@debian.org>  Wed, 02 Jan 2008 15:36:33 +0100
 
 etckeeper (0.6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 47afcfa..708f929 100644
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,9 @@ Architecture: all
 Section: admin
 Depends: metastore, git-core (>= 1:1.5.3.4), ${misc:Depends}
 Description: store /etc in git
- etckeeper is a collection of tools to let /etc be stored in a git
- repository. It hooks into apt to automatically commit changes made to /etc
- during package upgrades. It uses `metastore` to track file metadata that
+ The etckeeper program is a tool to let /etc be stored in a git
+ repository. It hooks into APT to automatically commit changes made to /etc
+ during package upgrades. It uses 'metastore' to track file metadata that
  git does not normally support, but that is important for /etc, such as the
- permissions of `/etc/shadow`. It's quite modular and configurable, while
+ permissions of /etc/shadow. It's quite modular and configurable, while
  also being simple to use if you understand the basics of working with git.
-
diff --git a/debian/po/cs.po b/debian/po/cs.po
new file mode 100644
index 0000000..7b355b6
--- /dev/null
+++ b/debian/po/cs.po
@@ -0,0 +1,55 @@
+# Czech translation of etckeeper debconf messages.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the etckeeper package.
+# Miroslav Kure <kurem@debian.cz>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: etckeeper\n"
+"Report-Msgid-Bugs-To: Source: etckeeper@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-12 00:45+0530\n"
+"PO-Revision-Date: 2007-12-24 13:10+0100\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: boolean
+#. Description
+#: ../templates:2001
+msgid "Commit changed files in /etc to git?"
+msgstr "Zapsat změněné soubory v /etc do gitu?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"The /etc directory contains uncommitted files or other changes. It's best "
+"for all files in /etc to be committed to git before running APT. Added and "
+"changed files listed below can be committed automatically:"
+msgstr ""
+"Adresář /etc obsahuje nezapsané soubory nebo jiné změny. Před spuštěním APT "
+"je lepší mít všechny soubory v /etc uloženy do gitu. Přidané a změněné "
+"soubory vypsané níže budou uloženy automaticky:"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "Commit failed"
+msgstr "Zápis selhal"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "An attempt to commit /etc changes to git failed."
+msgstr "Pokus o zapsání změn v /etc do gitu selhal."
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid ""
+"You may manually resolve the issues with the uncommitted changes before "
+"continuing."
+msgstr ""
+"Před pokračováním byste měli ručně vyřešit problémy s nezapsanými změnami."
diff --git a/debian/po/eu.po b/debian/po/eu.po
new file mode 100644
index 0000000..372725b
--- /dev/null
+++ b/debian/po/eu.po
@@ -0,0 +1,60 @@
+# translation of etckeeper-eu.po to Euskara
+# Aitor Ibañez <aitiba@gmail.com>,2007.
+# Aitor Ibañez <aitiba@gmail.com>, 2007.
+# Piarres Beobide <pi@beobide.net>, 2007.
+# translation of etckeeper-eu to Euskara
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+msgid ""
+msgstr ""
+"Project-Id-Version: etckeeper-eu\n"
+"Report-Msgid-Bugs-To: Source: etckeeper@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-12 00:45+0530\n"
+"PO-Revision-Date: 2007-12-17 12:47+0100\n"
+"Last-Translator: Aitor Ibañez <aitiba@gmail.com>\n"
+"Language-Team: Euskara <Librezale@librezale.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: boolean
+#. Description
+#: ../templates:2001
+msgid "Commit changed files in /etc to git?"
+msgstr "Aldaturiko fitxategiak git-en onartu?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"The /etc directory contains uncommitted files or other changes. It's best "
+"for all files in /etc to be committed to git before running APT. Added and "
+"changed files listed below can be committed automatically:"
+msgstr ""
+"/etc direktorioak onartu gabeko fitxategiak edo beste aldaketa batzuk ditu. /"
+"etc-n dauden fitxategi guztientzat hobe da git-en onarpena egitea APT "
+"exekutatu baino lehen.Azpian dauden erantsi eta aldatutako fitxategiak "
+"automatikoki onartu daitezke:"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "Commit failed"
+msgstr "Onarpenak failatu du"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "An attempt to commit /etc changes to git failed."
+msgstr "/etc-ko aldaketak git-en onartzearen saiakerak huts egin du."
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid ""
+"You may manually resolve the issues with the uncommitted changes before "
+"continuing."
+msgstr ""
+"Aurrera jarraitu baino lehen, eskuz erresolbitu beharko ditu onartu gabeko "
+"aldaketak."
diff --git a/debian/po/fi.po b/debian/po/fi.po
new file mode 100644
index 0000000..a8c4693
--- /dev/null
+++ b/debian/po/fi.po
@@ -0,0 +1,53 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: etckeeper 0.3\n"
+"Report-Msgid-Bugs-To: Source: etckeeper@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-12 00:45+0530\n"
+"PO-Revision-Date: 2007-12-12 19:54+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: boolean
+#. Description
+#: ../templates:2001
+msgid "Commit changed files in /etc to git?"
+msgstr "Talletetaanko hakemiston /etc muutetut tiedostot gitiin?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"The /etc directory contains uncommitted files or other changes. It's best "
+"for all files in /etc to be committed to git before running APT. Added and "
+"changed files listed below can be committed automatically:"
+msgstr ""
+"Hakemisto /etc sisältää tallettamattomia tiedostoja tai muita muutoksia. On "
+"parasta tallettaa kaikki /etc:n tiedostot git-varastoon ennen APTin "
+"ajamista. Alla luetellut lisätyt tai muutetut tiedostot voidaan tallettaa "
+"automaattisesti."
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "Commit failed"
+msgstr "Tallettaminen epäonnistui"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "An attempt to commit /etc changes to git failed."
+msgstr "Yritys tallettaa /etc:n muutokset git-varastoon epäonnistui."
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid ""
+"You may manually resolve the issues with the uncommitted changes before "
+"continuing."
+msgstr ""
+"Voit selvittää tallettamattomien muutosten ongelmat käsin ennen jatkamista."
diff --git a/debian/po/fr.po b/debian/po/fr.po
new file mode 100644
index 0000000..d99ddc3
--- /dev/null
+++ b/debian/po/fr.po
@@ -0,0 +1,63 @@
+# Translation of etckeeper debconf templates to French
+# Copyright (C) 2007 Jean-Baka Domelevo Entfellner <domelevo@gmail.com>
+# This file is distributed under the same license as the etckeeper package.
+#
+# Jean-Baka Domelevo Entfellner <domelevo@gmail.com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: etckeeper\n"
+"Report-Msgid-Bugs-To: Source: etckeeper@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-12 00:45+0530\n"
+"PO-Revision-Date: 2007-12-12 08:28+0100\n"
+"Last-Translator: Jean-Baka Domelevo Entfellner <domelevo@gmail.com>\n"
+"Language-Team: French <debian-l10n-french@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: French\n"
+"X-Poedit-Country: FRANCE\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Commit changed files in /etc to git?"
+msgstr ""
+"Faut-il enregistrer dans git les modifications de fichiers faites dans /etc ?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"The /etc directory contains uncommitted files or other changes. It's best "
+"for all files in /etc to be committed to git before running APT. Added and "
+"changed files listed below can be committed automatically:"
+msgstr ""
+"Le répertoire /etc contient des fichiers non synchronisés ou d'autres "
+"changements. Il est préférable que toutes les modifications apportées dans /"
+"etc soient enregistrées dans git avant de lancer APT. Les ajouts et "
+"modifications de fichiers dont la liste suit peuvent être enregistrés "
+"automatiquement :"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "Commit failed"
+msgstr "Échec de la synchronisation"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "An attempt to commit /etc changes to git failed."
+msgstr ""
+"La tentative d'enregistrement des modifications de /etc vers git a échoué."
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid ""
+"You may manually resolve the issues with the uncommitted changes before "
+"continuing."
+msgstr ""
+"Avant de poursuivre, vous devriez résoudre vous-même les problèmes liés aux "
+"changements non sauvegardés."
diff --git a/debian/po/gl.po b/debian/po/gl.po
new file mode 100644
index 0000000..ca00982
--- /dev/null
+++ b/debian/po/gl.po
@@ -0,0 +1,54 @@
+# Galician translation of etckeeper's debconf templates
+# This file is distributed under the same license as the etckeeper package.
+# Jacobo Tarrio <jtarrio@debian.org>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: etckeeper\n"
+"Report-Msgid-Bugs-To: Source: etckeeper@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-12 00:45+0530\n"
+"PO-Revision-Date: 2007-12-11 20:52+0000\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: boolean
+#. Description
+#: ../templates:2001
+msgid "Commit changed files in /etc to git?"
+msgstr "¿Gardar en git os ficheiros modificados de /etc?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"The /etc directory contains uncommitted files or other changes. It's best "
+"for all files in /etc to be committed to git before running APT. Added and "
+"changed files listed below can be committed automatically:"
+msgstr ""
+"O directorio /etc contén ficheiros ou outros cambios sen gardar. É mellor "
+"que se garden en git tódolos ficheiros de /etc antes de executar APT. Os "
+"ficheiros engadidos e modificados da lista de embaixo pódense gardar "
+"automaticamente:"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "Commit failed"
+msgstr "O gardado fallou"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "An attempt to commit /etc changes to git failed."
+msgstr "Fallou unha tentativa de gardar en git os cambios de /etc."
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid ""
+"You may manually resolve the issues with the uncommitted changes before "
+"continuing."
+msgstr "configurar apt para que instale paquetes adicionais do CD.<"
diff --git a/debian/po/it.po b/debian/po/it.po
new file mode 100644
index 0000000..2b547b4
--- /dev/null
+++ b/debian/po/it.po
@@ -0,0 +1,57 @@
+# Italian (it) translation of debconf templates for etckeeper
+# Copyright (C) 2007 Software in the Public Interest
+# This file is distributed under the same license as the etckeeper package.
+# Luca Monducci <luca.mo@tiscali.it>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: etckeeper 0.3 debconf templates\n"
+"Report-Msgid-Bugs-To: Source: etckeeper@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-12 00:45+0530\n"
+"PO-Revision-Date: 2007-12-14 20:32+0100\n"
+"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
+"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Commit changed files in /etc to git?"
+msgstr "Commit dei file modificati in /etc a git?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"The /etc directory contains uncommitted files or other changes. It's best "
+"for all files in /etc to be committed to git before running APT. Added and "
+"changed files listed below can be committed automatically:"
+msgstr ""
+"La directory /etc contiene dei file di cui non è stato ancora fatto il "
+"commit o altre modifiche. Si consiglia di effettuare il commit di tutti i "
+"file in /etc a git prima di eseguire APT. È possibile fare automaticamente "
+"il commit dei file nuovi o modificati elencati in seguito:"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "Commit failed"
+msgstr "Commit fallito"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "An attempt to commit /etc changes to git failed."
+msgstr "Il tentativo di commit delle modifiche in /etc a git è fallito."
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid ""
+"You may manually resolve the issues with the uncommitted changes before "
+"continuing."
+msgstr ""
+"Potrebbe essere necessario risolvere i problemi con le modifiche delle quali "
+"non è stato fatto il commit prima di continuare."
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 0000000..dafef37
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,59 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: etckeeper\n"
+"Report-Msgid-Bugs-To: Source: etckeeper@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-12 00:45+0530\n"
+"PO-Revision-Date: 2008-01-01 21:21+0100\n"
+"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
+"Language-Team: debian-l10n-dutch <debian-l10n-dutch@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: Dutch\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Commit changed files in /etc to git?"
+msgstr "Wilt u aangepaste bestanden uit de map '/etc' vastleggen in git?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"The /etc directory contains uncommitted files or other changes. It's best "
+"for all files in /etc to be committed to git before running APT. Added and "
+"changed files listed below can be committed automatically:"
+msgstr ""
+"De map '/etc' bevat niet-vastgelegde bestanden of andere aanpassingen. Het "
+"is sterk aan te raden om alle aanpassingen in '/etc/' vast te leggen in git "
+"vooraleer u APT uitvoert. De hieronder aangegeven toegevoegde en veranderde "
+"bestanden worden automatisch opgeslagen."
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "Commit failed"
+msgstr "Vastleggen is mislukt."
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "An attempt to commit /etc changes to git failed."
+msgstr ""
+"De poging om de aanpassingen in '/etc' vast te leggen in git is mislukt."
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid ""
+"You may manually resolve the issues with the uncommitted changes before "
+"continuing."
+msgstr ""
+"U kunt de problemen met de niet-vastgelegde aanpassingen handmatig oplossen "
+"alvorens verder te gaan."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index d8e8c56..aaea57e 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -5,10 +5,10 @@
 # Américo Monteiro <a_monteiro@netcabo.pt>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: etckeeper 0.1\n"
+"Project-Id-Version: etckeeper 0.3\n"
 "Report-Msgid-Bugs-To: Source: etckeeper@packages.debian.org\n"
-"POT-Creation-Date: 2007-11-11 01:13-0500\n"
-"PO-Revision-Date: 2007-11-15 23:23+0000\n"
+"POT-Creation-Date: 2007-12-12 00:45+0530\n"
+"PO-Revision-Date: 2007-12-11 20:01+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,43 +18,41 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:1001
+#: ../templates:2001
 msgid "Commit changed files in /etc to git?"
 msgstr "Submeter ficheiros alterados em /etc para o git?"
 
 #. Type: boolean
 #. Description
-#: ../templates:1001
+#: ../templates:2001
 msgid ""
-"etckeeper has detected that /etc contains uncommitted files or other "
-"changes. It's best to have everything in /etc committed to git before "
-"running apt. etckeeper can add any new files listed below, and commit all "
-"the changed files for you."
+"The /etc directory contains uncommitted files or other changes. It's best "
+"for all files in /etc to be committed to git before running APT. Added and "
+"changed files listed below can be committed automatically:"
 msgstr ""
-"etckeeper detectou que /etc contém ficheiros não submetidos ou outras "
-"alterações. É preferível ter tudo em /etc submetido ao git antes de correr "
-"o apt. etckeeper pode adicionar quaisquer novos ficheiros listados abaixo, "
-"e submeter todos os ficheiros alterados para si."
+"O directório /etc contém ficheiros não submetidos ou outras alterações. É "
+"melhor que todos os ficheiros em /etc sejam submetidos ao git antes de "
+"correr o APT. Os ficheiros adicionados e alterados da lista em baixo podem "
+"ser submetidos automaticamente:"
 
-#. Type: boolean
+#. Type: error
 #. Description
-#: ../templates:1001
-msgid "${STATUS}"
-msgstr "${STATUS}"
+#: ../templates:3001
+msgid "Commit failed"
+msgstr "Submissão falhada"
 
 #. Type: error
 #. Description
-#: ../templates:2001
-msgid "git commit failed"
-msgstr "falha a submeter ao git"
+#: ../templates:3001
+msgid "An attempt to commit /etc changes to git failed."
+msgstr "A tentativa de submeter as alterações de /etc ao git falhou."
 
 #. Type: error
 #. Description
-#: ../templates:2001
+#: ../templates:3001
 msgid ""
-"etckeeper failed to commit changes in /etc using git. You may want to "
-"resolve the uncommitted changes by hand before continuing."
+"You may manually resolve the issues with the uncommitted changes before "
+"continuing."
 msgstr ""
-"etckeeper falhou em submeter alterações em /etc usando git. Você poderá "
-"desejar resolver as alterações não submetidas manualmente antes de continuar."
-
+"Você pode resolver manualmente as situações com as alterações não submetidas "
+"antes de continuar. "
diff --git a/debian/po/ru.po b/debian/po/ru.po
new file mode 100644
index 0000000..9255a6d
--- /dev/null
+++ b/debian/po/ru.po
@@ -0,0 +1,59 @@
+# 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>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.3\n"
+"Report-Msgid-Bugs-To: Source: etckeeper@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-12 00:45+0530\n"
+"PO-Revision-Date: 2007-12-12 21:23+0300\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: boolean
+#. Description
+#: ../templates:2001
+msgid "Commit changed files in /etc to git?"
+msgstr "Зафиксировать изменённые файлы /etc в git?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"The /etc directory contains uncommitted files or other changes. It's best "
+"for all files in /etc to be committed to git before running APT. Added and "
+"changed files listed below can be committed automatically:"
+msgstr ""
+"Каталог /etc содержит незафиксированные файлы или другие изменения. Перед "
+"работой APT лучше зафиксировать все файлы /etc в git. Перечисленные ниже "
+"добавленные и изменённые файлы могут быть зафиксированы автоматически:"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "Commit failed"
+msgstr "Фиксация завершилась неудачно"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "An attempt to commit /etc changes to git failed."
+msgstr "Попытка зафиксировать изменения /etc в git завершилась неудачно."
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid ""
+"You may manually resolve the issues with the uncommitted changes before "
+"continuing."
+msgstr ""
+"Перед тем как продолжить вы можете исправить это вручную через "
+"незафиксированные изменения."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 51aea68..6637bdf 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Source: etckeeper@packages.debian.org\n"
-"POT-Creation-Date: 2007-11-11 01:13-0500\n"
+"POT-Creation-Date: 2007-12-12 00:45+0530\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"
@@ -18,36 +18,35 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:1001
+#: ../templates:2001
 msgid "Commit changed files in /etc to git?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../templates:1001
+#: ../templates:2001
 msgid ""
-"etckeeper has detected that /etc contains uncommitted files or other "
-"changes. It's best to have everything in /etc committed to git before "
-"running apt. etckeeper can add any new files listed below, and commit all "
-"the changed files for you."
+"The /etc directory contains uncommitted files or other changes. It's best "
+"for all files in /etc to be committed to git before running APT. Added and "
+"changed files listed below can be committed automatically:"
 msgstr ""
 
-#. Type: boolean
+#. Type: error
 #. Description
-#: ../templates:1001
-msgid "${STATUS}"
+#: ../templates:3001
+msgid "Commit failed"
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../templates:2001
-msgid "git commit failed"
+#: ../templates:3001
+msgid "An attempt to commit /etc changes to git failed."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../templates:2001
+#: ../templates:3001
 msgid ""
-"etckeeper failed to commit changes in /etc using git. You may want to "
-"resolve the uncommitted changes by hand before continuing."
+"You may manually resolve the issues with the uncommitted changes before "
+"continuing."
 msgstr ""
diff --git a/debian/po/vi.po b/debian/po/vi.po
new file mode 100644
index 0000000..14d1f42
--- /dev/null
+++ b/debian/po/vi.po
@@ -0,0 +1,58 @@
+# Vietnamese translation for ETC Keeper.
+# Copyright © 2007 Free Software Foundation, Inc.
+# Clytie Siddall <clytie@riverland.net.au>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: etckeeper 0.3\n"
+"Report-Msgid-Bugs-To: Source: etckeeper@packages.debian.org\n"
+"POT-Creation-Date: 2007-12-12 00:45+0530\n"
+"PO-Revision-Date: 2007-12-21 22:43+1030\n"
+"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: LocFactoryEditor 1.7b1\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid "Commit changed files in /etc to git?"
+msgstr "Ghi vào git các tập tin bị thay đổi trong « /etc » không?"
+
+#. Type: boolean
+#. Description
+#: ../templates:2001
+msgid ""
+"The /etc directory contains uncommitted files or other changes. It's best "
+"for all files in /etc to be committed to git before running APT. Added and "
+"changed files listed below can be committed automatically:"
+msgstr ""
+"Thư mục « /etc » chứa các tập tin hay thay đổi khác mà chưa ghi chép. Tốt "
+"nhất nếu mọi tập tin trong « /etc » được ghi chép, trước khi chạy APT. Có thể "
+"tự động ghi chép các tập tin được thêm và bị thay đổi trong danh sách bên "
+"dưới:"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "Commit failed"
+msgstr "Lỗi ghi chép"
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid "An attempt to commit /etc changes to git failed."
+msgstr "Gặp lỗi khi thử ghi vào git các thay đổi trong « /etc »."
+
+#. Type: error
+#. Description
+#: ../templates:3001
+msgid ""
+"You may manually resolve the issues with the uncommitted changes before "
+"continuing."
+msgstr ""
+"Bạn vẫn có thể tự giải quyết các vấn đề về các thay đổi chưa ghi chép, trước "
+"khi tiếp tục."
diff --git a/debian/templates b/debian/templates
index 3919b6a..565c703 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,16 +1,28 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: etckeeper/unclean
 Type: boolean
 Default: true
+#flag:translate!:3
 _Description: Commit changed files in /etc to git?
- etckeeper has detected that /etc contains uncommitted files
- or other changes. It's best to have everything in /etc committed
- to git before running apt. etckeeper can add any new files listed below,
- and commit all the changed files for you.
+ The /etc directory contains uncommitted files
+ or other changes. It's best for all files in /etc to be committed
+ to git before running APT. Added and changed files listed below can
+ be committed automatically:
  .
  ${STATUS}
 
 Template: etckeeper/commit_failed
 Type: error
-_Description: git commit failed
- etckeeper failed to commit changes in /etc using git.
- You may want to resolve the uncommitted changes by hand before continuing.
+_Description: Commit failed
+ An attempt to commit /etc changes to git failed.
+ .
+ You may manually resolve the issues with the uncommitted changes
+ before continuing.