cancelled > canceled

h2/src/docsrc/html/advanced.html

@@ -493,7 +493,7 @@ Afterwards, you may use this data source.
 At this time, only a subset of the PostgreSQL network protocol is implemented.
 Also, there may be compatibility problems on the SQL level, with the catalog, or with text encoding.
 Problems are fixed as they are found.
-Currently, statements can not be cancelled when using the PG protocol.
+Currently, statements can not be canceled when using the PG protocol.
 </p>
 <p>
 PostgreSQL ODBC Driver Setup requires a database password; that means it

h2/src/docsrc/html/changelog.html

@@ -212,7 +212,7 @@ Change Log
         object is garbage collected). Now they are removed as soon
         as the PreparedStatement is closed, or when the value is
         overwritten.
-</li><li>Statements can now be cancelled remotely 
+</li><li>Statements can now be canceled remotely 
         (when using remote connections).
 </li><li>The Shell tool now uses java.io.Console to read the password
         when using JDK 1.6
@@ -369,7 +369,7 @@ Change Log
 </li><li>SELECT UNION with a different number of ORDER BY columns did throw an ArrayIndexOutOfBoundsException.
 </li><li>When using a view, the column precision was changed to the default scale for some data types.
 </li><li>CSVWRITE now supports a 'null string' that is used for parsing and writing NULL.
-</li><li>Some long running queries could not be cancelled.
+</li><li>Some long running queries could not be canceled.
 </li><li>Queries with many outer join tables were very slow. Fixed.
 </li><li>The performance of text comparison has been improved when using locale sensitive
     string comparison (SET COLLATOR). Now CollationKey is used with a LRU cache.

h2/src/docsrc/text/_docs_en.utf8.txt

@@ -491,7 +491,7 @@ Afterwards, you may use this data source.
 PG Protocol Support Limitations
 
 @advanced_1164_p
-At this time, only a subset of the PostgreSQL network protocol is implemented. Also, there may be compatibility problems on the SQL level, with the catalog, or with text encoding. Problems are fixed as they are found. Currently, statements can not be cancelled when using the PG protocol.
+At this time, only a subset of the PostgreSQL network protocol is implemented. Also, there may be compatibility problems on the SQL level, with the catalog, or with text encoding. Problems are fixed as they are found. Currently, statements can not be canceled when using the PG protocol.
 
 @advanced_1165_p
 PostgreSQL ODBC Driver Setup requires a database password; that means it is not possible to connect to H2 databases without password. This is a limitation of the ODBC driver.
