### Eclipse Workspace Patch 1.0
#P JOSM
Index: src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 4018)
+++ src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(working copy)
@@ -635,7 +635,7 @@
             msg
             .add(
                     new JLabel(
-                            tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:")),
+                            tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:</html>")),
                             GBC.eol());
             msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces")), GBC.eop());
             if (!ConditionalOptionPaneUtil.showConfirmationDialog("convert_to_data", Main.parent, msg, tr("Warning"),
Index: src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java	(revision 4018)
+++ src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java	(working copy)
@@ -60,7 +60,7 @@
     boolean mappaintTabLoaded;
 
     public InspectPrimitiveDialog(Collection<OsmPrimitive> primitives) {
-        super(Main.parent, tr("Advanced object info"), new String[] {"Close"});
+        super(Main.parent, tr("Advanced object info"), new String[] {tr("Close")});
         this.primitives = primitives;
         setPreferredSize(new Dimension(750, 550));
 
Index: src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java	(revision 4018)
+++ src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java	(working copy)
@@ -664,7 +664,7 @@
 
             gc.gridx = 2;
             gc.weightx = 0.0;
-            pnl.add(new JLabel("Time: "),gc);
+            pnl.add(new JLabel(tr("Time:")),gc);
 
             gc.gridx = 3;
             gc.weightx = 0.3;
@@ -697,7 +697,7 @@
             tfClosedAfterDate2.setToolTipText(valClosedAfterDate2.getStandardTooltipTextAsHtml());
             gc.gridx = 3;
             gc.weightx = 0.0;
-            pnl.add(new JLabel("Time:"),gc);
+            pnl.add(new JLabel(tr("Time:")),gc);
 
             gc.gridx = 4;
             gc.weightx = 0.3;
@@ -728,7 +728,7 @@
 
             gc.gridx = 3;
             gc.weightx = 0.0;
-            pnl.add(new JLabel("Time:"),gc);
+            pnl.add(new JLabel(tr("Time:")),gc);
 
             gc.gridx = 4;
             gc.weightx = 0.3;
Index: src/org/openstreetmap/josm/gui/layer/WMSLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 4018)
+++ src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(working copy)
@@ -231,7 +231,7 @@
                 + "for this WMS layer does neither end with a ''&'' nor with a ''?''.<br>"
                 + "This is likely to lead to invalid WMS request. You should check your<br>"
                 + "preference settings.<br>"
-                + "Do you want to fetch WMS tiles anyway?",
+                + "Do you want to fetch WMS tiles anyway?</html>",
                 url);
         String [] options = new String[] {
                 tr("Yes, fetch images"),
Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java	(revision 4018)
+++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java	(working copy)
@@ -18,7 +18,7 @@
 
         // column 0 - Id
         col = new TableColumn(0);
-        col.setHeaderValue("ID");
+        col.setHeaderValue(tr("ID"));
         col.setResizable(true);
         col.setWidth(20);
         col.setPreferredWidth(20);
Index: src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java	(revision 4018)
+++ src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java	(working copy)
@@ -64,8 +64,8 @@
      * Constructor
      */
     public DuplicateWay() {
-        super(tr("Duplicated ways")+".",
-              tr("This test checks that there are no ways with same tags and same node coordinates."));
+        super(tr("Duplicated ways."),
+                tr("This test checks that there are no ways with same tags and same node coordinates."));
     }
 
 
@@ -94,7 +94,7 @@
         List<Node> wNodes = w.getNodes();
         List<LatLon> wLat = new ArrayList<LatLon>(wNodes.size());
         for (int i=0;i<wNodes.size();i++) {
-             wLat.add(wNodes.get(i).getCoor());
+            wLat.add(wNodes.get(i).getCoor());
         }
         Map<String, String> wkeys = w.getKeys();
         wkeys.remove("created_by");
Index: src/org/openstreetmap/josm/gui/preferences/LafPreference.java
===================================================================
--- src/org/openstreetmap/josm/gui/preferences/LafPreference.java	(revision 4018)
+++ src/org/openstreetmap/josm/gui/preferences/LafPreference.java	(working copy)
@@ -100,7 +100,7 @@
 
         panel.add(Box.createVerticalGlue(), GBC.eol().insets(0, 20, 0, 0));
 
-        panel.add(new JLabel(tr("Look and Feel")), GBC.std().insets(20, 0, 0, 0));
+        panel.add(new JLabel(tr("Skin")), GBC.std().insets(20, 0, 0, 0));
         panel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
         panel.add(lafCombo, GBC.eol().fill(GBC.HORIZONTAL));
 
Index: src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 4018)
+++ src/org/openstreetmap/josm/plugins/PluginHandler.java	(working copy)
@@ -26,8 +26,8 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -49,9 +49,9 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.JMultilineLabel;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
 import org.openstreetmap.josm.gui.download.DownloadSelection;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
@@ -86,34 +86,34 @@
         }
 
         DEPRECATED_PLUGINS = Arrays.asList(new DeprecatedPlugin[] {
-            new DeprecatedPlugin("mappaint", IN_CORE),
-            new DeprecatedPlugin("unglueplugin", IN_CORE),
-            new DeprecatedPlugin("lang-de", IN_CORE),
-            new DeprecatedPlugin("lang-en_GB", IN_CORE),
-            new DeprecatedPlugin("lang-fr", IN_CORE),
-            new DeprecatedPlugin("lang-it", IN_CORE),
-            new DeprecatedPlugin("lang-pl", IN_CORE),
-            new DeprecatedPlugin("lang-ro", IN_CORE),
-            new DeprecatedPlugin("lang-ru", IN_CORE),
-            new DeprecatedPlugin("ewmsplugin", IN_CORE),
-            new DeprecatedPlugin("ywms", IN_CORE),
-            new DeprecatedPlugin("tways-0.2", IN_CORE),
-            new DeprecatedPlugin("geotagged", IN_CORE),
-            new DeprecatedPlugin("landsat", tr("replaced by new {0} plugin","lakewalker")),
-            new DeprecatedPlugin("namefinder", IN_CORE),
-            new DeprecatedPlugin("waypoints", IN_CORE),
-            new DeprecatedPlugin("slippy_map_chooser", IN_CORE),
-            new DeprecatedPlugin("tcx-support", tr("replaced by new {0} plugin","dataimport")),
-            new DeprecatedPlugin("usertools", IN_CORE),
-            new DeprecatedPlugin("AgPifoJ", IN_CORE),
-            new DeprecatedPlugin("utilsplugin", IN_CORE),
-            new DeprecatedPlugin("ghost", IN_CORE),
-            new DeprecatedPlugin("validator", IN_CORE),
-            new DeprecatedPlugin("multipoly", IN_CORE),
-            new DeprecatedPlugin("remotecontrol", IN_CORE, new RemotecontrolMigration()),
-            new DeprecatedPlugin("imagery", IN_CORE),
-            new DeprecatedPlugin("slippymap", IN_CORE),
-            new DeprecatedPlugin("wmsplugin", IN_CORE),
+                new DeprecatedPlugin("mappaint", IN_CORE),
+                new DeprecatedPlugin("unglueplugin", IN_CORE),
+                new DeprecatedPlugin("lang-de", IN_CORE),
+                new DeprecatedPlugin("lang-en_GB", IN_CORE),
+                new DeprecatedPlugin("lang-fr", IN_CORE),
+                new DeprecatedPlugin("lang-it", IN_CORE),
+                new DeprecatedPlugin("lang-pl", IN_CORE),
+                new DeprecatedPlugin("lang-ro", IN_CORE),
+                new DeprecatedPlugin("lang-ru", IN_CORE),
+                new DeprecatedPlugin("ewmsplugin", IN_CORE),
+                new DeprecatedPlugin("ywms", IN_CORE),
+                new DeprecatedPlugin("tways-0.2", IN_CORE),
+                new DeprecatedPlugin("geotagged", IN_CORE),
+                new DeprecatedPlugin("landsat", tr("replaced by new {0} plugin","lakewalker")),
+                new DeprecatedPlugin("namefinder", IN_CORE),
+                new DeprecatedPlugin("waypoints", IN_CORE),
+                new DeprecatedPlugin("slippy_map_chooser", IN_CORE),
+                new DeprecatedPlugin("tcx-support", tr("replaced by new {0} plugin","dataimport")),
+                new DeprecatedPlugin("usertools", IN_CORE),
+                new DeprecatedPlugin("AgPifoJ", IN_CORE),
+                new DeprecatedPlugin("utilsplugin", IN_CORE),
+                new DeprecatedPlugin("ghost", IN_CORE),
+                new DeprecatedPlugin("validator", IN_CORE),
+                new DeprecatedPlugin("multipoly", IN_CORE),
+                new DeprecatedPlugin("remotecontrol", IN_CORE, new RemotecontrolMigration()),
+                new DeprecatedPlugin("imagery", IN_CORE),
+                new DeprecatedPlugin("slippymap", IN_CORE),
+                new DeprecatedPlugin("wmsplugin", IN_CORE),
         });
     }
 
