From a0afabd4567801393f8046b719467167e0734570 Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Fri, 26 Nov 1999 23:40:03 +0000 Subject: [PATCH] * dselect/main.cc: fixed three cases where gettext usage was not possible die to macros inlined in the strings --- ChangeLog | 5 +++++ debian/changelog | 7 +++++++ dselect/main.cc | 9 +++++---- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f73d54f8..6e09b9ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 26 18:36:22 EST 1999 Ben Collins + + * 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 * configure.in: generate utils/Makefile diff --git a/debian/changelog b/debian/changelog index 96ff0569..0d32414a 100644 --- 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 UNRELEASED + dpkg (1.6) unstable; urgency=low * Major overhaul of the buildsystem diff --git a/dselect/main.cc b/dselect/main.cc index 6c44f58b..d25e3b5b 100644 --- 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"); -- 2.39.5