* dselect/main.cc: fixed three cases where gettext usage was not

    possible die to macros inlined in the strings

diff --git a/ChangeLog b/ChangeLog
index f73d54f84b294acf41a16b86dc1dd45dbd4c2858..6e09b9ab131a3d04a6ecd299589dfd1ea023428e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 26 18:36:22 EST 1999 Ben Collins <bcollins@debian.org>
+
+  * dselect/main.cc: fixed three cases where gettext usage was not
+    possible die to macros inlined in the strings
+
 Fri Nov 26 18:09:17 EST 1999 Ben Collins <bcollins@debian.org>
 
   * configure.in: generate utils/Makefile

diff --git a/debian/changelog b/debian/changelog
index 96ff0569a6ed1204bd371d37f12a4b268acb8ca4..0d32414acf80f34e2c554890f8d459feb60d404e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dpkg (1.6.1) unstable; urgency=low
+
+  * dselect/main.cc: fixed three cases where gettext usage was not
+    possible die to macros inlined in the strings
+      
+ -- Wichert Akkerman <bcollins@debian.org>  UNRELEASED
+
 dpkg (1.6) unstable; urgency=low
 
   * Major overhaul of the buildsystem

diff --git a/dselect/main.cc b/dselect/main.cc
index 6c44f58b6758265b0f459697f0f682d609f26b95..d25e3b5b7fe922a509e2e7a021247d934648c378 100644 (file)
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -48,7 +48,7 @@ extern "C" {
 #include "pkglist.h"
 
 const char thisname[]= DSELECT;
-const char printforhelp[]= N_("Type " DSELECT " --help for help.");
+const char printforhelp[]= N_("Type %s --help for help.", DSELECT);
 
 modstatdb_rw readwrite;
 const char *admindir= ADMINDIR;
@@ -75,12 +75,13 @@ static const menuentry menuentries[]= {
 };
 
 static const char programdesc[]=
-      N_("Debian Linux `" DSELECT "' package handling frontend.");
+      N_("Debian Linux `%s' package handling frontend.", DSELECT);
 
 static const char copyrightstring[]= N_(
-      "Version " DPKG_VERSION_ARCH ".  Copyright (C) 1994-1996 Ian Jackson.   This is\n"
+      "Version %s.  Copyright (C) 1994-1996 Ian Jackson.   This is\n"
       "free software; see the GNU General Public Licence version 2 or later for\n"
-      "copying conditions.  There is NO warranty.  See dselect --licence for details.\n");
+      "copying conditions.  There is NO warranty.  See dselect --licence for details.\n",
+      DPKG_VERSION_ARCH);
 
 static void printversion(void) {
   if (fprintf(stdout,"%s\n%s",gettext(programdesc),gettext(copyrightstring)) == EOF) werr("stdout");