1
0
mirror of https://github.com/postgres/postgres.git synced 2025-04-22 23:02:54 +03:00

Fix some translator comments so that xgettext finds them and pgindent does

not destroy them.  Maybe we can adjust pgindent sometime.
This commit is contained in:
Peter Eisentraut 2006-11-28 12:54:42 +00:00
parent b64d2d2133
commit a75ccd1def
4 changed files with 20 additions and 27 deletions

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.158 2006/10/04 00:29:55 momjian Exp $ * $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.159 2006/11/28 12:54:41 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1229,10 +1229,8 @@ findTargetlistEntry(ParseState *pstate, Node *node, List **tlist, int clause)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_AMBIGUOUS_COLUMN), (errcode(ERRCODE_AMBIGUOUS_COLUMN),
/* /*------
* translator: first %s is name of a SQL translator: first %s is name of a SQL construct, eg ORDER BY */
* construct, eg ORDER BY
*/
errmsg("%s \"%s\" is ambiguous", errmsg("%s \"%s\" is ambiguous",
clauseText[clause], name), clauseText[clause], name),
parser_errposition(pstate, location))); parser_errposition(pstate, location)));

View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.145 2006/10/11 20:21:03 tgl Exp $ * $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.146 2006/11/28 12:54:41 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -954,9 +954,8 @@ select_common_type(List *typeids, const char *context)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATATYPE_MISMATCH), (errcode(ERRCODE_DATATYPE_MISMATCH),
/* /*------
* translator: first %s is name of a SQL construct, eg CASE translator: first %s is name of a SQL construct, eg CASE */
*/
errmsg("%s types %s and %s cannot be matched", errmsg("%s types %s and %s cannot be matched",
context, context,
format_type_be(ptype), format_type_be(ptype),

View File

@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.503 2006/11/21 20:59:52 tgl Exp $ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.504 2006/11/28 12:54:41 petere Exp $
* *
* NOTES * NOTES
* *
@ -2390,28 +2390,25 @@ LogChildExit(int lev, const char *procname, int pid, int exitstatus)
if (WIFEXITED(exitstatus)) if (WIFEXITED(exitstatus))
ereport(lev, ereport(lev,
/* /*------
* translator: %s is a noun phrase describing a child process, such as translator: %s is a noun phrase describing a child process, such as
* "server process" "server process" */
*/
(errmsg("%s (PID %d) exited with exit code %d", (errmsg("%s (PID %d) exited with exit code %d",
procname, pid, WEXITSTATUS(exitstatus)))); procname, pid, WEXITSTATUS(exitstatus))));
else if (WIFSIGNALED(exitstatus)) else if (WIFSIGNALED(exitstatus))
ereport(lev, ereport(lev,
/* /*------
* translator: %s is a noun phrase describing a child process, such as translator: %s is a noun phrase describing a child process, such as
* "server process" "server process" */
*/
(errmsg("%s (PID %d) was terminated by signal %d", (errmsg("%s (PID %d) was terminated by signal %d",
procname, pid, WTERMSIG(exitstatus)))); procname, pid, WTERMSIG(exitstatus))));
else else
ereport(lev, ereport(lev,
/* /*------
* translator: %s is a noun phrase describing a child process, such as translator: %s is a noun phrase describing a child process, such as
* "server process" "server process" */
*/
(errmsg("%s (PID %d) exited with unexpected status %d", (errmsg("%s (PID %d) exited with unexpected status %d",
procname, pid, exitstatus))); procname, pid, exitstatus)));
} }

View File

@ -42,7 +42,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.177 2006/11/21 22:19:46 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.178 2006/11/28 12:54:42 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1957,11 +1957,10 @@ useful_strerror(int errnum)
*/ */
if (str == NULL || *str == '\0') if (str == NULL || *str == '\0')
{ {
/*
* translator: This string will be truncated at 47 characters
* expanded.
*/
snprintf(errorstr_buf, sizeof(errorstr_buf), snprintf(errorstr_buf, sizeof(errorstr_buf),
/*------
translator: This string will be truncated at 47
characters expanded. */
_("operating system error %d"), errnum); _("operating system error %d"), errnum);
str = errorstr_buf; str = errorstr_buf;
} }