add more contexts for SLA.

diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index dbf717308292d3cbbd2253027004ccf6ac6a4ed8..5e35299fda4583462981cef7a4edff1663dedb87 100644 (file)
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -93,18 +93,18 @@ EditorRouteGroups::EditorRouteGroups (Editor* e)
        Gtk::Label* l;
 
        ColumnInfo ci[] = {
-               { 0, _("Col"), _("Group Tab Color") },
-               { 1, _("Name"), _("Name of Group") },
-               { 2, _("V"), _("Group is visible?") },
-               { 3, _("On"), _("Group is enabled?") },
-               { 4, S_("group|G"), _("Sharing Gain?") },
-               { 5, S_("relative|Rel"), _("Relative Gain Changes?") },
-               { 6, S_("mute|M"), _("Sharing Mute?") },
-               { 7, S_("solo|S"), _("Sharing Solo?") },
-               { 8, _("Rec"), _("Sharing Record-enable Status?") },
-               { 9, S_("monitoring|Mon"), _("Sharing Monitoring Choice?") },
-               { 10, S_("selection|Sel"), _("Sharing Selected/Editing Status?") },
-               { 11, S_("active|A"), _("Sharing Active Status?") },
+               { 0,   _("Col"),            _("Group Tab Color") },
+               { 1,   _("Name"),           _("Name of Group") },
+               { 2,  S_("Visible|V"),      _("Group is visible?") },
+               { 3,   _("On"),             _("Group is enabled?") },
+               { 4,  S_("group|G"),        _("Sharing Gain?") },
+               { 5,  S_("relative|Rel"),   _("Relative Gain Changes?") },
+               { 6,  S_("mute|M"),         _("Sharing Mute?") },
+               { 7,  S_("solo|S"),         _("Sharing Solo?") },
+               { 8,   _("Rec"),            _("Sharing Record-enable Status?") },
+               { 9,  S_("monitoring|Mon"), _("Sharing Monitoring Choice?") },
+               { 10, S_("selection|Sel"),  _("Sharing Selected/Editing Status?") },
+               { 11, S_("active|A"),       _("Sharing Active Status?") },
                { -1, 0, 0 }
        };
 

diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index 1c78d5ca549b3170e1171f61add8525b98eb1a06..327841f4ad40cd5c97acba8d5aabebab7d9a85d2 100644 (file)
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -203,15 +203,15 @@ EditorRoutes::EditorRoutes (Editor* e)
        Gtk::Label* l;
 
        ColumnInfo ci[] = {
-               { 0,  _("Name"),           _("Track/Bus Name") },
-               { 1, S_("TrackVisible|V"), _("Track/Bus visible ?") },
-               { 2, S_("TrackActive|A"),  _("Track/Bus active ?") },
-               { 3, S_("MidiInput|I"),    _("MIDI input enabled") },
-               { 4, S_("Rec|R"),          _("Record enabled") },
-               { 5, S_("Mute|M"),         _("Muted") },
-               { 6, S_("Solo|S"),         _("Soloed") },
-               { 7, S_("SoloIso|SI"),     _("Solo Isolated") },
-               { 8, S_("SoloLock|SS"),    _("Solo Safe (Locked)") },
+               { 0,  _("Name"),        _("Track/Bus Name") },
+               { 1, S_("Visible|V"),   _("Track/Bus visible ?") },
+               { 2, S_("Active|A"),    _("Track/Bus active ?") },
+               { 3, S_("MidiInput|I"), _("MIDI input enabled") },
+               { 4, S_("Rec|R"),       _("Record enabled") },
+               { 5, S_("Mute|M"),      _("Muted") },
+               { 6, S_("Solo|S"),      _("Soloed") },
+               { 7, S_("SoloIso|SI"),  _("Solo Isolated") },
+               { 8, S_("SoloLock|SS"), _("Solo Safe (Locked)") },
                { -1, 0, 0 }
        };
 

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 3376a65e1e180682e6573a963b3b5ca1d0573956..ef6503475fcba9056c59e33396788fb199c3e6fe 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1840,24 +1840,24 @@ MixerStrip::meter_point_string (MeterPoint mp)
        case Narrow:
                switch (mp) {
                case MeterInput:
-                       return _("In");
+                       return S_("Meter|In");
                        break;
                        
                case MeterPreFader:
-                       return _("Pr");
+                       return S_("Meter|Pr");
                        break;
                        
                case MeterPostFader:
-                       return _("Po");
+                       return S_("Meter|Po");
                        break;
                        
                case MeterOutput:
-                       return _("O");
+                       return S_("Meter|O");
                        break;
                        
                case MeterCustom:
                default:
-                       return _("C");
+                       return S_("Meter|C");
                        break;
                }
                break;

diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index d376b6e8ff4af854620ae62a6099d515994412eb..02f1dd46a2d55f0a542f71a591ce89b4a405e462 100644 (file)
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -600,16 +600,16 @@ PannerUI::_astate_string (AutoState state, bool shrt)
 
        switch (state) {
        case ARDOUR::Off:
-               sstr = (shrt ? "M" : _("M"));
+               sstr = (shrt ? "M" : S_("Manual|M"));
                break;
        case Play:
-               sstr = (shrt ? "P" : _("P"));
+               sstr = (shrt ? "P" : S_("Play|P"));
                break;
        case Touch:
-               sstr = (shrt ? "T" : _("T"));
+               sstr = (shrt ? "T" : S_("Touch|T"));
                break;
        case Write:
-               sstr = (shrt ? "W" : _("W"));
+               sstr = (shrt ? "W" : S_("Write|W"));
                break;
        }
 

diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index 7253e7f306ef489d240f67dbc29e5651e2d472bb..53cb65996e69a13fc64086adb7dd40004917807a 100644 (file)
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -268,7 +268,7 @@ StereoPanner::on_expose_event (GdkEventExpose*)
        context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
 
        if (state == Mono) {
-               layout->set_text (_("M"));
+               layout->set_text (S_("Panner|M"));
        } else {
                if (swidth < 0.0) {
                        layout->set_text (S_("Panner|L"));

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index cb03252d7f8b3c6f1d58154ad8afcfbf6c9f016c..23aaa617d587f43a430d48c2be6a489b3ecc1824 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -1187,7 +1187,7 @@ TimeAxisView::compute_heights ()
 
        window.add (one_row_table);
        test_button->set_name ("mute button");
-       test_button->set_text (_("M"));
+       test_button->set_text (S_("Mute|M"));
        test_button->set_tweaks (ArdourButton::TrackHeader);
 
        one_row_table.set_border_width (border_width);