@@ -1403,7 +1403,7 @@ Triggers are no longer executed when changing the table   structure (ALTER TABLE
 When setting BLOB or CLOB values larger than 65 KB using   a remote connection, temporary files were kept on the client   longer than required (until the connection was closed or the   object is garbage collected). Now they are removed as soon   as the PreparedStatement is closed, or when the value is   overwritten.
 
 @changelog_1100_li
-Statements can now be cancelled remotely   (when using remote connections).
+Statements can now be canceled remotely   (when using remote connections).
 
 @changelog_1101_li
 The Shell tool now uses java.io.Console to read the password   when using JDK 1.6
@@ -1613,7 +1613,7 @@ When using a view, the column precision was changed to the default scale for som
 CSVWRITE now supports a 'null string' that is used for parsing and writing NULL.
 
 @changelog_1170_li
-Some long running queries could not be cancelled.
+Some long running queries could not be canceled.
 
 @changelog_1171_li
 Queries with many outer join tables were very slow. Fixed.

h2/src/docsrc/text/_docs_ja.utf8.txt

@@ -1405,7 +1405,7 @@ Centralリポジトリの利用
 #When setting BLOB or CLOB values larger than 65 KB using   a remote connection, temporary files were kept on the client   longer than required (until the connection was closed or the   object is garbage collected). Now they are removed as soon   as the PreparedStatement is closed, or when the value is   overwritten.
 
 @changelog_1100_li
-#Statements can now be cancelled remotely   (when using remote connections).
+#Statements can now be canceled remotely   (when using remote connections).
 
 @changelog_1101_li
 #The Shell tool now uses java.io.Console to read the password   when using JDK 1.6
@@ -1615,7 +1615,7 @@ Centralリポジトリの利用
 #CSVWRITE now supports a 'null string' that is used for parsing and writing NULL.
 
 @changelog_1170_li
-#Some long running queries could not be cancelled.
+#Some long running queries could not be canceled.
 
 @changelog_1171_li
 #Queries with many outer join tables were very slow. Fixed.

h2/src/docsrc/textbase/_docs_en.properties

@@ -162,7 +162,7 @@ advanced_1160_td=sa
 advanced_1161_td=The database password.
 advanced_1162_p=Afterwards, you may use this data source.
 advanced_1163_h3=PG Protocol Support Limitations
-advanced_1164_p=At this time, only a subset of the PostgreSQL network protocol is implemented. Also, there may be compatibility problems on the SQL level, with the catalog, or with text encoding. Problems are fixed as they are found. Currently, statements can not be cancelled when using the PG protocol.
+advanced_1164_p=At this time, only a subset of the PostgreSQL network protocol is implemented. Also, there may be compatibility problems on the SQL level, with the catalog, or with text encoding. Problems are fixed as they are found. Currently, statements can not be canceled when using the PG protocol.
 advanced_1165_p=PostgreSQL ODBC Driver Setup requires a database password; that means it is not possible to connect to H2 databases without password. This is a limitation of the ODBC driver.
 advanced_1166_h3=Security Considerations
 advanced_1167_p=Currently, the PG Server does not support challenge response or encrypt passwords. This may be a problem if an attacker can listen to the data transferred between the ODBC driver and the server, because the password is readable to the attacker. Also, it is currently not possible to use encrypted SSL connections. Therefore the ODBC driver should not be used where security is important.
@@ -466,7 +466,7 @@ changelog_1096_li=SLF4J is now supported by using adding TRACE_LEVEL_FILE\=4   t
 changelog_1097_li=The recovery tool did not work if the table name contained spaces   or if there was a comment on the table.
 changelog_1098_li=Triggers are no longer executed when changing the table   structure (ALTER TABLE).
 changelog_1099_li=When setting BLOB or CLOB values larger than 65 KB using   a remote connection, temporary files were kept on the client   longer than required (until the connection was closed or the   object is garbage collected). Now they are removed as soon   as the PreparedStatement is closed, or when the value is   overwritten.
-changelog_1100_li=Statements can now be cancelled remotely   (when using remote connections).
+changelog_1100_li=Statements can now be canceled remotely   (when using remote connections).
 changelog_1101_li=The Shell tool now uses java.io.Console to read the password   when using JDK 1.6
 changelog_1102_li=When using read-only databases and setting LOG\=2, an exception   was written to the trace file when closing the database. Fixed.
 changelog_1103_h2=Version 1.0.71 (2008-04-25)
@@ -536,7 +536,7 @@ changelog_1166_li=Random\: the process didn't stop if generating the random seed
 changelog_1167_li=SELECT UNION with a different number of ORDER BY columns did throw an ArrayIndexOutOfBoundsException.
 changelog_1168_li=When using a view, the column precision was changed to the default scale for some data types.
 changelog_1169_li=CSVWRITE now supports a 'null string' that is used for parsing and writing NULL.
-changelog_1170_li=Some long running queries could not be cancelled.
+changelog_1170_li=Some long running queries could not be canceled.
 changelog_1171_li=Queries with many outer join tables were very slow. Fixed.
 changelog_1172_li=The performance of text comparison has been improved when using locale sensitive  string comparison (SET COLLATOR). Now CollationKey is used with a LRU cache.  The default cache size is 10000, and can be changed using the system property  h2.collatorCacheSize. Use 0 to disable the cache.
 changelog_1173_li=UPDATE SET column\=DEFAULT is now supported.

h2/src/docsrc/textbase/_messages_en.properties

@@ -72,7 +72,7 @@
 90048=Unsupported database file version or invalid file header in file {0}
 90049=Encryption error in file {0}
 90050=Wrong password format, must be\: file password <space> user password
-90051=Statement was cancelled or the session timed out
+90051=Statement was canceled or the session timed out
 90052=Subquery is not a single column query
 90053=Scalar subquery contains more than one row
 90054=Invalid use of aggregate function {0}

h2/src/docsrc/textbase/_text_en.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=Max rowcount is set
 result.noRows=no rows
 result.noRunningStatement=There is currently no running statement
 result.rows=rows
-result.statementWasCancelled=The statement was cancelled
+result.statementWasCanceled=The statement was canceled
 result.updateCount=Update count
 resultEdit.add=Add
 resultEdit.cancel=Cancel

h2/src/main/org/h2/api/DatabaseEventListener.java

@@ -62,7 +62,7 @@ public interface DatabaseEventListener extends EventListener {
      * within this method (even to close it).
      *
      * @param stillAvailable the estimated space that is still available, in bytes
-     * @throws SQLException if the operation should be cancelled
+     * @throws SQLException if the operation should be canceled
      */
     void diskSpaceIsLow(long stillAvailable) throws SQLException;
 

h2/src/main/org/h2/command/Command.java

@@ -40,7 +40,7 @@ public abstract class Command implements CommandInterface {
     protected long startTime;
 
     /**
-     * If this query was cancelled.
+     * If this query was canceled.
      */
     private volatile boolean cancel;
 
@@ -156,14 +156,14 @@ public abstract class Command implements CommandInterface {
     }
 
     /**
-     * Check if this command has been cancelled, and throw an exception if yes.
+     * Check if this command has been canceled, and throw an exception if yes.
      * 
-     * @throws SQLException if the statement has been cancelled
+     * @throws SQLException if the statement has been canceled
      */
-    public void checkCancelled() throws SQLException {
+    public void checkCanceled() throws SQLException {
         if (cancel) {
             cancel = false;
-            throw Message.getSQLException(ErrorCode.STATEMENT_WAS_CANCELLED);
+            throw Message.getSQLException(ErrorCode.STATEMENT_WAS_CANCELED);
         }
     }
 

h2/src/main/org/h2/command/Prepared.java

@@ -257,15 +257,15 @@ public abstract class Prepared {
     }
 
     /**
-     * Check if this statement was cancelled.
+     * Check if this statement was canceled.
      *
-     * @throws SQLException if it was cancelled
+     * @throws SQLException if it was canceled
      */
-    public void checkCancelled() throws SQLException {
-        session.checkCancelled();
+    public void checkCanceled() throws SQLException {
+        session.checkCanceled();
         Command c = command != null ? command : session.getCurrentCommand();
         if (c != null) {
-            c.checkCancelled();
+            c.checkCanceled();
         }
     }
 

h2/src/main/org/h2/command/dml/Delete.java

@@ -53,7 +53,7 @@ public class Delete extends Prepared {
         try {
             setCurrentRowNumber(0);
             while (tableFilter.next()) {
-                checkCancelled();
+                checkCanceled();
                 setCurrentRowNumber(rows.size() + 1);
                 if (condition == null || Boolean.TRUE.equals(condition.getBooleanValue(session))) {
                     Row row = tableFilter.get();
@@ -64,7 +64,7 @@ public class Delete extends Prepared {
                 }
             }
             for (rows.reset(); rows.hasNext();) {
-                checkCancelled();
+                checkCanceled();
                 Row row = rows.next();
                 table.removeRow(session, row);
                 session.log(table, UndoLogRecord.DELETE, row);

h2/src/main/org/h2/command/dml/Insert.java

@@ -88,7 +88,7 @@ public class Insert extends Prepared {
                         newRow.setValue(index, v);
                     }
                 }
-                checkCancelled();
+                checkCanceled();
                 table.fireBefore(session);
                 table.validateConvertUpdateSequence(session, newRow);
                 table.fireBeforeRow(session, null, newRow);
@@ -105,7 +105,7 @@ public class Insert extends Prepared {
             table.fireBefore(session);
             table.lock(session, true, false);
             while (rows.next()) {
-                checkCancelled();
+                checkCanceled();
                 count++;
                 Value[] r = rows.currentRow();
                 Row newRow = table.getTemplateRow();

h2/src/main/org/h2/command/dml/Merge.java

@@ -131,7 +131,7 @@ public class Merge extends Prepared {
             table.fireBefore(session);
             table.lock(session, true, false);
             while (rows.next()) {
-                checkCancelled();
+                checkCanceled();
                 count++;
                 Value[] r = rows.currentRow();
                 Row newRow = table.getTemplateRow();

h2/src/main/org/h2/command/dml/Select.java

@@ -153,7 +153,7 @@ public class Select extends Query {
         setCurrentRowNumber(0);
         Value[] previousKeyValues = null;
         while (topTableFilter.next()) {
-            checkCancelled();
+            checkCanceled();
             setCurrentRowNumber(rowNumber + 1);
             if (condition == null || Boolean.TRUE.equals(condition.getBooleanValue(session))) {
                 rowNumber++;
@@ -290,7 +290,7 @@ public class Select extends Query {
         setCurrentRowNumber(0);
         ValueArray defaultGroup = ValueArray.get(new Value[0]);
         while (topTableFilter.next()) {
-            checkCancelled();
+            checkCanceled();
             setCurrentRowNumber(rowNumber + 1);
             if (condition == null || Boolean.TRUE.equals(condition.getBooleanValue(session))) {
                 Value key;
@@ -443,7 +443,7 @@ public class Select extends Query {
         SearchRow first = null;
         int columnIndex = index.getColumns()[0].getColumnId();
         while (true) {
-            checkCancelled();
+            checkCanceled();
             setCurrentRowNumber(rowNumber + 1);
             Cursor cursor = index.findNext(session, first, null);
             if (!cursor.next()) {
@@ -477,7 +477,7 @@ public class Select extends Query {
         int rowNumber = 0;
         setCurrentRowNumber(0);
         while (topTableFilter.next()) {
-            checkCancelled();
+            checkCanceled();
             setCurrentRowNumber(rowNumber + 1);
             if (condition == null || Boolean.TRUE.equals(condition.getBooleanValue(session))) {
                 Value[] row = new Value[columnCount];

h2/src/main/org/h2/command/dml/Update.java

@@ -84,7 +84,7 @@ public class Update extends Prepared {
             setCurrentRowNumber(0);
             int count = 0;
             while (tableFilter.next()) {
-                checkCancelled();
+                checkCanceled();
                 setCurrentRowNumber(count+1);
                 if (condition == null || Boolean.TRUE.equals(condition.getBooleanValue(session))) {
                     Row oldRow = tableFilter.get();
@@ -132,7 +132,7 @@ public class Update extends Prepared {
             if (table.fireRow()) {
                 rows.invalidateCache();
                 for (rows.reset(); rows.hasNext();) {
-                    checkCancelled();
+                    checkCanceled();
                     Row o = rows.next();
                     Row n = rows.next();
                     table.fireAfterRow(session, o, n);

h2/src/main/org/h2/constant/ErrorCode.java

@@ -852,7 +852,7 @@ public class ErrorCode {
 
     /**
      * The error with code <code>90051</code> is thrown when
-     * a statement was cancelled using Statement.cancel() or
+     * a statement was canceled using Statement.cancel() or
      * when the query timeout has been reached.
      * Examples:
      * <pre>
@@ -860,7 +860,7 @@ public class ErrorCode {
      * stat.cancel();
      * </pre>
      */
-    public static final int STATEMENT_WAS_CANCELLED = 90051;
+    public static final int STATEMENT_WAS_CANCELED = 90051;
 
     /**
      * The error with code <code>90052</code> is thrown when

h2/src/main/org/h2/engine/Session.java

@@ -712,12 +712,12 @@ public class Session implements SessionInterface {
     }
 
     /**
-     * Check if the current transaction is cancelled by calling
+     * Check if the current transaction is canceled by calling
      * Statement.cancel() or because a session timeout was set and expired.
      * 
-     * @throws SQLException if the transaction is cancelled
+     * @throws SQLException if the transaction is canceled
      */
-    public void checkCancelled() throws SQLException {
+    public void checkCanceled() throws SQLException {
         throttle();
         if (cancelAt == 0) {
             return;
@@ -725,7 +725,7 @@ public class Session implements SessionInterface {
         long time = System.currentTimeMillis();
         if (time >= cancelAt) {
             cancelAt = 0;
-            throw Message.getSQLException(ErrorCode.STATEMENT_WAS_CANCELLED);
+            throw Message.getSQLException(ErrorCode.STATEMENT_WAS_CANCELED);
         }
     }
 

h2/src/main/org/h2/engine/SessionRemote.java

@@ -113,7 +113,7 @@ public class SessionRemote implements SessionInterface, DataHandler {
     
     public void cancel() {
         // this method is called when closing the connection
-        // the statement that is currently running is not cancelled in this case
+        // the statement that is currently running is not canceled in this case
         // however Statement.cancel is supported
     }
 

h2/src/main/org/h2/res/_messages_en.properties

@@ -72,7 +72,7 @@
 90048=Unsupported database file version or invalid file header in file {0}
 90049=Encryption error in file {0}
 90050=Wrong password format, must be\: file password <space> user password
-90051=Statement was cancelled or the session timed out
+90051=Statement was canceled or the session timed out
 90052=Subquery is not a single column query
 90053=Scalar subquery contains more than one row
 90054=Invalid use of aggregate function {0}

h2/src/main/org/h2/res/_messages_pl.properties

@@ -72,7 +72,7 @@
 90048=Nieprawidlowa wersja pliku bazy danych lub nieprawidlowy naglowek pliku {0}
 90049=Blad szyfowania pliku {0}
 90050=Zly format hasla, powinno byc\: plik haslo <spacja> uzytkownik haslo
-90051=Statement was cancelled or the session timed out
+90051=Statement was canceled or the session timed out
 90052=Podzapytanie nie jest zapytaniem opartym o jedna kolumne
 90053=Scalar subquery contains more than one row
 90054=Nieprawidlowe uzycie funkcji agregujacej {0}

h2/src/main/org/h2/res/_messages_pt_br.properties

@@ -72,7 +72,7 @@
 90048=Vers\u00E3o do arquivo de base de dados n\u00E3o \u00E9 suportado, ou o cabe\u00E7alho do arquivo \u00E9 inv\u00E1lido, no arquivo {0}
 90049=Erro de encripta\u00E7\u00E3o no arquivo {0}
 90050=Erro no formato da senha, deveria ser\: arquivo de senha <espa\u00E7o> senha do usu\u00E1rio
-90051=\#Statement was cancelled or the session timed out
+90051=\#Statement was canceled or the session timed out
 90052=A Subquery n\u00E3o \u00E9 de coluna \u00FAnica
 90053=A Subquery cont\u00E9m mais de uma linha
 90054=Uso inv\u00E1lido da fun\u00E7\u00E3o {0} agregada

h2/src/main/org/h2/res/help.csv

@@ -2711,7 +2711,7 @@ CANCEL_SESSION(sessionInt): boolean
 ","
 Cancels the currently executing statement of another session.
 The method only works if the multithreaded kernel is enabled (see SET MULTI_THREADED).
-Returns true if the statement was cancelled, false if the session is closed
+Returns true if the statement was canceled, false if the session is closed
 or no statement is currently executing.
 Admin rights are required to execute this command.
 ","

h2/src/main/org/h2/server/web/WebThread.java

@@ -1667,7 +1667,7 @@ class WebThread extends Thread implements DatabaseEventListener {
                 stat = session.executingStatement;
                 if (stat != null) {
                     stat.cancel();
-                    buff.append("${text.result.statementWasCancelled}");
+                    buff.append("${text.result.statementWasCanceled}");
                 } else {
                     buff.append("${text.result.noRunningStatement}");
                 }

h2/src/main/org/h2/server/web/res/_text_de.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=Maximale Anzahl Zeilen ist jetzt gesetzt
 result.noRows=keine Datensätze
 result.noRunningStatement=Im Moment wird kein Befehl ausgeführt
 result.rows=Datensätze
-result.statementWasCancelled=Der Befehl wurde abgebrochen
+result.statementWasCanceled=Der Befehl wurde abgebrochen
 result.updateCount=Änderungen
 resultEdit.add=Hinzufügen
 resultEdit.cancel=Abbrechen

h2/src/main/org/h2/server/web/res/_text_en.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=Max rowcount is set
 result.noRows=no rows
 result.noRunningStatement=There is currently no running statement
 result.rows=rows
-result.statementWasCancelled=The statement was cancelled
+result.statementWasCanceled=The statement was canceled
 result.updateCount=Update count
 resultEdit.add=Add
 resultEdit.cancel=Cancel

h2/src/main/org/h2/server/web/res/_text_es.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=Número máximo de filas modificado
 result.noRows=No se han recuperado filas
 result.noRunningStatement=No hay una instrucción ejecutándose
 result.rows=filas
-result.statementWasCancelled=La instrucción fue cancelada
+result.statementWasCanceled=La instrucción fue cancelada
 result.updateCount=Modificaciones
 resultEdit.add=Añadir
 resultEdit.cancel=Cancelar

h2/src/main/org/h2/server/web/res/_text_fr.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=Nombre max d'enregistrements défini
 result.noRows=Aucun enregistrement
 result.noRunningStatement=Pas d'instruction en cours
 result.rows=enregistrements
-result.statementWasCancelled=L'instruction a été annulée
+result.statementWasCanceled=L'instruction a été annulée
 result.updateCount=Nombre de modifications
 resultEdit.add=Ajouter
 resultEdit.cancel=Annuler

h2/src/main/org/h2/server/web/res/_text_hu.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=Rekordok maximális száma beállítva
 result.noRows=nincs rekord
 result.noRunningStatement=Utasítás jelenleg nincs folyamatban
 result.rows=rekordok
-result.statementWasCancelled=Az utasítás végrehajtása megszakadt
+result.statementWasCanceled=Az utasítás végrehajtása megszakadt
 result.updateCount=Frissítés
 resultEdit.add=Hozzáadás
 resultEdit.cancel=Mégse

h2/src/main/org/h2/server/web/res/_text_in.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=Hitungan baris maksimum terpasang
 result.noRows=Tidak ada hasil
 result.noRunningStatement=Saat ini tidak ada pernyataan yang beroperasi
 result.rows=baris
-result.statementWasCancelled=Pernyataan tersebut dibatalkan
+result.statementWasCanceled=Pernyataan tersebut dibatalkan
 result.updateCount=Perbarui Hitungan
 resultEdit.add=Tambah
 resultEdit.cancel=Batal

h2/src/main/org/h2/server/web/res/_text_it.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=Il numero massimo di righe e' stato impostato
 result.noRows=nessuna riga
 result.noRunningStatement=C'e' un comando in corso di esecuzione
 result.rows=righe
-result.statementWasCancelled=Il comando e' stato annullato
+result.statementWasCanceled=Il comando e' stato annullato
 result.updateCount=Aggiorna il risultato
 resultEdit.add=Aggiungi
 resultEdit.cancel=Annulla

h2/src/main/org/h2/server/web/res/_text_ja.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=\u6700\u5927\u884C\u6570\u304C\u8A2D\u5B9A\u3055\u308C\u307E\u
 result.noRows=\u8A72\u5F53\u884C\u7121\u3057
 result.noRunningStatement=\u73FE\u5728\u5B9F\u884C\u4E2D\u306E\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u306F\u3042\u308A\u307E\u305B\u3093
 result.rows=\u884C
-result.statementWasCancelled=\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u304C\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
+result.statementWasCanceled=\u30B9\u30C6\u30FC\u30C8\u30E1\u30F3\u30C8\u304C\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
 result.updateCount=\u66F4\u65B0\u6570
 resultEdit.add=\u8FFD\u52A0
 resultEdit.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB

h2/src/main/org/h2/server/web/res/_text_nl.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=Het maximum aantal rijen is ingesteld
 result.noRows=geen rijen
 result.noRunningStatement=Er wordt momenteel geen statement uitgevoerd
 result.rows=rijen
-result.statementWasCancelled=Het statement is geannuleerd
+result.statementWasCanceled=Het statement is geannuleerd
 result.updateCount=Aantal wijzigingen
 resultEdit.add=Toevoegen
 resultEdit.cancel=Annuleren

h2/src/main/org/h2/server/web/res/_text_pl.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=Maksymalna ilo&\#347;&\#263; rekordów
 result.noRows=brak danych
 result.noRunningStatement=Obecnie nie jest wykonywane &\#380;edne zapytanie
 result.rows=rekordy
-result.statementWasCancelled=Zapytanie zosta&\#322;o anulowane
+result.statementWasCanceled=Zapytanie zosta&\#322;o anulowane
 result.updateCount=Ilo&\#347;&\#263; aktualizacji
 resultEdit.add=Dodaj
 resultEdit.cancel=Anuluj

h2/src/main/org/h2/server/web/res/_text_pt_br.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=Número máximo de linhas foi alterado
 result.noRows=sem linhas
 result.noRunningStatement=Actualmente não existe nenhum comando em execução
 result.rows=linhas
-result.statementWasCancelled=O comando foi cancelado
+result.statementWasCanceled=O comando foi cancelado
 result.updateCount=Número de registros alterados
 resultEdit.add=Adicionar
 resultEdit.cancel=Cancelar

h2/src/main/org/h2/server/web/res/_text_pt_pt.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=O número máximo de linhas foi alterado
 result.noRows=sem linhas
 result.noRunningStatement=Actualmente não existe nenhum comando em execução
 result.rows=linhas
-result.statementWasCancelled=O comando foi cancelado
+result.statementWasCanceled=O comando foi cancelado
 result.updateCount=Número de registos actualizados
 resultEdit.add=Adicionar
 resultEdit.cancel=Cancelar

h2/src/main/org/h2/server/web/res/_text_ru.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=&\#1059;&\#1089;&\#1090;&\#1072;&\#1085;&\#1086;&\#1074;&\#108
 result.noRows=&\#1085;&\#1077;&\#1090; &\#1089;&\#1090;&\#1088;&\#1086;&\#1082;
 result.noRunningStatement=&\#1057;&\#1077;&\#1081;&\#1095;&\#1072;&\#1089; &\#1085;&\#1077;&\#1090;&\#1091; &\#1074;&\#1099;&\#1087;&\#1086;&\#1083;&\#1085;&\#1103;&\#1077;&\#1084;&\#1099;&\#1093; &\#1079;&\#1072;&\#1087;&\#1088;&\#1086;&\#1089;&\#1086;&\#1074;
 result.rows=&\#1089;&\#1090;&\#1088;&\#1086;&\#1082;&\#1080;
-result.statementWasCancelled=&\#1047;&\#1072;&\#1087;&\#1088;&\#1086;&\#1089; &\#1073;&\#1099;&\#1083; &\#1086;&\#1090;&\#1084;&\#1077;&\#1085;&\#1077;&\#1085;
+result.statementWasCanceled=&\#1047;&\#1072;&\#1087;&\#1088;&\#1086;&\#1089; &\#1073;&\#1099;&\#1083; &\#1086;&\#1090;&\#1084;&\#1077;&\#1085;&\#1077;&\#1085;
 result.updateCount=&\#1054;&\#1073;&\#1085;&\#1086;&\#1074;&\#1080;&\#1090;&\#1100; &\#1082;&\#1086;&\#1083;&\#1080;&\#1095;&\#1077;&\#1089;&\#1090;&\#1074;&\#1086;
 resultEdit.add=&\#1044;&\#1086;&\#1073;&\#1072;&\#1074;&\#1080;&\#1090;&\#1100;
 resultEdit.cancel=&\#1054;&\#1090;&\#1084;&\#1077;&\#1085;&\#1080;&\#1090;&\#1100;

h2/src/main/org/h2/server/web/res/_text_tr.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=Maximum dizi say&\#305;s&\#305; ayar&\#305; yap&\#305;ld&\#305
 result.noRows=Hi&\#231; bir bilgi yok
 result.noRunningStatement=&\#350;u an bir komut icra ediliyor
 result.rows=Dizi
-result.statementWasCancelled=Komut iptal edildi
+result.statementWasCanceled=Komut iptal edildi
 result.updateCount=G&\#252;ncelle&\#351;terilen dizi say&\#305;s&\#305;
 resultEdit.add=Ekle
 resultEdit.cancel=&\#304;ptal

h2/src/main/org/h2/server/web/res/_text_uk.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=&\#x0412;&\#x0441;&\#x0442;&\#x0430;&\#x043D;&\#x043E;&\#x0432
 result.noRows=&\#x043D;&\#x0435;&\#x043C;&\#x0430;&\#x0454; &\#x0440;&\#x044F;&\#x0434;&\#x043A;&\#x0456;&\#x0432;
 result.noRunningStatement=&\#x0412; &\#x0434;&\#x0430;&\#x043D;&\#x0438;&\#x0439; &\#x043C;&\#x043E;&\#x043C;&\#x0435;&\#x043D;&\#x0442; &\#x043D;&\#x0435; &\#x0432;&\#x0438;&\#x043A;&\#x043E;&\#x043D;&\#x0443;&\#x0454;&\#x0442;&\#x044C;&\#x0441;&\#x044F; &\#x0436;&\#x043E;&\#x0434;&\#x0435;&\#x043D; &\#x0437;&\#x0430;&\#x043F;&\#x0438;&\#x0442;
 result.rows=&\#x0440;&\#x044F;&\#x0434;&\#x043A;&\#x0456;&\#x0432;
-result.statementWasCancelled=&\#x0417;&\#x0430;&\#x043F;&\#x0438;&\#x0442; &\#x0431;&\#x0443;&\#x043B;&\#x043E; &\#x0432;&\#x0456;&\#x0434;&\#x043C;&\#x0456;&\#x043D;&\#x0435;&\#x043D;&\#x043E;
+result.statementWasCanceled=&\#x0417;&\#x0430;&\#x043F;&\#x0438;&\#x0442; &\#x0431;&\#x0443;&\#x043B;&\#x043E; &\#x0432;&\#x0456;&\#x0434;&\#x043C;&\#x0456;&\#x043D;&\#x0435;&\#x043D;&\#x043E;
 result.updateCount=&\#x041A;&\#x0456;&\#x043B;&\#x044C;&\#x043A;&\#x0456;&\#x0441;&\#x0442;&\#x044C; &\#x0437;&\#x043C;&\#x0456;&\#x043D;&\#x0435;&\#x043D;&\#x0438;&\#x0445;
 resultEdit.add=&\#x0414;&\#x043E;&\#x0434;&\#x0430;&\#x0442;&\#x0438;
 resultEdit.cancel=&\#x0412;&\#x0456;&\#x0434;&\#x043C;&\#x0456;&\#x043D;&\#x0438;&\#x0442;&\#x0438;

h2/src/main/org/h2/server/web/res/_text_zh_cn.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=\u6700\u5927\u8FD4\u56DE\u884C\u6570\u88AB\u8BBE\u7F6E
 result.noRows=\u65E0\u8FD4\u56DE\u884C
 result.noRunningStatement=\u5F53\u524D\u6CA1\u6709\u6B63\u5728\u6267\u884C\u7684SQL\u8BED\u53E5
 result.rows=\u884C
-result.statementWasCancelled=SQL \u8BED\u53E5\u88AB\u53D6\u6D88
+result.statementWasCanceled=SQL \u8BED\u53E5\u88AB\u53D6\u6D88
 result.updateCount=\u66F4\u65B0\u884C\u6570
 resultEdit.add=\u589E\u52A0
 resultEdit.cancel=\u53D6\u6D88

h2/src/main/org/h2/server/web/res/_text_zh_tw.properties

@@ -70,7 +70,7 @@ result.maxrowsSet=\u6700\u5927\u8CC7\u6599\u5217 (rowcount) \u8A2D\u5B9A\u5B8C\u
 result.noRows=\u7121\u8CC7\u6599\u5217 (rows)
 result.noRunningStatement=\u76EE\u524D\u6C92\u6709\u6B63\u5728\u57F7\u884C\u7684SQL\u8FF0\u53E5
 result.rows=\u8CC7\u6599\u5217 (rows)
-result.statementWasCancelled=SQL\u8FF0\u53E5\u5DF2\u53D6\u6D88
+result.statementWasCanceled=SQL\u8FF0\u53E5\u5DF2\u53D6\u6D88
 result.updateCount=\u66F4\u65B0\u8A08\u6578
 resultEdit.add=\u589E\u52A0
 resultEdit.cancel=\u53D6\u6D88

h2/src/main/org/h2/table/Table.java

@@ -350,7 +350,7 @@ public abstract class Table extends SchemaObjectBase {
             throws SQLException {
         // remove the old rows
         for (rows.reset(); rows.hasNext();) {
-            prepared.checkCancelled();
+            prepared.checkCanceled();
             Row o = rows.next();
             rows.next();
             removeRow(session, o);
@@ -358,7 +358,7 @@ public abstract class Table extends SchemaObjectBase {
         }
         // add the new rows
         for (rows.reset(); rows.hasNext();) {
-            prepared.checkCancelled();
+            prepared.checkCanceled();
             rows.next();
             Row n = rows.next();
             addRow(session, n);

h2/src/main/org/h2/table/TableFilter.java

@@ -360,7 +360,7 @@ public class TableFilter implements ColumnResolver {
     }
 
     private void checkTimeout() throws SQLException {
-        session.checkCancelled();
+        session.checkCanceled();
         // System.out.println(this.alias+ " " + table.getName() + ": " + scanCount);
     }
 

h2/src/main/org/h2/table/TableLink.java

@@ -433,7 +433,7 @@ public class TableLink extends Table {
         checkReadOnly();
         if (emitUpdates) {
             for (rows.reset(); rows.hasNext();) {
-                prepared.checkCancelled();
+                prepared.checkCanceled();
                 Row oldRow = rows.next();
                 Row newRow = rows.next();
                 linkedIndex.update(oldRow, newRow);

h2/src/test/org/h2/samples/newsfeed.sql

@@ -220,7 +220,7 @@ $$A new version of H2 is available for <a href="http://www.h2database.com">downl
         when using JDK 1.6
 </li><li>The Japanese translation of the error messages and the H2 Console 
         has been completed by Masahiro Ikemoto (Arizona Design Inc.)
-</li><li>Statements can now be cancelled remotely 
+</li><li>Statements can now be canceled remotely 
         (when using remote connections).
 </li><li>Triggers are no longer executed when executing an changing the table
         structure (ALTER TABLE).
@@ -392,7 +392,7 @@ INSERT INTO ITEM VALUES(38,
 </li><li>Random: the process didn''t stop if generateSeed was very slow.
 </li><li>SELECT UNION with a different number of ORDER BY columns didn''t work.
 </li><li>When using a view, the column precision was wrong sometimes.
-</li><li>Some long running queries could not be cancelled.
+</li><li>Some long running queries could not be canceled.
 </li><li>When using encrypted databases, and using the wrong file password,
     the log file was renamed sometimes.
 </li></ul>

h2/src/test/org/h2/test/jdbc/TestCancel.java

@@ -115,7 +115,7 @@ public class TestCancel extends TestBase {
             stat.executeQuery("SELECT MAX(RAND()) FROM SYSTEM_RANGE(1, 100000000)");
             fail();
         } catch (SQLException e) {
-            assertEquals(ErrorCode.STATEMENT_WAS_CANCELLED, e.getErrorCode());
+            assertEquals(ErrorCode.STATEMENT_WAS_CANCELED, e.getErrorCode());
         }
         stat.setQueryTimeout(0);
         stat.execute("SET QUERY_TIMEOUT 1100");
@@ -132,7 +132,7 @@ public class TestCancel extends TestBase {
             stat.executeQuery("SELECT MAX(RAND()) FROM SYSTEM_RANGE(1, 100000000)");
             fail();
         } catch (SQLException e) {
-            assertEquals(ErrorCode.STATEMENT_WAS_CANCELLED, e.getErrorCode());
+            assertEquals(ErrorCode.STATEMENT_WAS_CANCELED, e.getErrorCode());
         }
         conn.close();
     }
@@ -148,7 +148,7 @@ public class TestCancel extends TestBase {
                 stat.executeQuery("SELECT MAX(RAND()) FROM SYSTEM_RANGE(1, 100000000)");
                 fail();
             } catch (SQLException e) {
-                assertEquals(ErrorCode.STATEMENT_WAS_CANCELLED, e.getErrorCode());
+                assertEquals(ErrorCode.STATEMENT_WAS_CANCELED, e.getErrorCode());
             }
             conn.close();
         } finally {
@@ -193,7 +193,7 @@ public class TestCancel extends TestBase {
                         "SELECT VISIT(ID), (SELECT SUM(X) FROM SYSTEM_RANGE(1, 10000) WHERE X<>ID) FROM TEST ORDER BY ID");
             } catch (SQLException e) {
                 assertKnownException(e);
-                // ignore cancelled statements
+                // ignore canceled statements
             }
             cancel.stopNow();
             cancel.join();

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -559,4 +559,5 @@ causing nopack water onto resolve ontoprise treatment sparql rdfs piman zen
 owl rdf recommendations axiom fabric broker osoa epictetus replacements 
 brittain wasn november unixtime ddd jason formatter psqlodbc onmousemove 
 monitoring razuna asset drag pekar devx dmitry fragments onmouseup nav 
-onmousedown olap valign army blitz backgammon knife
+onmousedown olap valign army blitz backgammon knife abbreviate berger dhuse 
+strictly greg germany abbreviates frontends cleversafe