Changeset 4253 in josm for trunk

Timestamp:

2011-07-16T21:08:34+02:00 (13 years ago)

Author:

stoecker

Message:

see #6227 - fix wrong quote escaping in strings

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/Map_Rectifier_WMSmenuAction.java (modified) (1 diff)
• data/osm/DataSetMerger.java (modified) (2 diffs)
• data/validation/tests/NameMismatch.java (modified) (1 diff)
• gui/dialogs/LatLonDialog.java (modified) (1 diff)
• gui/oauth/FullyAutomaticAuthorizationUI.java (modified) (1 diff)
• gui/preferences/AddWMSLayerPanel.java (modified) (1 diff)
• io/imagery/WMSGrabber.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java

@@ -208 +208 @@
             // and display an error message. The while(true) ensures that the dialog pops up again
             JOptionPane.showMessageDialog(Main.parent,
-                    tr("Couldn't match the entered link or id to the selected service. Please try again."),
+                    tr("Couldn''t match the entered link or id to the selected service. Please try again."),
                     tr("No valid WMS URL or id"),
                     JOptionPane.ERROR_MESSAGE);

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -180 +180 @@
                 OsmPrimitive source = sourceDataSet.getPrimitiveById(target.getPrimitiveId());
                 if (source == null)
-                    throw new RuntimeException(tr("Object of type {0} with id {1} was marked to be deleted, but it's missing in the source dataset",
+                    throw new RuntimeException(tr("Object of type {0} with id {1} was marked to be deleted, but it''s missing in the source dataset",
                             target.getType(), target.getUniqueId()));
 
@@ -314 +314 @@
             // For example, datasets can be fetched from different OSM servers or badly hand-modified.
             // We shouldn't merge that datasets.
-            throw new DataIntegrityProblemException(tr("Conflict in 'visible' attribute for object of type {0} with id {1}",
+            throw new DataIntegrityProblemException(tr("Conflict in ''visible'' attribute for object of type {0} with id {1}",
                     target.getType(), target.getId()));
         else if (target.isDeleted() && ! source.isDeleted() && target.getVersion() == source.getVersion()) {

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

@@ -35 +35 @@
     public NameMismatch() {
         super(tr("Missing name:* translation."),
-            tr("This test finds multilingual objects whose 'name' attribute is not equal to some 'name:*' attribute and not a composition of 'name:*' attributes, e.g., Italia - Italien - Italy."));
+            tr("This test finds multilingual objects whose ''name'' attribute is not equal to some ''name:*'' attribute and not a composition of ''name:*'' attributes, e.g., Italia - Italien - Italy."));
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java

@@ -115 +115 @@
                         "<li>49 29.4 19 24.5</li>" +
                         "<li>-49 29.4 N -19 24.5 W</li></ul>" +
-                        "<li>48 deg 42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
+                        "<li>48 deg 42&#39; 52.13\" N, 21 deg 11&#39; 47.60\" E</li></ul>"
                                 )),
                 GBC.eol().fill().weight(1.0, 1.0));

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

@@ -97 +97 @@
                 + tr("Please enter your OSM user name and password. The password will <strong>not</strong> be saved "
                         + "in clear text in the JOSM preferences and it will be submitted to the OSM server <strong>only once</strong>. "
-                        + "Subsequent data upload requests don't use your password any more.")
+                        + "Subsequent data upload requests don''t use your password any more.")
                         + "</p>"
                         + "</body></html>");

trunk/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java

@@ -141 +141 @@
                             layerTree.removeSelectionPath(i);
                             if(!previouslyShownUnsupportedCrsError) {
-                                JOptionPane.showMessageDialog(null, tr("That layer does not support any of JOSM's projections,\n" +
+                                JOptionPane.showMessageDialog(null, tr("That layer does not support any of JOSM''s projections,\n" +
                                 "so you can not use it. This message will not show again."),
                                 tr("WMS Error"), JOptionPane.ERROR_MESSAGE);

trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

@@ -145 +145 @@
                     + "&width=" + wi + "&height=" + ht;
             if (!(baseURL.endsWith("&") || baseURL.endsWith("?"))) {
-                System.out.println(tr("Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' or a trailing '?'.", baseURL));
+                System.out.println(tr("Warning: The base URL ''{0}'' for a WMS service doesn''t have a trailing ''&'' or a trailing ''?''.", baseURL));
                 System.out.println(tr("Warning: Fetching WMS tiles is likely to fail. Please check you preference settings."));
                 System.out.println(tr("Warning: The complete URL is ''{0}''.", str));