Changeset 4253 in josm


Ignore:
Timestamp:
2011-07-16T21:08:34+02:00 (12 years ago)
Author:
stoecker
Message:

see #6227 - fix wrong quote escaping in strings

Location:
trunk/src/org/openstreetmap/josm
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java

    r3733 r4253  
    208208            // and display an error message. The while(true) ensures that the dialog pops up again
    209209            JOptionPane.showMessageDialog(Main.parent,
    210                     tr("Couldn't match the entered link or id to the selected service. Please try again."),
     210                    tr("Couldn''t match the entered link or id to the selected service. Please try again."),
    211211                    tr("No valid WMS URL or id"),
    212212                    JOptionPane.ERROR_MESSAGE);
  • trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

    r3965 r4253  
    180180                OsmPrimitive source = sourceDataSet.getPrimitiveById(target.getPrimitiveId());
    181181                if (source == null)
    182                     throw new RuntimeException(tr("Object of type {0} with id {1} was marked to be deleted, but it's missing in the source dataset",
     182                    throw new RuntimeException(tr("Object of type {0} with id {1} was marked to be deleted, but it''s missing in the source dataset",
    183183                            target.getType(), target.getUniqueId()));
    184184
     
    314314            // For example, datasets can be fetched from different OSM servers or badly hand-modified.
    315315            // We shouldn't merge that datasets.
    316             throw new DataIntegrityProblemException(tr("Conflict in 'visible' attribute for object of type {0} with id {1}",
     316            throw new DataIntegrityProblemException(tr("Conflict in ''visible'' attribute for object of type {0} with id {1}",
    317317                    target.getType(), target.getId()));
    318318        else if (target.isDeleted() && ! source.isDeleted() && target.getVersion() == source.getVersion()) {
  • trunk/src/org/openstreetmap/josm/data/validation/tests/NameMismatch.java

    r3671 r4253  
    3535    public NameMismatch() {
    3636        super(tr("Missing name:* translation."),
    37             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."));
     37            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."));
    3838    }
    3939
  • trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java

    r3720 r4253  
    115115                        "<li>49 29.4 19 24.5</li>" +
    116116                        "<li>-49 29.4 N -19 24.5 W</li></ul>" +
    117                         "<li>48 deg 42' 52.13\" N, 21 deg 11' 47.60\" E</li></ul>"
     117                        "<li>48 deg 42&#39; 52.13\" N, 21 deg 11&#39; 47.60\" E</li></ul>"
    118118                                )),
    119119                GBC.eol().fill().weight(1.0, 1.0));
  • trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

    r4245 r4253  
    9797                + tr("Please enter your OSM user name and password. The password will <strong>not</strong> be saved "
    9898                        + "in clear text in the JOSM preferences and it will be submitted to the OSM server <strong>only once</strong>. "
    99                         + "Subsequent data upload requests don't use your password any more.")
     99                        + "Subsequent data upload requests don''t use your password any more.")
    100100                        + "</p>"
    101101                        + "</body></html>");
  • trunk/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java

    r4240 r4253  
    141141                            layerTree.removeSelectionPath(i);
    142142                            if(!previouslyShownUnsupportedCrsError) {
    143                                 JOptionPane.showMessageDialog(null, tr("That layer does not support any of JOSM's projections,\n" +
     143                                JOptionPane.showMessageDialog(null, tr("That layer does not support any of JOSM''s projections,\n" +
    144144                                "so you can not use it. This message will not show again."),
    145145                                tr("WMS Error"), JOptionPane.ERROR_MESSAGE);
  • trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java

    r4240 r4253  
    145145                    + "&width=" + wi + "&height=" + ht;
    146146            if (!(baseURL.endsWith("&") || baseURL.endsWith("?"))) {
    147                 System.out.println(tr("Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' or a trailing '?'.", baseURL));
     147                System.out.println(tr("Warning: The base URL ''{0}'' for a WMS service doesn''t have a trailing ''&'' or a trailing ''?''.", baseURL));
    148148                System.out.println(tr("Warning: Fetching WMS tiles is likely to fail. Please check you preference settings."));
    149149                System.out.println(tr("Warning: The complete URL is ''{0}''.", str));
Note: See TracChangeset for help on using the changeset viewer.