Fix some strings incorrectly marked for translation.

My apologies to translators.

diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 9b474870a31ec453b394059b52012e429909fe95..157f6cfe2d9e3704fcf35afd7d8d7966598f7376 100644 (file)
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -182,7 +182,7 @@ Editor::track_canvas_button_press_event (GdkEventButton *event)
 {
        _track_canvas->grab_focus();
        if (!Keyboard::is_context_menu_event (event)) {
-               begin_reversible_selection_op (_("Clear Selection Click (track canvas)"));
+               begin_reversible_selection_op (X_("Clear Selection Click (track canvas)"));
                selection->clear ();
                commit_reversible_selection_op();
         }
@@ -1130,7 +1130,7 @@ Editor::canvas_drop_zone_event (GdkEvent* event)
        switch (event->type) {
        case GDK_BUTTON_RELEASE:
                if (event->button.button == 1) {
-                       begin_reversible_selection_op (_("Nowhere Click"));
+                       begin_reversible_selection_op (X_("Nowhere Click"));
                        selection->clear_objects ();
                        selection->clear_tracks ();
                        commit_reversible_selection_op ();

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index ed28bc39766596e6f0f9ee1500b9220ac37e87e6..9be9b63c924cafaa3cef104f78987711cbd3e129 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -4712,7 +4712,7 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred)
 {
        Session* s = _editor->session();
 
-       _editor->begin_reversible_selection_op (_("Change Time Selection"));
+       _editor->begin_reversible_selection_op (X_("Change Time Selection"));
        if (movement_occurred) {
                motion (event, false);
                /* XXX this is not object-oriented programming at all. ick */
@@ -5062,7 +5062,7 @@ NoteDrag::start_grab (GdkEvent* event, Gdk::Cursor *)
                                _region->unique_select (_primary);
                        }
 
-                       _editor->begin_reversible_selection_op(_("Select Note Press"));
+                       _editor->begin_reversible_selection_op(X_("Select Note Press"));
                        _editor->commit_reversible_selection_op();
                }
        }
@@ -5173,7 +5173,7 @@ NoteDrag::finished (GdkEvent* ev, bool moved)
                        }
 
                        if (changed) {
-                               _editor->begin_reversible_selection_op(_("Select Note Release"));
+                               _editor->begin_reversible_selection_op(X_("Select Note Release"));
                                _editor->commit_reversible_selection_op();
                        }
                }
@@ -5569,7 +5569,7 @@ EditorRubberbandSelectDrag::select_things (int button_state, framepos_t x1, fram
 
        Selection::Operation op = ArdourKeyboard::selection_type (button_state);
 
-       _editor->begin_reversible_selection_op (_("rubberband selection"));
+       _editor->begin_reversible_selection_op (X_("rubberband selection"));
 
        _editor->select_all_within (x1, x2 - 1, y1, y2, _editor->track_views, op, false);
 
@@ -5579,7 +5579,7 @@ EditorRubberbandSelectDrag::select_things (int button_state, framepos_t x1, fram
 void
 EditorRubberbandSelectDrag::deselect_things ()
 {
-       _editor->begin_reversible_selection_op (_("Clear Selection (rubberband)"));
+       _editor->begin_reversible_selection_op (X_("Clear Selection (rubberband)"));
 
        _editor->selection->clear_tracks();
        _editor->selection->clear_regions();

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 2c3e1744a273e17fac60f10a5e02bf941ea24716..def38da6cb5bac027ff7d4678bc242cd820a5d7f 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -525,7 +525,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
                        set_selected_track_as_side_effect (op);
 
                        /* We won't get a release.*/
-                       begin_reversible_selection_op (_("Button 3 Menu Select"));
+                       begin_reversible_selection_op (X_("Button 3 Menu Select"));
                        commit_reversible_selection_op ();
                }
                break;
@@ -539,7 +539,7 @@ Editor::button_selection (ArdourCanvas::Item* /*item*/, GdkEvent* event, ItemTyp
        }
 
        if ((!press) && _mouse_changed_selection) {
-               begin_reversible_selection_op (_("Button Selection"));
+               begin_reversible_selection_op (X_("Button Selection"));
                commit_reversible_selection_op ();
                _mouse_changed_selection = false;
        }

diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index c46ef04a64331d47879d7cf40013158075c5067e..ca48cd6dd1ad7f1cdc42b26e410de3f5bfd7e623 100644 (file)
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -274,7 +274,7 @@ Editor::set_selected_track_as_side_effect (Selection::Operation op)
 void
 Editor::set_selected_track (TimeAxisView& view, Selection::Operation op, bool no_remove)
 {
-       begin_reversible_selection_op(_("Set Selected Track"));
+       begin_reversible_selection_op (X_("Set Selected Track"));
 
        switch (op) {
        case Selection::Toggle:
@@ -900,7 +900,7 @@ Editor::set_selected_regionview_from_region_list (boost::shared_ptr<Region> regi
                return;
        }
 
-       begin_reversible_selection_op (_("set selected regions"));
+       begin_reversible_selection_op (X_("set selected regions"));
 
        switch (op) {
        case Selection::Toggle:
@@ -943,7 +943,7 @@ Editor::set_selected_regionview_from_map_event (GdkEventAny* /*ev*/, StreamView*
                return true;
        }
 
-       begin_reversible_selection_op (_("set selected regions"));
+       begin_reversible_selection_op (X_("set selected regions"));
 
        selection->set (rv);
 
@@ -1356,7 +1356,7 @@ Editor::select_all_in_track (Selection::Operation op)
                return;
        }
 
-       begin_reversible_selection_op(_("Select All in Track"));
+       begin_reversible_selection_op (X_("Select All in Track"));
 
        clicked_routeview->get_selectables (0, max_framepos, 0, DBL_MAX, touched);
 
@@ -1420,7 +1420,7 @@ Editor::select_all_objects (Selection::Operation op)
        }
 
 
-       begin_reversible_selection_op (_("select all"));
+       begin_reversible_selection_op (X_("select all"));
        switch (op) {
        case Selection::Add:
                selection->add (touched);
@@ -1447,7 +1447,7 @@ Editor::invert_selection_in_track ()
                return;
        }
 
-       begin_reversible_selection_op(_("Invert Selection in Track"));
+       begin_reversible_selection_op (X_("Invert Selection in Track"));
        clicked_routeview->get_inverted_selectables (*selection, touched);
        selection->set (touched);
        commit_reversible_selection_op ();
@@ -1475,7 +1475,7 @@ Editor::invert_selection ()
                (*iter)->get_inverted_selectables (*selection, touched);
        }
 
-       begin_reversible_selection_op(_("Invert Selection"));
+       begin_reversible_selection_op (X_("Invert Selection"));
        selection->set (touched);
        commit_reversible_selection_op ();
 }
@@ -1518,7 +1518,7 @@ Editor::select_all_within (framepos_t start, framepos_t end, double top, double
                }
        }
 
