X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fergonomic-us.bindings.in;h=a83f4dab61fc9f3e54a73acac2a51c61fd797530;hb=79731a716deae9a90be646695480f06f92c268f5;hp=523878bd3fe203a64ef83908df5c9267f5ce96bb;hpb=8aa9508c82f32efcf9c7c00e2c9e76268d4dddce;p=ardour.git

diff --git a/gtk2_ardour/ergonomic-us.bindings.in b/gtk2_ardour/ergonomic-us.bindings.in
index 523878bd3f..a83f4dab61 100644
--- a/gtk2_ardour/ergonomic-us.bindings.in
+++ b/gtk2_ardour/ergonomic-us.bindings.in
@@ -2,35 +2,35 @@
 ; this file is an automated accelerator map dump
 ;
 ; (gtk_accel_path "<Actions>/RegionList/RegionListSort" "")
-(gtk_accel_path "<Actions>/Common/Quit" "<%PRIMARY%>q")
-(gtk_accel_path "<Actions>/Common/Save" "<%PRIMARY%>s")
+(gtk_accel_path "<Actions>/Common/Quit" "<@PRIMARY@>q")
+(gtk_accel_path "<Actions>/Common/Save" "<@PRIMARY@>s")
 ; (gtk_accel_path "<Actions>/Editor/Pullup" "")
 ; (gtk_accel_path "<Actions>/Editor/zoom-to-session" "")
 ; (gtk_accel_path "<Actions>/JACK/JACKReconnect" "")
 ; (gtk_accel_path "<Actions>/Editor/Autoconnect" "")
 ; (gtk_accel_path "<Actions>/Editor/Edit" "")
 (gtk_accel_path "<Actions>/Editor/cycle-edit-point" "grave")
