mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Most of the code follows the American spelling of the word, which is

Browse Source 
"canceled", so I changed the one remaining usage of the British
spelling ("cancelled") over to the former, and updated the translation
files appropriately.

Neil Conway
This commit is contained in:
Bruce Momjian 2002-11-19 17:21:40 +00:00
parent cd55a2b1be
commit af26857a27
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/po/cs.po
View File

@ -8637,7 +8637,7 @@ msgid "This connection has been terminated by the administrator."
msgstr ""
#: ../tcop/postgres.c:1034
msgid "Query was cancelled."
msgid "Query was canceled."
msgstr ""
#: ../tcop/postgres.c:1175

4
src/backend/po/de.po
View File

@ -1,7 +1,7 @@
# German message translation file for PostgreSQL server
# Peter Eisentraut <peter_e@gmx.net>, 2001.
#
# $Header: /cvsroot/pgsql/src/backend/po/de.po,v 1.6 2001/11/30 18:04:23 petere Exp $
# $Header: /cvsroot/pgsql/src/backend/po/de.po,v 1.7 2002/11/19 17:21:37 momjian Exp $
#
# Use these quotes: »%s«
#
@ -8651,7 +8651,7 @@ msgid "This connection has been terminated by the administrator."
msgstr "Diese Verbindung wurde vom Administrator abgebrochen."
#: ../tcop/postgres.c:1035
msgid "Query was cancelled."
msgid "Query was canceled."
msgstr "Abfrage wurde storniert."
#: ../tcop/postgres.c:1176

2
src/backend/po/es.po
View File

@ -8581,7 +8581,7 @@ msgid "This connection has been terminated by the administrator."
msgstr ""
#: ../tcop/postgres.c:1112
msgid "Query was cancelled."
msgid "Query was canceled."
msgstr ""
#: ../tcop/postgres.c:1253

4
src/backend/po/hu.po
View File

@ -2,7 +2,7 @@
# Zoltan Kovacs <kovzol@math.u-szeged.hu>, 2001.
# Robert Zana <zerobert@freemail.hu>, 2001.
#
# $Header: /cvsroot/pgsql/src/backend/po/Attic/hu.po,v 1.4 2002/01/18 21:25:00 petere Exp $
# $Header: /cvsroot/pgsql/src/backend/po/Attic/hu.po,v 1.5 2002/11/19 17:21:38 momjian Exp $
#
msgid ""
msgstr ""
@ -8647,7 +8647,7 @@ msgid "This connection has been terminated by the administrator."
msgstr "Az adminisztrátor megszüntette ezt a kapcsolatot."
#: ../tcop/postgres.c:1034
msgid "Query was cancelled."
msgid "Query was canceled."
msgstr "A lekérdezés visszavonva."
#: ../tcop/postgres.c:1175

4
src/backend/po/ru.po
View File

@ -1,7 +1,7 @@
# ru.po
# POSTGRES Translated Messages into the Russian Language (KOI8-R)
#
# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.9 2002/10/14 19:04:27 petere Exp $
# $Header: /cvsroot/pgsql/src/backend/po/Attic/ru.po,v 1.10 2002/11/19 17:21:39 momjian Exp $
#
# Changelog:
# - 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."
msgstr ""
#: tcop/postgres.c:1114
msgid "Query was cancelled."
msgid "Query was canceled."
msgstr ""
#: tcop/postgres.c:1259

2
src/backend/po/sv.po
View File

@ -9539,7 +9539,7 @@ msgid "This connection has been terminated by the administrator."
msgstr ""
#: tcop/postgres.c:1082
msgid "Query was cancelled."
msgid "Query was canceled."
msgstr "Frågan avbröts."
#: tcop/postgres.c:1227

4
src/backend/po/zh_CN.po
View File

@ -1,7 +1,7 @@
# simplified Chinese translation file for PostgreSQL server
# Weiping He <laser@zhengmai.com.cn>, 2001.
#
# $Header: /cvsroot/pgsql/src/backend/po/Attic/zh_CN.po,v 1.4 2001/12/03 18:43:20 momjian Exp $
# $Header: /cvsroot/pgsql/src/backend/po/Attic/zh_CN.po,v 1.5 2002/11/19 17:21:39 momjian Exp $
#
msgid ""
msgstr ""
@ -250,7 +250,7 @@ msgid "This connection has been terminated by the administrator."
msgstr "这个联接已被管理员终止."
#: ../tcop/postgres.c:1068
msgid "Query was cancelled."
msgid "Query was canceled."
msgstr "查询已被取消."
#: ../tcop/postgres.c:1216

6
src/backend/tcop/postgres.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.309 2002/11/15 00:47:22 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.310 2002/11/19 17:21:40 momjian Exp $
*
* NOTES
* this is the "main" module of the postgres backend and
@ -1158,7 +1158,7 @@ ProcessInterrupts(void)
QueryCancelPending = false;
ImmediateInterruptOK = false; /* not idle anymore */
DisableNotifyInterrupt();
elog(ERROR, "Query was cancelled.");
elog(ERROR, "Query was canceled.");
}
/* If we get here, do nothing (probably, QueryCancelPending was reset) */
}
@ -1781,7 +1781,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster)
{
puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.309 $ $Date: 2002/11/15 00:47:22 $\n");
puts("$Revision: 1.310 $ $Date: 2002/11/19 17:21:40 $\n");
}
/*