smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Paul Davis 2014-02-10 10:53:01 -05:00
parent f4b5f4c72e
commit a0abf608d6
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.cc
View file

@ -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) {

7
gtk2_ardour/rc_option_editor.cc
View file

@ -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);

5
gtk2_ardour/route_ui.cc
View file

@ -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);

2
gtk2_ardour/video_timeline.cc
View file

@ -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