Index: trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java	(revision 4835)
+++ trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java	(revision 4836)
@@ -20,7 +20,8 @@
 public class MergeSelectionAction extends AbstractMergeAction {
     public MergeSelectionAction() {
-        super(tr("Merge selection"), "dialogs/mergedown", tr("Merge the currently selected objects into another layer"), Shortcut
-                .registerShortcut("system:mergeselection", tr("Edit: {0}", tr("Merge selection")), KeyEvent.VK_M, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT),
-                true /* register */
+        super(tr("Merge selection"), "dialogs/mergedown", tr("Merge the currently selected objects into another layer"),
+            Shortcut.registerShortcut("system:mergeselection", tr("Edit: {0}", tr("Merge selection")),
+            KeyEvent.VK_M, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT),
+            true /* register */
         );
         putValue("help", ht("/Action/MergeSelection"));
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java	(revision 4835)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java	(revision 4836)
@@ -124,8 +124,9 @@
 
     public ParallelWayAction(MapFrame mapFrame) {
-        super(tr("Parallel"), "parallel", tr("Make parallel copies of ways"), Shortcut
-                .registerShortcut("mapmode:parallel", tr("Mode: {0}", tr("Parallel")), KeyEvent.VK_P,
-                        Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), mapFrame, ImageProvider.getCursor("normal",
-                        "parallel"));
+        super(tr("Parallel"), "parallel", tr("Make parallel copies of ways"),
+            Shortcut.registerShortcut("mapmode:parallel", tr("Mode: {0}",
+            tr("Parallel")), KeyEvent.VK_P, Shortcut.GROUP_EDIT,
+            Shortcut.SHIFT_DEFAULT), mapFrame, ImageProvider.getCursor("normal",
+            "parallel"));
         putValue("help", ht("/Action/Parallel"));
         mv = mapFrame.mapView;