summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
authorColin Fletcher <colin.m.fletcher@googlemail.com>2014-07-09 19:13:31 +0100
committerColin Fletcher <colin.m.fletcher@googlemail.com>2014-10-02 18:03:19 +0100
commit44f71ce5998afb79c04126d82564b0f8542ca364 (patch)
tree8b979a50ad4210add0c0d71717b856564e1c5497 /libs/ardour
parent1c5246b5f11170c5cbce517017d930e23edc02fa (diff)
Text tweaks and typo fixes
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/audioregion.cc6
-rw-r--r--libs/ardour/export_handler.cc2
-rw-r--r--libs/ardour/midi_port.cc2
-rw-r--r--libs/ardour/session_state.cc2
4 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 630819d7c1..8c4eb6aa2a 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -1678,16 +1678,16 @@ AudioRegion::get_transients (AnalysisFeatureList& results, bool force_new)
if (!Config->get_auto_analyse_audio()) {
if (!analyse_dialog_shown) {
- pl->session().Dialog (_("\
+ pl->session().Dialog (string_compose (_("\
You have requested an operation that requires audio analysis.\n\n\
You currently have \"auto-analyse-audio\" disabled, which means \
that transient data must be generated every time it is required.\n\n\
If you are doing work that will require transient data on a \
regular basis, you should probably enable \"auto-analyse-audio\" \
-then quit ardour and restart.\n\n\
+then quit %1 and restart.\n\n\
This dialog will not display again. But you may notice a slight delay \
in this and future transient-detection operations.\n\
-"));
+"), PROGRAM_NAME));
analyse_dialog_shown = true;
}
}
diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc
index ec89f270ca..38086bd273 100644
--- a/libs/ardour/export_handler.cc
+++ b/libs/ardour/export_handler.cc
@@ -363,7 +363,7 @@ ExportHandler::finish_timespan ()
open_uri(path.c_str()); // open the soundcloud website to the new file
}
} else {
- error << _("upload to Soundcloud failed. Perhaps your email or password are incorrect?\n") << endmsg;
+ error << _("upload to Soundcloud failed. Perhaps your email or password are incorrect?\n") << endmsg;
}
delete soundcloud_uploader;
}
diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
index 55280eb942..97ef865f47 100644
--- a/libs/ardour/midi_port.cc
+++ b/libs/ardour/midi_port.cc
@@ -206,7 +206,7 @@ MidiPort::flush_buffers (pframes_t nframes)
}
} else {
cerr << "drop flushed event on the floor, time " << ev.time()
- << " to early for " << _global_port_buffer_offset
+ << " too early for " << _global_port_buffer_offset
<< " + " << _port_buffer_offset << endl;
}
}
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 0017a89daf..bb39a03b09 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -1955,7 +1955,7 @@ Session::XMLSourceFactory (const XMLNode& node)
}
catch (failed_constructor& err) {
- error << string_compose (_("Found a sound file that cannot be used by %1. Talk to the progammers."), PROGRAM_NAME) << endmsg;
+ error << string_compose (_("Found a sound file that cannot be used by %1. Talk to the programmers."), PROGRAM_NAME) << endmsg;
return boost::shared_ptr<Source>();
}
}