Index: applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java
===================================================================
--- applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java	(revision 26508)
+++ applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java	(revision 26509)
@@ -78,5 +78,5 @@
                     }
                     if (!parsedProperly) {
-                        JOptionPane.showMessageDialog(null, tr("Error occured while parsing gpx file {0}. Only part of the file will be available", urlString));
+                        JOptionPane.showMessageDialog(null, tr("Error occurred while parsing gpx file {0}. Only a part of the file will be available.", urlString));
                     }
 
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 26508)
+++ 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;
             }
         };
Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationModel.java
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationModel.java	(revision 26508)
+++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/ElevationModel.java	(revision 26509)
@@ -71,5 +71,5 @@
 
 	/**
-	 * Gets the the GPX data instance used by this model.
+	 * Gets the GPX data instance used by this model.
 	 * 
 	 * @return
Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java	(revision 26508)
+++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/gui/DefaultElevationProfileRenderer.java	(revision 26509)
@@ -276,5 +276,5 @@
 	 *            The fill color of the triangle.
 	 * @param dir
-	 *            The direction of the the triangle
+	 *            The direction of the triangle
 	 * @param x
 	 *            The x coordinate in the graphics context.
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 26508)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 26509)
@@ -646,4 +646,5 @@
 	 * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primitivesAdded(org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent)
 	 */
+        @Override
 	public void primitivesAdded(PrimitivesAddedEvent event) {
 		invalidate();
@@ -653,4 +654,5 @@
 	 * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primitivesRemoved(org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent)
 	 */
+        @Override
 	public void primitivesRemoved(PrimitivesRemovedEvent event) {
 		invalidate();
@@ -819,15 +821,3 @@
 		}
 	}
