replace a few creeping instances of the string "Ardour" with PROGRAM_NAME

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 29587092c31e875213b93d71519ffd8a41b5bc77..b46b30c27db1b3b7a2ee0ef8438db3f3e85043f6 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -3393,7 +3393,7 @@ void
 ARDOUR_UI::stop_video_server (bool ask_confirm)
 {
        if (!video_server_process && ask_confirm) {
-               warning << _("Video-Server was not launched by Ardour. The request to stop it is ignored.") << endmsg;
+               warning << string_compose (_("Video-Server was not launched by %1. The request to stop it is ignored."), PROGRAM_NAME) << endmsg;
        }
        if (video_server_process) {
                if(ask_confirm) {

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index ccb0e5fcddaf4be56a343f7b50568ec769a41685..4048cc407bf290faa192e9130ea777c53ae264a3 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -21,9 +21,12 @@
 #include "gtk2ardour-config.h"
 #endif
 
+#include <boost/algorithm/string.hpp>    
+
 #include <gtkmm/liststore.h>
 #include <gtkmm/stock.h>
 #include <gtkmm/scale.h>
+
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/gtk_ui.h>
@@ -1519,7 +1522,9 @@ RCOptionEditor::RCOptionEditor ()
                 mm->add (HardwareMonitoring, _("via Audio Driver"));
         }
 
-       mm->add (SoftwareMonitoring, _("ardour"));
+       string prog (PROGRAM_NAME);
+       boost::algorithm::to_lower (prog);
+       mm->add (SoftwareMonitoring, string_compose (_("%1"), prog));
        mm->add (ExternalMonitoring, _("audio hardware"));
 
        add_option (_("Audio"), mm);

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 424e59aee4c4b32965958550519431b79fe3ce8d..c9d168026da4dd68fa2d35a86a112cc45d9a1f71 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1816,13 +1816,14 @@ RouteUI::open_remote_control_id_dialog ()
                                                       (_route->is_master() ? _("the master bus") : _("the monitor bus"))));
                } else {
                        l->set_markup (string_compose (_("The remote control ID of %5 is: %2\n\n\n"
-                                                        "Remote Control IDs are currently determined by track/bus ordering in Ardour.\n\n"
+                                                        "Remote Control IDs are currently determined by track/bus ordering in %6.\n\n"
                                                         "%3Use the User Interaction tab of the Preferences window if you want to change this%4"),
                                                       (is_track() ? _("track") : _("bus")),
                                                       _route->remote_control_id(),
                                                       "<span size=\"small\" style=\"italic\">",
                                                       "</span>",
-                                                      Glib::Markup::escape_text (_route->name())));
+                                                      Glib::Markup::escape_text (_route->name()),
+                                                      PROGRAM_NAME));
                }
                dialog.get_vbox()->pack_start (*l);
                dialog.add_button (Stock::OK, RESPONSE_CANCEL);

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 536d57afe6fc6227e5047ad72488cb0572e93b31..8adc7bc4d093b7b4bb8463e3a56d2dd64142c0a4 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -583,7 +583,7 @@ VideoTimeLine::check_server_docroot ()
                        || lines.at(0).empty()
                        || lines.at(0).at(0) != video_get_docroot(Config)) {
                warning << string_compose(
-                               _("Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually means that the video server was not started by ardour and uses a different document-root."),
+                               _("Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually means that the video server was not started by %1 and uses a different document-root."),
                                PROGRAM_NAME, video_get_docroot(Config), lines.at(0).at(0))
                << endmsg;
                ok = false; // TODO allow to override