Ignore:
Timestamp:
2011-03-20T01:29:48+01:00 (14 years ago)
Author:
mjulius
Message:

fix #3590 - Primitives or objects: Pick one

Location:
trunk/src/org/openstreetmap/josm/command
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r3262 r3995  
    2828        JOptionPane.showMessageDialog(
    2929                Main.parent,
    30                 tr("<html>Layer ''{0}'' already has a conflict for primitive<br>"
     30                tr("<html>Layer ''{0}'' already has a conflict for object<br>"
    3131                        + "''{1}''.<br>"
    3232                        + "This conflict cannot be added.</html>",
    … …  
    5050    @Override public void undoCommand() {
    5151        if (! Main.map.mapView.hasLayer(getLayer())) {
    52             System.out.println(tr("Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for primitive ''{1}''.",
     52            System.out.println(tr("Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for object ''{1}''.",
    5353                    getLayer().getName(),
    5454                    conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
    … …  
    6565    @Override public JLabel getDescription() {
    6666        return new JLabel(
    67                         tr("Add conflict for ''{0}''",
    68                                 conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
    69                         ),
    70                         ImageProvider.get(OsmPrimitiveType.from(conflict.getMy())),
    71                         JLabel.HORIZONTAL
     67                tr("Add conflict for ''{0}''",
     68                        conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
     69                ),
     70                ImageProvider.get(OsmPrimitiveType.from(conflict.getMy())),
     71                JLabel.HORIZONTAL
    7272        );
    7373    }

  • trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java

    r3362 r3995  
    6363    @Override public JLabel getDescription() {
    6464        return new JLabel(
    65                         trn("Undelete {0} primitive", "Undelete {0} primitives", toUndelete.size(), toUndelete.size()),
    66                         ImageProvider.get("data", "object"),
    67                         JLabel.HORIZONTAL
     65                trn("Undelete {0} object", "Undelete {0} objects", toUndelete.size(), toUndelete.size()),
     66                ImageProvider.get("data", "object"),
     67                JLabel.HORIZONTAL
    6868        );
    6969    }
Note: See TracChangeset for help on using the changeset viewer.