dpkg (1.10.26) unstable; urgency=low

  The "Captain Tight-Pants" Release.

  * Fix incorrect claim that 'Q' in dselect quits without saving changes
    (really 'X').
  * Revert to current 'stable' behaviour of Space/Enter/'Q' in the dselect
    help screen, Space leaves the help screen and Enter and 'Q' do nothing.
    It's dangerous to encourage users to press Enter or 'Q' since they
    commit changes in the package selection screen.

  * New Translations (Christian Perrier):
    - Basque (Piarres Beobide Egaña).  Closes: #281245.
      (Was really added in 1.10.24, but forgotten from ALL_LINGUAS.)
    - Bosnian (Safir Šećerović).
    - Slovak (benco).  Closes: #284896, #289341
    - Traditional Chinese (Asho Yeh).  Closes: #287375.
  * Updated Translations (Christian Perrier):
    - Brazilian Portuguese (André Luís Lopes).  Closes: #281228.
    - Catalan (Jordi Mallach).  Closes: #281333.
    - Czech (Miroslav Kure).  Closes: #281231.
    - Danish (Claus Hindsgaul).  Closes: #281103.
    - Dutch (Christian Perrier).  Closes: #282087.
    - Galician (Héctor Fernéndez López).
    - German (Michael Piefel).  Closes: #281503.
    - Italian (Stefano Canepa). Closes: #282543.
    - Japanese (Kenshi Muto).  Closes: #281144.
    - Korean (Changwoo Ryu).  Closes: #282246.
    - Norwegian Nynorsk (Håvard Korsvoll).  Closes: #281456.
    - Polish (Bartosz Feñski).
    - Portuguese (Miguel Figueiredo).  Closes: #281122, #289359.
    - Russian (Yuri Kozlov).  Closes: #281166.
    - Simplified Chinese (Tchaikov, Carlos Liu).
    - Spanish (Javier Fernández-Sanguino Peña).  Closes: #281117.
    - Swedish (Peter Karlsson).  Closes: #281165.

 -- Scott James Remnant <scott@netsplit.com>  Tue, 11 Jan 2005 16:26:51 +0000

2 files changed, 9 insertions, 9 deletions

diff --git a/dselect/basecmds.cc b/dselect/basecmds.cc
index 4c5c4bbe9..f76bc09dc 100644
--- a/dselect/basecmds.cc
+++ b/dselect/basecmds.cc
@@ -174,7 +174,7 @@ void baselist::displayhelp(const struct helpmenuentry *helpmenu, int key) {
       while (++x<maxx) addch(' ');
       attrset(thisstate_attr);
       mvaddstr(maxy-1,0,
-_("Press ? for help menu, <space> for next topic, <enter> to exit help."));
+_("Press ? for help menu, . for next topic, <space> to exit help."));
       getyx(stdscr,y,x);
       while (++x<maxx) addch(' ');
       move(maxy,maxx);
@@ -189,18 +189,18 @@ _("Press ? for help menu, <space> for next topic, <enter> to exit help."));
         mvaddstr(i+3,6, gettext(hme->msg->title));
       }
       mvaddstr(i+4,1,
-               _("Press a key from the list above, <enter>, `q' or `Q' to exit help,\n"
-               "  or <space> to read each help page in turn. "));
+               _("Press a key from the list above, <space> or `q' to exit help,\n"
+               "  or `.' (full stop) to read each help page in turn. "));
       nextkey= helpmenu[0].key;
     }
     refresh();
     key= getch();
     if (key == EOF) ohshite(_("error reading keyboard in help"));
-    if (key == '\n' || key == '\r' || key == KEY_ENTER || key == 'q' || key == 'Q') {
+    if (key == ' ' || key == 'q') {
       break;
     } else if (key == '?' || key == 'h') {
       key= 0;
-    } else if (key == ' ' || key == '.') {
+    } else if (key == '.') {
       key= nextkey;
     }
   }
diff --git a/dselect/helpmsgs.cc b/dselect/helpmsgs.cc
index 44f10d124..83e4b07ae 100644
--- a/dselect/helpmsgs.cc
+++ b/dselect/helpmsgs.cc
@@ -48,10 +48,10 @@ Much on-line help is available, please make use of it - press `?' at\n\
 any time for help.\n\n\
 \
 When you have finished selecting packages, press <enter> to confirm changes,\n\
-or `Q' to quit without saving changes. A final check on conflicts and\n\
+or `X' to quit without saving changes. A final check on conflicts and\n\
 dependencies will be done - here too you may see a sublist.\n\n\
 \
-Press <enter> to leave help and enter the list now.\n")
+Press <space> to leave help and enter the list now.\n")
 };
 const struct helpmessage hlp_readonlyintro = {
   N_("Introduction to read-only package list browser"), N_("\
@@ -69,7 +69,7 @@ any time for help.\n\n\
 \
 When you have finished browsing, press `Q' or <enter> to quit.\n\n\
 \
-Press <enter> to leave help and enter the list now.\n")
+Press <space> to leave help and enter the list now.\n")
 };
 const struct helpmessage hlp_recurintro = {
   N_("Introduction to conflict/dependency resolution sub-list"), N_("\
@@ -94,7 +94,7 @@ like what you want, and you can `reject' my suggestions by using the capital\n\
 force me to accept the situation currently displayed, in case you want to\n\
 override a recommendation or think that the program is mistaken.\n\n\
 \
-Press <enter> to leave help and enter the sub-list; remember: press `?' for help.\n")
+Press <space> to leave help and enter the sub-list; remember: press `?' for help.\n")
 };
 const struct helpmessage hlp_displayexplain1 = {
   N_("Display, part 1: package listing and status chars"), N_("\