Index: applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java
===================================================================
--- applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java (revision 27580)
+++ applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java (revision 27650)
@@ -52,6 +52,6 @@
public MergeOverlapAction() {
- super(tr("Merge overlap", null), "merge_overlap", tr(
- "Merge overlap of ways.", null),
+ super(tr("Merge overlap"), "merge_overlap",
+ tr("Merge overlap of ways."),
Shortcut.registerShortcut("tools:mergeoverlap",tr("Tool: {0}", tr("Merge overlap")), KeyEvent.VK_O,
Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT)
@@ -241,5 +241,5 @@
// Commit
Main.main.undoRedo.add(new SequenceCommand(
- tr("Merge Overlap (combine)", null), cmds));
+ tr("Merge Overlap (combine)"), cmds));
getCurrentDataSet().setSelected(sel);
Main.map.repaint();
@@ -477,16 +477,16 @@
.showMessageDialog(
Main.parent,
- tr("A role based relation membership was copied to all new ways.
You should verify this and correct it when necessary.", null),
- tr("Warning", null), JOptionPane.WARNING_MESSAGE);
+ tr("A role based relation membership was copied to all new ways.
You should verify this and correct it when necessary."),
+ tr("Warning"), JOptionPane.WARNING_MESSAGE);
} else if (warnme) {
JOptionPane
.showMessageDialog(
Main.parent,
- tr("A relation membership was copied to all new ways.
You should verify this and correct it when necessary.", null),
- tr("Warning", null), JOptionPane.WARNING_MESSAGE);
+ tr("A relation membership was copied to all new ways.
You should verify this and correct it when necessary."),
+ tr("Warning"), JOptionPane.WARNING_MESSAGE);
}
return new SplitWayResult(
- new SequenceCommand("Split way", commandList), null,
+ new SequenceCommand(tr("Split way"), commandList), null,
changedWay, newWays);
}