Fix some translatable strings in pg_basebackup and pg_combinebackup

Two translatable strings introduced in dc212340058b were split into two
parts, making their translation harder than necessary.

Author: Kyotaro Horiguchi
Discussion: https://postgr.es/m/20231225.134747.2287499067164862136.horikyota.ntt@gmail.com

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 5795b91261fce53d792a537bde0a20a62749bd50..28d2ee435b5bf7874d2f90f675aa5d526f43247b 100644 (file)
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -396,8 +396,8 @@ usage(void)
    printf(_("\nOptions controlling the output:\n"));
    printf(_("  -D, --pgdata=DIRECTORY receive base backup into directory\n"));
    printf(_("  -F, --format=p|t       output format (plain (default), tar)\n"));
-   printf(_("  -i, --incremental=OLDMANIFEST\n"));
-   printf(_("                         take incremental backup\n"));
+   printf(_("  -i, --incremental=OLDMANIFEST\n"
+            "                         take incremental backup\n"));
    printf(_("  -r, --max-rate=RATE    maximum transfer rate to transfer data directory\n"
             "                         (in kB/s, or use suffix \"k\" or \"M\")\n"));
    printf(_("  -R, --write-recovery-conf\n"

diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c
index b6ae6f2aef938c0d9ac1b792dd6ed6b50afb6532..49e97fcca87f31a823eea82e08369636f8f5757b 100644 (file)
--- a/src/bin/pg_combinebackup/pg_combinebackup.c
+++ b/src/bin/pg_combinebackup/pg_combinebackup.c
@@ -669,8 +669,8 @@ help(const char *progname)
    printf(_("  -n, --dry-run             don't actually do anything\n"));
    printf(_("  -N, --no-sync             do not wait for changes to be written safely to disk\n"));
    printf(_("  -o, --output              output directory\n"));
-   printf(_("  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"));
-   printf(_("                            relocate tablespace in OLDDIR to NEWDIR\n"));
+   printf(_("  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
+            "                            relocate tablespace in OLDDIR to NEWDIR\n"));
    printf(_("      --manifest-checksums=SHA{224,256,384,512}|CRC32C|NONE\n"
             "                            use algorithm for manifest checksums\n"));
    printf(_("      --no-manifest         suppress generation of backup manifest\n"));