summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorPeter Eisentraut2020-06-15 06:22:52 +0000
committerPeter Eisentraut2020-06-15 06:46:56 +0000
commit47d4d0cfad6921fe1f6aabacc8a7a328ce9acb76 (patch)
tree8dc086dbc7319af309b3e25753de660c09d9b402 /src/bin
parent46241b28d84551bf6aeec3aa7e2391cda2757a21 (diff)
Error message refactoring
Take some untranslatable things out of the message and replace by format placeholders, to reduce translatable strings and reduce translation mistakes.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/pg_basebackup/pg_basebackup.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index b9ec640d2fc..b81b5679ec3 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -2505,7 +2505,8 @@ main(int argc, char **argv)
if (no_slot)
{
- pg_log_error("--create-slot and --no-slot are incompatible options");
+ pg_log_error("%s and %s are incompatible options",
+ "--create-slot", "--no-slot");
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname);
exit(1);
@@ -2543,7 +2544,8 @@ main(int argc, char **argv)
if (showprogress && !estimatesize)
{
- pg_log_error("--progress and --no-estimate-size are incompatible options");
+ pg_log_error("%s and %s are incompatible options",
+ "--progress", "--no-estimate-size");
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname);
exit(1);
@@ -2551,7 +2553,8 @@ main(int argc, char **argv)
if (!manifest && manifest_checksums != NULL)
{
- pg_log_error("--no-manifest and --manifest-checksums are incompatible options");
+ pg_log_error("%s and %s are incompatible options",
+ "--no-manifest", "--manifest-checksums");
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname);
exit(1);
@@ -2559,7 +2562,8 @@ main(int argc, char **argv)
if (!manifest && manifest_force_encode)
{
- pg_log_error("--no-manifest and --manifest-force-encode are incompatible options");
+ pg_log_error("%s and %s are incompatible options",
+ "--no-manifest", "--manifest-force-encode");
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname);
exit(1);