-       begin_reversible_selection_op (_("select all within"));
+       begin_reversible_selection_op (X_("select all within"));
        switch (op) {
        case Selection::Add:
                selection->add (found);
@@ -1582,7 +1582,7 @@ Editor::set_selection_from_loop()
 void
 Editor::set_selection_from_range (Location& loc)
 {
-       begin_reversible_selection_op (_("set selection from range"));
+       begin_reversible_selection_op (X_("set selection from range"));
        selection->set (loc.start(), loc.end());
        commit_reversible_selection_op ();
 
@@ -1622,7 +1622,7 @@ Editor::select_all_selectables_using_time_selection ()
                (*iter)->get_selectables (start, end - 1, 0, DBL_MAX, touched);
        }
 
-       begin_reversible_selection_op (_("select all from range"));
+       begin_reversible_selection_op (X_("select all from range"));
        selection->set (touched);
        commit_reversible_selection_op ();
 }
@@ -1653,7 +1653,7 @@ Editor::select_all_selectables_using_punch()
                }
                (*iter)->get_selectables (location->start(), location->end() - 1, 0, DBL_MAX, touched);
        }
-       begin_reversible_selection_op (_("select all from punch"));
+       begin_reversible_selection_op (X_("select all from punch"));
        selection->set (touched);
        commit_reversible_selection_op ();
 
@@ -1684,7 +1684,7 @@ Editor::select_all_selectables_using_loop()
                }
                (*iter)->get_selectables (location->start(), location->end() - 1, 0, DBL_MAX, touched);
        }
-       begin_reversible_selection_op (_("select all from loop"));
+       begin_reversible_selection_op (X_("select all from loop"));
        selection->set (touched);
        commit_reversible_selection_op ();
 
@@ -1720,9 +1720,9 @@ Editor::select_all_selectables_using_cursor (EditorCursor *cursor, bool after)
        }
 
        if (after) {
-               begin_reversible_selection_op (_("select all after cursor"));
+               begin_reversible_selection_op (X_("select all after cursor"));
        } else {
-               begin_reversible_selection_op (_("select all before cursor"));
+               begin_reversible_selection_op (X_("select all before cursor"));
        }
 
        TrackViewList* ts;
@@ -1771,9 +1771,9 @@ Editor::select_all_selectables_using_edit (bool after)
        }
 
        if (after) {
-               begin_reversible_selection_op (_("select all after edit"));
+               begin_reversible_selection_op (X_("select all after edit"));
        } else {
-               begin_reversible_selection_op (_("select all before edit"));
+               begin_reversible_selection_op (X_("select all before edit"));
        }
 
        TrackViewList* ts;
