finalize PROGRAM_NAME change for ardour3

git-svn-id: svn://localhost/ardour2/branches/3.0@6759 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 5836a4c2011579671494d4f47d566aba6b880f86..6d29737b8643bb633773529d92a999e4b9322610 100644 (file)
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -87,12 +87,12 @@ ActionManager::init ()
                error << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endmsg;
                cerr << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endl;
        } catch (...) {
-               error << _("Ardour menu definition file not found") << endmsg;
+               error << string_compose (_("%1 menu definition file not found"), PROGRAM_NAME) << endmsg;
        }
 
        if (!loaded) {
-               cerr << _("ardour will not work without a valid ardour.menus file") << endl;
-               error << _("ardour will not work without a valid ardour.menus file") << endmsg;
+               cerr << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endl;
+                error << string_compose (_("%1 will not work without a valid ardour.menus file"), PROGRAM_NAME) << endmsg;
                exit(1);
        }
 }

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index d51bf11df3aac2f969455fb0c411a04e159af2cf..73b4e060fb69890d7960dc3f5cf0a21e51ae6a3d 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -646,9 +646,9 @@ ARDOUR_UI::backend_audio_error (bool we_set_params, Gtk::Window* toplevel)
 {
        string title;
        if (we_set_params) {
-               title = _("Ardour could not start JACK");
+               title = string_compose (_("%1 could not start JACK"), PROGRAM_NAME);
        } else {
-               title = _("Ardour could not connect to JACK.");
+               title = string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME);
        }
 
        MessageDialog win (title,
@@ -711,7 +711,7 @@ ARDOUR_UI::startup ()
 
        goto_editor_window ();
 
-       BootMessage (_("Ardour is ready for use"));
+       BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME));
        show ();
 }
 
@@ -753,12 +753,13 @@ ARDOUR_UI::check_memory_locking ()
                        if (ram == 0 || ((double) limits.rlim_cur / ram) < 0.75) {
 
 
-                               MessageDialog msg (_("WARNING: Your system has a limit for maximum amount of locked memory. "
-                                                    "This might cause Ardour to run out of memory before your system "
-                                                    "runs out of memory. \n\n"
-                                                    "You can view the memory limit with 'ulimit -l', "
-                                                    "and it is normally controlled by /etc/security/limits.conf"));
-
+                               MessageDialog msg (string_compose (_("WARNING: Your system has a limit for maximum amount of locked memory. "
+                                                                     "This might cause %1 to run out of memory before your system "
+                                                                     "runs out of memory. \n\n"
+                                                                     "You can view the memory limit with 'ulimit -l', "
+                                                                     "and it is normally controlled by /etc/security/limits.conf"),
+                                                                   PROGRAM_NAME).c_str());
+                                                   
                                VBox* vbox = msg.get_vbox();
                                HBox hbox;
                                CheckButton cb (_("Do not show this window again"));
@@ -1242,8 +1243,9 @@ ARDOUR_UI::check_audioengine ()
 {
        if (engine) {
                if (!engine->connected()) {
-                       MessageDialog msg (_("Ardour is not connected to JACK\n"
-                                            "You cannot open or close sessions in this condition"));
+                       MessageDialog msg (string_compose (_("%1 is not connected to JACK\n"
+                                                             "You cannot open or close sessions in this condition"),
+                                                           PROGRAM_NAME));
                        pop_back_splash ();
                        msg.run ();
                        return false;
@@ -1275,7 +1277,7 @@ ARDOUR_UI::open_session ()
 
                FileFilter session_filter;
                session_filter.add_pattern ("*.ardour");
-               session_filter.set_name (_("Ardour sessions"));
+               session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME));
                open_session_selector->add_filter (session_filter);
                open_session_selector->set_filter (session_filter);
        }
@@ -2582,7 +2584,7 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
                goto out;
        }
 
