From 231ff70f98e389dd510db86d3971b87e92c65d39 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Tue, 26 Dec 2023 18:54:36 +0900 Subject: [PATCH] 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 --- src/bin/pg_basebackup/pg_basebackup.c | 4 ++-- src/bin/pg_combinebackup/pg_combinebackup.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index 5795b91261..28d2ee435b 100644 --- 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 b6ae6f2aef..49e97fcca8 100644 --- 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"));