Made the accelerator keys in dselect's main menu separate options, so that

they can be translated separately.

diff --git a/ChangeLog b/ChangeLog
index 654582cd4f5ce46e701ab4e85a1f561f393a3795..6645a0f03e4a74b8289d4939016f91212b50dca5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 24 05:58:48 CST 2000 Adam Heath <doogie@debian.org>
+
+  * dselect/main.cc: Made the accelerator keys in dselect's main
+    menu separate options, so that they can be translated separately.
+
 Sun Dec 24 05:31:27 CST 2000 Adam Heath <doogie@debian.org>
 
   * debian/control: Added depends on sysvinit (>= 2.72), so that we

diff --git a/debian/changelog b/debian/changelog
index af00ee8104970c03f128211dd1ac4f09a0dcec47..f9bd9c111a1705d10bcb69a9fb27b36ff1ccce7b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 dpkg (1.8.0) unstable; urgency=low
 
+  * Made the accelerator keys in dselect's main menu separate options, so
+    that they can be translated separately.  Closes: #50955.
   * Added depends on sysvinit (>= 2.72), so that we can make sure that
     /etc/rcS.d exists.  Closes: #55037.
   * update-rc.d: Changed documentation and help, as -f only applies during

diff --git a/dselect/main.cc b/dselect/main.cc
index 57853e10e76604d0badab77d04477fe04b451f55..eda42bc5491f7380ccba95af7b907ad96d424fb9 100644 (file)
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -60,20 +60,21 @@ int expertmode = 0;
 static keybindings packagelistbindings(packagelist_kinterps,packagelist_korgbindings);
 
 struct menuentry {
+  const char *key;
   const char *option;
   const char *menuent;
   urqfunction *fn;
 };
 
 static const menuentry menuentries[]= {
-  { N_("access"),  N_("Choose the access method to use."),                &urq_setup   },
-  { N_("update"),  N_("Update list of available packages, if possible."), &urq_update  },
-  { N_("select"),  N_("Request which packages you want on your system."), &urq_list    },
-  { N_("install"), N_("Install and upgrade wanted packages."),            &urq_install },
-  { N_("config"),  N_("Configure any packages that are unconfigured."),   &urq_config  },
-  { N_("remove"),  N_("Remove unwanted software."),                       &urq_remove  },
-  { N_("quit"),    N_("Quit dselect."),                                   &urq_quit    },
-  { N_("menu"),    0,                                                     &urq_menu    },
+  { N_("a"), N_("[A]ccess"),  N_("Choose the access method to use."),                &urq_setup   },
+  { N_("u"), N_("[U]pdate"),  N_("Update list of available packages, if possible."), &urq_update  },
+  { N_("s"), N_("[S]elect"),  N_("Request which packages you want on your system."), &urq_list    },
+  { N_("i"), N_("[I]nstall"), N_("Install and upgrade wanted packages."),            &urq_install },
+  { N_("c"), N_("[C]onfig"),  N_("Configure any packages that are unconfigured."),   &urq_config  },
+  { N_("r"), N_("[R]emove"),  N_("Remove unwanted software."),                       &urq_remove  },
+  { N_("q"), N_("[Q]uit"),    N_("Quit dselect."),                                   &urq_quit    },
+  { 0,       N_("menu"),      0,                                                     &urq_menu    },
   { 0                                                                              }
 };
 
