diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/session_option_editor.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/directory_names.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/export_handler.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session_vst.cc | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 77de24263a..56eced0d51 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3110,9 +3110,9 @@ require some unused files to continue to exist.")); } if (removed > 1) { - txt.set_text (string_compose (plural_msg, removed, dead_directory, space_adjusted, bprefix)); + txt.set_text (string_compose (plural_msg, removed, dead_directory, space_adjusted, bprefix, PROGRAM_NAME)); } else { - txt.set_text (string_compose (singular_msg, removed, dead_directory, space_adjusted, bprefix)); + txt.set_text (string_compose (singular_msg, removed, dead_directory, space_adjusted, bprefix, PROGRAM_NAME)); } dhbox.pack_start (*dimage, true, false, 5); @@ -3212,7 +3212,7 @@ Clean-up will move all unused files to a \"dead\" location.")); The following %1 files were not in use and \n\ have been moved to:\n\n\ %2\n\n\ -After a restart of Ardour,\n\n\ +After a restart of %5,\n\n\ Session -> Clean-up -> Flush Wastebasket\n\n\ will release an additional\n\ %3 %4bytes of disk space.\n"), @@ -3220,7 +3220,7 @@ will release an additional\n\ The following file was not in use and \n\ has been moved to:\n \ %2\n\n\ -After a restart of Ardour,\n\n\ +After a restart of %5,\n\n\ Session -> Clean-up -> Flush Wastebasket\n\n\ will release an additional\n\ %3 %4bytes of disk space.\n" diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 3a465c0b28..c5952f0b64 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -877,7 +877,7 @@ RCOptionEditor::RCOptionEditor () procs->add (i, string_compose (_("%1 processors"), i)); } - procs->set_note (_("This setting will only take effect when Ardour is restarted.")); + procs->set_note (string_compose (_("This setting will only take effect when %1 is restarted."), PROGRAM_NAME)); add_option (_("Misc"), procs); } @@ -1552,7 +1552,7 @@ RCOptionEditor::RCOptionEditor () add_option (S_("Visual|Interface"), new BoolOption ( "use-own-plugin-gui", - _("Use plugins' own interface instead of Ardour's basic one"), + _("Use plugins' own interface instead of a builtin one"), 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/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index c494870d7b..b524644542 100644 --- a/gtk2_ardour/session_option_editor.cc +++ b/gtk2_ardour/session_option_editor.cc @@ -135,7 +135,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s) add_option (_("Timecode"), new BoolOption ( "jack-time-master", - _("Ardour is JACK Time Master (provides Bar|Beat|Tick and other information to JACK)"), + string_compose (_("%1 is JACK Time Master (provides Bar|Beat|Tick and other information to JACK)"), PROGRAM_NAME), sigc::mem_fun (*_session_config, &SessionConfiguration::get_jack_time_master), sigc::mem_fun (*_session_config, &SessionConfiguration::set_jack_time_master) )); diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc index 1e2b08198f..a90dd9e0f4 100644 --- a/libs/ardour/directory_names.cc +++ b/libs/ardour/directory_names.cc @@ -18,7 +18,6 @@ const char* const route_templates_dir_name = X_("route_templates"); const char* const surfaces_dir_name = X_("surfaces"); const char* const panner_dir_name = X_("panners"); - /* these should end up using variants of PROGRAM_NAME */ #ifdef __APPLE__ const char* const user_config_dir_name = X_("Ardour" "3"); diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index 54b46ba617..f44450d3f0 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -424,7 +424,7 @@ ExportHandler::write_cue_header (CDMarkerStatus & status) { string title = status.timespan->name().compare ("Session") ? status.timespan->name() : (string) session.name(); - status.out << "REM Cue file generated by Ardour" << endl; + status.out << "REM Cue file generated by " << PROGRAM_NAME << endl; status.out << "TITLE " << cue_escape_cdtext (title) << endl; /* The original cue sheet sepc metions five file types diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc index fa0641a6ab..af57976544 100644 --- a/libs/ardour/session_vst.cc +++ b/libs/ardour/session_vst.cc @@ -282,7 +282,7 @@ intptr_t Session::vst_callback ( case audioMasterGetProductString: SHOW_CALLBACK ("amc: audioMasterGetProductString\n"); // fills <ptr> with a string with product name (max 64 char) - strcpy ((char*) ptr, "Ardour"); + strcpy ((char*) ptr, PROGRAM_NAME); return 0; case audioMasterGetVendorVersion: |