part 2 of 3 of the 2.8 -> 3.0 merge

git-svn-id: svn://localhost/ardour2/branches/3.0@4987 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 15 insertions, 15 deletions

diff --git a/gtk2_ardour/ergonomic-us.bindings.in b/gtk2_ardour/ergonomic-us.bindings.in
index a8c3f1fe0e..523878bd3f 100644
--- a/gtk2_ardour/ergonomic-us.bindings.in
+++ b/gtk2_ardour/ergonomic-us.bindings.in
@@ -14,7 +14,7 @@
 (gtk_accel_path "<Actions>/Editor/toggle-edit-mode" "1")
 (gtk_accel_path "<Actions>/Editor/cycle-snap-mode" "2")
 (gtk_accel_path "<Actions>/Editor/cycle-snap-choice" "3")
-; (gtk_accel_path "<Actions>/processormenu/copy" "")
+; (gtk_accel_path "<Actions>/redirectmenu/copy" "")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffFaster" "")
 (gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<%PRIMARY%>space")
 (gtk_accel_path "<Actions>/Transport/record-roll" "<%TERTIARY%>space")
@@ -22,7 +22,7 @@
 ; (gtk_accel_path "<Actions>/RegionList/SortByRegionLength" "")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffSlowest" "")
 ; (gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-sync" "")
-; (gtk_accel_path "<Actions>/processormenu/deactivate_all" "")
+; (gtk_accel_path "<Actions>/redirectmenu/deactivate_all" "")
 ; (gtk_accel_path "<Actions>/RegionList/SortByRegionPosition" "")
 ; (gtk_accel_path "<Actions>/Editor/ZoomFocus" "")
 (gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%SECONDARY%>i")
@@ -34,7 +34,7 @@
 ; (gtk_accel_path "<Actions>/Zoom/zoom-focus-playhead" "")
 ; (gtk_accel_path "<Actions>/Editor/center-edit-cursor" "")
 ; (gtk_accel_path "<Actions>/Editor/Monitoring" "")
-; (gtk_accel_path "<Actions>/processormenu/deactivate" "")
+; (gtk_accel_path "<Actions>/redirectmenu/deactivate" "")
 ; (gtk_accel_path "<Actions>/options/LatchedRecordEnable" "")
 ; (gtk_accel_path "<Actions>/Transport/TogglePunchIn" "")
 ; (gtk_accel_path "<Actions>/ShuttleActions/SetShuttleUnitsPercentage" "")
@@ -103,8 +103,8 @@
 (gtk_accel_path "<Actions>/Editor/playhead-to-previous-region-boundary" "leftarrow")
 (gtk_accel_path "<Actions>/Editor/selected-marker-to-previous-region-boundary" "<%PRIMARY%><%TERTIARY%>leftarrow")
 ; (gtk_accel_path "<Actions>/Editor/EditCursorMovementOptions" "")
-; (gtk_accel_path "<Actions>/processormenu/activate_all" "")
-; (gtk_accel_path "<Actions>/processormenu/paste" "")
+; (gtk_accel_path "<Actions>/redirectmenu/activate_all" "")
+; (gtk_accel_path "<Actions>/redirectmenu/paste" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte25" "")
 ; (gtk_accel_path "<Actions>/options/RegionEquivalentsOverlap" "")
 ; (gtk_accel_path "<Actions>/Main/MeteringFallOffRate" "")
@@ -128,7 +128,7 @@
 (gtk_accel_path "<Actions>/Editor/align-regions-sync" "less")
 ; (gtk_accel_path "<Actions>/Editor/EditSelectRegionOptions" "")
 (gtk_accel_path "<Actions>/Editor/crop" "c")
-; (gtk_accel_path "<Actions>/processormenu/newsend" "")
+; (gtk_accel_path "<Actions>/redirectmenu/newsend" "")
 ; (gtk_accel_path "<Actions>/Editor/ToggleGeneric MIDISurfaceSubMenu" "")
 ; (gtk_accel_path "<Actions>/Editor/MeterFalloff" "")
 ; (gtk_accel_path "<Actions>/RegionList/rlRemove" "")
@@ -141,7 +141,7 @@
 ; (gtk_accel_path "<Actions>/Snap/snap-to-minutes" "")
 ; (gtk_accel_path "<Actions>/Main/Windows" "")
 ; (gtk_accel_path "<Actions>/Main/CleanupUnused" "")
-; (gtk_accel_path "<Actions>/processormenu/deselectall" "")
+; (gtk_accel_path "<Actions>/redirectmenu/deselectall" "")
 ; (gtk_accel_path "<Actions>/options/SoloViaBus" "")
 ; (gtk_accel_path "<Actions>/RegionList/rlAudition" "")
 (gtk_accel_path "<Actions>/Editor/set-region-sync-position" "u")
@@ -206,7 +206,7 @@
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-in" "t")
 ; (gtk_accel_path "<Actions>/JACK/Latency" "")
 (gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-end" "<%TERTIARY%>F2")
-; (gtk_accel_path "<Actions>/processormenu/rename" "")
+; (gtk_accel_path "<Actions>/redirectmenu/rename" "")
 ; (gtk_accel_path "<Actions>/RegionList/rlShowAuto" "")
 (gtk_accel_path "<Actions>/Editor/select-all-before-playhead" "<%PRIMARY%>p")
 ; (gtk_accel_path "<Actions>/Main/Session" "")
@@ -231,7 +231,7 @@
 ; (gtk_accel_path "<Actions>/Editor/PullupMinus4" "")
 (gtk_accel_path "<Actions>/Common/goto-mixer" "<%WINDOW%>m")
 ; (gtk_accel_path "<Actions>/RegionList/SortBySourceFileCreationDate" "")
-; (gtk_accel_path "<Actions>/processormenu/activate" "")
+; (gtk_accel_path "<Actions>/redirectmenu/activate" "")
 (gtk_accel_path "<Actions>/Editor/extend-range-to-start-of-region" "leftanglebracket")
 ; (gtk_accel_path "<Actions>/Editor/PullupMinus1" "")
 ; (gtk_accel_path "<Actions>/Editor/snap-normal" "")
@@ -239,7 +239,7 @@
 (gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<%WINDOW%>k")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-asixteenthbeat" "")
 (gtk_accel_path "<Actions>/Editor/select-all-in-punch-range" "<%PRIMARY%>d")
-; (gtk_accel_path "<Actions>/processormenu/edit" "")
+; (gtk_accel_path "<Actions>/redirectmenu/edit" "")
 (gtk_accel_path "<Actions>/Editor/duplicate-region" "d")
 (gtk_accel_path "<Actions>/Editor/multi-duplicate-region" "<%SECONDARY%>d")
 ; (gtk_accel_path "<Actions>/JACK/JACKLatency2048" "")
@@ -249,8 +249,8 @@
 ; (gtk_accel_path "<Actions>/options/FileHeaderFormatWAVE" "")
 (gtk_accel_path "<Actions>/Transport/GotoZero" "KP_0")
 (gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%TERTIARY%>End")
-; (gtk_accel_path "<Actions>/processormenu/cut" "")
-; (gtk_accel_path "<Actions>/processormenu/newinsert" "")
+; (gtk_accel_path "<Actions>/redirectmenu/cut" "")
+; (gtk_accel_path "<Actions>/redirectmenu/newinsert" "")
 ; (gtk_accel_path "<Actions>/options/UseMMC" "")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffOff" "")
 ;(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-object" "o")
@@ -295,7 +295,7 @@
 ; (gtk_accel_path "<Actions>/Editor/toggle-xfades-active" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-bar" "")
 ; (gtk_accel_path "<Actions>/Editor/LayerLaterHigher" "")
-; (gtk_accel_path "<Actions>/processormenu/selectall" "")
+; (gtk_accel_path "<Actions>/redirectmenu/selectall" "")
 (gtk_accel_path "<Actions>/Editor/editor-copy" "<%PRIMARY%>c")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-quarters" "")
 (gtk_accel_path "<Actions>/Editor/temporal-zoom-out" "r")
@@ -306,12 +306,12 @@
 ; (gtk_accel_path "<Actions>/options/OutputAutoConnectManual" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-region-sync" "")
 (gtk_accel_path "<Actions>/Editor/edit-cursor-to-previous-region-sync" "apostrophe")
-; (gtk_accel_path "<Actions>/processormenu/clear" "")
+; (gtk_accel_path "<Actions>/redirectmenu/clear" "")
 ; (gtk_accel_path "<Actions>/Editor/ToggleGeneric MIDISurfaceFeedback" "")
 ; (gtk_accel_path "<Actions>/Editor/PullupPlus4Minus1" "")
 ; (gtk_accel_path "<Actions>/JACK/JACKLatency512" "")
 ; (gtk_accel_path "<Actions>/Main/Recent" "")
-; (gtk_accel_path "<Actions>/processormenu/newplugin" "")
+; (gtk_accel_path "<Actions>/redirectmenu/newplugin" "")
 ; (gtk_accel_path "<Actions>/options/InputAutoConnectManual" "")
 ; (gtk_accel_path "<Actions>/options/MeterHoldLong" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-seconds" "")