Index: src/backend/po/cs.po
===================================================================
RCS file: /var/lib/cvs/pgsql-server/src/backend/po/cs.po,v
retrieving revision 1.1
diff -c -r1.1 cs.po
*** src/backend/po/cs.po	21 Dec 2001 22:30:49 -0000	1.1
--- src/backend/po/cs.po	14 Nov 2002 23:29:05 -0000
***************
*** 8637,8643 ****
  msgstr ""
  
  #: ../tcop/postgres.c:1034
! msgid "Query was cancelled."
  msgstr ""
  
  #: ../tcop/postgres.c:1175
--- 8637,8643 ----
  msgstr ""
  
  #: ../tcop/postgres.c:1034
! msgid "Query was canceled."
  msgstr ""
  
  #: ../tcop/postgres.c:1175
Index: src/backend/po/de.po
===================================================================
RCS file: /var/lib/cvs/pgsql-server/src/backend/po/de.po,v
retrieving revision 1.6
diff -c -r1.6 de.po
*** src/backend/po/de.po	30 Nov 2001 18:04:23 -0000	1.6
--- src/backend/po/de.po	14 Nov 2002 23:29:31 -0000
***************
*** 8651,8657 ****
  msgstr "Diese Verbindung wurde vom Administrator abgebrochen."
  
  #: ../tcop/postgres.c:1035
! msgid "Query was cancelled."
  msgstr "Abfrage wurde storniert."
  
  #: ../tcop/postgres.c:1176
--- 8651,8657 ----
  msgstr "Diese Verbindung wurde vom Administrator abgebrochen."
  
  #: ../tcop/postgres.c:1035
! msgid "Query was canceled."
  msgstr "Abfrage wurde storniert."
  
  #: ../tcop/postgres.c:1176
Index: src/backend/po/es.po
===================================================================
RCS file: /var/lib/cvs/pgsql-server/src/backend/po/es.po,v
retrieving revision 1.2
diff -c -r1.2 es.po
*** src/backend/po/es.po	2 Sep 2002 22:22:12 -0000	1.2
--- src/backend/po/es.po	14 Nov 2002 23:29:40 -0000
***************
*** 8581,8587 ****
  msgstr ""
  
  #: ../tcop/postgres.c:1112
! msgid "Query was cancelled."
  msgstr ""
  
  #: ../tcop/postgres.c:1253
--- 8581,8587 ----
  msgstr ""
  
  #: ../tcop/postgres.c:1112
! msgid "Query was canceled."
  msgstr ""
  
  #: ../tcop/postgres.c:1253
Index: src/backend/po/hu.po
===================================================================
RCS file: /var/lib/cvs/pgsql-server/src/backend/po/hu.po,v
retrieving revision 1.4
diff -c -r1.4 hu.po
*** src/backend/po/hu.po	18 Jan 2002 21:25:00 -0000	1.4
--- src/backend/po/hu.po	14 Nov 2002 23:29:53 -0000
***************
*** 8647,8653 ****
  msgstr "Az adminisztr�tor megsz�ntette ezt a kapcsolatot."
  
  #: ../tcop/postgres.c:1034
! msgid "Query was cancelled."
  msgstr "A lek�rdez�s visszavonva."
  
  #: ../tcop/postgres.c:1175
--- 8647,8653 ----
  msgstr "Az adminisztr�tor megsz�ntette ezt a kapcsolatot."
  
  #: ../tcop/postgres.c:1034
! msgid "Query was canceled."
  msgstr "A lek�rdez�s visszavonva."
  
  #: ../tcop/postgres.c:1175
Index: src/backend/po/ru.po
===================================================================
RCS file: /var/lib/cvs/pgsql-server/src/backend/po/ru.po,v
retrieving revision 1.9
diff -c -r1.9 ru.po
*** src/backend/po/ru.po	14 Oct 2002 19:04:27 -0000	1.9
--- src/backend/po/ru.po	14 Nov 2002 23:30:00 -0000
***************
*** 9578,9584 ****
  msgstr ""
  
  #: tcop/postgres.c:1114
! msgid "Query was cancelled."
  msgstr ""
  
  #: tcop/postgres.c:1259
--- 9578,9584 ----
  msgstr ""
  
  #: tcop/postgres.c:1114
! msgid "Query was canceled."
  msgstr ""
  
  #: tcop/postgres.c:1259
Index: src/backend/po/sv.po
===================================================================
RCS file: /var/lib/cvs/pgsql-server/src/backend/po/sv.po,v
retrieving revision 1.2
diff -c -r1.2 sv.po
*** src/backend/po/sv.po	14 Oct 2002 19:04:28 -0000	1.2
--- src/backend/po/sv.po	14 Nov 2002 23:30:10 -0000
***************
*** 9539,9545 ****
  msgstr ""
  
  #: tcop/postgres.c:1082
! msgid "Query was cancelled."
  msgstr "Fr�gan avbr�ts."
  
  #: tcop/postgres.c:1227
--- 9539,9545 ----
  msgstr ""
  
  #: tcop/postgres.c:1082
! msgid "Query was canceled."
  msgstr "Fr�gan avbr�ts."
  
  #: tcop/postgres.c:1227
Index: src/backend/po/zh_CN.po
===================================================================
RCS file: /var/lib/cvs/pgsql-server/src/backend/po/zh_CN.po,v
retrieving revision 1.4
diff -c -r1.4 zh_CN.po
*** src/backend/po/zh_CN.po	3 Dec 2001 18:43:20 -0000	1.4
--- src/backend/po/zh_CN.po	14 Nov 2002 23:30:18 -0000
***************
*** 250,256 ****
  msgstr "��������ѱ�����Ա��ֹ."
  
  #: ../tcop/postgres.c:1068
! msgid "Query was cancelled."
  msgstr "��ѯ�ѱ�ȡ��."
  
  #: ../tcop/postgres.c:1216
--- 250,256 ----
  msgstr "��������ѱ�����Ա��ֹ."
  
  #: ../tcop/postgres.c:1068
! msgid "Query was canceled."
  msgstr "��ѯ�ѱ�ȡ��."
  
  #: ../tcop/postgres.c:1216
Index: src/backend/tcop/postgres.c
===================================================================
RCS file: /var/lib/cvs/pgsql-server/src/backend/tcop/postgres.c,v
retrieving revision 1.307
diff -c -r1.307 postgres.c
*** src/backend/tcop/postgres.c	31 Oct 2002 21:34:16 -0000	1.307
--- src/backend/tcop/postgres.c	14 Nov 2002 23:28:34 -0000
***************
*** 1158,1164 ****
  		QueryCancelPending = false;
  		ImmediateInterruptOK = false;	/* not idle anymore */
  		DisableNotifyInterrupt();
! 		elog(ERROR, "Query was cancelled.");
  	}
  	/* If we get here, do nothing (probably, QueryCancelPending was reset) */
  }
--- 1158,1164 ----
  		QueryCancelPending = false;
  		ImmediateInterruptOK = false;	/* not idle anymore */
  		DisableNotifyInterrupt();
! 		elog(ERROR, "Query was canceled.");
  	}
  	/* If we get here, do nothing (probably, QueryCancelPending was reset) */
  }