add context to single-letter translatable

diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc
index 235793c2ad17d87f9c187f33e483d826757847ca..1d6ac8c16cb62e74885e8fa0723cb2ae8eee09e8 100644 (file)
--- a/gtk2_ardour/editor_regions.cc
+++ b/gtk2_ardour/editor_regions.cc
@@ -109,17 +109,17 @@ EditorRegions::EditorRegions (Editor* e)
        Gtk::Label* l;
 
        ColumnInfo ci[] = {
-               { 0, _("Region"), _("Region name, with number of channels in []'s") },
-               { 1, _("Position"),  _("Position of start of region") },
-               { 2, _("End"),  _("Position of end of region") },
-               { 3, _("Length"),  _("Length of the region") },
-               { 4, _("Sync"),  _("Position of region sync point, relative to start of the region") },
-               { 5, _("Fade In"),  _("Length of region fade-in (units: secondary clock), () if disabled") },
-               { 6, _("Fade Out"),  _("Length of region fade-out (units: secondary clock), () if disabled") },
-               { 7, _("L"),  _("Region position locked?") },
-               { 8, _("G"),  _("Region position glued to Bars|Beats time?") },
-               { 9, _("M"),  _("Region muted?") },
-               { 10, _("O"),  _("Region opaque (blocks regions below it from being heard)?") },
+               { 0,   _("Region"),    _("Region name, with number of channels in []'s") },
+               { 1,   _("Position"),  _("Position of start of region") },
+               { 2,   _("End"),       _("Position of end of region") },
+               { 3,   _("Length"),    _("Length of the region") },
+               { 4,   _("Sync"),      _("Position of region sync point, relative to start of the region") },
+               { 5,   _("Fade In"),   _("Length of region fade-in (units: secondary clock), () if disabled") },
+               { 6,   _("Fade Out"),  _("Length of region fade-out (units: secondary clock), () if disabled") },
+               { 7,  S_("Lock|L"),    _("Region position locked?") },
+               { 8,  S_("Gain|G"),    _("Region position glued to Bars|Beats time?") },
+               { 9,  S_("Mute|M"),    _("Region muted?") },
+               { 10, S_("Opaque|O"),  _("Region opaque (blocks regions below it from being heard)?") },
                { -1, 0, 0 }
        };
        

diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index 48547fd0c81079acc655119fbf867676ae2b2392..1c78d5ca549b3170e1171f61add8525b98eb1a06 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, _("V"), _("Track/Bus visible ?") },
-               { 2, _("A"), _("Track/Bus active ?") },
-               { 3, _("I"), _("MIDI input enabled") },
-               { 4, _("R"), _("Record enabled") },
-               { 5, _("M"), _("Muted") },
-               { 6, _("S"), _("Soloed") },
-               { 7, _("SI"), _("Solo Isolated") },
-               { 8, _("SS"), _("Solo Safe (Locked)") },
+               { 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)") },
                { -1, 0, 0 }
        };
 

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index ee1d11071e4f744ca15f8416b1947cc649fa73e7..bfba07d1cf3413d60b1e012bf3f2b8fc378ded87 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -360,7 +360,7 @@ MeterStrip::state_id() const
 void
 MeterStrip::set_button_names()
 {
-       mute_button->set_text (_("M"));
+       mute_button->set_text (S_("Mute|M"));
 
        if (_route && _route->solo_safe()) {
                solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
@@ -368,20 +368,20 @@ MeterStrip::set_button_names()
                solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
        }
        if (!Config->get_solo_control_is_listen_control()) {
-               solo_button->set_text (_("S"));
+               solo_button->set_text (S_("Solo|S"));
        } else {
                switch (Config->get_listen_position()) {
                case AfterFaderListen:
-                       solo_button->set_text (_("A"));
+                       solo_button->set_text (S_("AfterFader|A"));
                        break;
                case PreFaderListen:
-                       solo_button->set_text (_("P"));
+                       solo_button->set_text (S_("PreFader|P"));
                        break;
                }
        }
 
-       monitor_input_button->set_text (_("I"));
-       monitor_disk_button->set_text (_("D"));
+       monitor_input_button->set_text (S_("MonitorInput|I"));
+       monitor_disk_button->set_text (S_("MonitorDisk|D"));
 }
 
 void

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 27f5a7c61d52d085bbca31d700fa7da2b9ae6b1c..3376a65e1e180682e6573a963b3b5ca1d0573956 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -2029,9 +2029,9 @@ MixerStrip::set_button_names ()
                break;
 
        default:
-               mute_button->set_text (_("M"));
-               monitor_input_button->set_text (_("I"));
-               monitor_disk_button->set_text (_("D"));
+               mute_button->set_text (S_("Mute|M"));
+               monitor_input_button->set_text (S_("MonitorInput|I"));
+               monitor_disk_button->set_text (S_("MonitorDisk|D"));
 
                if (_route && _route->solo_safe()) {
                        solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
@@ -2039,20 +2039,20 @@ MixerStrip::set_button_names ()
                        solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
                }
                if (!Config->get_solo_control_is_listen_control()) {
-                       solo_button->set_text (_("S"));
+                       solo_button->set_text (S_("Solo|S"));
                } else {
                        switch (Config->get_listen_position()) {
                        case AfterFaderListen:
-                               solo_button->set_text (_("A"));
+                               solo_button->set_text (S_("AfterFader|A"));
                                break;
                        case PreFaderListen:
-                               solo_button->set_text (_("P"));
+                               solo_button->set_text (S_("Prefader|P"));
                                break;
                        }
                }
 
