Changeset 27650 in osm for applications/editors/josm/plugins/merge-overlap/src
- Timestamp:
- 2012-01-28T23:36:50+01:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java
r27580 r27650 52 52 53 53 public MergeOverlapAction() { 54 super(tr("Merge overlap" , null), "merge_overlap",tr(55 "Merge overlap of ways." , null),54 super(tr("Merge overlap"), "merge_overlap", 55 tr("Merge overlap of ways."), 56 56 Shortcut.registerShortcut("tools:mergeoverlap",tr("Tool: {0}", tr("Merge overlap")), KeyEvent.VK_O, 57 57 Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT) … … 241 241 // Commit 242 242 Main.main.undoRedo.add(new SequenceCommand( 243 tr("Merge Overlap (combine)" , null), cmds));243 tr("Merge Overlap (combine)"), cmds)); 244 244 getCurrentDataSet().setSelected(sel); 245 245 Main.map.repaint(); … … 477 477 .showMessageDialog( 478 478 Main.parent, 479 tr("<html>A role based relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>" , null),480 tr("Warning" , null), JOptionPane.WARNING_MESSAGE);479 tr("<html>A role based relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>"), 480 tr("Warning"), JOptionPane.WARNING_MESSAGE); 481 481 } else if (warnme) { 482 482 JOptionPane 483 483 .showMessageDialog( 484 484 Main.parent, 485 tr("<html>A relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>" , null),486 tr("Warning" , null), JOptionPane.WARNING_MESSAGE);485 tr("<html>A relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>"), 486 tr("Warning"), JOptionPane.WARNING_MESSAGE); 487 487 } 488 488 489 489 return new SplitWayResult( 490 new SequenceCommand("Split way", commandList), null, 490 new SequenceCommand(tr("Split way"), commandList), null, 491 491 changedWay, newWays); 492 492 }
Note:
See TracChangeset
for help on using the changeset viewer.