Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 7186)
+++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 7187)
@@ -535,5 +535,5 @@
      * <tt>osm-primitives.showid</tt> is set.
      *
-     * The id is append to the {@link StringBuilder} passed in in <code>name</code>.
+     * The id is append to the {@link StringBuilder} passed in <code>name</code>.
      *
      * @param name  the name without the id
Index: trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java	(revision 7186)
+++ trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java	(revision 7187)
@@ -150,5 +150,5 @@
     /**
      * Explains a {@link IllegalDataException} which has caused an {@link OsmTransferException}.
-     * This is most likely happening when JOSM tries to load data in in an unsupported format.
+     * This is most likely happening when JOSM tries to load data in an unsupported format.
      *
      * @param e the exception
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 7186)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 7187)
@@ -546,5 +546,5 @@
                                 "but <b>failed</b> to do so, because of the following network errors:<br>" +
                                 "{1}" +
-                                "It may result of a missing proxy configuration.<br>" +
+                                "It may be due to a missing proxy configuration.<br>" +
                                 "Would you like to change your proxy settings now?",
                                 Utils.joinAsHtmlUnorderedList(NETWORK_ERRORS.keySet()),
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java	(revision 7186)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java	(revision 7187)
@@ -965,5 +965,5 @@
 
     /**
-     * Validator for user ids entered in in a {@link JTextComponent}.
+     * Validator for user ids entered in a {@link JTextComponent}.
      *
      */
@@ -1041,5 +1041,5 @@
 
     /**
-     * Validates dates entered as text in in a {@link JTextComponent}. Validates the input
+     * Validates dates entered as text in a {@link JTextComponent}. Validates the input
      * on the fly and gives feedback about whether the date is valid or not.
      *
@@ -1104,5 +1104,5 @@
 
     /**
-     * Validates time values entered as text in in a {@link JTextComponent}. Validates the input
+     * Validates time values entered as text in a {@link JTextComponent}. Validates the input
      * on the fly and gives feedback about whether the time value is valid or not.
      *
Index: trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java	(revision 7186)
+++ trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java	(revision 7187)
@@ -29,5 +29,5 @@
 
     private static final List<Proxy> NO_PROXY_LIST = Collections.singletonList(Proxy.NO_PROXY);
-    
+
     private static final String IPV4_LOOPBACK = "127.0.0.1";
     private static final String IPV6_LOOPBACK = "::1";
@@ -93,5 +93,5 @@
             port = Integer.parseInt(value);
         } catch (NumberFormatException e) {
-            Main.error(tr("Unexpected format for port number in in preference ''{0}''. Got ''{1}''.", property, value));
+            Main.error(tr("Unexpected format for port number in preference ''{0}''. Got ''{1}''.", property, value));
             Main.error(tr("The proxy will not be used."));
             return 0;
Index: trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java	(revision 7186)
+++ trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java	(revision 7187)
@@ -486,5 +486,5 @@
     /**
      * Explains a {@link IllegalDataException} which has caused an {@link OsmTransferException}.
-     * This is most likely happening when JOSM tries to load data in in an unsupported format.
+     * This is most likely happening when JOSM tries to load data in an unsupported format.
      *
      * @param e the exception