-               solo_isolated_led->set_text (_("I"));
-               solo_safe_led->set_text (_("L"));
+               solo_isolated_led->set_text (S_("SoloIso|I"));
+               solo_safe_led->set_text (S_("SoloLock|L"));
                break;
        }
 

diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc
index 0d9981dcf89a123d3ad14c775dc16ad549b0a362..ce8b55eacf689b66a4a48d765d6cdced61964cb9 100644 (file)
--- a/gtk2_ardour/mono_panner.cc
+++ b/gtk2_ardour/mono_panner.cc
@@ -200,7 +200,7 @@ MonoPanner::on_expose_event (GdkEventExpose*)
        Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create(get_pango_context());
        layout->set_attributes (panner_font_attributes);
 
-       layout->set_text (_("L"));
+       layout->set_text (S_("Panner|L"));
        layout->get_pixel_size(tw, th);
        context->move_to (rint(left - tw/2), rint(lr_box_size + step_down - th/2));
        context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));
@@ -217,7 +217,7 @@ MonoPanner::on_expose_event (GdkEventExpose*)
        context->stroke();
 
        /* add text */
-       layout->set_text (_("R"));
+       layout->set_text (S_("Panner|R"));
        layout->get_pixel_size(tw, th);
        context->move_to (rint(right - tw/2), rint(lr_box_size + step_down - th/2));
        context->set_source_rgba (UINT_RGBA_R_FLT(t), UINT_RGBA_G_FLT(t), UINT_RGBA_B_FLT(t), UINT_RGBA_A_FLT(t));

diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc
index db151fb2b4bb85e0746c3381a06075e73765ff4b..29806cae673becfefbf3627447389627902bd1af 100644 (file)
--- a/gtk2_ardour/panner2d.cc
+++ b/gtk2_ardour/panner2d.cc
@@ -237,8 +237,8 @@ Panner2d::label_signals ()
                        break;
 
                case 2:
-                       signals[0]->set_text (_("L"));
-                       signals[1]->set_text (_("R"));
+                       signals[0]->set_text (S_("Panner|L"));
+                       signals[1]->set_text (S_("Panner|R"));
                        break;
 
                default:

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 597b9ecde4ba526588500640b203948b3975ebaf..bec98d8756f2ac85a8966eb1a98a0ec7afbe4798 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -100,9 +100,9 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, ArdourCan
        , parent_canvas (canvas)
        , no_redraw (false)
        , button_table (3, 3)
-       , route_group_button (_("G"))
-       , playlist_button (_("P"))
-       , automation_button (_("A"))
+       , route_group_button (S_("RTAV|G"))
+       , playlist_button (S_("RTAV|P"))
+       , automation_button (S_("RTAV|A"))
        , automation_action_menu (0)
        , plugins_submenu_item (0)
        , route_group_menu (0)
@@ -2698,19 +2698,19 @@ RouteTimeAxisView::set_button_names ()
        if (Config->get_solo_control_is_listen_control()) {
                switch (Config->get_listen_position()) {
                        case AfterFaderListen:
-                               solo_button->set_text (_("A"));
+                               solo_button->set_text (S_("AfterFader|A"));
                                ARDOUR_UI::instance()->set_tip (*solo_button, _("After-fade listen (AFL)"));
                                break;
                        case PreFaderListen:
-                               solo_button->set_text (_("P"));
+                               solo_button->set_text (S_("PreFader|P"));
                                ARDOUR_UI::instance()->set_tip (*solo_button, _("Pre-fade listen (PFL)"));
                        break;
                }
        } else {
-               solo_button->set_text (_("S"));
+               solo_button->set_text (S_("Solo|S"));
                ARDOUR_UI::instance()->set_tip (*solo_button, _("Solo"));
        }
-       mute_button->set_text (_("M"));
+       mute_button->set_text (S_("Mute|M"));
 }
 
 Gtk::CheckMenuItem*

diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index 3245a97e9aa98b494753a78bd70d17f9db78dec5..7253e7f306ef489d240f67dbc29e5651e2d472bb 100644 (file)
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -246,9 +246,9 @@ StereoPanner::on_expose_event (GdkEventExpose*)
                /* add text */
                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 (swidth < 0.0) {
-                       layout->set_text (_("R"));
+                       layout->set_text (S_("Panner|R"));
                } else {
-                       layout->set_text (_("L"));
+                       layout->set_text (S_("Panner|L"));
                }
                layout->get_pixel_size(tw, th);
                context->move_to (rint(left - tw/2), rint(lr_box_size + step_down - th/2));
@@ -271,9 +271,9 @@ StereoPanner::on_expose_event (GdkEventExpose*)
                layout->set_text (_("M"));
        } else {
                if (swidth < 0.0) {
-                       layout->set_text (_("L"));
+                       layout->set_text (S_("Panner|L"));
                } else {
-                       layout->set_text (_("R"));
+                       layout->set_text (S_("Panner|R"));
                }
        }
        layout->get_pixel_size(tw, th);