From af26857a2775e7ceb0916155e931008c2116632f Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 19 Nov 2002 17:21:40 +0000 Subject: [PATCH] Most of the code follows the American spelling of the word, which is "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 --- src/backend/po/cs.po | 2 +- src/backend/po/de.po | 4 ++-- src/backend/po/es.po | 2 +- src/backend/po/hu.po | 4 ++-- src/backend/po/ru.po | 4 ++-- src/backend/po/sv.po | 2 +- src/backend/po/zh_CN.po | 4 ++-- src/backend/tcop/postgres.c | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/backend/po/cs.po b/src/backend/po/cs.po index 73f980a47a..ed79416b37 100644 --- a/src/backend/po/cs.po +++ b/src/backend/po/cs.po @@ -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 diff --git a/src/backend/po/de.po b/src/backend/po/de.po index 8704eca425..f4dcc26d79 100644 --- a/src/backend/po/de.po +++ b/src/backend/po/de.po @@ -1,7 +1,7 @@ # German message translation file for PostgreSQL server # Peter Eisentraut , 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 diff --git a/src/backend/po/es.po b/src/backend/po/es.po index 4f83bed9d2..5061650b95 100644 --- a/src/backend/po/es.po +++ b/src/backend/po/es.po @@ -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 diff --git a/src/backend/po/hu.po b/src/backend/po/hu.po index 486113b81e..700ffee1ac 100644 --- a/src/backend/po/hu.po +++ b/src/backend/po/hu.po @@ -2,7 +2,7 @@ # Zoltan Kovacs , 2001. # Robert Zana , 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 diff --git a/src/backend/po/ru.po b/src/backend/po/ru.po index 51500b4b08..d47e618e3b 100644 --- a/src/backend/po/ru.po +++ b/src/backend/po/ru.po @@ -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 @@ -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 diff --git a/src/backend/po/sv.po b/src/backend/po/sv.po index 487f86de0d..dbc712defa 100644 --- a/src/backend/po/sv.po +++ b/src/backend/po/sv.po @@ -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 diff --git a/src/backend/po/zh_CN.po b/src/backend/po/zh_CN.po index f60018ac9c..a1ce157814 100644 --- a/src/backend/po/zh_CN.po +++ b/src/backend/po/zh_CN.po @@ -1,7 +1,7 @@ # simplified Chinese translation file for PostgreSQL server # Weiping He , 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 diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index d09df569ce..457391b6a9 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -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"); } /* -- 2.40.0