Merge branch 'debconf-l10n'

diff --cc debian/changelog
index 96a90aae43347263150bbedf3fb02bf41227b8f7,718c6c66bc479327b8d434c9acd6cc4134ee45a1..87c98dc0747202fb4a48ca6aaa3b82f39636b2f4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,46 -1,21 +1,63 @@@
 -etckeeper (0.3) UNRELEASED; urgency=low
 +etckeeper (0.7) UNRELEASED; urgency=low
  
- 
-  -- Joey Hess <joeyh@debian.org>  Thu, 03 Jan 2008 20:43:23 -0500
++  [ Joey Hess ]
 +  * Added configuration options for highlevel and lowlevel package managers
 +    in etckeeper.conf.
 +  * Only install apt hooks if apt is used.
 +  * Only add backup conffile exclusion to gitignore if dpkg is used.
 +  * Rename pre/post-apt.d to pre/post-install.d to allow the same directories
 +    to be used for other package managers.
 +  * 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)
++  * 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
 +
 +  * Depend on a fairly recent git-core. Closes: #453063
 +
 + -- Joey Hess <joeyh@debian.org>  Sun, 02 Dec 2007 15:46:12 -0500
 +
 +etckeeper (0.5) unstable; urgency=low
 +
 +  * Typo. Closes: #452926
 +
 + -- Joey Hess <joeyh@debian.org>  Mon, 26 Nov 2007 03:16:14 -0500
 +
 +etckeeper (0.4) unstable; urgency=low
 +
 +  * Portuguese translation from Américo Monteiro. Closes: #451798
 +  * Pass --quiet to git-rm calls.
 +
 + -- Joey Hess <joeyh@debian.org>  Tue, 20 Nov 2007 01:04:32 -0500
 +
 +etckeeper (0.3) unstable; urgency=low
 +
 +  * Patch from Remi Vanicat adding an etckeeper.conf file and
 +    a GIT_COMMIT_OPTIONS configuration setting. Closes: #451167
 +  * Add network/run and adjtime to default gitignore. Closes: #451347
 +  * Patch from Rémi Vanicat adding bash completion. Closes: #451302
 +  * Remove redundant dependency on debconf. Closes: #451378
 +
 + -- Joey Hess <joeyh@debian.org>  Thu, 15 Nov 2007 12:21:02 -0500
 +
  etckeeper (0.2) unstable; urgency=low
  
    * Add .pwd.lock to default ignores, this file is created by programs

diff --cc debian/control
index 47afcfa8c78331d1feefd3db2cf3a762d5765b38,e908d287fca2f09212b62e6f12dc96089630fae6..708f929aa21164e835246283ce050fae71e50f4c
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -10,12 -10,11 +10,11 @@@ Homepage: http://kitenet.net/~joey/code
  Package: etckeeper
  Architecture: all
  Section: admin
 -Depends: metastore, git-core, ${misc:Depends}, debconf | debconf-2.0
 +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.
-