-(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<%SECONDARY%>grave")
+(gtk_accel_path "<Actions>/Editor/cycle-edit-point-with-marker" "<@SECONDARY@>grave")
 (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>/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")
-(gtk_accel_path "<Actions>/Transport/Record" "<%TERTIARY%>r")
+(gtk_accel_path "<Actions>/Transport/ToggleRollForgetCapture" "<@PRIMARY@>space")
+(gtk_accel_path "<Actions>/Transport/record-roll" "<@TERTIARY@>space")
+(gtk_accel_path "<Actions>/Transport/Record" "<@TERTIARY@>r")
 ; (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>/redirectmenu/deactivate_all" "")
 ; (gtk_accel_path "<Actions>/RegionList/SortByRegionPosition" "")
 ; (gtk_accel_path "<Actions>/Editor/ZoomFocus" "")
-(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<%SECONDARY%>i")
+(gtk_accel_path "<Actions>/Editor/addExistingAudioFiles" "<@SECONDARY@>i")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffSlow" "")
 ; (gtk_accel_path "<Actions>/RegionList/rlHide" "")
 ; (gtk_accel_path "<Actions>/Main/Metering" "")
 (gtk_accel_path "<Actions>/Editor/playhead-to-next-region-boundary" "rightarrow")
-(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<%PRIMARY%><%TERTIARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/selected-marker-to-next-region-boundary" "<@PRIMARY@><@TERTIARY@>rightarrow")
 ; (gtk_accel_path "<Actions>/Zoom/zoom-focus-playhead" "")
 ; (gtk_accel_path "<Actions>/Editor/center-edit-cursor" "")
 ; (gtk_accel_path "<Actions>/Editor/Monitoring" "")
@@ -40,19 +40,19 @@
 ; (gtk_accel_path "<Actions>/ShuttleActions/SetShuttleUnitsPercentage" "")
 ; (gtk_accel_path "<Actions>/Main/Close" "")
 ; (gtk_accel_path "<Actions>/Main/New" "")
-(gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<%PRIMARY%>KP_Subtract")
+(gtk_accel_path "<Actions>/Editor/nudge-next-backward" "<@PRIMARY@>KP_Subtract")
 ; (gtk_accel_path "<Actions>/Editor/EditSelectRangeOptions" "")
 ; (gtk_accel_path "<Actions>/Transport/ToggleTimeMaster" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-thirds" "")
-(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<%TERTIARY%>a")
+(gtk_accel_path "<Actions>/Editor/align-regions-start-relative" "<@TERTIARY@>a")
 ; (gtk_accel_path "<Actions>/Main/Export" "")
-(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<%PRIMARY%>KP_Right")
+(gtk_accel_path "<Actions>/Editor/jump-forward-to-mark" "<@PRIMARY@>KP_Right")
 ; (gtk_accel_path "<Actions>/Editor/Smpte30" "")
 ; (gtk_accel_path "<Actions>/Editor/playhead-to-range-start" "")
 ; (gtk_accel_path "<Actions>/Editor/Subframes" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte2997drop" "")
-(gtk_accel_path "<Actions>/Main/AddTrackBus" "<%PRIMARY%><%SECONDARY%>n")
-(gtk_accel_path "<Actions>/Editor/align-regions-end" "<%LEVEL4%>a")
+(gtk_accel_path "<Actions>/Main/AddTrackBus" "<@PRIMARY@><@SECONDARY@>n")
+(gtk_accel_path "<Actions>/Editor/align-regions-end" "<@LEVEL4@>a")
 ; (gtk_accel_path "<Actions>/JACK/JACKDisconnect" "")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffFast" "")
 ; (gtk_accel_path "<Actions>/options/FileDataFormatFloat" "")
@@ -63,17 +63,17 @@
 ; (gtk_accel_path "<Actions>/options/DoNotRunPluginsWhileRecording" "")
 ; (gtk_accel_path "<Actions>/Editor/PullupNone" "")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-range" "r")
-(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<%PRIMARY%>KP_Left")
+(gtk_accel_path "<Actions>/Editor/jump-backward-to-mark" "<@PRIMARY@>KP_Left")
 ; (gtk_accel_path "<Actions>/Main/AudioFileFormatData" "")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffFastest" "")
 (gtk_accel_path "<Actions>/Editor/play-selected-regions" "w")
-(gtk_accel_path "<Actions>/Editor/play-edit-range" "<%SECONDARY%>w")
-(gtk_accel_path "<Actions>/Transport/Forward" "<%PRIMARY%>rightarrow")
+(gtk_accel_path "<Actions>/Editor/play-edit-range" "<@SECONDARY@>w")
+(gtk_accel_path "<Actions>/Transport/Forward" "<@PRIMARY@>rightarrow")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-smpte-seconds" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-smpte-frame" "")
 ; (gtk_accel_path "<Actions>/Main/ExportSelection" "")
 ; (gtk_accel_path "<Actions>/options/StopPluginsWithTransport" "")
-(gtk_accel_path "<Actions>/Editor/editor-paste" "<%PRIMARY%>v")
+(gtk_accel_path "<Actions>/Editor/editor-paste" "<@PRIMARY@>v")
 (gtk_accel_path "<Actions>/Editor/scroll-tracks-down" "Page_Down")
 (gtk_accel_path "<Actions>/Editor/select-next-route" "downarrow")
 (gtk_accel_path "<Actions>/Editor/select-prev-route" "uparrow")
@@ -89,8 +89,8 @@
 ; (gtk_accel_path "<Actions>/options/MeterHoldOff" "")
 ; (gtk_accel_path "<Actions>/options/OutputAutoConnectMaster" "")
 ; (gtk_accel_path "<Actions>/JACK/JACKLatency64" "")
-(gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z")
-(gtk_accel_path "<Actions>/Editor/insert-region" "i")
+(gtk_accel_path "<Actions>/Editor/undo" "<@PRIMARY@>z")
+(gtk_accel_path "<Actions>/Editor/insert-region-from-region-list" "i")
 ; (gtk_accel_path "<Actions>/Editor/center-playhead" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-region-start" "")
 ; (gtk_accel_path "<Actions>/Editor/View" "")
@@ -101,7 +101,7 @@
 ; (gtk_accel_path "<Actions>/Editor/Smpte30drop" "")
 ; (gtk_accel_path "<Actions>/Zoom/zoom-focus-edit" "")
 (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/selected-marker-to-previous-region-boundary" "<@PRIMARY@><@TERTIARY@>leftarrow")
 ; (gtk_accel_path "<Actions>/Editor/EditCursorMovementOptions" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/activate_all" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/paste" "")
@@ -116,25 +116,26 @@
 ; (gtk_accel_path "<Actions>/JACK/JACKLatency8192" "")
 ; (gtk_accel_path "<Actions>/Editor/toggle-xfades-visible" "")
 (gtk_accel_path "<Actions>/Editor/extend-range-to-end-of-region" "rightanglebracket")
-(gtk_accel_path "<Actions>/Editor/start-range" "F1")
+; (gtk_accel_path "<Actions>/Editor/start-range" "F1")
 ; (gtk_accel_path "<Actions>/ShuttleActions/SetShuttleUnitsSemitones" "")
 ; (gtk_accel_path "<Actions>/JACK/JACKLatency128" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-beat" "")
 ; (gtk_accel_path "<Actions>/Editor/RegionEditOps" "")
 ; (gtk_accel_path "<Actions>/Editor/snap-magnetic" "")
 ; (gtk_accel_path "<Actions>/Editor/playhead-to-range-end" "")
-(gtk_accel_path "<Actions>/Editor/scroll-playhead-forward" "<%TERTIARY%>rightarrow")
-(gtk_accel_path "<Actions>/Editor/align-regions-sync-relative" "<%SECONDARY%>less")
+(gtk_accel_path "<Actions>/Editor/scroll-playhead-forward" "<@TERTIARY@>rightarrow")
+(gtk_accel_path "<Actions>/Editor/align-regions-sync-relative" "<@SECONDARY@>less")
 (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>/redirectmenu/newsend" "")
+; (gtk_accel_path "<Actions>/redirectmenu/newreturn" "")
 ; (gtk_accel_path "<Actions>/Editor/ToggleGeneric MIDISurfaceSubMenu" "")
 ; (gtk_accel_path "<Actions>/Editor/MeterFalloff" "")
 ; (gtk_accel_path "<Actions>/RegionList/rlRemove" "")
 (gtk_accel_path "<Actions>/Transport/GotoStart" "Home")
-(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%TERTIARY%>Home")
-(gtk_accel_path "<Actions>/Editor/scroll-playhead-backward" "<%TERTIARY%>leftarrow")
+(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<@TERTIARY@>Home")
+(gtk_accel_path "<Actions>/Editor/scroll-playhead-backward" "<@TERTIARY@>leftarrow")
 (gtk_accel_path "<Actions>/Editor/split-region" "z")
 ; (gtk_accel_path "<Actions>/Transport/ToggleAutoInput" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-thirtyseconds" "")
@@ -148,47 +149,48 @@
 ; (gtk_accel_path "<Actions>/Editor/PullupPlus4Plus1" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-region-boundary" "")
 ; (gtk_accel_path "<Actions>/JACK/JACK" "")
-(gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x")
+(gtk_accel_path "<Actions>/Editor/editor-cut" "<@PRIMARY@>x")
 (gtk_accel_path "<Actions>/Editor/editor-separate" "F4")
 ; (gtk_accel_path "<Actions>/RegionList/SortAscending" "")
 ; (gtk_accel_path "<Actions>/Main/Help" "")
 ; (gtk_accel_path "<Actions>/options/UseExternalMonitoring" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte23976" "")
-(gtk_accel_path "<Actions>/Common/goto-editor" "<%WINDOW%>e")
-(gtk_accel_path "<Actions>/Editor/select-all" "F14")
-(gtk_accel_path "<Actions>/Editor/invert-selection" "F15")
-(gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add")
+(gtk_accel_path "<Actions>/Common/goto-editor" "<@WINDOW@>e")
+(gtk_accel_path "<Actions>/Common/select-all" "F14")
+(gtk_accel_path "<Actions>/Common/invert-selection" "F15")
+(gtk_accel_path "<Actions>/Editor/nudge-next-forward" "<@PRIMARY@>KP_Add")
 ; (gtk_accel_path "<Actions>/options/ShowSoloMutes" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-eighths" "")
-(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<%TERTIARY%><%PRIMARY%>p")
+(gtk_accel_path "<Actions>/Editor/select-all-after-playhead" "<@TERTIARY@><@PRIMARY@>p")
 (gtk_accel_path "<Actions>/Common/ToggleMaximalEditor" "F11")
+(gtk_accel_path "<Actions>/Common/ToggleMaximalMixer" "F12")
 ; (gtk_accel_path "<Actions>/RegionList/SortBySourceFileLength" "")
 ; (gtk_accel_path "<Actions>/Editor/Timecode" "")
 ; (gtk_accel_path "<Actions>/Transport/PlaySelection" "")
 ; (gtk_accel_path "<Actions>/Editor/PullupMinus4Minus1" "")
-(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<%TERTIARY%><%PRIMARY%>e")
+(gtk_accel_path "<Actions>/Editor/select-all-after-edit-cursor" "<@TERTIARY@><@PRIMARY@>e")
 ; (gtk_accel_path "<Actions>/RegionList/SortBySourceFileName" "")
-(gtk_accel_path "<Actions>/Editor/finish-range" "F2")
+; (gtk_accel_path "<Actions>/Editor/finish-range" "F2")
 (gtk_accel_path "<Actions>/Editor/select-range-between-cursors" "F16")
 (gtk_accel_path "<Actions>/Transport/Loop" "l")
 ; (gtk_accel_path "<Actions>/Editor/CrossfadesFull" "")
-(gtk_accel_path "<Actions>/Editor/finish-add-range" "<%TERTIARY%><%PRIMARY%>KP_Up")
+(gtk_accel_path "<Actions>/Editor/finish-add-range" "<@TERTIARY@><@PRIMARY@>KP_Up")
 ; (gtk_accel_path "<Actions>/options/SendMTC" "")
 ; (gtk_accel_path "<Actions>/Transport/TogglePunchOut" "")
-(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<%PRIMARY%>l")
-(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<%TERTIARY%>e")
+(gtk_accel_path "<Actions>/Editor/select-all-in-loop-range" "<@PRIMARY@>l")
+(gtk_accel_path "<Actions>/Editor/show-editor-mixer" "<@TERTIARY@>e")
 ; (gtk_accel_path "<Actions>/options/SoloInPlace" "")
 ; (gtk_accel_path "<Actions>/Main/Options" "")
 ; (gtk_accel_path "<Actions>/options/MeterFalloffMedium" "")
 (gtk_accel_path "<Actions>/Editor/toggle-follow-playhead" "f")
 ; (gtk_accel_path "<Actions>/Main/SaveTemplate" "")
-(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<%PRIMARY%>uparrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToRoll" "<@PRIMARY@>uparrow")
 ; (gtk_accel_path "<Actions>/RegionList/SortByRegionStartinFile" "")
 ; (gtk_accel_path "<Actions>/options/GainReduceFastTransport" "")
 ; (gtk_accel_path "<Actions>/Common/ToggleInspector" "")
 ; (gtk_accel_path "<Actions>/Transport/ToggleAutoPlay" "")
 ; (gtk_accel_path "<Actions>/Editor/playhead-to-next-region-sync" "")
-(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<%SECONDARY%>Return")
+(gtk_accel_path "<Actions>/Editor/edit-to-playhead" "<@SECONDARY@>Return")
 ; (gtk_accel_path "<Actions>/Editor/LayerMoveAddHigher" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte60" "")
 ; (gtk_accel_path "<Actions>/Main/Open" "")
@@ -199,27 +201,27 @@
 ; (gtk_accel_path "<Actions>/Transport/ToggleAutoReturn" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte2997" "")
 ; (gtk_accel_path "<Actions>/Editor/ToggleWaveformVisibility" "")
-(gtk_accel_path "<Actions>/Editor/redo" "<%PRIMARY%>r")
+(gtk_accel_path "<Actions>/Editor/redo" "<@PRIMARY@>r")
 ; (gtk_accel_path "<Actions>/Main/ExportSession" "")
 ; (gtk_accel_path "<Actions>/options/InputAutoConnectPhysical" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-edit-cursor" "")
 (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>/Editor/edit-cursor-to-range-end" "<@TERTIARY@>F2")
 ; (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>/Editor/select-all-before-playhead" "<@PRIMARY@>p")
 ; (gtk_accel_path "<Actions>/Main/Session" "")
-(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<%TERTIARY%>F1")
+(gtk_accel_path "<Actions>/Editor/edit-cursor-to-range-start" "<@TERTIARY@>F1")
 ; (gtk_accel_path "<Actions>/Main/AudioFileFormat" "")
 ; (gtk_accel_path "<Actions>/Transport/Transport" "")
 (gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-timefx" "t")
+(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-content" "e")
 ; (gtk_accel_path "<Actions>/RegionList/SortByRegionName" "")
 ; (gtk_accel_path "<Actions>/Main/KeyMouse Actions" "")
-(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-gain" "g")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-frame" "")
 ; (gtk_accel_path "<Actions>/Editor/SnapTo" "")
-(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<%PRIMARY%>downarrow")
+(gtk_accel_path "<Actions>/Transport/TransitionToReverse" "<@PRIMARY@>downarrow")
 ; (gtk_accel_path "<Actions>/Editor/Crossfades" "")
 ; (gtk_accel_path "<Actions>/Editor/PullupPlus4" "")
 ; (gtk_accel_path "<Actions>/Main/MeteringHoldTime" "")
@@ -227,28 +229,28 @@
 ; (gtk_accel_path "<Actions>/Editor/Smpte24976" "")
 ; (gtk_accel_path "<Actions>/options/FileDataFormat24bit" "")
 ; (gtk_accel_path "<Actions>/Editor/SnapMode" "")
-(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<%WINDOW%>o")
+(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<@WINDOW@>o")
 ; (gtk_accel_path "<Actions>/Editor/PullupMinus4" "")
-(gtk_accel_path "<Actions>/Common/goto-mixer" "<%WINDOW%>m")
+(gtk_accel_path "<Actions>/Common/goto-mixer" "<@WINDOW@>m")
 ; (gtk_accel_path "<Actions>/RegionList/SortBySourceFileCreationDate" "")
 ; (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" "")
-(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<%WINDOW%>b")
-(gtk_accel_path "<Actions>/Common/ToggleKeyEditor" "<%WINDOW%>k")
+(gtk_accel_path "<Actions>/Common/ToggleBigClock" "<@WINDOW@>b")
+(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>/Editor/select-all-in-punch-range" "<@PRIMARY@>d")
 ; (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>/Editor/multi-duplicate-region" "<@SECONDARY@>d")
 ; (gtk_accel_path "<Actions>/JACK/JACKLatency2048" "")
 ; (gtk_accel_path "<Actions>/Editor/ToggleWaveformsWhileRecording" "")
 ; (gtk_accel_path "<Actions>/Zoom/zoom-focus-right" "")
-(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<%PRIMARY%>Delete")
+(gtk_accel_path "<Actions>/Editor/remove-last-capture" "<@PRIMARY@>Delete")
 ; (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>/Editor/select-all-after-edit-cursor" "<@TERTIARY@>End")
 ; (gtk_accel_path "<Actions>/redirectmenu/cut" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/newinsert" "")
 ; (gtk_accel_path "<Actions>/options/UseMMC" "")
@@ -263,14 +265,14 @@
 ; (gtk_accel_path "<Actions>/Transport/ToggleVideoSync" "")
 (gtk_accel_path "<Actions>/Transport/ToggleRoll" "space")
 ; (gtk_accel_path "<Actions>/RegionList/SortBySourceFilesystem" "")
-(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<%WINDOW%>c")
+(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<@WINDOW@>c")
 ; (gtk_accel_path "<Actions>/Common/About" "")
 ; (gtk_accel_path "<Actions>/JACK/JACKLatency32" "")
 (gtk_accel_path "<Actions>/Editor/playhead-to-edit" "Return")
 ; (gtk_accel_path "<Actions>/options/FileHeaderFormatWAVE64" "")
 (gtk_accel_path "<Actions>/Editor/brush-at-mouse" "F3")
 ; (gtk_accel_path "<Actions>/RegionList/rlShowAll" "")
-(gtk_accel_path "<Actions>/Transport/Rewind" "<%PRIMARY%>leftarrow")
+(gtk_accel_path "<Actions>/Transport/Rewind" "<@PRIMARY@>leftarrow")
 ; (gtk_accel_path "<Actions>/RegionList/SortByRegionTimestamp" "")
 ; (gtk_accel_path "<Actions>/options/VerifyRemoveLastCapture" "")
 ; (gtk_accel_path "<Actions>/options/OutputAutoConnectPhysical" "")
@@ -279,10 +281,10 @@
 ; (gtk_accel_path "<Actions>/Main/AudioFileFormatHeader" "")
 ; (gtk_accel_path "<Actions>/options/MeterHoldShort" "")
 ; (gtk_accel_path "<Actions>/options/MeterHoldMedium" "")
-(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<%PRIMARY%>e")
+(gtk_accel_path "<Actions>/Editor/select-all-before-edit-cursor" "<@PRIMARY@>e")
 ; (gtk_accel_path "<Actions>/Editor/Subframes80" "")
 ; (gtk_accel_path "<Actions>/options/FileHeaderFormatCAF" "")
-(gtk_accel_path "<Actions>/Common/ToggleLocations" "<%WINDOW%>l")
+(gtk_accel_path "<Actions>/Common/ToggleLocations" "<@WINDOW@>l")
 ; (gtk_accel_path "<Actions>/Editor/ToggleGeneric MIDISurface" "")
 (gtk_accel_path "<Actions>/Editor/editor-delete" "BackSpace")
 ; (gtk_accel_path "<Actions>/JACK/JACKLatency256" "")
@@ -296,12 +298,12 @@
 ; (gtk_accel_path "<Actions>/Snap/snap-to-bar" "")
 ; (gtk_accel_path "<Actions>/Editor/LayerLaterHigher" "")
 ; (gtk_accel_path "<Actions>/redirectmenu/selectall" "")
-(gtk_accel_path "<Actions>/Editor/editor-copy" "<%PRIMARY%>c")
+(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")
 ; (gtk_accel_path "<Actions>/options/UseSoftwareMonitoring" "")
 ; (gtk_accel_path "<Actions>/Editor/Subframes100" "")
-(gtk_accel_path "<Actions>/Editor/mute-unmute-region" "<%SECONDARY%>m")
+(gtk_accel_path "<Actions>/Editor/toggle-region-mute" "<@SECONDARY@>m")
 (gtk_accel_path "<Actions>/Editor/add-location-from-playhead" "m")
 ; (gtk_accel_path "<Actions>/options/OutputAutoConnectManual" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-region-sync" "")
@@ -316,11 +318,11 @@
 ; (gtk_accel_path "<Actions>/options/MeterHoldLong" "")
 ; (gtk_accel_path "<Actions>/Snap/snap-to-seconds" "")
 (gtk_accel_path "<Actions>/Editor/set-fade-in-length" "q")
-(gtk_accel_path "<Actions>/Editor/toggle-fade-in-active" "<%SECONDARY%>q")
+(gtk_accel_path "<Actions>/Editor/toggle-region-fade-in" "<@SECONDARY@>q")
 (gtk_accel_path "<Actions>/Editor/set-fade-out-length" "e")
-(gtk_accel_path "<Actions>/Editor/toggle-fade-out-active" "<%SECONDARY%>e")
-(gtk_accel_path "<Actions>/Editor/trim-from-start" "<%TERTIARY%>braceleft")
-(gtk_accel_path "<Actions>/Editor/trim-to-end" "<%TERTIARY%>braceright")
+(gtk_accel_path "<Actions>/Editor/toggle-region-fade-out" "<@SECONDARY@>e")
+(gtk_accel_path "<Actions>/Editor/trim-from-start" "<@TERTIARY@>braceleft")
+(gtk_accel_path "<Actions>/Editor/trim-to-end" "<@TERTIARY@>braceright")
 (gtk_accel_path "<Actions>/Editor/trim-front" "a")
 (gtk_accel_path "<Actions>/Editor/trim-back" "s")
 (gtk_accel_path "<Actions>/Editor/goto-mark-1" "KP_1")
@@ -337,10 +339,10 @@
 (gtk_accel_path "<Actions>/Transport/focus-on-clock" "KP_Divide")
 (gtk_accel_path "<Actions>/Editor/set-loop-from-edit-range" "bracketright")
 (gtk_accel_path "<Actions>/Editor/set-punch-from-edit-range" "bracketleft")
-(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<%PRIMARY%><%SECONDARY%>bracketright")
-(gtk_accel_path "<Actions>/Editor/loop-region" "<%PRIMARY%>bracketright")
+(gtk_accel_path "<Actions>/Editor/set-loop-from-region" "<@PRIMARY@><@SECONDARY@>bracketright")
+(gtk_accel_path "<Actions>/Editor/loop-region" "<@PRIMARY@>bracketright")
 (gtk_accel_path "<Actions>/Editor/toggle-zoom" "o")
 (gtk_accel_path "<Actions>/Editor/zoom-to-region" "y")
 (gtk_accel_path "<Actions>/Editor/pitch-shift-region" "F5")
-(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<%LEVEL4%>space")
+(gtk_accel_path "<Actions>/Editor/play-from-edit-point-and-return" "<@LEVEL4@>space")