-       loading_message (_("Please wait while Ardour loads your session"));
+       loading_message (string_compose (_("Please wait while %1loads your session"), PROGRAM_NAME));
 
        try {
                new_session = new Session (*engine, path, snap_name, mix_template);
@@ -3185,7 +3187,7 @@ ARDOUR_UI::write_buffer_stats ()
        strcpy (path, "ardourBufferingXXXXXX");
 
        if ((fd = mkstemp (path )) < 0) {
-               cerr << X_("cannot find temporary name for ardour buffer stats") << endl;
+               cerr << X_("cannot find temporary name for buffer stats") << endl;
                return;
        }
        
@@ -3193,7 +3195,7 @@ ARDOUR_UI::write_buffer_stats ()
        close (fd);
 
        if (!fout) {
-               cerr << string_compose (X_("cannot open file %1 for ardour buffer stats"), path) << endl;
+               cerr << string_compose (X_("cannot open file %1 for buffer stats"), path) << endl;
                return;
        }
 
@@ -3207,7 +3209,7 @@ ARDOUR_UI::write_buffer_stats ()
 
        fout.close ();
 
-       cerr << "Ardour buffering statistics can be found in: " << path << endl;
+       cerr << "buffering statistics can be found in: " << path << endl;
 }
 
 void

diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index c40c7e1efee97271e1739116fb07fa366c79d569..52ab0716d8c2e365b4155e50719d64f621b118b7 100644 (file)
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -121,7 +121,7 @@ ARDOUR_UI::setup_tooltips ()
        set_tip (punch_out_button, _("Stop recording at auto-punch end"));
        set_tip (click_button, _("Enable/Disable audio click"));
        set_tip (sync_button, _("Enable/Disable external positional sync"));
