N_(" ? help\n"),
N_(" q quit\n"),
N_(" Q quit without saving\n"),
-N_(" P quit and print selected item(s) to stderr\n"),
+N_(" P quit and output selected item(s) to stderr\n"),
N_(" ^L refresh screen\n"),
"\n",
N_(" arrows / j,k scroll list\n"),
N_(" enter view/edit item\n"),
N_(" a add item\n"),
N_(" r / del remove selected items\n"),
+N_(" M merge selected items (into top one)\n"),
N_(" D duplicate item\n"),
+N_(" U remove duplicates\n"),
"\n",
N_(" space select item\n"),
N_(" + select all\n"),
-N_(" - select none\n"),
+N_(" - unselect all\n"),
N_(" * invert selection\n"),
"\n",
N_(" w write database to disk\n"),
N_(" S \"surname sort\"\n"),
N_(" F sort by field (defined in configuration file)\n"),
"\n",
-N_(" / find\n"),
-N_(" \\ find next\n"),
+N_(" / search\n"),
+N_(" \\ search next occurrence\n"),
"\n",
N_(" A move current item up\n"),
N_(" Z move current item down\n"),
"\n",
N_(" m send mail with mutt\n"),
-N_(" u view URL with www browser\n"),
+N_(" v view URL with web browser\n"),
NULL
};
static char *editorhelp[] = {
"\n",
-N_(" a,c,p,o,C/arrows/h,l change tab\n"),
+N_(" arrows/h,l change tab\n"),
"\n",
-N_(" 1 - 5 edit fields\n"),
+N_(" q quit to main screen\n"),
+"\n",
+N_(" 1 - 5 A - Z edit fields\n"),
"\n",
N_(" k or < previous item\n"),
N_(" j or > next item\n"),
"\n",
-N_(" r roll e-mail addresses\n"),
+N_(" r roll e-mail addresses up\n"),
+N_(" ESC-r roll e-mail addresses down\n"),
"\n",
N_(" u undo\n"),
"\n",
N_(" m send mail with mutt\n"),
-N_(" v view url with WWW browser\n"),
+N_(" v view url with web browser\n"),
"\n",
NULL