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

Commitaf26857

Browse files
committed
Most of the code follows the American spelling of the word, which is
"canceled", so I changed the one remaining usage of the Britishspelling ("cancelled") over to the former, and updated the translationfiles appropriately.Neil Conway
1 parentcd55a2b commitaf26857

File tree

8 files changed

+14
-14
lines changed

8 files changed

+14
-14
lines changed

‎src/backend/po/cs.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8637,7 +8637,7 @@ msgid "This connection has been terminated by the administrator."
86378637
msgstr""
86388638

86398639
#:../tcop/postgres.c:1034
8640-
msgid"Query wascancelled."
8640+
msgid"Query wascanceled."
86418641
msgstr""
86428642

86438643
#:../tcop/postgres.c:1175

‎src/backend/po/de.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# German message translation file for PostgreSQL server
22
# Peter Eisentraut <peter_e@gmx.net>, 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/backend/po/de.po,v 1.6 2001/11/30 18:04:23 petere Exp $
4+
# $Header: /cvsroot/pgsql/src/backend/po/de.po,v 1.7 2002/11/19 17:21:37 momjian Exp $
55
#
66
# Use these quotes: »%s«
77
#
@@ -8651,7 +8651,7 @@ msgid "This connection has been terminated by the administrator."
86518651
msgstr"Diese Verbindung wurde vom Administrator abgebrochen."
86528652

86538653
#:../tcop/postgres.c:1035
8654-
msgid"Query wascancelled."
8654+
msgid"Query wascanceled."
86558655
msgstr"Abfrage wurde storniert."
86568656

86578657
#:../tcop/postgres.c:1176

‎src/backend/po/es.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8581,7 +8581,7 @@ msgid "This connection has been terminated by the administrator."
85818581
msgstr""
85828582

85838583
#:../tcop/postgres.c:1112
8584-
msgid"Query wascancelled."
8584+
msgid"Query wascanceled."
85858585
msgstr""
85868586

85878587
#:../tcop/postgres.c:1253

‎src/backend/po/hu.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Zoltan Kovacs <kovzol@math.u-szeged.hu>, 2001.
33
# Robert Zana <zerobert@freemail.hu>, 2001.
44
#
5-
# $Header: /cvsroot/pgsql/src/backend/po/Attic/hu.po,v 1.4 2002/01/1821:25:00 petere Exp $
5+
# $Header: /cvsroot/pgsql/src/backend/po/Attic/hu.po,v 1.5 2002/11/19 17:21:38 momjian Exp $
66
#
77
msgid ""
88
msgstr ""
@@ -8647,7 +8647,7 @@ msgid "This connection has been terminated by the administrator."
86478647
msgstr"Az adminisztrátor megszüntette ezt a kapcsolatot."
86488648

86498649
#:../tcop/postgres.c:1034
8650-
msgid"Query wascancelled."
8650+
msgid"Query wascanceled."
86518651
msgstr"A lekérdezés visszavonva."
86528652

86538653
#:../tcop/postgres.c:1175

‎src/backend/po/ru.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ru.po
22
# POSTGRES Translated Messages into the Russian Language (KOI8-R)
33
#
4-
# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.9 2002/10/14 19:04:27 petere Exp $
4+
# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.10 2002/11/19 17:21:39 momjian Exp $
55
#
66
# Changelog:
77
# - October 12, 2002: Post-7.3 beta 2, Fuzzy Fixes, Serguei A. Mokhov <mokhov@cs.concordia.ca>
@@ -9578,7 +9578,7 @@ msgid "This connection has been terminated by the administrator."
95789578
msgstr""
95799579

95809580
#:tcop/postgres.c:1114
9581-
msgid"Query wascancelled."
9581+
msgid"Query wascanceled."
95829582
msgstr""
95839583

95849584
#:tcop/postgres.c:1259

‎src/backend/po/sv.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9539,7 +9539,7 @@ msgid "This connection has been terminated by the administrator."
95399539
msgstr""
95409540

95419541
#:tcop/postgres.c:1082
9542-
msgid"Query wascancelled."
9542+
msgid"Query wascanceled."
95439543
msgstr"Frågan avbröts."
95449544

95459545
#:tcop/postgres.c:1227

‎src/backend/po/zh_CN.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# simplified Chinese translation file for PostgreSQL server
22
# Weiping He <laser@zhengmai.com.cn>, 2001.
33
#
4-
# $Header: /cvsroot/pgsql/src/backend/po/Attic/zh_CN.po,v 1.4 2001/12/03 18:43:20 momjian Exp $
4+
# $Header: /cvsroot/pgsql/src/backend/po/Attic/zh_CN.po,v 1.5 2002/11/19 17:21:39 momjian Exp $
55
#
66
msgid ""
77
msgstr ""
@@ -250,7 +250,7 @@ msgid "This connection has been terminated by the administrator."
250250
msgstr"这个联接已被管理员终止."
251251

252252
#:../tcop/postgres.c:1068
253-
msgid"Query wascancelled."
253+
msgid"Query wascanceled."
254254
msgstr"查询已被取消."
255255

256256
#:../tcop/postgres.c:1216

‎src/backend/tcop/postgres.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.309 2002/11/15 00:47:22 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.310 2002/11/19 17:21:40 momjian Exp $
1212
*
1313
* NOTES
1414
* this is the "main" module of the postgres backend and
@@ -1158,7 +1158,7 @@ ProcessInterrupts(void)
11581158
QueryCancelPending= false;
11591159
ImmediateInterruptOK= false;/* not idle anymore */
11601160
DisableNotifyInterrupt();
1161-
elog(ERROR,"Query wascancelled.");
1161+
elog(ERROR,"Query wascanceled.");
11621162
}
11631163
/* If we get here, do nothing (probably, QueryCancelPending was reset) */
11641164
}
@@ -1781,7 +1781,7 @@ PostgresMain(int argc, char *argv[], const char *username)
17811781
if (!IsUnderPostmaster)
17821782
{
17831783
puts("\nPOSTGRES backend interactive interface ");
1784-
puts("$Revision: 1.309 $ $Date: 2002/11/15 00:47:22 $\n");
1784+
puts("$Revision: 1.310 $ $Date: 2002/11/19 17:21:40 $\n");
17851785
}
17861786

17871787
/*

0 commit comments

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