-       set_tip (time_master_button, _("Does Ardour control the time?"));
+       set_tip (time_master_button, string_compose (_("Does %1 control the time?"), PROGRAM_NAME));
        set_tip (shuttle_box, _("Shuttle speed control"));
        set_tip (shuttle_units_button, _("Select semitones or %%-age for speed display"));
        set_tip (speed_display_box, _("Current transport speed"));

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 1c56abb47d64269043f86a812f6b87069f64cd45..f7b68fcbf105518298546d6e94f9b55aa0b0cf17 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4640,7 +4640,7 @@ Editor::first_idle ()
 
        if (track_views.size() > 1) {
                dialog = new MessageDialog (*this,
-                                           _("Please wait while Ardour loads visual data"),
+                                           string_compose (_("Please wait while %1 loads visual data"), PROGRAM_NAME),
                                            true,
                                            Gtk::MESSAGE_INFO,
                                            Gtk::BUTTONS_NONE);

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index a61ab4ca05d5371774b656b8143e092ac55c7368..3213761c781c48992547b1d7264340df613d1a8e 100644 (file)
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -959,7 +959,7 @@ EngineControl::find_jack_servers (vector<string>& strings)
        if (getenv ("ARDOUR_WITH_JACK")) {
                /* no other options - only use the JACK we supply */
                if (strings.empty()) {
-                       fatal << _("JACK appears to be missing from the Ardour bundle") << endmsg;
+                       fatal << string_compose (_("JACK appears to be missing from the %1 bundle"), PROGRAM_NAME) << endmsg;
                        /*NOTREACHED*/
                }
                return;

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index 99b24f6e01e38632718ebcb4d938caf90d59ae77..983d5e2ddfbea9493d80d7b00dadfcbcb8b2b213 100644 (file)
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -132,7 +132,7 @@ ArdourKeyboard::setup_keybindings ()
                        if ( ! find_file_in_search_path (spath, keybindings_path, keybindings_file)) {
 
                                if (keybindings_path == default_bindings) {
-                                       error << _("Default keybindings not found - Ardour will be hard to use!") << endmsg;
+                                       error << string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME) << endmsg;
                                        return;
                                } else {
                                        warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"),
@@ -156,7 +156,7 @@ ArdourKeyboard::setup_keybindings ()
 
                        if (!Glib::file_test (keybindings_path, Glib::FILE_TEST_EXISTS)) {
                                if (keybindings_path == default_bindings) {
-                                       error << _("Default keybindings not found - Ardour will be hard to use!") << endmsg;
+                                       error << string_compose (_("Default keybindings not found - %1 will be hard to use!"), PROGRAM_NAME) << endmsg;
                                        return;
                                } else {
                                        warning << string_compose (_("Key bindings file \"%1\" not found. Default bindings used instead"),

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 6ad5d245d8bd14565bc349ccbfab2c4c39b82c2e..2b16de3d70be41e7c1206525bd85071b32f008e5 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -66,7 +66,7 @@ static const char* localedir = LOCALEDIR;
 void
 gui_jack_error ()
 {
-       MessageDialog win (_("Ardour could not connect to JACK."),
+       MessageDialog win (string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME),
                     false,
                     Gtk::MESSAGE_INFO,
                     (Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
@@ -348,7 +348,7 @@ int main (int argc, char *argv[])
                return curvetest (curvetest_file);
        }
 
-       cout << _("Ardour/GTK ")
+       cout << PROGRAM_NAME
             << VERSIONSTRING
             << _(" (built using ")
             << svn_revision
@@ -366,7 +366,7 @@ int main (int argc, char *argv[])
                cerr << _("Copyright (C) 1999-2008 Paul Davis") << endl
                     << _("Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker") << endl
                     << endl
-                    << _("Ardour comes with ABSOLUTELY NO WARRANTY") << endl
+                    << string_compose (_("%1 comes with ABSOLUTELY NO WARRANTY"), PROGRAM_NAME) << endl
                     << _("not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.") << endl
                     << _("This is free software, and you are welcome to redistribute it ") << endl
                     << _("under certain conditions; see the source for copying conditions.")

diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index 429d5fa85b6d1a5b6dfe1d5393a52c0fd8c8c389..3a0794e65ab8c925f667eb4277569437f970a928 100644 (file)
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -59,7 +59,7 @@ print_help (const char *execname)
             << _("  -d, --disable-plugins       Disable all plugins in an existing session\n")
             << _("  -D, --debug <options>       Set debug flags. Use \"-D list\" to see available options\n")
             << _("  -n, --show-splash           Show splash screen\n")
-            << _("  -m, --menus file            Use \"file\" for Ardour menus\n")
+            << _("  -m, --menus file            Use \"file\" to define menus\n")
             << _("  -N, --new session-name      Create a new session from the command line\n")
             << _("  -O, --no-hw-optimizations   Disable h/w specific optimizations\n")
             << _("  -S, --sync                  Draw the gui synchronously \n")

diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 1c7ce5d9e6895896957fbd6b5d6e158848b326db..697fd9afba539a5a290116662926788d9983d370 100644 (file)
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -408,8 +408,8 @@ PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi)
 
        focus_button.add (*focus_out_image);
 
-       ARDOUR_UI::instance()->set_tip (&focus_button, _("Click to allow the plugin to receive keyboard events that Ardour would normally use as a shortcut"), "");
-       ARDOUR_UI::instance()->set_tip (&bypass_button, _("Click to enable/disable this plugin"), "");
+       ARDOUR_UI::instance()->set_tip (focus_button, string_compose (_("Click to allow the plugin to receive keyboard events that %1 would normally use as a shortcut"), PROGRAM_NAME));
+       ARDOUR_UI::instance()->set_tip (bypass_button, _("Click to enable/disable this plugin"));
 
        plugin_analysis_expander.property_expanded().signal_changed().connect( sigc::mem_fun(*this, &PlugUIBase::toggle_plugin_analysis));
        plugin_analysis_expander.set_expanded(false);
@@ -538,13 +538,13 @@ PlugUIBase::focus_toggled (GdkEventButton*)
                focus_button.remove ();
                focus_button.add (*focus_out_image);
                focus_out_image->show ();
-               ARDOUR_UI::instance()->set_tip (&focus_button, _("Click to allow the plugin to receive keyboard events that Ardour would normally use as a shortcut"), "");
+               ARDOUR_UI::instance()->set_tip (focus_button, string_compose (_("Click to allow the plugin to receive keyboard events that %1 would normally use as a shortcut"), PROGRAM_NAME));
        } else {
                Keyboard::the_keyboard().magic_widget_grab_focus();
                focus_button.remove ();
                focus_button.add (*focus_in_image);
                focus_in_image->show ();
-               ARDOUR_UI::instance()->set_tip (&focus_button, _("Click to allow normal use of Ardour keyboard shortcuts"), "");
+               ARDOUR_UI::instance()->set_tip (focus_button, string_compose (_("Click to allow normal use of %1 keyboard shortcuts"), PROGRAM_NAME));
        }
 
        return true;

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index c4d01e4458479078135821e4cc178d2ad0975df0..9c3c7902bb5a4153c5746801a33b9410ba826acc 100644 (file)
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -796,7 +796,7 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams)
                text += string_compose("\t%1 ", streams.count.n_audio()) + _("audio channel(s)\n");
        }
 
-       text += _("\nArdour is unable to insert this plugin here.\n");
+       text += string_compose (_("\n%1 is unable to insert this plugin here.\n"), PROGRAM_NAME);
        label.set_text(text);
 
        dialog.get_vbox()->pack_start (label);

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index b3d7364ebdb9878b9093d75732b469e37339498a..1440081d57e49bceea2073e615eb5c08da23bcc3 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -924,8 +924,8 @@ private:
 
 
 RCOptionEditor::RCOptionEditor ()
-       : OptionEditor (Config, _("Ardour Preferences")),
-         _rc_config (Config)
+       : OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
+        , _rc_config (Config)
 {
        /* MISC */
 

diff --git a/gtk2_ardour/session_metadata_dialog.cc b/gtk2_ardour/session_metadata_dialog.cc
index 0bce776c62412f7875aedce1dd160c44695aeddf..f93c57abe4489dae451235eaed54a6565154776d 100644 (file)
--- a/gtk2_ardour/session_metadata_dialog.cc
+++ b/gtk2_ardour/session_metadata_dialog.cc
@@ -674,7 +674,7 @@ SessionMetadataImporter::run ()
 
        Gtk::FileFilter session_filter;
        session_filter.add_pattern ("*.ardour");
-       session_filter.set_name (_("Ardour sessions"));
+       session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME));
        session_selector.add_filter (session_filter);
        session_selector.set_filter (session_filter);
 
@@ -705,7 +705,7 @@ SessionMetadataImporter::run ()
        string filename = Glib::build_filename (path, name + ".ardour");
        XMLTree session_tree;
        if (!session_tree.read (filename)) {
-               warn_user (_("A proper ardour session file was not selected!"));
+               warn_user (_("This session file could not be read!"));
                return;
        }
 

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 910e996702f92ea3da08ce0e806ed29ebd36c46d..652d820b28dcfddb744d34cf425f353603b42cfd 100644 (file)
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -42,7 +42,7 @@ Splash::Splash ()
 
        layout = create_pango_layout ("");
        string str = "<b>";
-       string i18n = _("Ardour loading ...");
+       string i18n = string_compose (_("%1 loading ..."), PROGRAM_NAME);
        str += i18n;
        str += "</b>";
 

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index f39f41246231016771e0d79b35679ec498248577..f6ec9e049007fcb039e417d652c727e2ad48878f 100644 (file)
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -43,7 +43,7 @@ ArdourStartup::ArdourStartup ()
        , 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_ardour_button (_("Ask Ardour to playback material as it is being recorded"))
+       , monitor_via_ardour_button (string_compose (_("Ask %1 to playback material as it is being recorded"), PROGRAM_NAME))
        , new_folder_chooser (FILE_CHOOSER_ACTION_SELECT_FOLDER)
        , more_new_session_options_button (_("I'd like more options for this session"))
        , _output_limit_count_adj (1, 0, 100, 1, 10, 0)
@@ -226,15 +226,15 @@ ArdourStartup::setup_new_user_page ()
 {
        Label* foomatic = manage (new Label);
 
-       foomatic->set_markup (_("\
-<span size=\"larger\">Ardour is a digital audio workstation. You can use it to\n\
+       foomatic->set_markup (string_compose (_("\
+<span size=\"larger\">%1 is a digital audio workstation. You can use it to\n\
 record, edit and mix multi-track audio. You can produce your\n\
 own CDs, mix video soundtracks, or just experiment with new\n\
 ideas about music and sound.\n\
 \n\
 There are a few things that need to configured before you start\n\
 using the program.</span>\
-"));
+"), PROGRAM_NAME));
 
        HBox* hbox = manage (new HBox);
        HBox* vbox = manage (new HBox);
@@ -265,7 +265,7 @@ ArdourStartup::default_dir_changed ()
 void
 ArdourStartup::setup_first_time_config_page ()
 {
-       default_dir_chooser = manage (new FileChooserButton (_("Default folder for Ardour sessions"),
+       default_dir_chooser = manage (new FileChooserButton (string_compose (_("Default folder for %1 sessions"), PROGRAM_NAME),
                                                             FILE_CHOOSER_ACTION_SELECT_FOLDER));
        Gtk::Label* txt = manage (new Label);
        HBox* hbox = manage (new HBox);
@@ -417,7 +417,7 @@ ArdourStartup::setup_session_page ()
 void
 ArdourStartup::setup_final_page ()
 {
-       final_page.set_text ("Ardour is ready for use");
+       final_page.set_text (string_compose (_("%1 is ready for use"), PROGRAM_NAME));
        final_page.show ();
        final_page_index = append_page (final_page);
        set_page_complete (final_page, true);

diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index e92c639febbf2d89bc04cc6a0c3fb9ca4b5c7989..ac61efa5ec7daafee76a74ec8a146c2cfbde1aca 100644 (file)
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -193,9 +193,8 @@ load_rc_file (const string& filename, bool themechange)
        spath += system_config_search_path();
 
        if (!find_file_in_search_path (spath, filename, rc_file_path)) {
-               warning << string_compose(
-                               _("Unable to find UI style file %1 in search path %2. Ardour will look strange"),
-                               filename, spath.to_string())
+               warning << string_compose (_("Unable to find UI style file %1 in search path %2. %3 will look strange"),
+                                           filename, spath.to_string(), PROGRAM_NAME)
                                << endmsg;
                return;
        }

diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc
index 090dd49e88f0a88857b8c3f04ffd838d49f57638..4a63f66cf5cd1543677b2f1345b66ec4519c2b40 100644 (file)
--- a/libs/ardour/audio_unit.cc
+++ b/libs/ardour/audio_unit.cc
@@ -1080,7 +1080,7 @@ AUPlugin::set_state(const XMLNode& node)
        return ret;
 #else
        if (!seen_set_state_message) {
-               info << _("Restoring AudioUnit settings is not supported in this build of Ardour. Consider paying for a newer version")
+               info << string_compose (_("Restoring AudioUnit settings is not supported in this build of %1. Consider paying for a newer version", PROGRAM_NAME)
                     << endmsg;
        }
        return 0;
@@ -1110,7 +1110,7 @@ AUPlugin::load_preset (const string& preset_label)
        return ret;
 #else
        if (!seen_loading_message) {
-               info << _("Loading AudioUnit presets is not supported in this build of Ardour. Consider paying for a newer version")
+               info << string_compose (_("Loading AudioUnit presets is not supported in this build of %1. Consider paying for a newer version", PROGRAM_NAME)
                     << endmsg;
                seen_loading_message = true;
        }
@@ -1171,7 +1171,7 @@ AUPlugin::save_preset (string preset_name)
        return ret;
 #else
        if (!seen_saving_message) {
-               info << _("Saving AudioUnit presets is not supported in this build of Ardour. Consider paying for a newer version")
+               info << string_compose (_("Saving AudioUnit presets is not supported in this build of %1. Consider paying for a newer version"), PROGRAM_NAME)
                     << endmsg;
                seen_saving_message = true;
        }

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 3766f60b63d34ab4dae3e5e6e35ce93f0081f992..ba08e9f878cf5d57da56b2f137d2ac731ee8a338 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -631,7 +631,7 @@ AudioEngine::port_registration_failure (const std::string& portname)
        if (p) {
                reason = string_compose (_("a port with the name \"%1\" already exists: check for duplicated track/bus names"), portname);
        } else {
-               reason = _("No more JACK ports are available. You will need to stop Ardour and restart JACK with ports if you need this many tracks.");
+               reason = string_compose (_("No more JACK ports are available. You will need to stop %1 and restart JACK with ports if you need this many tracks."), PROGRAM_NAME);
        }
 
        throw PortRegistrationFailure (string_compose (_("AudioEngine: cannot register port \"%1\": %2"), portname, reason).c_str());

diff --git a/libs/ardour/find_session.cc b/libs/ardour/find_session.cc
index a572a9a7a390d9600d99cae2cba72a43cbeeded4..90a54b1390d3354d5156518611977ce7223a05f7 100644 (file)
--- a/libs/ardour/find_session.cc
+++ b/libs/ardour/find_session.cc
@@ -104,7 +104,7 @@ ARDOUR::find_session (string str, string& path, string& snapshot, bool& isnew)
                        suffix = snapshot.find (statefile_suffix);
 
                        if (suffix == string::npos) {
-                               error << string_compose (_("%1 is not an Ardour snapshot file"), str) << endmsg;
+                               error << string_compose (_("%1 is not a snapshot file"), str) << endmsg;
                                return -1;
                        }