@@ -1828,7 +1828,7 @@ Editor::select_all_selectables_between (bool within)
                (*iter)->get_selectables (start, end, 0, DBL_MAX, touched, within);
        }
 
-       begin_reversible_selection_op(_("Select all Selectables Between"));
+       begin_reversible_selection_op (X_("Select all Selectables Between"));
        selection->set (touched);
        commit_reversible_selection_op ();
 }
@@ -1847,7 +1847,7 @@ Editor::select_range_between ()
                return;
        }
 
-       begin_reversible_selection_op(_("Select Range Between"));
+       begin_reversible_selection_op (X_("Select Range Between"));
        set_mouse_mode (MouseRange);
        selection->set (start, end);
        commit_reversible_selection_op ();
@@ -1957,7 +1957,7 @@ Editor::get_edit_op_range (framepos_t& start, framepos_t& end) const
 void
 Editor::deselect_all ()
 {
-       begin_reversible_selection_op(_("Deselect All"));
+       begin_reversible_selection_op (X_("Deselect All"));
        selection->clear ();
        commit_reversible_selection_op ();
 }
@@ -1965,7 +1965,7 @@ Editor::deselect_all ()
 long
 Editor::select_range (framepos_t s, framepos_t e)
 {
-       begin_reversible_selection_op(_("Select Range"));
+       begin_reversible_selection_op (X_("Select Range"));
        selection->add (clicked_axisview);
        selection->time.clear ();
        long ret = selection->set (s, e);

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 1934da937fdcd08a19fa523767a08bbc7cc31b3a..0426495fb37408ca040bb625c7fc5c6545bd46ff 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -599,7 +599,7 @@ MidiRegionView::button_release (GdkEventButton* ev)
        }
 
        if (_mouse_changed_selection) {
-               trackview.editor().begin_reversible_selection_op (_("Mouse Selection Change"));
+               trackview.editor().begin_reversible_selection_op (X_("Mouse Selection Change"));
                trackview.editor().commit_reversible_selection_op ();
        }
 
@@ -760,7 +760,7 @@ MidiRegionView::key_press (GdkEventKey* ev)
 
        } else if (ev->keyval == GDK_Tab || ev->keyval == GDK_ISO_Left_Tab) {
 
-               trackview.editor().begin_reversible_selection_op (_("Select Adjacent Note"));
+               trackview.editor().begin_reversible_selection_op (X_("Select Adjacent Note"));
 
                if (Keyboard::modifier_state_contains (ev->state, Keyboard::PrimaryModifier)) {
                        goto_previous_note (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier));

diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index cf1b8a1b3b656f6b8b2b8076bea0fe84938ffdfb..bbf0473ded61b5494d22404b00bf7744d5830744 100644 (file)
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -1309,7 +1309,7 @@ MidiTimeAxisView::set_note_selection (uint8_t note)
 {
        uint16_t chn_mask = midi_track()->get_playback_channel_mask();
 
-       _editor.begin_reversible_selection_op(_("Set Note Selection"));
+       _editor.begin_reversible_selection_op (X_("Set Note Selection"));
 
        if (_view->num_selected_regionviews() == 0) {
                _view->foreach_regionview (
@@ -1329,7 +1329,7 @@ MidiTimeAxisView::add_note_selection (uint8_t note)
 {
        const uint16_t chn_mask = midi_track()->get_playback_channel_mask();
 
-       _editor.begin_reversible_selection_op(_("Add Note Selection"));
+       _editor.begin_reversible_selection_op (X_("Add Note Selection"));
 
        if (_view->num_selected_regionviews() == 0) {
                _view->foreach_regionview (
@@ -1349,7 +1349,7 @@ MidiTimeAxisView::extend_note_selection (uint8_t note)
 {
        const uint16_t chn_mask = midi_track()->get_playback_channel_mask();
 
-       _editor.begin_reversible_selection_op(_("Extend Note Selection"));
+       _editor.begin_reversible_selection_op (X_("Extend Note Selection"));
 
        if (_view->num_selected_regionviews() == 0) {
                _view->foreach_regionview (
@@ -1369,7 +1369,7 @@ MidiTimeAxisView::toggle_note_selection (uint8_t note)
 {
        const uint16_t chn_mask = midi_track()->get_playback_channel_mask();
 
-       _editor.begin_reversible_selection_op(_("Toggle Note Selection"));
+       _editor.begin_reversible_selection_op (X_("Toggle Note Selection"));
 
        if (_view->num_selected_regionviews() == 0) {
                _view->foreach_regionview (