dselect: Unmark debug messages for translation

7 files changed, 21 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 322d5c4a0..687a03545 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-14  Guillem Jover  <guillem@debian.org>
+
+	* dselect/baselist.cc (baselist::startdisplay): Unmark debug message
+	for translation.
+	* dselect/methlist.cc (methodlist::display): Likewise.
+	* dselect/pkgdepcon.cc (packagelist::resolvedepcon): Likewise.
+	* dselect/pkglist.cc (packagelist::addheading): Likewise.
+	* dselect/pkgsublist.cc (packagelist::add): Likewise.
+
 2008-09-05  Raphael Hertzog  <hertzog@debian.org>
 
 	* configure.ac: Release 1.14.22.
diff --git a/debian/changelog b/debian/changelog
index a761b6168..f64c30d85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ dpkg (1.15.0) UNRELEASED; urgency=low
     and checksum support in .deb files. Closes: #492052
   * Use a troff special character for the copyright symbol on man pages.
   * Mark program names in dpkg-trigger.1 in bold.
+  * Unmark dselect debug messages for translation.
 
   [ Raphael Hertzog ]
   * Enhance dpkg-shlibdeps's error message when a library can't be found to
diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index 2478a6380..9e64a590f 100644
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -199,12 +199,12 @@ void baselist::startdisplay() {
 
   if (debug)
     fprintf(debug,
-            _("baselist::startdisplay() done ...\n\n"
+            "baselist::startdisplay() done ...\n\n"
             " xmax=%d, ymax=%d;\n\n"
             " title_height=%d, colheads_height=%d, list_height=%d;\n"
             " thisstate_height=%d, info_height=%d, whatinfo_height=%d;\n\n"
             " colheads_row=%d, thisstate_row=%d, info_row=%d;\n"
-            " whatinfo_row=%d, list_row=%d;\n\n"),
+            " whatinfo_row=%d, list_row=%d;\n\n",
             xmax, ymax,
             title_height, colheads_height, list_height,
             thisstate_height, info_height, whatinfo_height,
diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index d13aa12c6..b133aa663 100644
--- a/dselect/methlist.cc
+++ b/dselect/methlist.cc
@@ -172,7 +172,7 @@ quitaction methodlist::display() {
     interp= (*bindings)(response);
     if (debug)
       fprintf(debug,"methodlist[%p]::display() response=%d interp=%s\n",
-              this,response, interp ? interp->action : _("[none]"));
+              this,response, interp ? interp->action : "[none]");
     if (!interp) { beep(); continue; }
     (this->*(interp->mfn))();
     if (interp->qa != qa_noquit) break;
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index f5a8c4570..4b41961e3 100644
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -206,13 +206,13 @@ int packagelist::resolvedepcon(dependency *depends) {
 
   if (depdebug && debug) {
     fprintf(debug,"packagelist[%p]::resolvedepcon([%p] %s --%s-->",
-          this,depends,depends->up->name,gettext(relatestrings[depends->type]));
+            this, depends, depends->up->name, relatestrings[depends->type]);
     for (possi=depends->list; possi; possi=possi->next)
       fprintf(debug," %s",possi->ed->name);
     fprintf(debug,"); (ing)->want=%s\n",
             depends->up->clientdata
-            ? gettext(wantstrings[depends->up->clientdata->suggested])
-            : _("(no clientdata)"));
+            ? wantstrings[depends->up->clientdata->suggested]
+            : "(no clientdata)");
   }
   
   if (!depends->up->clientdata) return 0;
@@ -239,7 +239,7 @@ int packagelist::resolvedepcon(dependency *depends) {
     if (depdebug && debug)
       fprintf(debug,"packagelist[%p]::resolvedepcon([%p]): depends found %s\n",
               this,depends,
-              possi ? possi->ed->name : _("[none]"));
+              possi ? possi->ed->name : "[none]");
     if (possi) return 0;
 
     // Ensures all in the recursive list; adds info strings; ups priorities
diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index b459b11b7..3557a901c 100644
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -118,8 +118,8 @@ void packagelist::addheading(enum ssavailval ssavail,
   
   if (debug) fprintf(debug,"packagelist[%p]::addheading(%d,%d,%d,%s,%s)\n",
                      this,ssavail,ssstate,priority,
-                     otherpriority ? otherpriority : _("<null>"),
-                     section ? section : _("<null>"));
+                     otherpriority ? otherpriority : "<null>",
+                     section ? section : "<null>");
 
   struct pkginfo *newhead= new pkginfo;
   newhead->name= 0;
diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc
index f2a5a2459..f5d2225a0 100644
--- a/dselect/pkgsublist.cc
+++ b/dselect/pkgsublist.cc
@@ -52,14 +52,14 @@ void packagelist::add(pkginfo *pkg) {
 
 void packagelist::add(pkginfo *pkg, pkginfo::pkgwant nw) {
   if (debug) fprintf(debug,"packagelist[%p]::add(pkginfo %s, %s)\n",
-                     this,pkg->name,gettext(wantstrings[nw]));
+                     this, pkg->name, wantstrings[nw]);
   add(pkg);  if (!pkg->clientdata) return;
   pkg->clientdata->direct= nw;
   selpriority np;
   np= would_like_to_install(nw,pkg) ? sp_selecting : sp_deselecting;
   if (pkg->clientdata->spriority > np) return;
   if (debug) fprintf(debug,"packagelist[%p]::add(pkginfo %s, %s) setting\n",
-                     this,pkg->name,gettext(wantstrings[nw]));
+                     this, pkg->name, wantstrings[nw]);
   pkg->clientdata->suggested= pkg->clientdata->selected= nw;
   pkg->clientdata->spriority= np;