From 56a9ed92b664af191040d848ca923fb3234671ee Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Mon, 5 Sep 2011 18:52:49 -0300 Subject: [PATCH] Adjust translator comment format to xgettext expectations --- src/backend/access/transam/xlog.c | 7 +++---- src/backend/catalog/dependency.c | 22 ++++++++++------------ src/bin/scripts/common.c | 7 +++---- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 7d66545017..4abc5630e9 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -3280,11 +3280,10 @@ ExecuteRecoveryCommand(char *command, char *commandName, bool failOnSignal) */ signaled = WIFSIGNALED(rc) || WEXITSTATUS(rc) > 125; - /* - * translator: First %s represents a recovery.conf parameter name like - * "recovery_end_command", and the 2nd is the value of that parameter. - */ ereport((signaled && failOnSignal) ? FATAL : WARNING, + /*------ + translator: First %s represents a recovery.conf parameter name like + "recovery_end_command", and the 2nd is the value of that parameter. */ (errmsg("%s \"%s\": return code %d", commandName, command, rc))); } diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index 290e74a777..223c097abb 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -2447,12 +2447,11 @@ getObjectDescription(const ObjectAddress *object) initStringInfo(&opfam); getOpFamilyDescription(&opfam, amopForm->amopfamily); - /* - * translator: %d is the operator strategy (a number), the - * first two %s's are data type names, the third %s is the - * description of the operator family, and the last %s is the - * textual form of the operator with arguments. - */ + /*------ + translator: %d is the operator strategy (a number), the + first two %s's are data type names, the third %s is the + description of the operator family, and the last %s is the + textual form of the operator with arguments. */ appendStringInfo(&buffer, _("operator %d (%s, %s) of %s: %s"), amopForm->amopstrategy, format_type_be(amopForm->amoplefttype), @@ -2498,12 +2497,11 @@ getObjectDescription(const ObjectAddress *object) initStringInfo(&opfam); getOpFamilyDescription(&opfam, amprocForm->amprocfamily); - /* - * translator: %d is the function number, the first two %s's - * are data type names, the third %s is the description of the - * operator family, and the last %s is the textual form of the - * function with arguments. - */ + /*------ + translator: %d is the function number, the first two %s's + are data type names, the third %s is the description of the + operator family, and the last %s is the textual form of the + function with arguments. */ appendStringInfo(&buffer, _("function %d (%s, %s) of %s: %s"), amprocForm->amprocnum, format_type_be(amprocForm->amproclefttype), diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c index e85adfaf11..9a7cc2c264 100644 --- a/src/bin/scripts/common.c +++ b/src/bin/scripts/common.c @@ -289,10 +289,9 @@ yesno_prompt(const char *question) { char prompt[256]; - /* - * translator: This is a question followed by the translated options for - * "yes" and "no". - */ + /*------ + translator: This is a question followed by the translated options for + "yes" and "no". */ snprintf(prompt, sizeof(prompt), _("%s (%s/%s) "), _(question), _(PG_YESLETTER), _(PG_NOLETTER));