Ticket #4339: messageformat-fixes.diff

File messageformat-fixes.diff, 13.7 KB (added by andre68@…, 16 years ago)

  • src/org/openstreetmap/josm/actions/JoinAreasAction.java

     
    135135        List<Node> allNodes = new ArrayList<Node>();
    136136        for (Way way: ways) {
    137137            if(!way.isClosed()) {
    138                 JOptionPane.showMessageDialog(Main.parent, tr("\"{0}\" is not closed and therefore can't be joined.", way.getName()));
     138                JOptionPane.showMessageDialog(Main.parent, tr("\"{0}\" is not closed and therefore can''t be joined.", way.getName()));
    139139                return;
    140140            }
    141141

  • src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java

     
    471471                    FullyAutomaticAuthorisationUI.this,
    472472                    tr("<html>"
    473473                            + "The automatic process for retrieving an OAuth Access Token<br>"
    474                             + "from the OSM server failed because JOSM wasn't able to build<br>"
     474                            + "from the OSM server failed because JOSM wasn''t able to build<br>"
    475475                            + "a valid login URL from the OAuth Authorise Endpoint URL ''{0}''.<br><br>"
    476476                            + "Please check your advanced setting and try again."
    477477                            +"</html>",

  • src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

     
    869869                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable"));
    870870
    871871            if (! synchronizedAdjustables.contains(adjustable))
    872                 throw new IllegalStateException(tr("Adjustable {0} not registered yet. Can't set participation in synchronized adjustment.", adjustable));
     872                throw new IllegalStateException(tr("Adjustable {0} not registered yet. Can''t set participation in synchronized adjustment.", adjustable));
    873873
    874874            enabledMap.put(adjustable, isParticipating);
    875875            observable.notifyObservers();

  • src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

     
    9898        if (value == null)
    9999            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "value"));
    100100        if (!tags.getValues().contains(value))
    101             throw new IllegalStateException(tr("Tag collection doesn't include the selected value ''{0}''.", value));
     101            throw new IllegalStateException(tr("Tag collection doesn''t include the selected value ''{0}''.", value));
    102102        this.value = value;
    103103        this.type = MultiValueDecisionType.KEEP_ONE;
    104104    }

  • src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

     
    214214                        tr("Continue resolving")};
    215215                int ret = JOptionPane.showOptionDialog(Main.parent,
    216216                        tr("<html>You didn''t finish to merge the differences in this conflict.<br>"
    217                                 + "Conflict resolutions won't be applied unless all differences<br>"
     217                                + "Conflict resolutions won''t be applied unless all differences<br>"
    218218                                + "are resolved."
    219219                                + "Click <strong>{0}</strong> to close anyway.<strong>Already<br>"
    220                                 + "resolved differences won't be applied.</strong><br>"
     220                                + "resolved differences won''t be applied.</strong><br>"
    221221                                + "Click <strong>{1}</strong> to return to resolving conflicts.</html>"
    222222                                , options[0].toString(), options[1].toString()
    223223                        ),

  • src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

     
    341341        protected void warnBecauseOfDeletedRelation(Relation r) {
    342342            String message = tr("<html>The child relation<br>"
    343343                    + "{0}<br>"
    344                     + "is deleted on the server. It can't be loaded",
     344                    + "is deleted on the server. It can''t be loaded",
    345345                    r.getDisplayName(DefaultNameFormatter.getInstance())
    346346            );
    347347

  • src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java

     
    7676            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable"));
    7777
    7878        if (! synchronizedAdjustables.contains(adjustable))
    79             throw new IllegalStateException(tr("Adjustable {0} not registered yet. Can't set participation in synchronized adjustment.", adjustable));
     79            throw new IllegalStateException(tr("Adjustable {0} not registered yet. Can''t set participation in synchronized adjustment.", adjustable));
    8080
    8181        enabledMap.put(adjustable, isParticipating);
    8282        observable.notifyObservers();

  • src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java

     
    5858        HelpAwareOptionPane.showOptionDialog(
    5959                parent,
    6060                tr("<html>"
    61                         + "''{0}'' isn't a valid OSM API URL.<br>"
     61                        + "''{0}'' isn''t a valid OSM API URL.<br>"
    6262                        + "Please check the spelling and validate again."
    6363                        +"</html>",
    6464                        url

  • src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java

     
    6262            throw new IllegalStateException(tr("Failed to update primitive with id {0} because current edit layer is null", id));
    6363        OsmPrimitive p = layer.data.getPrimitiveById(id, type);
    6464        if (p == null)
    65             throw new IllegalStateException(tr("Failed to update primitive with id {0} because current edit layer doesn't include such a primitive", id));
     65            throw new IllegalStateException(tr("Failed to update primitive with id {0} because current edit layer doesn''t include such a primitive", id));
    6666        Main.worker.execute(new UpdatePrimitivesTask(layer, Collections.singleton(p)));
    6767    }
    6868

  • src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java

     
    229229
    230230    protected void warnLayersWithIllegalFilesAndSaveRequest(List<SaveLayerInfo> infos) {
    231231        String msg = trn("<html>{0} layer needs saving but has an associated file<br>"
    232                 + "which can't be written.<br>"
     232                + "which can''t be written.<br>"
    233233                + "Either select another file for this layer or discard the changes.<br>"
    234234                + "Layer with a non-writable file:</html>",
    235235                "<html>{0} layers need saving but have associated files<br>"
    236                 + "which can't be written.<br>"
     236                + "which can''t be written.<br>"
    237237                + "Either select another file for each of them or discard the changes.<br>"
    238238                + "Layers with non-writable files:</html>",
    239239                infos.size(),

  • src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

     
    111111        if (id <= 0) return;
    112112        OsmPrimitive primitive = ds.getPrimitiveById(id, type);
    113113        if (primitive == null)
    114             throw new NoSuchElementException(tr("No primitive with id {0} in local dataset. Can't infer primitive type.", id));
     114            throw new NoSuchElementException(tr("No primitive with id {0} in local dataset. Can''t infer primitive type.", id));
    115115        remember(primitive.getPrimitiveId());
    116116        return;
    117117    }

  • src/org/openstreetmap/josm/data/Preferences.java

     
    446446        File prefDir = getPreferencesDirFile();
    447447        if (prefDir.exists()) {
    448448            if(!prefDir.isDirectory()) {
    449                 System.err.println(tr("Warning: Failed to initialize preferences. Preference directory ''{0}'' isn't a directory.", prefDir.getAbsoluteFile()));
     449                System.err.println(tr("Warning: Failed to initialize preferences. Preference directory ''{0}'' isn''t a directory.", prefDir.getAbsoluteFile()));
    450450                JOptionPane.showMessageDialog(
    451451                        Main.parent,
    452                         tr("<html>Failed to initialize preferences.<br>Preference directory ''{0}'' isn't a directory.</html>", prefDir.getAbsoluteFile()),
     452                        tr("<html>Failed to initialize preferences.<br>Preference directory ''{0}'' isn''t a directory.</html>", prefDir.getAbsoluteFile()),
    453453                        tr("Error"),
    454454                        JOptionPane.ERROR_MESSAGE
    455455                );

  • src/org/openstreetmap/josm/data/osm/DataSet.java

     
    204204    public void addPrimitive(OsmPrimitive primitive) {
    205205        if (getPrimitiveById(primitive) != null)
    206206            throw new DataIntegrityProblemException(
    207                     tr("Unable to add primitive {0} to the dataset because it's already included", primitive.toString()));
     207                    tr("Unable to add primitive {0} to the dataset because it''s already included", primitive.toString()));
    208208
    209209        if (primitive instanceof Node) {
    210210            nodes.add((Node) primitive);
    … …  
    646646    private OsmPrimitive getPrimitiveByIdChecked(PrimitiveId primitiveId) {
    647647        OsmPrimitive result = getPrimitiveById(primitiveId);
    648648        if (result == null) {
    649             System.out.println(tr("JOSM expected to find primitive [{0} {1}] in dataset but it's not there. Please report this "
     649            System.out.println(tr("JOSM expected to find primitive [{0} {1}] in dataset but it''s not there. Please report this "
    650650                    + " at http://josm.openstreetmap.de . This is not a critical error, it should be safe to continue in your work.",
    651651                    primitiveId.getType(), Long.toString(primitiveId.getUniqueId())));
    652652            new Exception().printStackTrace();

  • src/org/openstreetmap/josm/command/ConflictAddCommand.java

     
    3131                Main.parent,
    3232                tr("<html>Layer ''{0}'' already has a conflict for primitive<br>"
    3333                        + "''{1}''.<br>"
    34                         + "This conflict can't be added.</html>",
     34                        + "This conflict can''t be added.</html>",
    3535                        getLayer().getName(),
    3636                        conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
    3737                ),
    … …  
    5151
    5252    @Override public void undoCommand() {
    5353        if (! Main.map.mapView.hasLayer(getLayer())) {
    54             System.out.println(tr("Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for primitive ''{1}''.",
     54            System.out.println(tr("Warning: Layer ''{0}'' doesn''t exist any more. Can''t remove conflict for primitive ''{1}''.",
    5555                    getLayer().getName(),
    5656                    conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
    5757            ));