@@ -487,13 +487,14 @@
             e.printStackTrace();
             if (e.getCause() instanceof ClassNotFoundException) {
                 msg = tr("<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was not found.<br>"
-                        + "Delete from preferences?", plugin.name, plugin.className);
+                        + "Delete from preferences?</html>", plugin.name, plugin.className);
             }
         }  catch (Throwable e) {
             e.printStackTrace();
         }
-        if(msg != null && confirmDisablePlugin(parent, msg, plugin.name))
+        if(msg != null && confirmDisablePlugin(parent, msg, plugin.name)) {
             Main.pref.removeFromCollection("plugins", plugin.name);
+        }
     }
 
     /**
@@ -717,8 +718,8 @@
      * @throws IllegalArgumentException thrown if plugins is null
      */
     public static List<PluginInformation>  updatePlugins(Window parent,
-    List<PluginInformation> plugins, ProgressMonitor monitor)
-    throws IllegalArgumentException{
+            List<PluginInformation> plugins, ProgressMonitor monitor)
+            throws IllegalArgumentException{
         CheckParameterUtil.ensureParameterNotNull(plugins, "plugins");
         if (monitor == null) {
             monitor = NullProgressMonitor.INSTANCE;
@@ -1011,11 +1012,12 @@
             PluginInformation pi = pp.getPluginInformation();
             pl.remove(pi.name);
             pl.add(pi.name + " (" + (pi.localversion != null && !pi.localversion.equals("")
-            ? pi.localversion : "unknown") + ")");
+                    ? pi.localversion : "unknown") + ")");
         }
         Collections.sort(pl);
