psql: Small fixes for better translatability

diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 400b683859c35f6797006d2d2c5893a1ea0bf763..3e39fdb54529725853b791016b21e381ec6f8ba4 100644 (file)
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -4088,7 +4088,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
            (showTables || showMatViews || showIndexes))
            appendPQExpBuffer(&buf,
                              ",\n  am.amname as \"%s\"",
-                             gettext_noop("Access Method"));
+                             gettext_noop("Access method"));
 
        /*
         * As of PostgreSQL 9.0, use pg_table_size() to show a more accurate

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 8e3bb38ab1e050bc903e061df892ada7a0ffd5ce..97fc680f1f70befec06bd624204f4a19646a35b8 100644 (file)
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -240,8 +240,8 @@ slashUsage(unsigned short int pager)
    fprintf(output, _("  \\des[+] [PATTERN]      list foreign servers\n"));
    fprintf(output, _("  \\deu[+] [PATTERN]      list user mappings\n"));
    fprintf(output, _("  \\dew[+] [PATTERN]      list foreign-data wrappers\n"));
-   fprintf(output, _("  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"));
-   fprintf(output, _("                         list [only agg/normal/procedure/trigger/window] functions\n"));
+   fprintf(output, _("  \\df[anptw][S+] [FUNCPTRN [TYPEPTRN ...]]\n"
+                     "                         list [only agg/normal/procedure/trigger/window] functions\n"));
    fprintf(output, _("  \\dF[+]  [PATTERN]      list text search configurations\n"));
    fprintf(output, _("  \\dFd[+] [PATTERN]      list text search dictionaries\n"));
    fprintf(output, _("  \\dFp[+] [PATTERN]      list text search parsers\n"));
@@ -252,7 +252,8 @@ slashUsage(unsigned short int pager)
    fprintf(output, _("  \\dL[S+] [PATTERN]      list procedural languages\n"));
    fprintf(output, _("  \\dm[S+] [PATTERN]      list materialized views\n"));
    fprintf(output, _("  \\dn[S+] [PATTERN]      list schemas\n"));
-   fprintf(output, _("  \\do[S]  [OPPTRN [TYPEPTRN [TYPEPTRN]]]  list operators\n"));
+   fprintf(output, _("  \\do[S]  [OPPTRN [TYPEPTRN [TYPEPTRN]]]\n"
+                     "                         list operators\n"));
    fprintf(output, _("  \\dO[S+] [PATTERN]      list collations\n"));
    fprintf(output, _("  \\dp     [PATTERN]      list table, view, and sequence access privileges\n"));
    fprintf(output, _("  \\dP[itn+] [PATTERN]    list [only index/table] partitioned relations [n=nested]\n"));

diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index 49139dd3633bdda985640b8306a9c3238344867b..1b2f6bc418850aa9368f3674a8540f46cfa85d31 100644 (file)
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -2846,7 +2846,7 @@ Access method: heap
 -- AM is displayed for tables, indexes and materialized views.
 \d+
                                                            List of relations
-     Schema      |        Name        |       Type        |        Owner         | Persistence | Access Method |  Size   | Description 
+     Schema      |        Name        |       Type        |        Owner         | Persistence | Access method |  Size   | Description 
 -----------------+--------------------+-------------------+----------------------+-------------+---------------+---------+-------------
  tableam_display | mat_view_heap_psql | materialized view | regress_display_role | permanent   | heap_psql     | 0 bytes | 
  tableam_display | tbl_heap           | table             | regress_display_role | permanent   | heap          | 0 bytes | 
@@ -2856,7 +2856,7 @@ Access method: heap
 
 \dt+
                                                   List of relations
-     Schema      |     Name      | Type  |        Owner         | Persistence | Access Method |  Size   | Description 
+     Schema      |     Name      | Type  |        Owner         | Persistence | Access method |  Size   | Description 
 -----------------+---------------+-------+----------------------+-------------+---------------+---------+-------------
  tableam_display | tbl_heap      | table | regress_display_role | permanent   | heap          | 0 bytes | 
  tableam_display | tbl_heap_psql | table | regress_display_role | permanent   | heap_psql     | 0 bytes | 
@@ -2864,7 +2864,7 @@ Access method: heap
 
 \dm+
                                                            List of relations
-     Schema      |        Name        |       Type        |        Owner         | Persistence | Access Method |  Size   | Description 
+     Schema      |        Name        |       Type        |        Owner         | Persistence | Access method |  Size   | Description 
 -----------------+--------------------+-------------------+----------------------+-------------+---------------+---------+-------------
  tableam_display | mat_view_heap_psql | materialized view | regress_display_role | permanent   | heap_psql     | 0 bytes | 
 (1 row)