Merge with 2.0-ongoing R3082.

[ardour.git] / gtk2_ardour / ardour.menus

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 9387c1eb3eef9840b4ae25f149e92eb69eaae297..c333b03b615f7a7e7492350f83cad845c22d9dab 100644 (file)
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -123,7 +123,7 @@
               </menu>
              <menuitem action='set-tempo-from-region'/>
                   <menuitem action='set-tempo-from-edit-range'/>
-              <menu name='KeyMouse Actions' action='KeyMouse Actions'>
+              <menu action='KeyMouseActions'>
                        <menuitem action='play-selected-regions'/>
                                <menuitem action='brush-at-mouse'/>
                                <menuitem action='set-edit-point'/>
@@ -367,10 +367,12 @@
                    <menuitem action='RemoteMixerDefined'/>
                    <menuitem action='RemoteEditorDefined'/>
                </menu>
-                   <menu action='Monitoring'>
+               <menu action='Monitoring'>
                    <menuitem action='UseHardwareMonitoring'/>
                    <menuitem action='UseSoftwareMonitoring'/>
                    <menuitem action='UseExternalMonitoring'/>
+                  <separator/>
+                          <menuitem action='ToggleTapeMachineMode'/>
                </menu>
                <menu action='Plugins'>
                   <menuitem action='DisableAllPlugins'/>
@@ -442,8 +444,9 @@
                        <menuitem action='ShowTrackMeters'/>
               <menuitem action='OnlyCopyImportedFiles'/>
               <menuitem action='ShowTrackMeters'/>
-                       <menuitem action='DefaultNarrowMS'/>
+              <menuitem action='DefaultNarrowMS'/>
                <menuitem action='link-region-and-track-selection'/>
+               <menuitem action='RubberbandingSnapsToGrid'/>
                        
               <separator/>
          </menu>