Merge with Michael

Remove a non breakable space in the Frenc translation. Closes: #408877

diff --combined configure.in
index e4c76191f72e6f1ae7b9bd9f08d58780a8f06f26,fe7c0e3e189ee7fd83b8f15b71f35642cf786fd7..c7bf253d19113b464ad94d6f710836e6fc364c72
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.6.46.3-0.1")
+ AC_DEFINE_UNQUOTED(VERSION,"0.6.46.5")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
@@@ -192,7 -192,7 +192,7 @@@ ah_GCC3DE
  dnl It used to be that the user could select translations and that could get
  dnl passed to the makefiles, but now that can only work if you use special
  dnl gettext approved makefiles, so this feature is unsupported by this.
 -ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW"
 +ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko ku nb nl nn pl pt_BR pt ro ru sk sl sv tl uk vi zn_CN zh_TW"
  AM_GNU_GETTEXT(external)
  if test x"$USE_NLS" = "xyes"; then
     AC_DEFINE(USE_NLS)

diff --combined po/ChangeLog
index e5b35bad86a01b4b8024f56b77717a6f2ac523f8,1171d288a40f34171619c0031a96c58a99999757..5b6df4804e7e483bdec66775ba88a97a3701bc6c
--- 1/po/ChangeLog
--- 2/po/ChangeLog
+++ b/po/ChangeLog
@@@ -1,15 -1,3 +1,20 @@@
++2007-01-29  Christian Perrier  <bubulle@debian.org>
++
++      * fr.po: Remove a non-breakable space for usability
++               issues. Closes: #408877
++
 +2006-12-12  Yuri Kozlov  <kozlov.y@gmail.com>
 +
 +      * ru.po: Updated Russian translation. Closes: #405476
 +
 +2006-12-12  Christian Perrier  <bubulle@debian.org>
 +
 +      * *.po: Unfuzzy after upstream typo corrections
 +
 +2006-12-12  Eugeniy Meshcheryakov  <eugen@debian.org>
 +
 +      * uk.po: Updated Ukrainian translation: 495t16f3u
 +
  2006-11-04  Artem Bondarenko  <artem.brz@gmail.com>
  
        * uk.po: New Ukrainian translation: 483t28f3u

diff --combined po/fr.po
index d7d631ea5ec600c77c1d52562171ec2b5acff9fb,2c046f1d1106c3213ea4a3d9cba5a644de3e11d0..76281d32fa1e4b73c374b0995987e36a56a274f7
--- 1/po/fr.po
--- 2/po/fr.po
+++ b/po/fr.po
@@@ -877,7 -877,7 +877,7 @@@ msgstr "
  # sentence is supposed to be typed by a user who cannot see the difference.
  #: cmdline/apt-get.cc:866
  msgid "Yes, do as I say!"
--msgstr "Oui, faites ce que je vous dis !"
++msgstr "Oui, faites ce que je vous dis !"
  
  #: cmdline/apt-get.cc:868
  #, c-format
@@@ -2635,7 -2635,8 +2635,7 @@@ msgid "MD5Sum mismatch
  msgstr "Somme de contrôle MD5 incohérente"
  
  #: apt-pkg/acquire-item.cc:640
 -#, fuzzy
 -msgid "There are no public key available for the following key IDs:\n"
 +msgid "There is no public key available for the following key IDs:\n"
  msgstr ""
  "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"