@@ -194,10 +195,9 @@ urqresult urq_list(void) {
 void dme(int i, int so) {
   char buf[120];
   const menuentry *me= &menuentries[i];
-  const char* option = gettext(me->option);
-  sprintf(buf," %c %d. [%c]%-10.10s %-80.80s ",
+  sprintf(buf," %c %d. %-11.11s %-80.80s ",
           so ? '*' : ' ', i,
-          toupper(option[0]), option+1,
+          me->option,
           gettext(me->menuent));
   
   int y,x;
@@ -287,7 +287,7 @@ urqresult urq_menu(void) {
       }
     } else if (isalpha(c)) {
       c= tolower(c);
-      for (i=0; i<entries && gettext(menuentries[i].option)[0] != c; i++);
+      for (i=0; i<entries && gettext(menuentries[i].key)[0] != c; i++);
       if (i < entries) {
         dme(cursor,0); cursor=i; dme(cursor,1);
       } else {

diff --git a/po/dpkg.pot b/po/dpkg.pot
index 324261878ed71446c92962cde91650421eabe29d..5f46b9125412118f92c267fa7801db08841d1999 100644 (file)
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-24 05:07-0600\n"
+"POT-Creation-Date: 2000-12-24 05:57-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3872,72 +3872,100 @@ msgstr ""
 msgid "Type dselect --help for help."
 msgstr ""
 
-#: dselect/main.cc:69
-msgid "access"
+#: dselect/main.cc:70
+msgid "a"
 msgstr ""
 
-#: dselect/main.cc:69
-msgid "Choose the access method to use."
+#: dselect/main.cc:70
+msgid "[A]ccess"
 msgstr ""
 
 #: dselect/main.cc:70
-msgid "update"
+msgid "Choose the access method to use."
 msgstr ""
 
-#: dselect/main.cc:70
-msgid "Update list of available packages, if possible."
+#: dselect/main.cc:71
+msgid "u"
 msgstr ""
 
 #: dselect/main.cc:71
-msgid "select"
+msgid "[U]pdate"
 msgstr ""
 
 #: dselect/main.cc:71
-msgid "Request which packages you want on your system."
+msgid "Update list of available packages, if possible."
 msgstr ""
 
-#: dselect/main.cc:72 dselect/pkgdisplay.cc:37
-msgid "install"
+#: dselect/main.cc:72
+msgid "s"
 msgstr ""
 
 #: dselect/main.cc:72
-msgid "Install and upgrade wanted packages."
+msgid "[S]elect"
+msgstr ""
+
+#: dselect/main.cc:72
+msgid "Request which packages you want on your system."
 msgstr ""
 
 #: dselect/main.cc:73
-msgid "config"
+msgid "i"
 msgstr ""
 
 #: dselect/main.cc:73
-msgid "Configure any packages that are unconfigured."
+msgid "[I]nstall"
 msgstr ""
 
-#: dselect/main.cc:74 dselect/pkgdisplay.cc:39
-msgid "remove"
+#: dselect/main.cc:73
+msgid "Install and upgrade wanted packages."
 msgstr ""
 
 #: dselect/main.cc:74
-msgid "Remove unwanted software."
+msgid "c"
+msgstr ""
+
+#: dselect/main.cc:74
+msgid "[C]onfig"
+msgstr ""
+
+#: dselect/main.cc:74
+msgid "Configure any packages that are unconfigured."
 msgstr ""
 
 #: dselect/main.cc:75
-msgid "quit"
+msgid "r"
 msgstr ""
 
 #: dselect/main.cc:75
-msgid "Quit dselect."
+msgid "[R]emove"
+msgstr ""
+
+#: dselect/main.cc:75
+msgid "Remove unwanted software."
+msgstr ""
+
+#: dselect/main.cc:76
+msgid "q"
 msgstr ""
 
 #: dselect/main.cc:76
+msgid "[Q]uit"
+msgstr ""
+
+#: dselect/main.cc:76
+msgid "Quit dselect."
+msgstr ""
+
+#: dselect/main.cc:77
 msgid "menu"
 msgstr ""
 
-#: dselect/main.cc:81
+#: dselect/main.cc:82
 #, c-format
 msgid "Debian GNU/Linux `%s' package handling frontend."
 msgstr ""
 
-#: dselect/main.cc:84
+#: dselect/main.cc:85
 #, c-format
 msgid ""
 "Version %s.  Copyright (C) 1994-1996 Ian Jackson.   This is\n"
@@ -3946,7 +3974,7 @@ msgid ""
 "details.\n"
 msgstr ""
 
-#: dselect/main.cc:96
+#: dselect/main.cc:97
 msgid ""
 "Usage: dselect [options]\n"
 "       dselect [options] action ...\n"
@@ -3955,26 +3983,26 @@ msgid ""
 "Actions:  access update select install config remove quit menu\n"
 msgstr ""
 
-#: dselect/main.cc:116
+#: dselect/main.cc:117
 #, c-format
 msgid "couldn't open debug file `%.255s'\n"
 msgstr ""
 
-#: dselect/main.cc:147
+#: dselect/main.cc:148
 msgid "Terminal does not appear to support cursor addressing.\n"
 msgstr ""
 
-#: dselect/main.cc:149
+#: dselect/main.cc:150
 msgid "Terminal does not appear to support highlighting.\n"
 msgstr ""
 
-#: dselect/main.cc:150
+#: dselect/main.cc:151
 msgid ""
 "Set your TERM variable correctly, use a better terminal,\n"
 "or make do with the per-package management tool "
 msgstr ""
 
-#: dselect/main.cc:153
+#: dselect/main.cc:154
 msgid "terminal lacks necessary features, giving up"
 msgstr ""
 
@@ -4262,10 +4290,18 @@ msgstr ""
 msgid "new package"
 msgstr ""
 
+#: dselect/pkgdisplay.cc:37
+msgid "install"
+msgstr ""
+
 #: dselect/pkgdisplay.cc:38
 msgid "hold"
 msgstr ""
 
+#: dselect/pkgdisplay.cc:39
+msgid "remove"
+msgstr ""
+
 #: dselect/pkgdisplay.cc:40
 msgid "purge"
 msgstr ""