summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk2_ardour/ambiguous_file_dialog.cc2
-rw-r--r--gtk2_ardour/engine_dialog.cc6
-rw-r--r--gtk2_ardour/main.cc12
-rw-r--r--gtk2_ardour/nag.cc2
-rw-r--r--gtk2_ardour/plugin_ui.cc10
-rw-r--r--gtk2_ardour/rc_option_editor.cc35
-rw-r--r--gtk2_ardour/startup.cc4
-rw-r--r--libs/ardour/mtc_slave.cc7
-rw-r--r--libs/ardour/plugin_manager.cc8
-rw-r--r--libs/ardour/rb_effect.cc2
-rw-r--r--libs/ardour/session_rtevents.cc2
-rw-r--r--libs/gtkmm2ext/keyboard.cc2
-rw-r--r--libs/gtkmm2ext/motionfeedback.cc1
13 files changed, 50 insertions, 43 deletions
diff --git a/gtk2_ardour/ambiguous_file_dialog.cc b/gtk2_ardour/ambiguous_file_dialog.cc
index 7d57c67660..3527ab471a 100644
--- a/gtk2_ardour/ambiguous_file_dialog.cc
+++ b/gtk2_ardour/ambiguous_file_dialog.cc
@@ -32,7 +32,7 @@ AmbiguousFileDialog::AmbiguousFileDialog (const string& file, const vector<strin
get_vbox()->set_spacing (6);
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);
for (vector<string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index aa3409b36d..a9e04d8db0 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -774,7 +774,7 @@ EngineControl::enumerate_coreaudio_devices ()
if (devs.size() == 0) {
- MessageDialog msg (_("\
+ MessageDialog msg (string_compose (_("\
You do not have any audio devices capable of\n\
simultaneous playback and recording.\n\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\
Alternatively, if you really want just playback\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);
msg.set_title (_("No suitable audio devices"));
msg.set_position (Gtk::WIN_POS_MOUSE);
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 8b7a8772b2..74d310e75a 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -80,13 +80,13 @@ gui_jack_error ()
false,
Gtk::MESSAGE_INFO,
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\
1) JACK is not running.\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\
-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.set_default_response (RESPONSE_CLOSE);
@@ -194,7 +194,7 @@ fixup_bundle_environment (int, char* [])
*/
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;
} else {
@@ -312,7 +312,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
*/
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;
} else {
@@ -513,7 +513,7 @@ int main (int argc, char *argv[])
try {
ui = new ARDOUR_UI (&argc, &argv, localedir);
} catch (failed_constructor& err) {
- error << _("could not create ARDOUR GUI") << endmsg;
+ error << string_compose (_("could not create %1 GUI"), PROGRAM_NAME) << endmsg;
exit (1);
}
diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc
index 45f040eb1d..f89752a935 100644
--- a/gtk2_ardour/nag.cc
+++ b/gtk2_ardour/nag.cc
@@ -37,7 +37,7 @@ using namespace Glib;
using namespace Gtk;
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"))
, subscribe_button (button_group, _("Tell me more about becoming a subscriber"))
, existing_button (button_group, _("I'm already a subscriber!"))
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 555ffe0b21..2dd8741a13 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -124,7 +124,7 @@ PluginUIWindow::PluginUIWindow (
default:
#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;
#else
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;
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)")
- << endmsg;
+ error << string_compose (_("unknown type of editor-supplying plugin (note: no VST support in this version of %1)"), PROGRAM_NAME)
+ << endmsg;
throw failed_constructor ();
} else {
WindowsVSTPluginUI* vpu = new WindowsVSTPluginUI (insert, vp);
@@ -297,8 +297,8 @@ PluginUIWindow::create_lxvst_editor(boost::shared_ptr<PluginInsert>)
boost::shared_ptr<LXVSTPlugin> lxvp;
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)")
- << endmsg;
+ error << string_compose (_("unknown type of editor-supplying plugin (note: no linuxVST support in this version of %1)"), PROGRAM_NAME)
+ << endmsg;
throw failed_constructor ();
} else {
LXVSTPluginUI* lxvpu = new LXVSTPluginUI (insert, lxvp);
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 0275922437..e50b285694 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1000,7 +1000,9 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::get_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);
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::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 "
- "when it reaches the current session end marker\n\n"
- "<b>When disabled</b> Ardour will continue to roll past the session end marker at all times"));
+ Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+ string_compose (_("<b>When enabled</b> if %1 is <b>not recording</b>, it will stop the transport "
+ "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);
tsf = new BoolOption (
@@ -1029,10 +1033,11 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_rc_config, &RCConfiguration::get_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, "
- "preventing any need to do a transport locate at the end of the loop\n\n"
- "<b>When disabled</b> looping is done by locating back to the start of the loop when Ardour reaches the end "
- "which will often cause a small click or delay"));
+ Gtkmm2ext::UI::instance()->set_tip (tsf->tip_widget(),
+ string_compose (_("<b>When enabled</b> this will loop by reading ahead and wrapping around at the loop point, "
+ "preventing any need to do a transport locate at the end of the loop\n\n"
+ "<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);
tsf = new BoolOption (
@@ -1074,11 +1079,11 @@ RCOptionEditor::RCOptionEditor ()
);
Gtkmm2ext::UI::instance()->set_tip
(_sync_framerate->tip_widget(),
- _("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 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 "
- "timecode standard and the session standard."));
+ 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 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 %1 will convert between the external "
+ "timecode standard and the session standard."), PROGRAM_NAME));
add_option (_("Transport"), _sync_framerate);
@@ -1148,7 +1153,7 @@ RCOptionEditor::RCOptionEditor ()
);
Gtkmm2ext::UI::instance()->set_tip
(_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);
_ltc_volume_adjustment = new Gtk::Adjustment(-18, -50, 0, .5, 5);
@@ -1739,7 +1744,7 @@ RCOptionEditor::RCOptionEditor ()
add_option (S_("GUI"),
new BoolOption (
"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::set_use_plugin_own_gui)
));
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 5916d3bfa2..e08d89d5fa 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -70,8 +70,8 @@ ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name,
, default_dir_chooser (0)
, ic_new_session_button (_("Create a new 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\
-Ardour will play NO role in monitoring"))
+ , monitor_via_hardware_button (string_compose (_("Use an external mixer or the hardware mixer of your audio interface.\n"
+ "%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))
, engine_dialog (0)
, new_folder_chooser (FILE_CHOOSER_ACTION_SELECT_FOLDER)
diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index eadc40646b..b3992598d3 100644
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -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 (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."),
- Timecode::timecode_format_name(tc_format),
- Timecode::timecode_format_name(cur_timecode))
+ warning << string_compose(_("Session and MTC framerate mismatch: MTC:%1 %2:%3."),
+ Timecode::timecode_format_name(tc_format),
+ PROGRAM_NAME,
+ Timecode::timecode_format_name(cur_timecode))
<< endmsg;
}
printed_timecode_warning = true;
diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 6a24a33b60..9bd40cb1ae 100644
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -597,8 +597,8 @@ PluginManager::windows_vst_discover (string path)
}
if (!finfo->canProcessReplacing) {
- warning << string_compose (_("VST plugin %1 does not support processReplacing, and so cannot be used in ardour at this time"),
- finfo->name)
+ warning << string_compose (_("VST plugin %1 does not support processReplacing, and so cannot be used in %2 at this time"),
+ finfo->name, PROGRAM_NAME)
<< endl;
}
@@ -701,8 +701,8 @@ PluginManager::lxvst_discover (string path)
}
if (!finfo->canProcessReplacing) {
- warning << string_compose (_("linuxVST plugin %1 does not support processReplacing, and so cannot be used in ardour at this time"),
- finfo->name)
+ warning << string_compose (_("linuxVST plugin %1 does not support processReplacing, and so cannot be used in %2 at this time"),
+ finfo->name, PROGRAM_NAME)
<< endl;
}
diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc
index f3adaec22c..a5d47d2668 100644
--- a/libs/ardour/rb_effect.cc
+++ b/libs/ardour/rb_effect.cc
@@ -329,7 +329,7 @@ RBEffect::run (boost::shared_ptr<Region> r, Progress* progress)
}
} 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;
goto out;
}
diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc
index 3afce0c898..2b52b3b28a 100644
--- a/libs/ardour/session_rtevents.cc
+++ b/libs/ardour/session_rtevents.cc
@@ -150,7 +150,7 @@ void
Session::rt_set_mute (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/)
{
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);
}
}
diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc
index 81b9ae642a..9966972edb 100644
--- a/libs/gtkmm2ext/keyboard.cc
+++ b/libs/gtkmm2ext/keyboard.cc
@@ -531,7 +531,7 @@ Keyboard::load_keybindings (string path)
} 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;
return false;
}
diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc
index cb1d2cba88..44fb3e5f47 100644
--- a/libs/gtkmm2ext/motionfeedback.cc
+++ b/libs/gtkmm2ext/motionfeedback.cc
@@ -94,6 +94,7 @@ MotionFeedback::MotionFeedback (Glib::RefPtr<Gdk::Pixbuf> pix,
hpacker = manage (new HBox);
hpacker->pack_start (*value_packer, true, false);
hpacker->show ();
+ hpacker->set_border_width (6);
pack_start (*hpacker, false, false);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 19:24:39 +0000