-
-	@Override
-	public void primtivesAdded(PrimitivesAddedEvent event) {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	public void primtivesRemoved(PrimitivesRemovedEvent event) {
-		// TODO Auto-generated method stub
-		
-	}
 }
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java	(revision 26508)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesMapMode.java	(revision 26509)
@@ -26,5 +26,5 @@
 
 	public FixAddressesMapMode(MapFrame mapFrame) {
-		super(tr("Fix adresses"), "incompleteaddress_24",
+		super(tr("Fix addresses"), "incompleteaddress_24",
 				tr("Show dialog with incomplete addresses"),
 				mapFrame,
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 26508)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 26509)
@@ -46,5 +46,5 @@
 	private OSMAddress curAddressNode;
 	private boolean isRunning = false;
-	private boolean cancelled;
+	private boolean canceled;
 
 
@@ -170,5 +170,5 @@
 	@Override
 	protected void cancel() {
-		cancelled = true;
+		canceled = true;
 	}
 
@@ -190,5 +190,5 @@
 
 		isRunning = true;
-		cancelled = false;
+		canceled = false;
 
 		// Start progress monitor to guess address values
@@ -221,5 +221,5 @@
 
 				// check for cancel
-				if (cancelled) {
+				if (canceled) {
 					break;
 				}
@@ -229,5 +229,5 @@
 				// visit osm data
 				for (OsmPrimitive osmPrimitive : Main.main.getCurrentDataSet().allPrimitives()) {
-					if (cancelled) {
+					if (canceled) {
 						break;
 					}
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java	(revision 26508)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java	(revision 26509)
@@ -52,5 +52,5 @@
 
 	/**
-	 * Gets the coordinate of the node. If the the underlying object is a
+	 * Gets the coordinate of the node. If the underlying object is a
 	 * node, it just returns the node coordinate. For ways and areas, this
 	 * method returns the coordinate of the center (balance point).
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StringUtils.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StringUtils.java	(revision 26508)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/StringUtils.java	(revision 26509)
@@ -120,5 +120,5 @@
 	/**
 	 * @param needle The string to find the best match for.
-	 * @param haystack The list of strings to pick the the best match from.
+	 * @param haystack The list of strings to pick the best match from.
 	 * @return The string of the list with the longest common substring to needle or
 	 * <tt>null</tt>, if either <tt>needle</tt> or <tt>haystack</tt> is empty or null.
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java	(revision 26508)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/IncompleteAddressesDialog.java	(revision 26509)
@@ -157,4 +157,5 @@
 	 * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primitivesAdded(org.openstreetmap.josm.data.osm.event.PrimitivesAddedEvent)
 	 */
+        @Override
 	public void primitivesAdded(PrimitivesAddedEvent event) {
 		container.invalidate();
@@ -165,4 +166,5 @@
 	 * @see org.openstreetmap.josm.data.osm.event.DataSetListener#primitivesRemoved(org.openstreetmap.josm.data.osm.event.PrimitivesRemovedEvent)
 	 */
+        @Override
 	public void primitivesRemoved(PrimitivesRemovedEvent event) {
 		container.invalidate();
@@ -227,13 +229,3 @@
 		container.invalidate();
 	}
-
-	@Override
-	public void primtivesAdded(PrimitivesAddedEvent event) {
-		// do something here?		
-	}
-
-	@Override
-	public void primtivesRemoved(PrimitivesRemovedEvent event) {
-		// do something here?		
-	}
 }
Index: applications/editors/josm/plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWATargetWayHelper.java
===================================================================
--- applications/editors/josm/plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWATargetWayHelper.java	(revision 26508)
+++ applications/editors/josm/plugins/ImproveWayAccuracy/src/org/openstreetmap/josm/plugins/iwa/IWATargetWayHelper.java	(revision 26509)
@@ -143,5 +143,5 @@
 
             if (altitudeIntersection != null) {
-                // If the the segment intersects with the altitude from p
+                // If the segment intersects with the altitude from p
                 currentDistance = pEN.distance(altitudeIntersection);
 
Index: applications/editors/josm/plugins/cadastre-fr/build.xml
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 26508)
+++ applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 26509)
@@ -32,5 +32,5 @@
     <property name="ant.build.javac.target" value="1.5"/>
     <property name="commit.message" value="Changed constructor for Plugin"/>
-    <property name="plugin.main.version" value="4126"/>
+    <property name="plugin.main.version" value="4310"/>
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java	(revision 26508)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java	(revision 26509)
@@ -26,5 +26,5 @@
 
 public class CadastreInterface {
-    public boolean downloadCancelled = false;
+    public boolean downloadCanceled = false;
     public HttpURLConnection urlConn = null;
 
@@ -76,5 +76,5 @@
             interfaceRef = null;
         // open the session with the French Cadastre web front end
-        downloadCancelled = false;
+        downloadCanceled = false;
         try {
             if (cookie == null || isCookieExpired) {
@@ -306,5 +306,5 @@
                     // list of values parsed in listOfFeuilles (list all non-georeferenced images)
                     lines = getFeuillesList();
-                    if (!downloadCancelled) {
+                    if (!downloadCanceled) {
                         parseFeuillesList(lines);
                         if (listOfFeuilles.size() > 0) {
@@ -567,5 +567,5 @@
             //urlConn.disconnect();
         }
-        downloadCancelled = true;
+        downloadCanceled = true;
         lastWMSLayerName = null;
     }
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java	(revision 26508)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java	(revision 26509)
@@ -256,7 +256,7 @@
         if (!alreadyRedefined) {
             int reply = JOptionPane.showConfirmDialog(null,
-                    tr("Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"+
-                    "which is currently allocated for full-screen switch by default\n"+
-                    "Would you like to restore F11 for grab action ?"),
+                    tr("Plugin cadastre-fr used traditionally the key shortcut F11 for grabbing,\n"+
+                    "which is currently allocated for full-screen switch by default.\n"+
+                    "Would you like to restore F11 for grab action?"),
                     tr("Restore grab shortcut F11"),
                     JOptionPane.YES_NO_OPTION);
@@ -268,5 +268,5 @@
             }
         } else
-            System.out.println("shortcut F11 already redefined; do not change");
+            System.out.println("Shortcut F11 already redefined; do not change.");
 
         refreshMenu();
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java	(revision 26508)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java	(revision 26509)
@@ -114,5 +114,5 @@
         // option to alter the original colors of the wms images
         alterColors.setSelected(Main.pref.getBoolean("cadastrewms.alterColors", false));
-        alterColors.setToolTipText(tr("Replace the original white background by the backgound color defined in JOSM preferences."));
+        alterColors.setToolTipText(tr("Replace the original white background by the background color defined in JOSM preferences."));
         cadastrewms.add(alterColors, GBC.eop().insets(0, 0, 0, 0));
 
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java	(revision 26508)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java	(revision 26509)
@@ -45,5 +45,5 @@
                         // till here
                         dontGeoreference = true;
-                    } else if (wmsLayer.grabber.getWmsInterface().downloadCancelled){
+                    } else if (wmsLayer.grabber.getWmsInterface().downloadCanceled){
                         // do nothing
                     } else {
@@ -62,5 +62,5 @@
                             // grab new images from wms server into active layer
                             wmsLayer.grab(bounds);
-                            if (wmsLayer.grabber.getWmsInterface().downloadCancelled) {
+                            if (wmsLayer.grabber.getWmsInterface().downloadCanceled) {
                                 wmsLayer.clearImages();
                                 Main.map.mapView.repaint();
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java	(revision 26508)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java	(revision 26509)
@@ -68,5 +68,5 @@
         wmsLayer.grabber.getWmsInterface().cancel();
         if (wmsLayer != null)
-            wmsLayer.grabThread.setCancelled(true);
+            wmsLayer.grabThread.setCanceled(true);
     }
 
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GrabThread.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GrabThread.java	(revision 26508)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/GrabThread.java	(revision 26509)
@@ -17,5 +17,5 @@
 public class GrabThread extends Thread {
 
-    private boolean cancelled;
+    private boolean canceled;
 
     private CadastreGrabber grabber;
@@ -84,5 +84,5 @@
                 imagesToGrab.remove(0);
                 lockImagesToGrag.unlock();
-                if (cancelled) {
+                if (canceled) {
                     break;
                 } else {
@@ -93,15 +93,15 @@
                     } catch (IOException e) {
                         System.out
-                                .println("Download action cancelled by user or server did not respond");
-                        setCancelled(true);
+                                .println("Download action canceled by user or server did not respond");
+                        setCanceled(true);
                         break;
                     } catch (OsmTransferException e) {
                         System.out.println("OSM transfer failed");
-                        setCancelled(true);
+                        setCanceled(true);
                         break;
                     }
-                    if (grabber.getWmsInterface().downloadCancelled) {
-                        System.out.println("Download action cancelled by user");
-                        setCancelled(true);
+                    if (grabber.getWmsInterface().downloadcanceled) {
+                        System.out.println("Download action canceled by user");
+                        setCanceled(true);
                         break;
                     }
@@ -125,5 +125,5 @@
                     } catch (NullPointerException e) {
                         System.out.println("Layer destroyed. Cancel grab thread");
-                        setCancelled(true);
+                        setCanceled(true);
                     }
                 }
@@ -133,7 +133,7 @@
             currentGrabImage = null;
             lockCurrentGrabImage.unlock();
-            if (cancelled) {
+            if (canceled) {
                 clearImagesToGrab();
-                cancelled = false;
+                canceled = false;
             }
             if (wmsLayer.isRaster()) {
@@ -207,10 +207,10 @@
     }
     
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
+    public boolean isCanceled() {
+        return canceled;
+    }
+
+    public void setCanceled(boolean canceled) {
+        this.canceled = canceled;
     }
 
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java	(revision 26508)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java	(revision 26509)
@@ -108,5 +108,5 @@
             Main.map.repaint();
         } else if (wmsLayer.getImages().size() == 0) {
-            // action cancelled or image loaded from cache (and already georeferenced)
+            // action canceled or image loaded from cache (and already georeferenced)
             actionInterrupted();
         } else {
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java	(revision 26508)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java	(revision 26509)
@@ -129,5 +129,5 @@
 
     public void grab(Bounds b) throws IOException {
-        grabThread.setCancelled(false);
+        grabThread.setCanceled(false);
         grabThread.setGrabber(grabber);
         // if it is the first layer, use the communeBBox as grab bbox (and not divided)
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java	(revision 26508)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/addressdatabase/House.java	(revision 26509)
@@ -45,5 +45,5 @@
         assert (co != null) || (cp != null);
 
-        //... but the the name is overwritten.
+        //... but the name is overwritten.
         this.name = generateName(this.cp, this.co);
     }
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java	(revision 26508)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/ManagerDialog.java	(revision 26509)
@@ -338,5 +338,5 @@
         } catch (NullPointerException except) {
             dbTreeValue = null;
-            System.err.println("Strange exception has occured."+
+            System.err.println("Strange exception has occurred."+
                 " If you find a way to reproduce it, please report a bug!");
             except.printStackTrace();
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java	(revision 26508)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/intelligence/Reasoner.java	(revision 26509)
@@ -565,5 +565,5 @@
 
         } catch (NullPointerException except) {
-            System.err.println("Strange exception occured." +
+            System.err.println("Strange exception occurred." +
                 " If you find a way to reproduce this situation, please "+
                 "e-mail the author of the CzechAddress plugin.");
@@ -615,5 +615,5 @@
 
         } catch (NullPointerException except) {
-            System.err.println("Strange exception occured." +
+            System.err.println("Strange exception occurred." +
                 " If you find a way to reproduce this situation, please "+
                 "e-mail the author of the CzechAddress plugin.");
Index: applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java
===================================================================
--- applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java	(revision 26508)
+++ applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java	(revision 26509)
@@ -119,5 +119,5 @@
     private SerialPort port = null;
 
-    private boolean cancelled = false;
+    private boolean canceled = false;
 
     public GlobalsatDg100(CommPortIdentifier portId){
@@ -126,5 +126,5 @@
 
     public void cancel(){
-        cancelled = true;
+        canceled = true;
         disconnect();
     }
@@ -138,5 +138,5 @@
         try {
             GpxData result = null;
-            cancelled = false;
+            canceled = false;
             if(port == null){
                 connect();
@@ -152,5 +152,5 @@
                 Collection<WayPoint> seg = new ArrayList<WayPoint>(100);
                 for(GpsRec r:gpsRecList){
-                    if(cancelled){
+                    if(canceled){
                         return result;
                     }
@@ -306,6 +306,6 @@
     }
 
-    public boolean isCancelled(){
-        return cancelled;
+    public boolean isCanceled(){
+        return canceled;
     }
 
Index: applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java
===================================================================
--- applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java	(revision 26508)
+++ applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java	(revision 26509)
@@ -56,5 +56,5 @@
 
         @Override protected void finish() {
-            if(deleteAfter && GlobalsatPlugin.dg100().isCancelled() == false){
+            if(deleteAfter && GlobalsatPlugin.dg100().isCanceled() == false){
                 Main.pref.put("globalsat.deleteAfterDownload", true);
                 try{
Index: applications/editors/josm/plugins/gpxfilter/build.xml
===================================================================
--- applications/editors/josm/plugins/gpxfilter/build.xml	(revision 26508)
+++ applications/editors/josm/plugins/gpxfilter/build.xml	(revision 26509)
@@ -100,5 +100,5 @@
                 <attribute name="Plugin-Class" value="gpxfilter.GpxFilterPlugin"/>
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="Allows to filter out unnececary GPS tracks"/>
+                <attribute name="Plugin-Description" value="Allows to filter out unnecessary GPS tracks"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/GPXFilter"/>
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
Index: applications/editors/josm/plugins/gpxfilter/src/gpxfilter/EGpxLayer.java
===================================================================
--- applications/editors/josm/plugins/gpxfilter/src/gpxfilter/EGpxLayer.java	(revision 26508)
+++ applications/editors/josm/plugins/gpxfilter/src/gpxfilter/EGpxLayer.java	(revision 26509)
@@ -1246,5 +1246,5 @@
         if (bestEN == null)
             return null;
-        WayPoint best = new WayPoint(Main.proj.eastNorth2latlon(bestEN));
+        WayPoint best = new WayPoint(Main.getProjection().eastNorth2latlon(bestEN));
         best.time = bestTime;
         return best;
Index: applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java
===================================================================
--- applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java	(revision 26508)
+++ applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java	(revision 26509)
@@ -134,5 +134,5 @@
 
         private List<File> files;
-        private boolean cancelled;
+        private boolean canceled;
 
         public ImportTask(List<File> files) {
@@ -142,5 +142,5 @@
         @Override
         protected void cancel() {
-            this.cancelled = true;
+            this.canceled = true;
         }
 
@@ -250,5 +250,5 @@
             try {
                 for (File f : files) {
-                    if (cancelled) return;
+                    if (canceled) return;
                     SVGLoader loader = new SVGLoader(new URI("about:blank"),true);
                     XMLReader rdr = XMLReaderFactory.createXMLReader();
Index: applications/editors/josm/plugins/junctionchecking/build.xml
===================================================================
--- applications/editors/josm/plugins/junctionchecking/build.xml	(revision 26508)
+++ applications/editors/josm/plugins/junctionchecking/build.xml	(revision 26509)
@@ -27,5 +27,5 @@
 <project name="junctionchecking" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="3751"/>
+    <property name="plugin.main.version" value="4126"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.build.dir" value="build"/>
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/ChannelDiGraphLayer.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/ChannelDiGraphLayer.java	(revision 26508)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/ChannelDiGraphLayer.java	(revision 26509)
@@ -150,5 +150,5 @@
 
 	private Point getCoord(OSMNode node, MapView mv) {
-		return mv.getPoint(Main.proj.latlon2eastNorth(new LatLon(node.getLatitude(), node.getLongitude())));
+		return mv.getPoint(Main.getProjection().latlon2eastNorth(new LatLon(node.getLatitude(), node.getLongitude())));
 	}
 
Index: applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java
===================================================================
--- applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java	(revision 26508)
+++ applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java	(revision 26509)
@@ -89,5 +89,5 @@
         private Collection<OsmPrimitive> validatedPrimitives;
         private Collection<OsmPrimitive> formerValidatedPrimitives;
-        private boolean cancelled;
+        private boolean canceled;
         private List<LicenseProblem> problems;
 
@@ -109,5 +109,5 @@
         protected void cancel() 
         {
-            this.cancelled = true;
+            this.canceled = true;
         }
 
@@ -115,5 +115,5 @@
         protected void finish() 
         {
-            if (cancelled) return;
+            if (canceled) return;
 
             // update GUI on Swing EDT
Index: applications/editors/josm/plugins/livegps/src/org/json/JSONArray.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/org/json/JSONArray.java	(revision 26508)
+++ applications/editors/josm/plugins/livegps/src/org/json/JSONArray.java	(revision 26509)
@@ -729,5 +729,5 @@
      * @param value The Map value.
      * @return      this.
-     * @throws JSONException If the index is negative or if the the value is
+     * @throws JSONException If the index is negative or if the value is
      *  an invalid number.
      */
@@ -747,5 +747,5 @@
      *  JSONObject.NULL object.
      * @return this.
-     * @throws JSONException If the index is negative or if the the value is
+     * @throws JSONException If the index is negative or if the value is
      *  an invalid number.
      */
Index: applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java
===================================================================
--- applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java	(revision 26508)
+++ applications/editors/josm/plugins/native-password-manager/src/org/openstreetmap/josm/plugins/npm/NPMCredentialsAgent.java	(revision 26509)
@@ -37,5 +37,5 @@
      * to avoid prompting the user for login multiple times in one session,
      * when they decide not to save the credentials.
-     * In contrast, this cache avoids read request the the backend in general.
+     * In contrast, this cache avoids read request the backend in general.
      */
     private Map<RequestorType, PasswordAuthentication> credentialsCache = new HashMap<RequestorType, PasswordAuthentication>();
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java	(revision 26508)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java	(revision 26509)
@@ -75,5 +75,5 @@
 
         if(comment == null) {
-            cancelled = true;
+            canceled = true;
         }
     }
@@ -94,5 +94,5 @@
         AddCommentAction action = new AddCommentAction(dialog);
         action.comment = comment;
-        action.cancelled = cancelled;
+        action.canceled = canceled;
         action.node = node;
         return action;
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java	(revision 26508)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java	(revision 26509)
@@ -76,5 +76,5 @@
 
         if(comment == null) {
-            cancelled = true;
+            canceled = true;
         }
 
@@ -99,5 +99,5 @@
     public CloseIssueAction clone() {
         CloseIssueAction action = new CloseIssueAction(dialog);
-        action.cancelled = cancelled;
+        action.canceled = canceled;
         action.comment = comment;
         action.node = node;
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java	(revision 26508)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java	(revision 26509)
@@ -79,5 +79,5 @@
 
         if(result == null) {
-            cancelled = true;
+            canceled = true;
         }
     }
@@ -105,5 +105,5 @@
     public OsbAction clone() {
         NewIssueAction action = new NewIssueAction(plugin, p);
-        action.cancelled = cancelled;
+        action.canceled = canceled;
         action.p = p;
         action.result = result;
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java	(revision 26508)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java	(revision 26509)
@@ -52,5 +52,5 @@
     protected final OsbDialog dialog;
 
-    protected boolean cancelled = false;
+    protected boolean canceled = false;
     protected final ActionQueue actionQueue;
 
@@ -62,8 +62,8 @@
 
     public void actionPerformed(ActionEvent e) {
-        cancelled = false;
+        canceled = false;
         try {
             doActionPerformed(e);
-            if(!cancelled) {
+            if(!canceled) {
                 if (!Main.pref.getBoolean(ConfigKeys.OSB_API_OFFLINE)) {
                     execute();
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java	(revision 26508)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java	(revision 26509)
@@ -71,5 +71,5 @@
                     actionQueue.processQueue();
 
-                    // toggle queue panel visibility, if now error occured
+                    // toggle queue panel visibility, if now error occurred
                     dialog.hideQueuePanel();
 
Index: applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java
===================================================================
--- applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java	(revision 26508)
+++ applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java	(revision 26509)
@@ -167,5 +167,5 @@
         final private int mTimeMode;
 
-        private boolean cancelled = false;
+        private boolean canceled = false;
         private Boolean override_backup = null;
 
@@ -186,5 +186,5 @@
 
             for (int i=0; i<images.size(); ++i) {
-                if (cancelled) return;
+                if (canceled) return;
 
                 ImageEntry e = images.get(i);
@@ -210,5 +210,5 @@
 
                     chooseFiles(e.getFile());
-                    if (cancelled) return;
+                    if (canceled) return;
                     ExifGPSTagger.setExifGPSTag(fileFrom, fileTo, e.getPos().lat(), e.getPos().lon(), e.getGpsTime().getTime());
 
@@ -254,5 +254,5 @@
             if (fileBackup.exists()) {
                 confirm_override();
-                if (cancelled)
+                if (canceled)
                     return;
 
@@ -316,5 +316,5 @@
                             override_backup = true;
                         } else {
-                            cancelled = true;
+                            canceled = true;
                         }
                     }
@@ -322,5 +322,5 @@
             } catch (Exception e) {
                 System.err.println(e);
-                cancelled = true;
+                canceled = true;
             }
         }
@@ -356,5 +356,5 @@
         @Override
         protected void cancel() {
-            cancelled = true;
+            canceled = true;
         }
     }
Index: applications/editors/josm/plugins/piclayer/build.xml
===================================================================
--- applications/editors/josm/plugins/piclayer/build.xml	(revision 26508)
+++ applications/editors/josm/plugins/piclayer/build.xml	(revision 26509)
@@ -23,5 +23,5 @@
 <project name="PicLayer" default="dist" basedir=".">
     <property name="commit.message" value="applied #J5852 (patch by Petschge) - new shear option"/>
-    <property name="plugin.main.version" value="3835"/>
+    <property name="plugin.main.version" value="4126"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java
===================================================================
--- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java	(revision 26508)
+++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java	(revision 26509)
@@ -359,5 +359,5 @@
         if ( m_image == null )
             return;
-        String projcode = Main.proj.toCode();
+        String projcode = Main.getProjection().toCode();
 
         // TODO: bounding box only supported when coordinates are in meters
Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java
===================================================================
--- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java	(revision 26508)
+++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java	(revision 26509)
@@ -232,5 +232,5 @@
         boolean loadcal = false;
 
-        String msg = tr("A calibration file associated to the picture file was found:")+"\n"+fileName;
+        String msg = tr("A calibration file associated to the picture file was found: {0}\n", fileName);
         if ( policy.equals("yes") ) {
             loadcal = true;
@@ -240,6 +240,6 @@
         }
         else if ( policy.equals("ask") ) {
-            msg += "\n" + tr("(set  \"{0}\"  to yes/no/ask in the preferences\n"+
-                            "to control the autoloading of calibration files)", prefkey);
+            msg += "\n" + tr("Set \"{0}\" to yes/no/ask in the preferences\n"+
+                            "to control the autoloading of calibration files.", prefkey);
             msg += "\n" + tr("Do you want to apply it ?");
             int answer = JOptionPane.showConfirmDialog(Main.parent, msg, tr("Load calibration file ?"), JOptionPane.YES_NO_OPTION);
@@ -250,6 +250,6 @@
         else {
             msg += "\n" + tr("It will be applied automatically.");
-            msg += "\n" + tr("Also, frow now on, cal files will always be loaded automatically.");
-            msg += "\n" + tr("Set  \"{0}\"  to yes/no/ask in the preferences\n"+
+            msg += "\n" + tr("Also, from now on, calibration files will always be loaded automatically.");
+            msg += "\n" + tr("Set \"{0}\" to yes/no/ask in the preferences\n"+
                             "to control the autoloading of calibration files.", prefkey);
             // TODO: there should be here a yes/no dialog with a checkbox "do not ask again"
Index: applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/ProjectionException.java
===================================================================
--- applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/ProjectionException.java	(revision 26508)
+++ applications/editors/josm/plugins/proj4j/src/org/osgeo/proj4j/ProjectionException.java	(revision 26509)
@@ -21,5 +21,5 @@
 /**
  * Signals that an erroneous situation has
- * occured during the computation of
+ * occurred during the computation of
  * a projected coordinate system value. 
  * 
Index: applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java
===================================================================
--- applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java	(revision 26508)
+++ applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterAction.java	(revision 26509)
@@ -213,5 +213,5 @@
       if (!parsedProperly)
       {
-        JOptionPane.showMessageDialog(null, tr("Error occured while parsing gpx file {0}. Only part of the file will be available", file.getName()));
+        JOptionPane.showMessageDialog(null, tr("Error occurred while parsing gpx file {0}. Only a part of the file will be available.", file.getName()));
       }
     }
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java	(revision 26508)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/DownloadParentsAction.java	(revision 26509)
@@ -31,5 +31,5 @@
         super(tr("Download referrers"));
         putValue(SMALL_ICON, ImageProvider.get("downloadreferrers"));
-        putValue(SHORT_DESCRIPTION, tr("Download referrers for the the chosen relation and its members"));
+        putValue(SHORT_DESCRIPTION, tr("Download referrers for the chosen relation and its members."));
         this.rel = rel;
         rel.addChosenRelationListener(this);
Index: applications/editors/josm/plugins/reverter/build.xml
===================================================================
--- applications/editors/josm/plugins/reverter/build.xml	(revision 26508)
+++ applications/editors/josm/plugins/reverter/build.xml	(revision 26509)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="recompile after change in OsmPrimitive in JOSM 4099"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4099"/>
+    <property name="plugin.main.version" value="4310"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java	(revision 26508)
+++ applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java	(revision 26509)
@@ -171,10 +171,10 @@
                 rdr.ReadObject(entry.getPrimitiveId(), cds.getEarliestVersion(entry.getPrimitiveId())-1,
                         progressMonitor.createSubTaskMonitor(1, true));
-                if (progressMonitor.isCancelled()) return;
+                if (progressMonitor.isCanceled()) return;
             }
             for (HistoryOsmPrimitive entry : deleted) {
                 rdr.ReadObject(entry.getPrimitiveId(), cds.getEarliestVersion(entry.getPrimitiveId())-1,
                         progressMonitor.createSubTaskMonitor(1, true));
-                if (progressMonitor.isCancelled()) return;
+                if (progressMonitor.isCanceled()) return;
             }
             nds = rdr.parseOsm(progressMonitor.createSubTaskMonitor(1, true));
Index: applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java	(revision 26508)
+++ applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java	(revision 26509)
@@ -68,5 +68,5 @@
                     monitor.close();
                 }
-                return !monitor.isCancelled();
+                return !monitor.isCanceled();
             }
 
@@ -76,5 +76,5 @@
                 rev = new ChangesetReverter(changesetId, revertType,
                         progressMonitor.createSubTaskMonitor(0, true));
-                if (progressMonitor.isCancelled()) return;
+                if (progressMonitor.isCanceled()) return;
 
                 // Check missing objects
@@ -91,7 +91,7 @@
                 }
 
-                if (progressMonitor.isCancelled()) return;
+                if (progressMonitor.isCanceled()) return;
                 rev.downloadObjectsHistory(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
-                if (progressMonitor.isCancelled()) return;
+                if (progressMonitor.isCanceled()) return;
                 if (!checkAndDownloadMissing()) return;
                 List<Command> cmds = rev.getCommands();
Index: applications/editors/josm/plugins/reverter/src/reverter/corehacks/MultiOsmReader.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/corehacks/MultiOsmReader.java	(revision 26508)
+++ applications/editors/josm/plugins/reverter/src/reverter/corehacks/MultiOsmReader.java	(revision 26509)
@@ -168,5 +168,5 @@
                 } else {
                     throwException(tr(
-                            "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''.",
+                            "Missing mandatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''.",
                             minlon, minlat, maxlon, maxlat, origin
                     ));
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/ButtonDescription.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/ButtonDescription.java	(revision 26508)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/ButtonDescription.java	(revision 26509)
@@ -150,5 +150,5 @@
         this.type = ButtonType.valueOf(type.toUpperCase());
         } catch (IllegalArgumentException e) {
-            System.err.println("Unkown button type '" + type + "' given. Allowed values are " + Arrays.toString(ButtonType.values()));
+            System.err.println("Unknown button type '" + type + "' given. Allowed values are " + Arrays.toString(ButtonType.values()));
         }
     }
Index: applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java	(revision 26508)
+++ applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java	(revision 26509)
@@ -547,5 +547,5 @@
  * Closes the tokenizer (and the reader is uses internally).
  *
- * @exception IOException if an error occured.
+ * @exception IOException if an error occurred.
  */
   public void close()
@@ -563,5 +563,5 @@
  *
  * @return the next character.
- * @exception IOException if an error occured.
+ * @exception IOException if an error occurred.
  */
   protected int readNextChar()
@@ -610,5 +610,5 @@
  *
  * @return the next token.
- * @exception IOException if an error occured.
+ * @exception IOException if an error occurred.
  */
   public int nextToken()
@@ -694,5 +694,5 @@
  *
  * @return true, if the tokenizer can return another line.
- * @exception IOException if an error occured.
+ * @exception IOException if an error occurred.
  */
   public boolean hasNextLine()
@@ -724,5 +724,5 @@
  * @return a list of elements (Strings) from the next line of the
  * tokenizer.
- * @exception IOException if an error occured.
+ * @exception IOException if an error occurred.
  */
   public List<String> nextLine()
Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java	(revision 26508)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagSpecificationAwareTagCellEditor.java	(revision 26509)
@@ -18,5 +18,5 @@
      * to edit the key of a tag. In this case the auto completion list is
      * initialized with the set of standard key values and the set of current key
-     * values from the the current JOSM data set. Keys already present in the
+     * values from the current JOSM data set. Keys already present in the
      * current tag model are removed from the auto completion list.
      * 
Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java	(revision 26508)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/TagSpecifications.java	(revision 26509)
@@ -61,5 +61,5 @@
 
     /**
-     * loads the the tag specifications from the resource file given by
+     * loads the tag specifications from the resource file given by
      * {@link #RES_NAME_TAG_SPECIFICATIONS}.
      * 
Index: applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java
===================================================================
--- applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java	(revision 26508)
+++ applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/DownloadSignedOsmDataTask.java	(revision 26509)
@@ -25,5 +25,5 @@
 public class DownloadSignedOsmDataTask  extends PleaseWaitRunnable {
 
-	private boolean cancelled;
+	private boolean canceled;
 	private Exception lastException;
 	private final Collection<OsmPrimitive> missing;
@@ -44,5 +44,5 @@
 	@Override
 	protected void cancel() {
-		cancelled = true;
+		canceled = true;
 		synchronized(this) {
 			if (objectReader != null) {
@@ -55,5 +55,5 @@
 	protected void finish() {
 		Main.map.repaint();
-		if (cancelled)
+		if (canceled)
 			return;
 		if (lastException != null) {
@@ -75,5 +75,5 @@
 		try {
 			synchronized (this) {
-				if (cancelled) return;
+				if (canceled) return;
 				objectReader = new MultiFetchServerObjectReader();
 			}
@@ -87,5 +87,5 @@
 				return;
 			synchronized (this) {
-				if (cancelled) return;
+				if (canceled) return;
 				objectReader = null;
 			}
@@ -103,6 +103,6 @@
 
 		} catch (Exception e) {
-			if (cancelled) {
-				System.out.println(tr("Warning: ignoring exception because task is cancelled. Exception: {0}", e.toString()));
+			if (canceled) {
+				System.out.println(tr("Warning: ignoring exception because task is canceled. Exception: {0}", e.toString()));
 				return;
 			}
Index: applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java
===================================================================
--- applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java	(revision 26508)
+++ applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/KeyGenerationTask.java	(revision 26509)
@@ -12,5 +12,5 @@
 public class KeyGenerationTask extends PleaseWaitRunnable {
 
-	private boolean cancelled;
+	private boolean canceled;
 	private Exception lastException;
 
@@ -21,5 +21,5 @@
 	@Override
 	protected void cancel() {
-		cancelled = true;
+		canceled = true;
 		synchronized(this) {
 			/*		if (objectReader != null) {
@@ -31,5 +31,5 @@
 	@Override
 	protected void finish() {
-		if (cancelled)
+		if (canceled)
 			return;
 		if (lastException != null) {
@@ -44,5 +44,5 @@
 		try {
 			/*			synchronized (this) {
-				if (cancelled) return;
+				if (canceled) return;
 				objectReader = new MultiFetchServerObjectReader();
 			}
@@ -56,5 +56,5 @@
 				return;
 			synchronized (this) {
-				if (cancelled) return;
+				if (canceled) return;
 				objectReader = null;
 			}
@@ -71,6 +71,6 @@
 			 */
 		} catch (Exception e) {
-			if (cancelled) {
-				System.out.println(tr("Warning: ignoring exception because task is cancelled. Exception: {0}", e
+			if (canceled) {
+				System.out.println(tr("Warning: ignoring exception because task is canceled. Exception: {0}", e
 						.toString()));
 				return;
Index: applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java
===================================================================
--- applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java	(revision 26508)
+++ applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java	(revision 26509)
@@ -3,4 +3,5 @@
 import static java.lang.Math.sqrt;
 import static org.openstreetmap.josm.plugins.turnlanes.gui.GuiUtil.locs;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BasicStroke;
@@ -146,5 +147,5 @@
         }
         
-        throw new IllegalArgumentException("No such lane.");
+        throw new IllegalArgumentException(tr("No such lane."));
     }
     
Index: applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java
===================================================================
--- applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java	(revision 26508)
+++ applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/JunctionPane.java	(revision 26509)
@@ -1,3 +1,5 @@
 package org.openstreetmap.josm.plugins.turnlanes.gui;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.AlphaComposite;
@@ -333,6 +335,6 @@
                 && UnexpectedDataException.Kind.MISSING_TAG.format("lanes").equals(e.getMessage())) {
             
-            error.setText("<html>The number of lanes is not specified for one or more roads;"
-                    + " please add missing lanes tags.</html>");
+            error.setText(tr("<html>The number of lanes is not specified for one or more roads;"
+                    + " please add missing lanes tags.</html>"));
         } else {
             displayError((RuntimeException) e);
@@ -341,7 +343,7 @@
     
     private void displayError(RuntimeException e) {
-        error.setText("<html>An error occured while constructing the model."
-                + " Please run the validator to make sure the data is consistent.<br><br>Error: " + e.getMessage()
-                + "</html>");
+        error.setText(tr("<html>An error occurred while constructing the model."
+                + " Please run the validator to make sure the data is consistent."
+                + "<br><br>Error: {0}</html>", e.getMessage()));
     }
     
Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java	(revision 26508)
+++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java	(revision 26509)
@@ -485,5 +485,5 @@
             sb.append(trn("This turn restriction refers to an object which was deleted outside "
                        + "of this turn restriction editor:",
-                       "This turn restriction refers to {0} which were deleted outside "
+                       "This turn restriction refers to {0} objects which were deleted outside "
                        + "of this turn restriction editor:", deletedMembers.size(), deletedMembers.size()));
             sb.append("<ul>");
Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java	(revision 26508)
+++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java	(revision 26509)
@@ -215,5 +215,5 @@
     class EditAction extends AbstractAction implements ListSelectionListener{
         public EditAction() {
-            putValue(SHORT_DESCRIPTION,tr( "Open an editor for the selected turn restricion"));
+            putValue(SHORT_DESCRIPTION,tr("Open an editor for the selected turn restriction"));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "edit"));
             putValue(NAME, tr("Edit"));
Index: applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/Issue.java
===================================================================
--- applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/Issue.java	(revision 26508)
+++ applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/Issue.java	(revision 26509)
@@ -14,5 +14,5 @@
  * The issue has a {@see Severity}. It is described to the user with a HTML formatted
  * text (see {@see #getText()}) and it suggests a list of possible actions to fix
- * the the issue (see {@see #getActions()}).
+ * the issue (see {@see #getActions()}).
  * 
  */
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java	(revision 26508)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java	(revision 26509)
@@ -86,5 +86,5 @@
                     int last = w.getNodesCount() - 1;
                     // Only closed ways with at least four nodes
-                    // (i.e. five members since the the first/last is listed twice)
+                    // (i.e. five members since the first/last is listed twice)
                     // can be split into two objects
                     if (last <= 4 || !w.isClosed()) {
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java	(revision 26508)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java	(revision 26509)
@@ -24,5 +24,5 @@
     public AdjacentWaysAction() {
         super(tr("Adjacent ways"), "adjways",
-                tr("Adjacent ways will be selected. Nodes wiil be deselected."),
+                tr("Adjacent ways will be selected. Nodes will be deselected."),
                 Shortcut.registerShortcut("tools:adjways", tr("Tool: {0}","Adjacent ways"),
                 KeyEvent.VK_E, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
Index: applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java
===================================================================
--- applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java	(revision 26508)
+++ applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java	(revision 26509)
@@ -273,5 +273,5 @@
     }
 
-    /** Given the the node on one end of the way, return the node on the other end */
+    /** Given the node on one end of the way, return the node on the other end */
     private Node findOtherEnd(Way way, Node firstEnd) {
         Node otherEnd = way.firstNode();