Changeset 6528 in josm for trunk/src/org

Timestamp:

2013-12-25T11:21:09+01:00 (11 years ago)

Author:

simon04

Message:

Fix i18n string

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/UnconnectedWays.java (modified) (1 diff)
• gui/MainApplication.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java

@@ -295 +295 @@
             }
             if (nearbyNodeCache != null) {
-                // If we've cached an aread greater than the
+                // If we've cached an area greater than the
                 // one now being asked for...
                 if (nearbyNodeCacheDist > dist) {

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -483 +483 @@
             if (proxySelector.hasErrors()) {
                 ExtendedDialog ed = new ExtendedDialog(
-                        Main.parent, tr("Proxy errors occured"),
+                        Main.parent, tr("Proxy errors occurred"),
                         new String[]{tr("Change proxy settings"), tr("Cancel")});
                 ed.setButtonIcons(new String[]{"dialogs/settings.png", "cancel.png"}).setCancelButton(2);
                 ed.setMinimumSize(new Dimension(460, 260));
                 ed.setIcon(JOptionPane.WARNING_MESSAGE);
-                ed.setContent(tr("JOSM tried to access the following resources:")+
-                        "<br>"+Utils.joinAsHtmlUnorderedList(proxySelector.getErrorResources())+
-                        tr("but <b>failed</b> to do so, because of the following proxy errors:")+
-                        "<br>"+Utils.joinAsHtmlUnorderedList(proxySelector.getErrorMessages())+
-                        tr("Would you like to change your proxy settings now ?")
-                        );
+                ed.setContent(tr("JOSM tried to access the following resources:<br>" +
+                        "{0}" +
+                        "but <b>failed</b> to do so, because of the following proxy errors:<br>" +
+                        "{1}" +
+                        "Would you like to change your proxy settings now?",
+                        Utils.joinAsHtmlUnorderedList(proxySelector.getErrorResources()),
+                        Utils.joinAsHtmlUnorderedList(proxySelector.getErrorMessages())
+                ));
 
                 if (ed.showDialog().getValue() == 1) {