diff --git a/gtk2_ardour/ardour.keys.in b/gtk2_ardour/ardour.keys.in index 016b94ce34..5d5a361dd4 100644 --- a/gtk2_ardour/ardour.keys.in +++ b/gtk2_ardour/ardour.keys.in @@ -28,32 +28,32 @@ $ARDOUR Shortcuts \linebreak Mnemonic US-Keypad ;; GROUP DEFINITIONS -%trans global Transport \& Recording Control +%trans Global Transport \& Recording Control -%sess global Session \& File Handling +%sess Global Session \& File Handling -%edit editor Basic Editing +%edit Editor Basic Editing -%vis editor Changing What's Visible +%vis Editor Changing What's Visible -%wvis global Window Visibility +%wvis Global Window Visibility -%eep editor Editing with Edit Point +%eep Editor Editing with Edit Point Most edit functions operate on a single "Edit Point". The edit point can be any of: playhead (default), the mouse or an active marker. The choice of Edit Point (by default) also sets the Zoom Focus. -%aep editor Aligning with the Edit Point +%aep Editor Aligning with the Edit Point Align operations move regions so that their start/end/sync point is at the edit point. "Relative" operations just align the first region and moves other selected regions to maintain relative positioning. -%epp editor Edit Point Playback +%epp Editor Edit Point Playback -%movp editor Moving the Playhead +%movp Editor Moving the Playhead A left click in the rulers positions the playhead unless Ardour is recording. You can use {\tt KP$\_$n} to move the playhead to the n-th marker. -%rop editor Region Operations +%rop Editor Region Operations -%edit editor Edit Range +%edit Editor Edit Range There are only a few functions that refer to an "Edit Range". The current edit range is defined using combinations of the possible edit points: Playhead, Marker or Mouse.\par \begin{tabular}{lll} {\bf Edit Point} & {\bf Active Mark?} & {\bf Edit Range} \\ @@ -67,31 +67,31 @@ Marker & no & {\it No edit range defined} \\ Marker & yes & from Active Marker to Mouse \end{tabular} -%select editor Selecting +%select Editor Selecting -%ranges editor Defining Loop, Punch Range and Tempo Changes +%ranges Editor Defining Loop, Punch Range and Tempo Changes %markers editor Markers \& Locations The "move" commands all move the active marker(s). Jump to the first 9 markers using the keypad digits 1-9 (requires numlock). -%mmode editor Mouse Modes +%mmode Editor Mouse Modes -%mouse editor Mouse Usage +%mouse Editor Mouse Usage Right click on most objects and controls displays a context menu Shift+Right click deletes most objects. OS X users without a 3 button mouse can use {\tt Option+Ctrl+Left} to simulate "Middle" for some purposes. Use F1 to step through mouse modes. -%mobject editor Mouse Object Mode +%mobject Editor Mouse Object Mode This mode provides many different operations on both regions and control points, partially depending on where you click/drag with the mouse. The "body" of a region is the area where the waveform is displayed. -%mzoom editor Mouse Zoom Mode -%mops editor Mouse Ops on Solo/Mute/Rec-enable -%mopsolo editor Mouse Ops on Solo Buttons only -%mopsfader editor Mouse Ops on Faders \& Plugin Controls +%mzoom Editor Mouse Zoom Mode +%mops Editor Mouse Ops on Solo/Mute/Rec-enable +%mopsolo Editor Mouse Ops on Solo Buttons only +%mopsfader Editor Mouse Ops on Faders \& Plugin Controls -%midi global MIDI specific commands +%midi Global MIDI specific commands ;; END GROUP DEFINITIONS diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 86a01e26aa..a01f2edaed 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -5447,7 +5447,7 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey void ARDOUR_UI::load_bindings () { - if ((global_bindings = Bindings::get_bindings ("global", global_actions)) == 0) { + if ((global_bindings = Bindings::get_bindings (X_("Global"), global_actions)) == 0) { error << _("Global keybindings are missing") << endmsg; } } diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 280bc3f9cb..da1a9159aa 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -752,7 +752,7 @@ Editor::register_actions () void Editor::load_bindings () { - bindings = Bindings::get_bindings (X_("editor"), myactions); + bindings = Bindings::get_bindings (X_("Editor"), myactions); global_hpacker.set_data ("ardour-bindings", bindings); } diff --git a/gtk2_ardour/mixer.bindings b/gtk2_ardour/mixer.bindings index 4a819907f5..2189715026 100644 --- a/gtk2_ardour/mixer.bindings +++ b/gtk2_ardour/mixer.bindings @@ -1,4 +1,4 @@ - + diff --git a/gtk2_ardour/mixer_actor.cc b/gtk2_ardour/mixer_actor.cc index eb62d72c67..ada3b3f500 100644 --- a/gtk2_ardour/mixer_actor.cc +++ b/gtk2_ardour/mixer_actor.cc @@ -86,7 +86,7 @@ MixerActor::register_actions () void MixerActor::load_bindings () { - bindings = Bindings::get_bindings (X_("mixer"), myactions); + bindings = Bindings::get_bindings (X_("Mixer"), myactions); } void diff --git a/gtk2_ardour/monitor.bindings b/gtk2_ardour/monitor.bindings index b1a7d7c477..d7cafffb46 100644 --- a/gtk2_ardour/monitor.bindings +++ b/gtk2_ardour/monitor.bindings @@ -1,4 +1,4 @@ - + diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 63227ac58c..f24cab7c3e 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -1669,7 +1669,7 @@ MonitorSection::port_connected_or_disconnected (boost::weak_ptr wa, boost: void MonitorSection::load_bindings () { - bindings = Bindings::get_bindings (X_("monitor section"), myactions); + bindings = Bindings::get_bindings (X_("Monitor Section"), myactions); } void diff --git a/gtk2_ardour/processor_box.bindings b/gtk2_ardour/processor_box.bindings index cf4bbb9dbd..1a43d9067e 100644 --- a/gtk2_ardour/processor_box.bindings +++ b/gtk2_ardour/processor_box.bindings @@ -1,4 +1,4 @@ - + diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index c72344c9d6..2180dd5ff1 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -3710,5 +3710,5 @@ ProcessorWindowProxy::show_the_right_window () void ProcessorBox::load_bindings () { - bindings = Bindings::get_bindings (X_("processor box"), myactions); + bindings = Bindings::get_bindings (X_("Processor Box"), myactions); } diff --git a/gtk2_ardour/step_editing.bindings b/gtk2_ardour/step_editing.bindings index 52fdbc2de2..ee41ab4d0b 100644 --- a/gtk2_ardour/step_editing.bindings +++ b/gtk2_ardour/step_editing.bindings @@ -1,4 +1,4 @@ - + diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index a8329ceaab..f49ce44813 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -694,7 +694,7 @@ StepEntry::register_actions () void StepEntry::load_bindings () { - bindings = Bindings::get_bindings (X_("step-editing"), myactions); + bindings = Bindings::get_bindings (X_("Step Editing"), myactions); set_data ("ardour-bindings", bindings); }