-        for (String s : pl)
+        for (String s : pl) {
             text += "Plugin: " + s + "\n";
+        }
         return text;
     }
 
Index: src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java	(revision 4018)
+++ src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java	(working copy)
@@ -36,7 +36,7 @@
      * Constructor
      */
     public UntaggedNode() {
-        super(tr("Untagged and unconnected nodes")+".",
+        super(tr("Untagged and unconnected nodes."),
                 tr("This test checks for untagged nodes that are not part of any way."));
     }
 
@@ -68,7 +68,7 @@
                     /* translation note: don't translate quoted words */
                     String msg = marktr("Has tag containing ''fixme'' or ''FIXME''");
                     errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"),
-                                tr(msg), msg, UNTAGGED_NODE_FIXME, n));
+                            tr(msg), msg, UNTAGGED_NODE_FIXME, n));
                     return;
                 }
 
@@ -93,13 +93,13 @@
                 }
                 if (msg != null) {
                     errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"),
-                                tr(msg), msg, code, n));
+                            tr(msg), msg, code, n));
                     return;
                 }
             }
             // Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
             errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"),
-                        tr("Other"), "Other", UNTAGGED_NODE_OTHER, n));
+                    tr("Other"), "Other", UNTAGGED_NODE_OTHER, n));
         }
     }
 
@@ -117,11 +117,11 @@
         if (testError.getTester() instanceof UntaggedNode) {
             int code = testError.getCode();
             switch (code) {
-                case UNTAGGED_NODE_BLANK:
-                case UNTAGGED_NODE_CREATED_BY:
-                case UNTAGGED_NODE_WATCH:
-                case UNTAGGED_NODE_SOURCE:
-                    return true;
+            case UNTAGGED_NODE_BLANK:
+            case UNTAGGED_NODE_CREATED_BY:
+            case UNTAGGED_NODE_WATCH:
+            case UNTAGGED_NODE_SOURCE:
+                return true;
             }
         }
         return false;
Index: src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java	(revision 4018)
+++ src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java	(working copy)
@@ -38,8 +38,8 @@
      * Constructor
      */
     public SimilarNamedWays() {
-        super(tr("Similarly named ways")+".",
-              tr("This test checks for ways with similar names that may have been misspelled."));
+        super(tr("Similarly named ways."),
+                tr("This test checks for ways with similar names that may have been misspelled."));
     }
 
     @Override
Index: src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
===================================================================
--- src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java	(revision 4018)
+++ src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java	(working copy)
@@ -65,9 +65,8 @@
                 if (precision==0)
                     return ((List<Node>) o).get(0).getCoor().getRoundedToOsmPrecision();
                 return RoundCoord(((List<Node>) o).get(0));
-            } else {
+            } else
                 throw new AssertionError();
-            }
         }
 
         @Override
@@ -106,7 +105,7 @@
      * Constructor
      */
     public DuplicateNode() {
-        super(tr("Duplicated nodes")+".",
+        super(tr("Duplicated nodes."),
                 tr("This test checks that there are no nodes at the very same location."));
     }
 
