Reword some messages and add translator comments.

* src/gdbmtool.c: Avoid duplicating the GDBM_BAD_AVAIL message.
Add translator comments.
* src/gdbmerrno.c: Add translator comments.
* src/util.c: Likewise.

3 files changed, 5 insertions, 3 deletions

diff --git a/src/gdbmerrno.c b/src/gdbmerrno.c
index efda7a4..0fa667a 100644
--- a/src/gdbmerrno.c
+++ b/src/gdbmerrno.c
@@ -130,12 +130,13 @@ const char * const gdbm_errlist[_GDBM_MAX_ERRNO+1] = {
   [GDBM_ERR_FILE_MODE]          = N_("Failed to restore file mode"),
   [GDBM_NEED_RECOVERY]          = N_("Database needs recovery"),
   [GDBM_BACKUP_FAILED]          = N_("Failed to create backup copy"),
   [GDBM_DIR_OVERFLOW]           = N_("Bucket directory overflow"),
   [GDBM_BAD_BUCKET]             = N_("Malformed bucket header"),
   [GDBM_BAD_HEADER]             = N_("Malformed database file header"),
+  /* TRANSLATORS: avail_block is a field name. Don't translate it. */
   [GDBM_BAD_AVAIL]              = N_("Malformed avail_block"),
   [GDBM_BAD_HASH_TABLE]         = N_("Malformed hash table"),
   [GDBM_BAD_DIR_ENTRY]          = N_("Invalid directory entry"),
   [GDBM_FILE_CLOSE_ERROR]       = N_("Error closing file"),
   [GDBM_FILE_SYNC_ERROR]        = N_("Error synchronizing file"),
   [GDBM_FILE_TRUNCATE_ERROR]    = N_("Error truncating file")
diff --git a/src/gdbmtool.c b/src/gdbmtool.c
index 8a17c29..d736411 100644
--- a/src/gdbmtool.c
+++ b/src/gdbmtool.c
@@ -308,13 +308,13 @@ _gdbm_print_avail_list (FILE *fp, GDBM_FILE dbf)
       /* Print the block! */
       fprintf (fp, _("\nblock = %d\nsize  = %d\ncount = %d\n"), temp,
                av_stk->size, av_stk->count);
       if (gdbm_avail_block_validate (dbf, av_stk) == 0)
         av_table_display (av_stk->av_table, av_stk->count, fp);
       else
-        terror (_("invalid avail_block"));
+        terror ("%s", gdbm_strerror (GDBM_BAD_AVAIL));
       temp = av_stk->next_block;
     }
   free (av_stk);
 }
 
 void
@@ -1232,13 +1232,13 @@ struct command command_tab[] = {
   { S(next), T_CMD,
     checkdb_begin, nextkey_handler, NULL,
     { { N_("[KEY]"), GDBM_ARG_DATUM, DS_KEY },
       { NULL } },
     FALSE,
     REPEAT_NOARG,
-    N_("nextkey") },
+    N_("continue iteration: get next key and datum") },
   { S(store), T_CMD,
     checkdb_begin, store_handler, NULL,
     { { N_("KEY"), GDBM_ARG_DATUM, DS_KEY },
       { N_("DATA"), GDBM_ARG_DATUM, DS_CONTENT },
       { NULL } },
     FALSE,
@@ -1246,13 +1246,13 @@ struct command command_tab[] = {
     N_("store") },
   { S(first), T_CMD,
     checkdb_begin, firstkey_handler, NULL,
     { { NULL } },
     FALSE,
     REPEAT_NEVER,
-    N_("firstkey") },
+    N_("begin iteration: get first key and datum") },
   { S(reorganize), T_CMD,
     checkdb_begin, reorganize_handler, NULL,
     { { NULL } },
     FALSE,
     REPEAT_NEVER,
     N_("reorganize") },
diff --git a/src/util.c b/src/util.c
index 25daeed..aa56dc4 100644
--- a/src/util.c
+++ b/src/util.c
@@ -92,12 +92,13 @@ vgetyn (const char *prompt, va_list ap)
                 case 'Y':
                   return 1;
                 case 'n':
                 case 'N':
                   return 0;
                 default:
+                  /* TRANSLATORS: Please, don't translate 'y' and 'n'. */
                   fprintf (stdout, "%s\n", _("Please, reply 'y' or 'n'"));
                 }
               /* fall through */
             }
           else
             break;