The petty tidying up remnants of a noble, yet utterly failed, tempo lines experiment.

[ardour.git] / gtk2_ardour / editor_audio_import.cc

diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index fb6e2c86738c1efd35a7b65fe243cfbae7250cb6..90202aa3d94e4f3deb2dcd7b2e2b8cd6b91292aa 100644 (file)
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -74,7 +74,7 @@ void
 Editor::add_external_audio_action (ImportMode mode_hint)
 {
        if (session == 0) {
-               MessageDialog msg (0, _("You can't import or embed a file until you have a session loaded."));
+               MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded."));
                msg.run ();
                return;
        }
@@ -95,7 +95,7 @@ Editor::external_audio_dialog ()
        uint32_t track_cnt;
 
        if (session == 0) {
-               MessageDialog msg (0, _("You can't import or embed a file until you have a session loaded."));
+               MessageDialog msg (_("You can't import or embed an audiofile until you have a session loaded."));
                msg.run ();
                return;
        }
@@ -225,10 +225,10 @@ Editor::check_whether_and_how_to_import(string path, bool all_or_nothing)
                        //message = string_compose(_("The session already contains a source file named %1. Do you want to update that file (and thus all regions using the file) or import this file as a new file?"),wave_name);
                        message = string_compose(_("The session already contains a source file named %1. This file will be imported as a new file, please confirm."),wave_name);
                } else {
-                       message = _("Lorem ipsum. Do you want to skidaddle?");
+                       message = string_compose(_("A source file %1 already exists. This operation will not update that source but import the file %2 as a new source, please confirm."), wave_name, wave_name);
 
                }
-               MessageDialog dialog(message, false,Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
+               MessageDialog dialog(message, false, Gtk::MESSAGE_QUESTION, Gtk::BUTTONS_NONE, true);
 
                if (all_or_nothing) {
                        // disabled
@@ -779,10 +779,7 @@ Editor::add_sources (vector<Glib::ustring> paths, SourceList& sources, nframes64
                        just_one.clear ();
                        just_one.push_back (*x);
                        
-                       region_name = region_name_from_path ((*x)->path(), false, true, sources.size(), n);
-
-                       cout << "REGION NAME: " << region_name << endl;
-                       cout << "SOURCE LENGTH: " << (*x)->length() << endl;
+                       region_name = region_name_from_path ((*x)->path(), false, false, sources.size(), n);
 
                        regions.push_back (RegionFactory::create (just_one, 0, (*x)->length(), region_name, 0,
                                                                   Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)));