Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita75ccd1

Browse files
committed
Fix some translator comments so that xgettext finds them and pgindent does
not destroy them. Maybe we can adjust pgindent sometime.
1 parentb64d2d2 commita75ccd1

File tree

4 files changed

+20
-27
lines changed

4 files changed

+20
-27
lines changed

‎src/backend/parser/parse_clause.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.158 2006/10/04 00:29:55 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/parse_clause.c,v 1.159 2006/11/28 12:54:41 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1229,10 +1229,8 @@ findTargetlistEntry(ParseState *pstate, Node *node, List **tlist, int clause)
12291229
ereport(ERROR,
12301230
(errcode(ERRCODE_AMBIGUOUS_COLUMN),
12311231

1232-
/*
1233-
* translator: first %s is name of a SQL
1234-
* construct, eg ORDER BY
1235-
*/
1232+
/*------
1233+
translator: first %s is name of a SQL construct, eg ORDER BY */
12361234
errmsg("%s \"%s\" is ambiguous",
12371235
clauseText[clause],name),
12381236
parser_errposition(pstate,location)));

‎src/backend/parser/parse_coerce.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.145 2006/10/11 20:21:03 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/parse_coerce.c,v 2.146 2006/11/28 12:54:41 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -954,9 +954,8 @@ select_common_type(List *typeids, const char *context)
954954
ereport(ERROR,
955955
(errcode(ERRCODE_DATATYPE_MISMATCH),
956956

957-
/*
958-
* translator: first %s is name of a SQL construct, eg CASE
959-
*/
957+
/*------
958+
translator: first %s is name of a SQL construct, eg CASE */
960959
errmsg("%s types %s and %s cannot be matched",
961960
context,
962961
format_type_be(ptype),

‎src/backend/postmaster/postmaster.c

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.503 2006/11/21 20:59:52 tgl Exp $
40+
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.504 2006/11/28 12:54:41 petere Exp $
4141
*
4242
* NOTES
4343
*
@@ -2390,28 +2390,25 @@ LogChildExit(int lev, const char *procname, int pid, int exitstatus)
23902390
if (WIFEXITED(exitstatus))
23912391
ereport(lev,
23922392

2393-
/*
2394-
* translator: %s is a noun phrase describing a child process, such as
2395-
* "server process"
2396-
*/
2393+
/*------
2394+
translator: %s is a noun phrase describing a child process, such as
2395+
"server process" */
23972396
(errmsg("%s (PID %d) exited with exit code %d",
23982397
procname,pid,WEXITSTATUS(exitstatus))));
23992398
elseif (WIFSIGNALED(exitstatus))
24002399
ereport(lev,
24012400

2402-
/*
2403-
* translator: %s is a noun phrase describing a child process, such as
2404-
* "server process"
2405-
*/
2401+
/*------
2402+
translator: %s is a noun phrase describing a child process, such as
2403+
"server process" */
24062404
(errmsg("%s (PID %d) was terminated by signal %d",
24072405
procname,pid,WTERMSIG(exitstatus))));
24082406
else
24092407
ereport(lev,
24102408

2411-
/*
2412-
* translator: %s is a noun phrase describing a child process, such as
2413-
* "server process"
2414-
*/
2409+
/*------
2410+
translator: %s is a noun phrase describing a child process, such as
2411+
"server process" */
24152412
(errmsg("%s (PID %d) exited with unexpected status %d",
24162413
procname,pid,exitstatus)));
24172414
}

‎src/backend/utils/error/elog.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
*
4343
*
4444
* IDENTIFICATION
45-
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.177 2006/11/21 22:19:46 tgl Exp $
45+
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.178 2006/11/28 12:54:42 petere Exp $
4646
*
4747
*-------------------------------------------------------------------------
4848
*/
@@ -1957,11 +1957,10 @@ useful_strerror(int errnum)
19571957
*/
19581958
if (str==NULL||*str=='\0')
19591959
{
1960-
/*
1961-
* translator: This string will be truncated at 47 characters
1962-
* expanded.
1963-
*/
19641960
snprintf(errorstr_buf,sizeof(errorstr_buf),
1961+
/*------
1962+
translator: This string will be truncated at 47
1963+
characters expanded. */
19651964
_("operating system error %d"),errnum);
19661965
str=errorstr_buf;
19671966
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp