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

replace final(?) incidences of program name (ardour, Ardour) with PROGRAM_NAME (thanks to edgar for tracking them all down)

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@14050 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2013-02-05 18:18:35 +00:00
parent 2398b955c3
commit 241a9edd3e
13 changed files with 50 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ambiguous_file_dialog.cc
View file

@ -32,7 +32,7 @@ AmbiguousFileDialog::AmbiguousFileDialog (const string& file, const vector<strin
get_vbox()->set_spacing (6); get_vbox()->set_spacing (6);
Label* l = manage (new Label); Label* l = manage (new Label);
l->set_markup (string_compose (_("Ardour has found the file <i>%1</i> in the following places:\n\n"), file)); l->set_markup (string_compose (_("%1 has found the file <i>%2</i> in the following places:\n\n"), PROGRAM_NAME, file));
get_vbox()->pack_start (*l); get_vbox()->pack_start (*l);
for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) { for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {

6
gtk2_ardour/engine_dialog.cc
View file

@ -774,7 +774,7 @@ EngineControl::enumerate_coreaudio_devices ()
if (devs.size() == 0) { if (devs.size() == 0) {
MessageDialog msg (_("\ MessageDialog msg (string_compose (_("\
You do not have any audio devices capable of\n\ You do not have any audio devices capable of\n\
simultaneous playback and recording.\n\n\ simultaneous playback and recording.\n\n\
Please use Applications -> Utilities -> Audio MIDI Setup\n\ Please use Applications -> Utilities -> Audio MIDI Setup\n\
@ -784,8 +784,8 @@ Please send email to Apple and ask them why new Macs\n\
have no duplex audio device.\n\n\ have no duplex audio device.\n\n\
Alternatively, if you really want just playback\n\ Alternatively, if you really want just playback\n\
or recording but not both, start JACK before running\n\ or recording but not both, start JACK before running\n\
Ardour and choose the relevant device then." %1 and choose the relevant device then."
), ), PROGRAM_NAME),
true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK); true, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK);
msg.set_title (_("No suitable audio devices")); msg.set_title (_("No suitable audio devices"));
msg.set_position (Gtk::WIN_POS_MOUSE); msg.set_position (Gtk::WIN_POS_MOUSE);

12
gtk2_ardour/main.cc
View file

@ -80,13 +80,13 @@ gui_jack_error ()
false, false,
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,
Gtk::BUTTONS_NONE); Gtk::BUTTONS_NONE);
win.set_secondary_text(_("There are several possible reasons:\n\ win.set_secondary_text(string_compose (_("There are several possible reasons:\n\
\n\ \n\
1) JACK is not running.\n\ 1) JACK is not running.\n\
2) JACK is running as another user, perhaps root.\n\ 2) JACK is running as another user, perhaps root.\n\
3) There is already another client called \"ardour\".\n\ 3) There is already another client called \"%1\".\n\
\n\ \n\
Please consider the possibilities, and perhaps (re)start JACK.")); Please consider the possibilities, and perhaps (re)start JACK."), PROGRAM_NAME));
win.add_button (Stock::QUIT, RESPONSE_CLOSE); win.add_button (Stock::QUIT, RESPONSE_CLOSE);
win.set_default_response (RESPONSE_CLOSE); win.set_default_response (RESPONSE_CLOSE);
@ -194,7 +194,7 @@ fixup_bundle_environment (int, char* [])
*/ */
if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) { if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
error << string_compose (_("cannot create user ardour folder %1 (%2)"), userconfigdir, strerror (errno)) error << string_compose (_("cannot create user %3 folder %1 (%2)"), userconfigdir, strerror (errno), PROGRAM_NAME)
<< endmsg; << endmsg;
} else { } else {
@ -312,7 +312,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
*/ */
if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) { if (g_mkdir_with_parents (userconfigdir.c_str(), 0755) < 0) {
error << string_compose (_("cannot create user ardour folder %1 (%2)"), userconfigdir, strerror (errno)) error << string_compose (_("cannot create user %3 folder %1 (%2)"), userconfigdir, strerror (errno), PROGRAM_NAME)
<< endmsg; << endmsg;
} else { } else {
@ -513,7 +513,7 @@ int main (int argc, char *argv[])
try { try {
ui = new ARDOUR_UI (&argc, &argv, localedir); ui = new ARDOUR_UI (&argc, &argv, localedir);
} catch (failed_constructor& err) { } catch (failed_constructor& err) {
error << _("could not create ARDOUR GUI") << endmsg; error << string_compose (_("could not create %1 GUI"), PROGRAM_NAME) << endmsg;
exit (1); exit (1);
} }

2
gtk2_ardour/nag.cc
View file

@ -37,7 +37,7 @@ using namespace Glib;
using namespace Gtk; using namespace Gtk;
NagScreen::NagScreen (std::string /*context*/, bool maybe_sub) NagScreen::NagScreen (std::string /*context*/, bool maybe_sub)
: ArdourDialog (_("Support Ardour Development"), true) : ArdourDialog (string_compose (_("Support %1 Development"), PROGRAM_NAME), true)
, donate_button (button_group, _("I'd like to make a one-time donation")) , donate_button (button_group, _("I'd like to make a one-time donation"))
, subscribe_button (button_group, _("Tell me more about becoming a subscriber")) , subscribe_button (button_group, _("Tell me more about becoming a subscriber"))
, existing_button (button_group, _("I'm already a subscriber!")) , existing_button (button_group, _("I'm already a subscriber!"))

10
gtk2_ardour/plugin_ui.cc
View file

@ -124,7 +124,7 @@ PluginUIWindow::PluginUIWindow (
default: default:
#ifndef WINDOWS_VST_SUPPORT #ifndef WINDOWS_VST_SUPPORT
error << _("unknown type of editor-supplying plugin (note: no VST support in this version of ardour)") error << string_compose (_("unknown type of editor-supplying plugin (note: no VST support in this version of %1)"), PROGRAM_NAME)
<< endmsg; << endmsg;
#else #else
error << _("unknown type of editor-supplying plugin") error << _("unknown type of editor-supplying plugin")
@ -267,8 +267,8 @@ PluginUIWindow::create_windows_vst_editor(boost::shared_ptr<PluginInsert>)
boost::shared_ptr<WindowsVSTPlugin> vp; boost::shared_ptr<WindowsVSTPlugin> vp;
if ((vp = boost::dynamic_pointer_cast<WindowsVSTPlugin> (insert->plugin())) == 0) { if ((vp = boost::dynamic_pointer_cast<WindowsVSTPlugin> (insert->plugin())) == 0) {
error << _("unknown type of editor-supplying plugin (note: no VST support in this version of ardour)") error << string_compose (_("unknown type of editor-supplying plugin (note: no VST support in this version of %1)"), PROGRAM_NAME)
<< endmsg; << endmsg;
throw failed_constructor (); throw failed_constructor ();
} else { } else {
WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp); WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp);
@ -297,8 +297,8 @@ PluginUIWindow::create_lxvst_editor(boost::shared_ptr<PluginInsert>)
boost::shared_ptr<LXVSTPlugin> lxvp; boost::shared_ptr<LXVSTPlugin> lxvp;
if ((lxvp = boost::dynamic_pointer_cast<LXVSTPlugin> (insert->plugin())) == 0) { if ((lxvp = boost::dynamic_pointer_cast<LXVSTPlugin> (insert->plugin())) == 0) {
error << _("unknown type of editor-supplying plugin (note: no linuxVST support in this version of ardour)") error << string_compose (_("unknown type of editor-supplying plugin (note: no linuxVST support in this version of %1)"), PROGRAM_NAME)
<< endmsg; << endmsg;
throw failed_constructor (); throw failed_constructor ();
} else { } else {
LXVSTPluginUI* lxvpu = new LXVSTPluginUI (insert, lxvp); LXVSTPluginUI* lxvpu = new LXVSTPluginUI (insert, lxvp);

35
gtk2_ardour/rc_option_editor.cc
View file

@ -1000,7 +1000,9 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_recording_on_xrun), sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_recording_on_xrun),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_recording_on_xrun) sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_recording_on_xrun)
); );
Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("<b>When enabled</b> Ardour will stop recording if an over- or underrun is detected by the audio engine")); Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
string_compose (_("<b>When enabled</b> %1 will stop recording if an over- or underrun is detected by the audio engine"),
PROGRAM_NAME));
add_option (_("Transport"), tsf); add_option (_("Transport"), tsf);
tsf = new BoolOption ( tsf = new BoolOption (
@ -1018,9 +1020,11 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_at_session_end), sigc::mem_fun (*_rc_config, &RCConfiguration::get_stop_at_session_end),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end) sigc::mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end)
); );
Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("<b>When enabled</b> if Ardour is <b>not recording</b>, it will stop the transport " Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
"when it reaches the current session end marker\n\n" string_compose (_("<b>When enabled</b> if %1 is <b>not recording</b>, it will stop the transport "
"<b>When disabled</b> Ardour will continue to roll past the session end marker at all times")); "when it reaches the current session end marker\n\n"
"<b>When disabled</b> %1 will continue to roll past the session end marker at all times"),
PROGRAM_NAME));
add_option (_("Transport"), tsf); add_option (_("Transport"), tsf);
tsf = new BoolOption ( tsf = new BoolOption (
@ -1029,10 +1033,11 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::get_seamless_loop), sigc::mem_fun (*_rc_config, &RCConfiguration::get_seamless_loop),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_seamless_loop) sigc::mem_fun (*_rc_config, &RCConfiguration::set_seamless_loop)
); );
Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(), _("<b>When enabled</b> this will loop by reading ahead and wrapping around at the loop point, " Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
"preventing any need to do a transport locate at the end of the loop\n\n" string_compose (_("<b>When enabled</b> this will loop by reading ahead and wrapping around at the loop point, "
"<b>When disabled</b> looping is done by locating back to the start of the loop when Ardour reaches the end " "preventing any need to do a transport locate at the end of the loop\n\n"
"which will often cause a small click or delay")); "<b>When disabled</b> looping is done by locating back to the start of the loop when %1 reaches the end "
"which will often cause a small click or delay"), PROGRAM_NAME));
add_option (_("Transport"), tsf); add_option (_("Transport"), tsf);
tsf = new BoolOption ( tsf = new BoolOption (
@ -1074,11 +1079,11 @@ RCOptionEditor::RCOptionEditor ()
); );
Gtkmm2ext::UI::instance()->set_tip Gtkmm2ext::UI::instance()->set_tip
(_sync_framerate->tip_widget(), (_sync_framerate->tip_widget(),
_("This option controls the value of the video frame rate <i>while chasing</i> an external timecode source.\n\n" string_compose (_("This option controls the value of the video frame rate <i>while chasing</i> an external timecode source.\n\n"
"<b>When enabled</b> the session video frame rate will be changed to match that of the selected external timecode source.\n\n" "<b>When enabled</b> the session video frame rate will be changed to match that of the selected external timecode source.\n\n"
"<b>When disabled</b> the session video frame rate will not be changed to match that of the selected external timecode source." "<b>When disabled</b> the session video frame rate will not be changed to match that of the selected external timecode source."
"Instead the frame rate indication in the main clock will flash red and Ardour will convert between the external " "Instead the frame rate indication in the main clock will flash red and %1 will convert between the external "
"timecode standard and the session standard.")); "timecode standard and the session standard."), PROGRAM_NAME));
add_option (_("Transport"), _sync_framerate); add_option (_("Transport"), _sync_framerate);
@ -1148,7 +1153,7 @@ RCOptionEditor::RCOptionEditor ()
); );
Gtkmm2ext::UI::instance()->set_tip Gtkmm2ext::UI::instance()->set_tip
(_ltc_send_continuously->tip_widget(), (_ltc_send_continuously->tip_widget(),
_("<b>When enabled</b> Ardour will continue to send LTC information even when the transport (playhead) is not moving")); string_compose (_("<b>When enabled</b> %1 will continue to send LTC information even when the transport (playhead) is not moving"), PROGRAM_NAME));
add_option (_("Transport"), _ltc_send_continuously); add_option (_("Transport"), _ltc_send_continuously);
_ltc_volume_adjustment = new Gtk::Adjustment(-18, -50, 0, .5, 5); _ltc_volume_adjustment = new Gtk::Adjustment(-18, -50, 0, .5, 5);
@ -1739,7 +1744,7 @@ RCOptionEditor::RCOptionEditor ()
add_option (S_("GUI"), add_option (S_("GUI"),
new BoolOption ( new BoolOption (
"use-own-plugin-gui", "use-own-plugin-gui",
_("Use plugins' own interfaces instead of Ardour's"), string_compose (_("Use plugins' own interfaces instead of %s's"), PROGRAM_NAME),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_plugin_own_gui), sigc::mem_fun (*_rc_config, &RCConfiguration::get_use_plugin_own_gui),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_plugin_own_gui) sigc::mem_fun (*_rc_config, &RCConfiguration::set_use_plugin_own_gui)
)); ));

4
gtk2_ardour/startup.cc
View file

@ -70,8 +70,8 @@ ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name,
, default_dir_chooser (0) , default_dir_chooser (0)
, ic_new_session_button (_("Create a new session")) , ic_new_session_button (_("Create a new session"))
, ic_existing_session_button (_("Open an existing session")) , ic_existing_session_button (_("Open an existing session"))
, monitor_via_hardware_button (_("Use an external mixer or the hardware mixer of your audio interface.\n\ , monitor_via_hardware_button (string_compose (_("Use an external mixer or the hardware mixer of your audio interface.\n"
Ardour will play NO role in monitoring")) "%1 will play NO role in monitoring"), PROGRAM_NAME))
, monitor_via_ardour_button (string_compose (_("Ask %1 to play back material as it is being recorded"), PROGRAM_NAME)) , monitor_via_ardour_button (string_compose (_("Ask %1 to play back material as it is being recorded"), PROGRAM_NAME))
, engine_dialog (0) , engine_dialog (0)
, new_folder_chooser (FILE_CHOOSER_ACTION_SELECT_FOLDER) , new_folder_chooser (FILE_CHOOSER_ACTION_SELECT_FOLDER)

7
libs/ardour/mtc_slave.cc
View file

@ -389,9 +389,10 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now)
if (cur_timecode != tc_format && ! printed_timecode_warning) { if (cur_timecode != tc_format && ! printed_timecode_warning) {
if (ceil(Timecode::timecode_to_frames_per_second(cur_timecode)) != ceil(Timecode::timecode_to_frames_per_second(tc_format))) { if (ceil(Timecode::timecode_to_frames_per_second(cur_timecode)) != ceil(Timecode::timecode_to_frames_per_second(tc_format))) {
warning << string_compose(_("Session and MTC framerate mismatch: MTC:%1 Ardour:%2."), warning << string_compose(_("Session and MTC framerate mismatch: MTC:%1 %2:%3."),
Timecode::timecode_format_name(tc_format), Timecode::timecode_format_name(tc_format),
Timecode::timecode_format_name(cur_timecode)) PROGRAM_NAME,
Timecode::timecode_format_name(cur_timecode))
<< endmsg; << endmsg;
} }
printed_timecode_warning = true; printed_timecode_warning = true;

8
libs/ardour/plugin_manager.cc
View file

@ -597,8 +597,8 @@ PluginManager::windows_vst_discover (string path)
} }
if (!finfo->canProcessReplacing) { if (!finfo->canProcessReplacing) {
warning << string_compose (_("VST plugin %1 does not support processReplacing, and so cannot be used in ardour at this time"), warning << string_compose (_("VST plugin %1 does not support processReplacing, and so cannot be used in %2 at this time"),
finfo->name) finfo->name, PROGRAM_NAME)
<< endl; << endl;
} }
@ -701,8 +701,8 @@ PluginManager::lxvst_discover (string path)
} }
if (!finfo->canProcessReplacing) { if (!finfo->canProcessReplacing) {
warning << string_compose (_("linuxVST plugin %1 does not support processReplacing, and so cannot be used in ardour at this time"), warning << string_compose (_("linuxVST plugin %1 does not support processReplacing, and so cannot be used in %2 at this time"),
finfo->name) finfo->name, PROGRAM_NAME)
<< endl; << endl;
} }

2
libs/ardour/rb_effect.cc
View file

@ -329,7 +329,7 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
} }
} catch (runtime_error& err) { } catch (runtime_error& err) {
error << _("timefx code failure. please notify ardour-developers.") << endmsg; error << string_compose (_("programming error: %1"), X_("timefx code failure")) << endmsg;
error << err.what() << endmsg; error << err.what() << endmsg;
goto out; goto out;
} }

2
libs/ardour/session_rtevents.cc
View file

@ -150,7 +150,7 @@ void
Session::rt_set_mute (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/) Session::rt_set_mute (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/)
{ {
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
if (!(*i)->is_master() && !(*i)->is_monitor() && !(*i)->is_hidden()) { if (!(*i)->is_monitor() && !(*i)->is_hidden()) {
(*i)->set_mute (yn, this); (*i)->set_mute (yn, this);
} }
} }

2
libs/gtkmm2ext/keyboard.cc
View file

@ -531,7 +531,7 @@ Keyboard::load_keybindings (string path)
} catch (...) { } catch (...) {
error << string_compose (_("Ardour key bindings file not found at \"%1\" or contains errors."), path) error << string_compose (_("key bindings file not found at \"%2\" or contains errors."), path)
<< endmsg; << endmsg;
return false; return false;
} }

1
libs/gtkmm2ext/motionfeedback.cc
View file

@ -94,6 +94,7 @@ MotionFeedback::MotionFeedback (Glib::RefPtr<Gdk::Pixbuf> pix,
hpacker = manage (new HBox); hpacker = manage (new HBox);
hpacker->pack_start (*value_packer, true, false); hpacker->pack_start (*value_packer, true, false);
hpacker->show (); hpacker->show ();
hpacker->set_border_width (6);
pack_start (*hpacker, false, false); pack_start (*hpacker, false, false);