Merge things from the potato branch:

+ po/*.po: updated
+ THANKS: Add Lele Gaifax
+ configure.in: add Italian to LINGUAS
+ doc/sv: new directory with Swedish manpages
+ doc/*: removed "GNU/Linux" since this runs on HURD as well
+ doc/ja/update-alternatives.8: new version
+ dpkg-deb/main.c: remove preprocessor define from gettextized string
+ dselect/main.c: remove preprocessor define from gettextized string
+ lib/showcright.c: remove preprocessor define from gettextized string
+ main/enquiry.c: can't use prepocessor defines in a gettextized string
+ dselect/pkgdisplay.cc: Replace empty string for eflags with a space
+ dselect/pkgsublist.cc: mark another string as translateable
+ dselect/pkgtop.cc: change code to reflect that the empty case for
  an eflagstring is now a single space, not an empty string (since
  gettext can't handle empty strings).
+ main/help.c: allocate a bit more space for the path buffer in checkpath()
+ main/main.c: fix location of --abort-after in --help output
+ scripts/debian-changelog-mode.el: fix documentation string for
  debian-changelog-finalise-last
+ scripts/dpkg-source.pl: fix typo
+ scripts/udate-alternatives.8: fixed errors found while Japanese
  translation was made.
methods/Makefile.am: removed

1 files changed, 2 insertions, 1 deletions

diff --git a/dselect/main.cc b/dselect/main.cc
index e28b0ef27..85ba9236f 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -148,7 +148,8 @@ void curseson() {
       if (!smso)
         fputs(_("Terminal does not appear to support highlighting.\n"),stderr);
       fputs(_("Set your TERM variable correctly, use a better terminal,\n"
-            "or make do with the per-package management tool " DPKG ".\n"),stderr);
+            "or make do with the per-package management tool "),stderr);
+      fputs(DPKG ".\n",stderr);
       ohshit(_("terminal lacks necessary features, giving up"));
     }
   }