Index: applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java
===================================================================
--- applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java	(revision 24239)
+++ applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java	(revision 26509)
@@ -98,5 +98,5 @@
     private static final String uploadTraceText = tr("Upload Trace");
 
-    private boolean cancelled = false;
+    private boolean canceled = false;
     
     public UploadDataGui() {
@@ -225,9 +225,9 @@
             flushToServer(bais, conn.getOutputStream(), progressMonitor);
 
-            if (cancelled) {
+            if (canceled) {
                 conn.disconnect();
-                OutputDisplay.setText(tr("Upload cancelled"));
+                OutputDisplay.setText(tr("Upload canceled"));
                 buttons.get(0).setEnabled(true);
-                cancelled = false;
+                canceled = false;
             }
             else {
@@ -318,9 +318,9 @@
                 progressMonitor.subTask(getProgressText(cur, progressMonitor));
 
-                if(cancelled)
+                if(canceled)
                     break;
             }
         }
-        if(!cancelled)
+        if(!canceled)
             out.flush();
         progressMonitor.subTask("Waiting for server reply...");
@@ -406,5 +406,5 @@
             @Override protected void finish() {}
             @Override protected void cancel() {
-                cancelled = true;
+                canceled = true;
             }
         };