fix merge conflicts with master

213 files changed, 29240 insertions, 21437 deletions

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 3b0133b535..cefaeeb4cf 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -58,8 +58,8 @@ vector<RefPtr<Gtk::Action> > ActionManager::playlist_selection_sensitive_actions
 vector<RefPtr<Gtk::Action> > ActionManager::mouse_edit_point_requires_canvas_actions;
 
 vector<RefPtr<Gtk::Action> > ActionManager::range_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::jack_sensitive_actions;
-vector<RefPtr<Gtk::Action> > ActionManager::jack_opposite_sensitive_actions;
+vector<RefPtr<Gtk::Action> > ActionManager::engine_sensitive_actions;
+vector<RefPtr<Gtk::Action> > ActionManager::engine_opposite_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::transport_sensitive_actions;
 vector<RefPtr<Gtk::Action> > ActionManager::edit_point_in_region_sensitive_actions;
 
diff --git a/gtk2_ardour/actions.h b/gtk2_ardour/actions.h
index 20c0532636..f3fba51de5 100644
--- a/gtk2_ardour/actions.h
+++ b/gtk2_ardour/actions.h
@@ -46,8 +46,8 @@ namespace ActionManager {
 
 	extern std::vector<Glib::RefPtr<Gtk::Action> > range_sensitive_actions;
 	extern std::vector<Glib::RefPtr<Gtk::Action> > transport_sensitive_actions;
-	extern std::vector<Glib::RefPtr<Gtk::Action> > jack_sensitive_actions;
-	extern std::vector<Glib::RefPtr<Gtk::Action> > jack_opposite_sensitive_actions;
+	extern std::vector<Glib::RefPtr<Gtk::Action> > engine_sensitive_actions;
+	extern std::vector<Glib::RefPtr<Gtk::Action> > engine_opposite_sensitive_actions;
 	extern std::vector<Glib::RefPtr<Gtk::Action> > edit_point_in_region_sensitive_actions;
 
 	extern void map_some_state (const char* group, const char* action, bool (ARDOUR::RCConfiguration::*get)() const);
diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in
index 716dd5a6d9..dd014f5fd9 100644
--- a/gtk2_ardour/ardev_common.sh.in
+++ b/gtk2_ardour/ardev_common.sh.in
@@ -17,6 +17,7 @@ export ARDOUR_DATA_PATH=$TOP:$TOP/build:$TOP/gtk2_ardour:$TOP/build/gtk2_ardour:
 export ARDOUR_MIDIMAPS_PATH=$TOP/midi_maps:.
 export ARDOUR_MCP_PATH=$TOP/mcp:.
 export ARDOUR_EXPORT_FORMATS_PATH=$TOP/export:.
+export ARDOUR_BACKEND_PATH=$libs/backends/jack
 
 #
 # even though we set the above variables, ardour requires that these 
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 15f1bde1b6..197b484698 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -495,27 +495,27 @@
       <menuitem action='show-marker-lines'/>
     </menu>
     <menu name='JACK' action='JACK'>
-      <menuitem action='JACKDisconnect'/>
-      <menuitem action='JACKReconnect'/>
+      <menuitem action='EngineDisconnect'/>
+      <menuitem action='EngineReconnect'/>
       <menu name='Latency' action='Latency'>
-        <menuitem action='JACKLatency32'/>
-        <menuitem action='JACKLatency64'/>
-        <menuitem action='JACKLatency128'/>
-        <menuitem action='JACKLatency256'/>
-        <menuitem action='JACKLatency512'/>
-        <menuitem action='JACKLatency1024'/>
-        <menuitem action='JACKLatency2048'/>
-        <menuitem action='JACKLatency4096'/>
-        <menuitem action='JACKLatency8192'/>
+        <menuitem action='EngineLatency32'/>
+        <menuitem action='EngineLatency64'/>
+        <menuitem action='EngineLatency128'/>
+        <menuitem action='EngineLatency256'/>
+        <menuitem action='EngineLatency512'/>
+        <menuitem action='EngineLatency1024'/>
+        <menuitem action='EngineLatency2048'/>
+        <menuitem action='EngineLatency4096'/>
+        <menuitem action='EngineLatency8192'/>
       </menu>
     </menu>
     <menu action = 'WindowMenu'>
+      <menuitem action='toggle-audio-midi-setup'/>
+      <separator/>
       <menuitem action='toggle-mixer'/>
       <menuitem action='toggle-meterbridge'/>
       <menuitem action='toggle-editor-mixer'/>
-
       <separator/>
-
       <menuitem action='toggle-inspector'/>
       <menuitem action='toggle-locations'/>
       <menuitem action='toggle-key-editor'/>
diff --git a/gtk2_ardour/ardour3_fonts.rc.in b/gtk2_ardour/ardour3_fonts.rc.in
index 7d017df4b3..8d09ff0f1d 100644
--- a/gtk2_ardour/ardour3_fonts.rc.in
+++ b/gtk2_ardour/ardour3_fonts.rc.in
@@ -50,6 +50,11 @@ style "large_bold_text"
  	font_name = "bold @FONT_LARGE@"
 }
 
+style "big_text"
+{
+        font_name = "@FONT_BIG@"
+}
+
 style "bigger_mono_text"
 {
 	font_name = "@MONOSPACE@ @FONT_BIGGER@"
diff --git a/gtk2_ardour/ardour3_styles.rc.in b/gtk2_ardour/ardour3_styles.rc.in
index e3978d063a..8b5b5e4c99 100644
--- a/gtk2_ardour/ardour3_styles.rc.in
+++ b/gtk2_ardour/ardour3_styles.rc.in
@@ -1011,3 +1011,8 @@ style "meter_strip_sep" = "default"
 {
   bg[NORMAL] = { 0.0, 0.0, 0.0 }
 }
+
+style "settings_notebook" = "big_text"
+{
+
+}
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 81c15ead95..6ec5dff8d1 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -58,9 +58,8 @@
 #include "gtkmm2ext/popup.h"
 #include "gtkmm2ext/window_title.h"
 
-#include "midi++/manager.h"
-
 #include "ardour/ardour.h"
+#include "ardour/audio_backend.h"
 #include "ardour/audioengine.h"
 #include "ardour/audiofilesource.h"
 #include "ardour/automation_watch.h"
@@ -158,10 +157,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 	  /* start of private members */
 
 	, _startup (0)
-	, engine (0)
 	, nsm (0)
 	, _was_dirty (false)
 	, _mixer_on_top (false)
+	, first_time_engine_run (true)
 
 	  /* transport */
 
@@ -203,7 +202,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
 	, _status_bar_visibility (X_("status-bar"))
 	, _feedback_exists (false)
-
+	, _audio_midi_setup (0)
 {
 	Gtkmm2ext::init(localedir);
 
@@ -214,15 +213,17 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 	}
 
 	ui_config = new UIConfiguration();
+
 	ui_config->ParameterChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed));
 	boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
 	ui_config->map_parameters (pc);
 
+	_audio_midi_setup = new EngineControl;
+
 	editor = 0;
 	mixer = 0;
 	meterbridge = 0;
 	editor = 0;
-	engine = 0;
 	_session_is_new = false;
 	session_selector_window = 0;
 	last_key_press_time = 0;
@@ -270,6 +271,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
 	ARDOUR::Session::AskAboutPendingState.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::pending_state_dialog, this));
 
+	/* handle Audio/MIDI setup when session requires it */
+
+	ARDOUR::Session::AudioEngineSetupRequired.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::do_audio_midi_setup, this, _1));
+
 	/* handle sr mismatch with a dialog (PROBLEM: needs to return a value and thus cannot be x-thread) */
 
 	ARDOUR::Session::AskAboutSampleRateMismatch.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::sr_mismatch_dialog, this, _1, _2));
@@ -368,6 +373,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 	_process_thread->init ();
 
 	DPIReset.connect (sigc::mem_fun (*this, &ARDOUR_UI::resize_text_widgets));
+
+	attach_to_engine ();
 }
 
 GlobalPortMatrixWindow*
@@ -379,45 +386,138 @@ ARDOUR_UI::create_global_port_matrix (ARDOUR::DataType type)
 	return new GlobalPortMatrixWindow (_session, type);
 }
 
-int
-ARDOUR_UI::create_engine ()
+void
+ARDOUR_UI::attach_to_engine ()
 {
-	// this gets called every time by new_session()
+	AudioEngine::instance()->Running.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_running, this), gui_context());
+	ARDOUR::Port::set_connecting_blocked (ARDOUR_COMMAND_LINE::no_connect_ports);
+}
 
-	if (engine) {
-		return 0;
+void
+ARDOUR_UI::engine_stopped ()
+{
+	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::engine_stopped)
+	ActionManager::set_sensitive (ActionManager::engine_sensitive_actions, false);
+	ActionManager::set_sensitive (ActionManager::engine_opposite_sensitive_actions, true);
+}
+
+void
+ARDOUR_UI::engine_running ()
+{
+	if (first_time_engine_run) {
+		post_engine();
+		first_time_engine_run = false;
 	}
+	
+	ActionManager::set_sensitive (ActionManager::engine_sensitive_actions, true);
+	ActionManager::set_sensitive (ActionManager::engine_opposite_sensitive_actions, false);
 
-	loading_message (_("Starting audio engine"));
+	Glib::RefPtr<Action> action;
+	const char* action_name = 0;
 
-	try {
-		engine = new ARDOUR::AudioEngine (ARDOUR_COMMAND_LINE::jack_client_name, ARDOUR_COMMAND_LINE::jack_session_uuid);
+	switch (AudioEngine::instance()->samples_per_cycle()) {
+	case 32:
+		action_name = X_("JACKLatency32");
+		break;
+	case 64:
+		action_name = X_("JACKLatency64");
+		break;
+	case 128:
+		action_name = X_("JACKLatency128");
+		break;
+	case 512:
+		action_name = X_("JACKLatency512");
+		break;
+	case 1024:
+		action_name = X_("JACKLatency1024");
+		break;
+	case 2048:
+		action_name = X_("JACKLatency2048");
+		break;
+	case 4096:
+		action_name = X_("JACKLatency4096");
+		break;
+	case 8192:
+		action_name = X_("JACKLatency8192");
+		break;
+	default:
+		/* XXX can we do anything useful ? */
+		break;
+	}
 
-	} catch (...) {
+	if (action_name) {
 
-		return -1;
+		action = ActionManager::get_action (X_("JACK"), action_name);
+
+		if (action) {
+			Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (action);
+			ract->set_active ();
+		}
+
+		update_disk_space ();
+		update_cpu_load ();
+		update_sample_rate (AudioEngine::instance()->sample_rate());
+		update_timecode_format ();
+	}
+}
+
+void
+ARDOUR_UI::engine_halted (const char* reason, bool free_reason)
+{
+	if (!Gtkmm2ext::UI::instance()->caller_is_ui_thread()) {
+		/* we can't rely on the original string continuing to exist when we are called
+		   again in the GUI thread, so make a copy and note that we need to
+		   free it later.
+		*/
+		char *copy = strdup (reason);
+		Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&ARDOUR_UI::engine_halted, this, copy, true));
+		return;
 	}
 
-	engine->Stopped.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_stopped, this), gui_context());
-	engine->Running.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_running, this), gui_context());
-	engine->SampleRateChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_sample_rate, this, _1), gui_context());
+	ActionManager::set_sensitive (ActionManager::engine_sensitive_actions, false);
+	ActionManager::set_sensitive (ActionManager::engine_opposite_sensitive_actions, true);
 
-	engine->Halted.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
+	update_sample_rate (0);
 
-	ARDOUR::Port::set_connecting_blocked (ARDOUR_COMMAND_LINE::no_connect_ports);
+	string msgstr;
 
-	post_engine ();
+	/* if the reason is a non-empty string, it means that the backend was shutdown
+	   rather than just Ardour.
+	*/
 
-	return 0;
+	if (strlen (reason)) {
+		msgstr = string_compose (_("The audio backend (JACK) was shutdown because:\n\n%1"), reason);
+	} else {
+		msgstr = string_compose (_("\
+JACK has either been shutdown or it\n\
+disconnected %1 because %1\n\
+was not fast enough. Try to restart\n\
+JACK, reconnect and save the session."), PROGRAM_NAME);
+	}
+
+	MessageDialog msg (*editor, msgstr);
+	pop_back_splash (msg);
+	msg.set_keep_above (true);
+	msg.run ();
+	
+	if (free_reason) {
+		free (const_cast<char*> (reason));
+	}
 }
 
 void
 ARDOUR_UI::post_engine ()
 {
-	/* Things to be done once we create the AudioEngine
+	/* Things to be done once (and once ONLY) after we have a backend running in the AudioEngine
 	 */
 
 	ARDOUR::init_post_engine ();
+	
+	/* connect to important signals */
+
+	AudioEngine::instance()->Stopped.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_stopped, this), gui_context());
+	AudioEngine::instance()->SampleRateChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_sample_rate, this, _1), gui_context());
+	AudioEngine::instance()->Halted.connect_same_thread (halt_connection, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
 
 	_tooltips.enable();
 
@@ -480,25 +580,9 @@ ARDOUR_UI::post_engine ()
 	Glib::signal_timeout().connect_seconds (sigc::mem_fun(*this, &ARDOUR_UI::update_wall_clock), 1);
 #endif
 
-	update_disk_space ();
-	update_cpu_load ();
-	update_sample_rate (engine->frame_rate());
-	update_timecode_format ();
-
 	Config->ParameterChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context());
 	boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
 	Config->map_parameters (pc);
-
-	/* now start and maybe save state */
-
-	if (do_engine_start () == 0) {
-		if (_session && _session_is_new) {
-			/* we need to retain initial visual
-			   settings for a new session
-			*/
-			_session->save_state ("");
-		}
-	}
 }
 
 ARDOUR_UI::~ARDOUR_UI ()
@@ -684,6 +768,7 @@ ARDOUR_UI::startup ()
 {
 	Application* app = Application::instance ();
 	char *nsm_url;
+
 	app->ShouldQuit.connect (sigc::mem_fun (*this, &ARDOUR_UI::queue_finish));
 	app->ShouldLoad.connect (sigc::mem_fun (*this, &ARDOUR_UI::idle_load));
 
@@ -778,7 +863,7 @@ ARDOUR_UI::check_memory_locking ()
 
 	XMLNode* memory_warning_node = Config->instant_xml (X_("no-memory-warning"));
 
-	if (engine->is_realtime() && memory_warning_node == 0) {
+	if (AudioEngine::instance()->is_realtime() && memory_warning_node == 0) {
 
 		struct rlimit limits;
 		int64_t ram;
@@ -918,7 +1003,8 @@ If you still wish to quit, please use the\n\n\
 		_session = 0;
 	}
 
-	engine->stop (true);
+	halt_connection.disconnect ();
+	AudioEngine::instance()->stop ();
 	quit ();
 }
 
@@ -1047,22 +1133,28 @@ ARDOUR_UI::update_sample_rate (framecnt_t)
 
 	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::update_sample_rate, ignored)
 
-	if (!engine->connected()) {
+	if (!AudioEngine::instance()->connected()) {
 
-		snprintf (buf, sizeof (buf), "%s", _("disconnected"));
+		snprintf (buf, sizeof (buf), _("Audio: <span foreground=\"red\">none</span>"));
 
 	} else {
 
-		framecnt_t rate = engine->frame_rate();
+		framecnt_t rate = AudioEngine::instance()->sample_rate();
 
-		if (fmod (rate, 1000.0) != 0.0) {
-			snprintf (buf, sizeof (buf), _("JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"),
-				  (float) rate/1000.0f,
-				  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
+		if (rate == 0) {
+			/* no sample rate available */
+			snprintf (buf, sizeof (buf), _("Audio: <span foreground=\"red\">none</span>"));
 		} else {
-			snprintf (buf, sizeof (buf), _("JACK: <span foreground=\"green\">%" PRId64 " kHz / %4.1f ms</span>"),
-				  rate/1000,
-				  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
+
+			if (fmod (rate, 1000.0) != 0.0) {
+				snprintf (buf, sizeof (buf), _("Audio: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"),
+					  (float) rate / 1000.0f,
+					  (AudioEngine::instance()->usecs_per_cycle() / 1000.0f));
+			} else {
+				snprintf (buf, sizeof (buf), _("Audio: <span foreground=\"green\">%" PRId64 " kHz / %4.1f ms</span>"),
+					  rate/1000,
+					  (AudioEngine::instance()->usecs_per_cycle() / 1000.0f));
+			}
 		}
 	}
 
@@ -1132,7 +1224,7 @@ ARDOUR_UI::update_cpu_load ()
 	   should also be changed.
 	*/
 
-	float const c = engine->get_cpu_load ();
+	float const c = AudioEngine::instance()->get_cpu_load ();
 	snprintf (buf, sizeof (buf), _("DSP: <span foreground=\"%s\">%5.1f%%</span>"), c >= 90 ? X_("red") : X_("green"), c);
 	cpu_load_label.set_markup (buf);
 }
@@ -1186,6 +1278,11 @@ ARDOUR_UI::update_disk_space()
 	char buf[64];
 	framecnt_t fr = _session->frame_rate();
 
+	if (fr == 0) {
+		/* skip update - no SR available */
+		return;
+	}
+
 	if (!opt_frames) {
 		/* Available space is unknown */
 		snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">Unknown</span>"));
@@ -1448,20 +1545,16 @@ ARDOUR_UI::open_recent_session ()
 bool
 ARDOUR_UI::check_audioengine ()
 {
-	if (engine) {
-		if (!engine->connected()) {
-			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);
-			msg.run ();
-			return false;
-		}
-		return true;
-	} else {
+	if (!AudioEngine::instance()->connected()) {
+		MessageDialog msg (string_compose (
+					   _("%1 is not connected to any audio backend.\n"
+					     "You cannot open or close sessions in this condition"),
+					   PROGRAM_NAME));
+		pop_back_splash (msg);
+		msg.run ();
 		return false;
 	}
+	return true;
 }
 
 void
@@ -1667,10 +1760,17 @@ ARDOUR_UI::transport_goto_wallclock ()
 
 		time (&now);
 		localtime_r (&now, &tmnow);
+		
+		int frame_rate = _session->frame_rate();
+		
+		if (frame_rate == 0) {
+			/* no frame rate available */
+			return;
+		}
 
-		frames = tmnow.tm_hour * (60 * 60 * _session->frame_rate());
-		frames += tmnow.tm_min * (60 * _session->frame_rate());
-		frames += tmnow.tm_sec * _session->frame_rate();
+		frames = tmnow.tm_hour * (60 * 60 * frame_rate);
+		frames += tmnow.tm_min * (60 * frame_rate);
+		frames += tmnow.tm_sec * frame_rate;
 
 		_session->request_locate (frames, _session->transport_rolling ());
 
@@ -2031,127 +2131,6 @@ ARDOUR_UI::map_transport_state ()
 }
 
 void
-ARDOUR_UI::engine_stopped ()
-{
-	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::engine_stopped)
-	ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, false);
-	ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, true);
-}
-
-void
-ARDOUR_UI::engine_running ()
-{
-	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::engine_running)
-	ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, true);
-	ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, false);
-
-	Glib::RefPtr<Action> action;
-	const char* action_name = 0;
-
-	switch (engine->frames_per_cycle()) {
-	case 32:
-		action_name = X_("JACKLatency32");
-		break;
-	case 64:
-		action_name = X_("JACKLatency64");
-		break;
-	case 128:
-		action_name = X_("JACKLatency128");
-		break;
-	case 512:
-		action_name = X_("JACKLatency512");
-		break;
-	case 1024:
-		action_name = X_("JACKLatency1024");
-		break;
-	case 2048:
-		action_name = X_("JACKLatency2048");
-		break;
-	case 4096:
-		action_name = X_("JACKLatency4096");
-		break;
-	case 8192:
-		action_name = X_("JACKLatency8192");
-		break;
-	default:
-		/* XXX can we do anything useful ? */
-		break;
-	}
-
-	if (action_name) {
-
-		action = ActionManager::get_action (X_("JACK"), action_name);
-
-		if (action) {
-			Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (action);
-			ract->set_active ();
-		}
-	}
-}
-
-void
-ARDOUR_UI::engine_halted (const char* reason, bool free_reason)
-{
-	if (!Gtkmm2ext::UI::instance()->caller_is_ui_thread()) {
-		/* we can't rely on the original string continuing to exist when we are called
-		   again in the GUI thread, so make a copy and note that we need to
-		   free it later.
-		*/
-		char *copy = strdup (reason);
-		Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&ARDOUR_UI::engine_halted, this, copy, true));
-		return;
-	}
-
-	ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, false);
-	ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, true);
-
-	update_sample_rate (0);
-
-	string msgstr;
-
-	/* if the reason is a non-empty string, it means that the backend was shutdown
-	   rather than just Ardour.
-	*/
-
-	if (strlen (reason)) {
-		msgstr = string_compose (_("The audio backend (JACK) was shutdown because:\n\n%1"), reason);
-	} else {
-		msgstr = string_compose (_("\
-JACK has either been shutdown or it\n\
-disconnected %1 because %1\n\
-was not fast enough. Try to restart\n\
-JACK, reconnect and save the session."), PROGRAM_NAME);
-	}
-
-	MessageDialog msg (*editor, msgstr);
-	pop_back_splash (msg);
-	msg.set_keep_above (true);
-	msg.run ();
-	
-	if (free_reason) {
-		free (const_cast<char*> (reason));
-	}
-}
-
-int32_t
-ARDOUR_UI::do_engine_start ()
-{
-	try {
-		engine->start();
-	}
-
-	catch (...) {
-		engine->stop ();
-		error << _("Unable to start the session running")
-		      << endmsg;
-		unload_session ();
-		return -2;
-	}
-
-	return 0;
-}
-
-void
 ARDOUR_UI::update_clocks ()
 {
 	if (!editor || !editor->dragging_playhead()) {
@@ -2701,10 +2680,6 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 			}
 		}
 	
-		if (create_engine ()) {
-			break;
-		}
-
 		if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
 
 			if (likely_new && !nsm) {
@@ -2800,25 +2775,23 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
 	int unload_status;
 	int retval = -1;
 
-	session_loaded = false;
-
-	if (!check_audioengine()) {
-		return -2;
+	if (_session) {
+		unload_status = unload_session ();
+		
+		if (unload_status < 0) {
+			goto out;
+		} else if (unload_status > 0) {
+			retval = 0;
+			goto out;
+		}
 	}
 
-	unload_status = unload_session ();
-
-	if (unload_status < 0) {
-		goto out;
-	} else if (unload_status > 0) {
-		retval = 0;
-		goto out;
-	}
+	session_loaded = false;
 
 	loading_message (string_compose (_("Please wait while %1 loads your session"), PROGRAM_NAME));
 
 	try {
-		new_session = new Session (*engine, path, snap_name, 0, mix_template);
+		new_session = new Session (*AudioEngine::instance(), path, snap_name, 0, mix_template);
 	}
 
 	/* this one is special */
@@ -2919,12 +2892,7 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
 	Session *new_session;
 	int x;
 
-	if (!check_audioengine()) {
-		return -1;
-	}
-
 	session_loaded = false;
-
 	x = unload_session ();
 
 	if (x < 0) {
@@ -2936,7 +2904,7 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
 	_session_is_new = true;
 
 	try {
-		new_session = new Session (*engine, path, snap_name, &bus_profile);
+		new_session = new Session (*AudioEngine::instance(), path, snap_name, &bus_profile);
 	}
 
 	catch (...) {
@@ -3823,31 +3791,33 @@ audio may be played at the wrong sample rate.\n"), desired, PROGRAM_NAME, actual
         return 1;
 }
 
-
 void
-ARDOUR_UI::disconnect_from_jack ()
+ARDOUR_UI::disconnect_from_engine ()
 {
-	if (engine) {
-		if (engine->disconnect_from_jack ()) {
-			MessageDialog msg (*editor, _("Could not disconnect from JACK"));
-			msg.run ();
-		}
-
-		update_sample_rate (0);
+	/* drop connection to AudioEngine::Halted so that we don't act
+	 *  as if the engine unexpectedly shut down
+	 */
+	halt_connection.disconnect ();
+	
+	if (AudioEngine::instance()->stop ()) {
+		MessageDialog msg (*editor, _("Could not disconnect from JACK"));
+		msg.run ();
+	} else {
+		AudioEngine::instance()->Halted.connect_same_thread (halt_connection, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
 	}
+	
+	update_sample_rate (0);
 }
 
 void
-ARDOUR_UI::reconnect_to_jack ()
+ARDOUR_UI::reconnect_to_engine ()
 {
-	if (engine) {
-		if (engine->reconnect_to_jack ()) {
-			MessageDialog msg (*editor,  _("Could not reconnect to JACK"));
-			msg.run ();
-		}
-
-		update_sample_rate (0);
+	if (AudioEngine::instance()->start ()) {
+		MessageDialog msg (*editor,  _("Could not reconnect to JACK"));
+		msg.run ();
 	}
+	
+	update_sample_rate (0);
 }
 
 void
@@ -4154,3 +4124,49 @@ ARDOUR_UI::reset_route_peak_display (Route* route)
 		reset_peak_display ();
 	}
 }
+
+void
+ARDOUR_UI::toggle_audio_midi_setup ()
+{
+	Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("toggle-audio-midi-setup"));
+	if (!act) {
+		return;
+	}
+
+	Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+
+	if (tact->get_active()) {
+		launch_audio_midi_setup ();
+	} else {
+		_audio_midi_setup->hide ();
+	}
+}
+
+void
+ARDOUR_UI::launch_audio_midi_setup ()
+{
+	if (!_audio_midi_setup) {
+		_audio_midi_setup = new EngineControl ();
+	}
+
+	_audio_midi_setup->present ();
+}
+						
+int
+ARDOUR_UI::do_audio_midi_setup (uint32_t desired_sample_rate)
+{
+	launch_audio_midi_setup ();
+
+	_audio_midi_setup->set_desired_sample_rate (desired_sample_rate);
+
+	int r = _audio_midi_setup->run ();
+
+	switch (r) {
+	case Gtk::RESPONSE_OK:
+		return 0;
+	case Gtk::RESPONSE_APPLY:
+		return 0;
+	default:
+		return -1;
+	}
+}
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 551e115efa..381ae20afc 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -89,6 +89,7 @@ class BigClockWindow;
 class BundleManager;
 class ButtonJoiner;
 class ConnectionEditor;
+class EngineControl;
 class KeyEditor;
 class LocationUIWindow;
 class MainClock;
@@ -263,7 +264,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 		session_add_midi_route (false);
 	}*/
 
-	int  create_engine ();
+        void attach_to_engine ();
 	void post_engine ();
 
 	gint exit_on_main_window_close (GdkEventAny *);
@@ -301,19 +302,18 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void reenable_hide_loop_punch_ruler_if_appropriate ();
 	void toggle_auto_return ();
 	void toggle_click ();
-
+        void toggle_audio_midi_setup ();
 	void toggle_session_auto_loop ();
-
 	void toggle_rc_options_window ();
 	void toggle_session_options_window ();
 
   private:
 	ArdourStartup*      _startup;
-	ARDOUR::AudioEngine *engine;
 	Gtk::Tooltips        _tooltips;
 	NSM_Client          *nsm;
 	bool                 _was_dirty;
         bool                 _mixer_on_top;
+        bool first_time_engine_run;
 
 	void goto_editor_window ();
 	void goto_mixer_window ();
@@ -666,9 +666,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	int pending_state_dialog ();
 	int sr_mismatch_dialog (ARDOUR::framecnt_t, ARDOUR::framecnt_t);
 
-	void disconnect_from_jack ();
-	void reconnect_to_jack ();
-	void set_jack_buffer_size (ARDOUR::pframes_t);
+	void disconnect_from_engine ();
+	void reconnect_to_engine ();
+	void set_engine_buffer_size (ARDOUR::pframes_t);
 
 	Gtk::MenuItem* jack_disconnect_item;
 	Gtk::MenuItem* jack_reconnect_item;
@@ -709,6 +709,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 	void loading_message (const std::string& msg);
 
 	PBD::ScopedConnectionList forever_connections;
+        PBD::ScopedConnection halt_connection; 
 
         void step_edit_status_change (bool);
 
@@ -745,6 +746,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 
         std::string _announce_string;
         void check_announcements ();
+
+        EngineControl* _audio_midi_setup;
+        void launch_audio_midi_setup ();
+        int do_audio_midi_setup (uint32_t);
 };
 
 #endif /* __ardour_gui_h__ */
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 24f6511b4c..db9e420206 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -161,10 +161,6 @@ ARDOUR_UI::set_session (Session *s)
 	_session->locations()->removed.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::handle_locations_change, this, _1), gui_context());
 	_session->config.ParameterChanged.connect (_session_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_parameter_changed, this, _1), gui_context ());
 
-#ifdef HAVE_JACK_SESSION
-	engine->JackSessionEvent.connect (*_session, MISSING_INVALIDATOR, boost::bind (&Session::jack_session_event, _session, _1), gui_context());
-#endif
-
 	/* Clocks are on by default after we are connected to a session, so show that here.
 	*/
 
@@ -279,7 +275,10 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 	rec_button.set_sensitive (false);
 
 	WM::Manager::instance().set_session ((ARDOUR::Session*) 0);
-	ARDOUR_UI::instance()->video_timeline->close_session();
+
+	if (ARDOUR_UI::instance()->video_timeline) {
+		ARDOUR_UI::instance()->video_timeline->close_session();
+	}
 
 	stop_blinking ();
 	stop_clocking ();
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 6c050578ec..53ea7c02de 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -183,38 +183,38 @@ ARDOUR_UI::install_actions ()
 	ActionManager::write_sensitive_actions.push_back (act);
 	ActionManager::session_sensitive_actions.push_back (act);
 
-	/* JACK actions for controlling ... JACK */
-
-	Glib::RefPtr<ActionGroup> jack_actions = ActionGroup::create (X_("JACK"));
-	ActionManager::register_action (jack_actions, X_("JACK"), _("JACK"));
-	ActionManager::register_action (jack_actions, X_("Latency"), _("Latency"));
-
-	act = ActionManager::register_action (jack_actions, X_("JACKReconnect"), _("Reconnect"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::reconnect_to_jack));
-	ActionManager::jack_opposite_sensitive_actions.push_back (act);
-
-	act = ActionManager::register_action (jack_actions, X_("JACKDisconnect"), _("Disconnect"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::disconnect_from_jack));
-	ActionManager::jack_sensitive_actions.push_back (act);
-
-	RadioAction::Group jack_latency_group;
-
-	act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency32"), X_("32"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 32));
-	ActionManager::jack_sensitive_actions.push_back (act);
-	act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency64"), X_("64"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 64));
-	ActionManager::jack_sensitive_actions.push_back (act);
-	act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency128"), X_("128"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 128));
-	ActionManager::jack_sensitive_actions.push_back (act);
-	act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency256"), X_("256"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 256));
-	ActionManager::jack_sensitive_actions.push_back (act);
-	act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency512"), X_("512"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 512));
-	ActionManager::jack_sensitive_actions.push_back (act);
-	act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency1024"), X_("1024"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 1024));
-	ActionManager::jack_sensitive_actions.push_back (act);
-	act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency2048"), X_("2048"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 2048));
-	ActionManager::jack_sensitive_actions.push_back (act);
-	act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency4096"), X_("4096"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 4096));
-	ActionManager::jack_sensitive_actions.push_back (act);
-	act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency8192"), X_("8192"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 8192));
-	ActionManager::jack_sensitive_actions.push_back (act);
+	/* AudioEngine actions */
+
+	Glib::RefPtr<ActionGroup> engine_actions = ActionGroup::create (X_("Audio"));
+	ActionManager::register_action (engine_actions, X_("JACK"), _("JACK"));
+	ActionManager::register_action (engine_actions, X_("Latency"), _("Latency"));
+
+	act = ActionManager::register_action (engine_actions, X_("EngineReconnect"), _("Reconnect"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::reconnect_to_engine));
+	ActionManager::engine_opposite_sensitive_actions.push_back (act);
+
+	act = ActionManager::register_action (engine_actions, X_("EngineDisconnect"), _("Disconnect"), sigc::mem_fun (*(ARDOUR_UI::instance()), &ARDOUR_UI::disconnect_from_engine));
+	ActionManager::engine_sensitive_actions.push_back (act);
+
+	RadioAction::Group latency_group;
+
+	act = ActionManager::register_radio_action (engine_actions, latency_group, X_("EngineLatency32"), X_("32"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_engine_buffer_size), (pframes_t) 32));
+	ActionManager::engine_sensitive_actions.push_back (act);
+	act = ActionManager::register_radio_action (engine_actions, latency_group, X_("EngineLatency64"), X_("64"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_engine_buffer_size), (pframes_t) 64));
+	ActionManager::engine_sensitive_actions.push_back (act);
+	act = ActionManager::register_radio_action (engine_actions, latency_group, X_("EngineLatency128"), X_("128"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_engine_buffer_size), (pframes_t) 128));
+	ActionManager::engine_sensitive_actions.push_back (act);
+	act = ActionManager::register_radio_action (engine_actions, latency_group, X_("EngineLatency256"), X_("256"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_engine_buffer_size), (pframes_t) 256));
+	ActionManager::engine_sensitive_actions.push_back (act);
+	act = ActionManager::register_radio_action (engine_actions, latency_group, X_("EngineLatency512"), X_("512"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_engine_buffer_size), (pframes_t) 512));
+	ActionManager::engine_sensitive_actions.push_back (act);
+	act = ActionManager::register_radio_action (engine_actions, latency_group, X_("EngineLatency1024"), X_("1024"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_engine_buffer_size), (pframes_t) 1024));
+	ActionManager::engine_sensitive_actions.push_back (act);
+	act = ActionManager::register_radio_action (engine_actions, latency_group, X_("EngineLatency2048"), X_("2048"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_engine_buffer_size), (pframes_t) 2048));
+	ActionManager::engine_sensitive_actions.push_back (act);
+	act = ActionManager::register_radio_action (engine_actions, latency_group, X_("EngineLatency4096"), X_("4096"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_engine_buffer_size), (pframes_t) 4096));
+	ActionManager::engine_sensitive_actions.push_back (act);
+	act = ActionManager::register_radio_action (engine_actions, latency_group, X_("EngineLatency8192"), X_("8192"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_engine_buffer_size), (pframes_t) 8192));
+	ActionManager::engine_sensitive_actions.push_back (act);
 
 	/* these actions are intended to be shared across all windows */
 
@@ -230,6 +230,7 @@ ARDOUR_UI::install_actions ()
 	ActionManager::register_toggle_action (common_actions, X_("toggle-mixer"), S_("Window|Mixer"),  sigc::mem_fun(*this, &ARDOUR_UI::toggle_mixer_window));
 	ActionManager::register_action (common_actions, X_("toggle-editor-mixer"), _("Toggle Editor+Mixer"),  sigc::mem_fun(*this, &ARDOUR_UI::toggle_editor_mixer));
 	ActionManager::register_toggle_action (common_actions, X_("toggle-meterbridge"), S_("Window|Meterbridge"),  sigc::mem_fun(*this, &ARDOUR_UI::toggle_meterbridge));
+	ActionManager::register_toggle_action (common_actions, X_("toggle-audio-midi-setup"), S_("Window|Audio/MIDI Setup"),  sigc::mem_fun(*this, &ARDOUR_UI::toggle_audio_midi_setup));
 
 	act = ActionManager::register_action (common_actions, X_("NewMIDITracer"), _("MIDI Tracer"), sigc::mem_fun(*this, &ARDOUR_UI::new_midi_tracer_window));
 	ActionManager::session_sensitive_actions.push_back (act);
@@ -421,7 +422,7 @@ ARDOUR_UI::install_actions ()
 
 	ActionManager::add_action_group (shuttle_actions);
 	ActionManager::add_action_group (option_actions);
-	ActionManager::add_action_group (jack_actions);
+	ActionManager::add_action_group (engine_actions);
 	ActionManager::add_action_group (transport_actions);
 	ActionManager::add_action_group (main_actions);
 	ActionManager::add_action_group (main_menu_actions);
@@ -430,38 +431,38 @@ ARDOUR_UI::install_actions ()
 }
 
 void
-ARDOUR_UI::set_jack_buffer_size (pframes_t nframes)
+ARDOUR_UI::set_engine_buffer_size (pframes_t nframes)
 {
 	Glib::RefPtr<Action> action;
 	const char* action_name = 0;
 
 	switch (nframes) {
 	case 32:
-		action_name = X_("JACKLatency32");
+		action_name = X_("EngineLatency32");
 		break;
 	case 64:
-		action_name = X_("JACKLatency64");
+		action_name = X_("EngineLatency64");
 		break;
 	case 128:
-		action_name = X_("JACKLatency128");
+		action_name = X_("EngineLatency128");
 		break;
 	case 256:
-		action_name = X_("JACKLatency256");
+		action_name = X_("EngineLatency256");
 		break;
 	case 512:
-		action_name = X_("JACKLatency512");
+		action_name = X_("EngineLatency512");
 		break;
 	case 1024:
-		action_name = X_("JACKLatency1024");
+		action_name = X_("EngineLatency1024");
 		break;
 	case 2048:
-		action_name = X_("JACKLatency2048");
+		action_name = X_("EngineLatency2048");
 		break;
 	case 4096:
-		action_name = X_("JACKLatency4096");
+		action_name = X_("EngineLatency4096");
 		break;
 	case 8192:
-		action_name = X_("JACKLatency8192");
+		action_name = X_("EngineLatency8192");
 		break;
 	default:
 		/* XXX can we do anything useful ? */
@@ -476,7 +477,7 @@ ARDOUR_UI::set_jack_buffer_size (pframes_t nframes)
 			Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (action);
 
 			if (ract && ract->get_active()) {
-				engine->request_buffer_size (nframes);
+				AudioEngine::instance()->request_buffer_size (nframes);
 				update_sample_rate (0);
 			}
 		}
@@ -647,11 +648,10 @@ ARDOUR_UI::save_ardour_state ()
 	window_node->add_child_nocopy (*tearoff_node);
 
 	Config->add_extra_xml (*window_node);
+	Config->add_extra_xml (_audio_midi_setup->get_state());
 
-	if (_startup && _startup->engine_control() && _startup->engine_control()->was_used()) {
-		Config->add_extra_xml (_startup->engine_control()->get_state());
-	}
 	Config->save_state();
+
 	if (ui_config->dirty()) {
 		ui_config->save_state ();
 	}
diff --git a/gtk2_ardour/arval b/gtk2_ardour/arval
index 6503bc1ede..2209dcb110 100755
--- a/gtk2_ardour/arval
+++ b/gtk2_ardour/arval
@@ -10,5 +10,6 @@ LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
 export ARDOUR_RUNNING_UNDER_VALGRIND=TRUE
 exec valgrind --tool=memcheck \
 	$VALGRIND_OPTIONS \
+        --track-origins=yes \
 	--suppressions=`dirname "$0"`/../tools/valgrind.supp \
 	$TOP/$EXECUTABLE --novst "$@"
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 7af556416d..c140ef71ab 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1260,7 +1260,8 @@ Editor::set_session (Session *t)
 
 	/* These signals can all be emitted by a non-GUI thread. Therefore the
 	   handlers for them must not attempt to directly interact with the GUI,
-	   but use Gtkmm2ext::UI::instance()->call_slot();
+	   but use PBD::Signal<T>::connect() which accepts an event loop
+	   ("context") where the handler will be asked to run.
 	*/
 
 	_session->StepEditStatusChange.connect (_session_connections, invalidator (*this), boost::bind (&Editor::step_edit_status_change, this, _1), gui_context());
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index 3cb2d378c2..7089372e63 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -962,7 +962,5 @@ void *
 Editor::import_thread ()
 {
 	_session->import_files (import_status);
-	pthread_exit_pbd (0);
-	/*NOTREACHED*/
 	return 0;
 }
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 92d009f531..d9580c1eeb 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -2377,9 +2377,14 @@ CursorDrag::fake_locate (framepos_t t)
 	Session* s = _editor->session ();
 	if (s->timecode_transmission_suspended ()) {
 		framepos_t const f = _editor->playhead_cursor->current_frame ();
+		/* This is asynchronous so it will be sent "now"
+		 */
 		s->send_mmc_locate (f);
-		s->send_full_time_code (f);
-		s->send_song_position_pointer (f);
+		/* These are synchronous and will be sent during the next
+		   process cycle
+		*/
+		s->queue_full_time_code ();
+		s->queue_song_position_pointer ();
 	}
 
 	show_verbose_cursor_time (t);
diff --git a/gtk2_ardour/editor_videotimeline.cc b/gtk2_ardour/editor_videotimeline.cc
index 3f12c59179..4bf8b047cb 100644
--- a/gtk2_ardour/editor_videotimeline.cc
+++ b/gtk2_ardour/editor_videotimeline.cc
@@ -125,7 +125,8 @@ Editor::export_video ()
 				break;
 		}
 	}
-	ExportVideoDialog dialog (*this, _session);
-	dialog.run();
+	ExportVideoDialog dialog (_session, get_selection().time);
+	Gtk::ResponseType r = (Gtk::ResponseType) dialog.run();
+	(void) r; // keep gcc quiet
 	dialog.hide();
 }
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 05cd9a661e..d724f4f4d3 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include <exception>
 #include <vector>
 #include <cmath>
 #include <fstream>
@@ -24,37 +25,27 @@
 
 #include <boost/scoped_ptr.hpp>
 
-#include <glibmm.h>
 #include <gtkmm/messagedialog.h>
 
-#include "pbd/epa.h"
+#include "pbd/error.h"
 #include "pbd/xml++.h"
-
-#ifdef __APPLE__
-#include <CoreAudio/CoreAudio.h>
-#include <CoreFoundation/CFString.h>
-#include <sys/param.h>
-#include <mach-o/dyld.h>
-#elif !defined(__FreeBSD__)
-#include <alsa/asoundlib.h>
-#endif
-
-#include <jack/jack.h>
+#include "pbd/unwind.h"
 
 #include <gtkmm/stock.h>
+#include <gtkmm/notebook.h>
 #include <gtkmm2ext/utils.h>
 
+#include "ardour/audio_backend.h"
+#include "ardour/audioengine.h"
+#include "ardour/mtdm.h"
 #include "ardour/rc_configuration.h"
+#include "ardour/types.h"
 
 #include "pbd/convert.h"
 #include "pbd/error.h"
-#include "pbd/pathscanner.h"
-
-#ifdef __APPLE
-#include <CFBundle.h>
-#endif
 
 #include "engine_dialog.h"
+#include "gui_thread.h"
 #include "i18n.h"
 
 using namespace std;
@@ -64,322 +55,236 @@ using namespace PBD;
 using namespace Glib;
 
 EngineControl::EngineControl ()
-	: periods_adjustment (2, 2, 16, 1, 2),
-	  periods_spinner (periods_adjustment),
-	  ports_adjustment (128, 8, 1024, 1, 16),
-	  ports_spinner (ports_adjustment),
-	  input_latency_adjustment (0, 0, 99999, 1),
-	  input_latency (input_latency_adjustment),
-	  output_latency_adjustment (0, 0, 99999, 1),
-	  output_latency (output_latency_adjustment),
-	  realtime_button (_("Realtime")),
-	  no_memory_lock_button (_("Do not lock memory")),
-	  unlock_memory_button (_("Unlock memory")),
-	  soft_mode_button (_("No zombies")),
-	  monitor_button (_("Provide monitor ports")),
-	  force16bit_button (_("Force 16 bit")),
-	  hw_monitor_button (_("H/W monitoring")),
-	  hw_meter_button (_("H/W metering")),
-	  verbose_output_button (_("Verbose output")),
-	  start_button (_("Start")),
-	  stop_button (_("Stop")),
-#ifdef __APPLE___
-	  basic_packer (5, 2),
-	  options_packer (4, 2),
-	  device_packer (4, 2)
-#else
-	  basic_packer (8, 2),
-	  options_packer (14, 2),
-	  device_packer (6, 2)
-#endif
+	: ArdourDialog (_("Audio/MIDI Setup"))
+	, input_latency_adjustment (0, 0, 99999, 1)
+	, input_latency (input_latency_adjustment)
+	, output_latency_adjustment (0, 0, 99999, 1)
+	, output_latency (output_latency_adjustment)
+	, input_channels_adjustment (0, 0, 256, 1)
+	, input_channels (input_channels_adjustment)
+	, output_channels_adjustment (0, 0, 256, 1)
+	, output_channels (output_channels_adjustment)
+	, ports_adjustment (128, 8, 1024, 1, 16)
+	, ports_spinner (ports_adjustment)
+	, control_app_button (_("Launch Control App"))
+	, lm_measure_button (_("Measure latency"))
+	, lm_use_button (_("Use results"))
+	, lm_table (5, 2)
+	, basic_packer (9, 3)
+	, ignore_changes (0)
+	, _desired_sample_rate (0)
+{
+	build_notebook ();
+
+	get_vbox()->set_border_width (12);
+	get_vbox()->pack_start (notebook);
+
+	control_app_button.signal_clicked().connect (mem_fun (*this, &EngineControl::control_app_button_clicked));
+	manage_control_app_sensitivity ();
+
+	add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+	add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
+	add_button (Gtk::Stock::APPLY, Gtk::RESPONSE_APPLY);
+
+	/* Pick up any existing audio setup configuration, if appropriate */
+
+	XMLNode* audio_setup = ARDOUR::Config->extra_xml ("AudioMIDISetup");
+	
+	/* push a change as if we altered the backend */
+	backend_changed ();
+
+	if (audio_setup) {
+		set_state (*audio_setup);
+	} 
+}
+
+void
+EngineControl::on_response (int response_id)
+{
+	ArdourDialog::on_response (response_id);
+
+	switch (response_id) {
+	case RESPONSE_APPLY:
+		push_state_to_backend (true);
+		break;
+	case RESPONSE_OK:
+		push_state_to_backend (true);
+		hide ();
+		break;
+	default:
+		hide ();
+	}
+}
+
+void
+EngineControl::build_notebook ()
 {
 	using namespace Notebook_Helpers;
 	Label* label;
 	vector<string> strings;
 	int row = 0;
 
-	_used = false;
-
-	strings.push_back (_("8000Hz"));
-	strings.push_back (_("22050Hz"));
-	strings.push_back (_("44100Hz"));
-	strings.push_back (_("48000Hz"));
-	strings.push_back (_("88200Hz"));
-	strings.push_back (_("96000Hz"));
-	strings.push_back (_("192000Hz"));
-	set_popdown_strings (sample_rate_combo, strings);
-	sample_rate_combo.set_active_text ("48000Hz");
-
-	strings.clear ();
-	strings.push_back ("32");
-	strings.push_back ("64");
-	strings.push_back ("128");
-	strings.push_back ("256");
-	strings.push_back ("512");
-	strings.push_back ("1024");
-	strings.push_back ("2048");
-	strings.push_back ("4096");
-	strings.push_back ("8192");
-	set_popdown_strings (period_size_combo, strings);
-	period_size_combo.set_active_text ("1024");
-
-	strings.clear ();
-	strings.push_back (_("None"));
-	strings.push_back (_("Triangular"));
-	strings.push_back (_("Rectangular"));
-	strings.push_back (_("Shaped"));
-	set_popdown_strings (dither_mode_combo, strings);
-	dither_mode_combo.set_active_text (_("None"));
-
-	/* basic parameters */
+	vector<const ARDOUR::AudioBackendInfo*> backends = ARDOUR::AudioEngine::instance()->available_backends();
+	for (vector<const ARDOUR::AudioBackendInfo*>::const_iterator b = backends.begin(); b != backends.end(); ++b) {
+		strings.push_back ((*b)->name);
+	}
+
+	set_popdown_strings (backend_combo, strings);
+	backend_combo.set_active_text (strings.front());
 
 	basic_packer.set_spacings (6);
+	basic_packer.set_border_width (12);
+	basic_packer.set_homogeneous (true);
 
-	strings.clear ();
-#ifdef __APPLE__
-	strings.push_back (X_("CoreAudio"));
-#else
-#ifndef __FreeBSD__
-	strings.push_back (X_("ALSA"));
-#endif
-	strings.push_back (X_("OSS"));
-	strings.push_back (X_("FreeBoB"));
-	strings.push_back (X_("FFADO"));
-#endif
-	strings.push_back (X_("NetJACK"));
-	strings.push_back (X_("Dummy"));
-	set_popdown_strings (driver_combo, strings);
-	driver_combo.set_active_text (strings.front());
+	row = 0;
 
-	driver_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::driver_changed));
-	driver_changed ();
-
-	strings.clear ();
-	strings.push_back (_("Playback/recording on 1 device"));
-	strings.push_back (_("Playback/recording on 2 devices"));
-	strings.push_back (_("Playback only"));
-	strings.push_back (_("Recording only"));
-	set_popdown_strings (audio_mode_combo, strings);
-	audio_mode_combo.set_active_text (strings.front());
-
-	audio_mode_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::audio_mode_changed));
-	audio_mode_changed ();
-
-	strings.clear ();
-	strings.push_back (_("None"));
-#ifdef __APPLE__
-	strings.push_back (_("coremidi"));
-#else
-	strings.push_back (_("seq"));
-	strings.push_back (_("raw"));
-#endif
-	set_popdown_strings (midi_driver_combo, strings);
-	midi_driver_combo.set_active_text (strings.front ());
+	AttachOptions xopt = AttachOptions (FILL|EXPAND);
 
-	row = 0;
+	label = manage (left_aligned_label (_("Audio System:")));
+	basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
+	basic_packer.attach (backend_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
+	row++;
 
 	label = manage (left_aligned_label (_("Driver:")));
-	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	basic_packer.attach (driver_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+	basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
+	basic_packer.attach (driver_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
 	row++;
 
-	label = manage (left_aligned_label (_("Audio Interface:")));
-	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	basic_packer.attach (interface_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+	label = manage (left_aligned_label (_("Device:")));
+	basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
+	basic_packer.attach (device_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
 	row++;
 
 	label = manage (left_aligned_label (_("Sample rate:")));
-	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	basic_packer.attach (sample_rate_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+	basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
+	basic_packer.attach (sample_rate_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
 	row++;
 
-	label = manage (left_aligned_label (_("Buffer size:")));
-	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	basic_packer.attach (period_size_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	row++;
 
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
-	label = manage (left_aligned_label (_("Number of buffers:")));
-	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	basic_packer.attach (periods_spinner, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	periods_spinner.set_value (2);
+	label = manage (left_aligned_label (_("Buffer size:")));
+	basic_packer.attach (*label, 0, 1, row, row + 1, xopt, (AttachOptions) 0);
+	basic_packer.attach (buffer_size_combo, 1, 2, row, row + 1, xopt, (AttachOptions) 0);
+	buffer_size_duration_label.set_alignment (0.0); /* left-align */
+	basic_packer.attach (buffer_size_duration_label, 2, 3, row, row+1, xopt, (AttachOptions) 0);
 	row++;
-#endif
 
-	label = manage (left_aligned_label (_("Approximate latency:")));
-	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	basic_packer.attach (latency_label, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	row++;
 
-	sample_rate_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::redisplay_latency));
-	periods_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &EngineControl::redisplay_latency));
-	period_size_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::redisplay_latency));
-	redisplay_latency();
-	row++;
-	/* no audio mode with CoreAudio, its duplex or nuthin' */
+	label = manage (left_aligned_label (_("Input Channels:")));
+	basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
+	basic_packer.attach (input_channels, 1, 2, row, row+1, xopt, (AttachOptions) 0);
+	++row;
 
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
-	label = manage (left_aligned_label (_("Audio mode:")));
-	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	basic_packer.attach (audio_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	row++;
-#endif
 
-	interface_combo.set_size_request (250, -1);
-	input_device_combo.set_size_request (250, -1);
-	output_device_combo.set_size_request (250, -1);
+	label = manage (left_aligned_label (_("Output Channels:")));
+	basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
+	basic_packer.attach (output_channels, 1, 2, row, row+1, xopt, (AttachOptions) 0);
+	++row;
 
-	/*
 
-	if (engine_running()) {
-		start_button.set_sensitive (false);
-	} else {
-		stop_button.set_sensitive (false);
-	}
+	label = manage (left_aligned_label (_("Hardware input latency:")));
+	basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
+	basic_packer.attach (input_latency, 1, 2, row, row+1, xopt, (AttachOptions) 0);
+	label = manage (left_aligned_label (_("samples")));
+	basic_packer.attach (*label, 2, 3, row, row+1, xopt, (AttachOptions) 0);
+	++row;
 
-	start_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::start_engine));
-	stop_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::start_engine));
-	*/
+	label = manage (left_aligned_label (_("Hardware output latency:")));
+	basic_packer.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
+	basic_packer.attach (output_latency, 1, 2, row, row+1, xopt, (AttachOptions) 0);
+	label = manage (left_aligned_label (_("samples")));
+	basic_packer.attach (*label, 2, 3, row, row+1, xopt, (AttachOptions) 0);
+	++row;
 
-	button_box.pack_start (start_button, false, false);
-	button_box.pack_start (stop_button, false, false);
+	basic_hbox.pack_start (basic_packer, false, false);
+	basic_vbox.pack_start (basic_hbox, false, false);
 
-	// basic_packer.attach (button_box, 0, 2, 8, 9, FILL|EXPAND, (AttachOptions) 0);
+	Gtk::HBox* hpacker = manage (new HBox);
+	hpacker->set_border_width (12);
+	hpacker->pack_start (control_app_button, false, false);
+	hpacker->show ();
+	control_app_button.show();
+	basic_vbox.pack_start (*hpacker);
 
-	/* options */
+	midi_packer.set_border_width (12);
 
-	options_packer.set_spacings (6);
+	/* latency measurement tab */
+	
+	lm_title.set_markup (string_compose ("<span size=\"large\" weight=\"bold\">%1</span>", _("Latency Measurement Tool")));
+	
 	row = 0;
+	lm_table.set_row_spacings (12);
 
-	options_packer.attach (realtime_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
+	lm_table.attach (lm_title, 0, 2, row, row+1, xopt, (AttachOptions) 0);
+	row++;
 
-	realtime_button.set_active (true);
+	lm_preamble.set_width_chars (60);
+	lm_preamble.set_line_wrap (true);
+	lm_preamble.set_markup (_("1. <span weight=\"bold\">Turn down the volume on your hardware to a very low level.</span>\n\n\
+2. Connect the two channels that you select below using either a cable or (less ideally) a speaker \
+and microphone.\n\n\
+3. Once the channels are connected, click the \"Measure latency\" button.\n\n\
+4. When satisfied with the results, click the \"Use results\" button."));
 
-#if PROVIDE_TOO_MANY_OPTIONS
+	lm_table.attach (lm_preamble, 0, 2, row, row+1, AttachOptions(FILL|EXPAND), (AttachOptions) 0);
+	row++;
 
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
-	options_packer.attach (no_memory_lock_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
-	options_packer.attach (unlock_memory_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
-	options_packer.attach (soft_mode_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
-	options_packer.attach (monitor_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
-	options_packer.attach (force16bit_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
-	options_packer.attach (hw_monitor_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
-	options_packer.attach (hw_meter_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
-	options_packer.attach (verbose_output_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
-#else
-	options_packer.attach (verbose_output_button, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
-#endif
-
-	strings.clear ();
-	strings.push_back (_("Ignore"));
-	strings.push_back ("500 msec");
-	strings.push_back ("1 sec");
-	strings.push_back ("2 sec");
-	strings.push_back ("10 sec");
-	set_popdown_strings (timeout_combo, strings);
-	timeout_combo.set_active_text (strings.front ());
-
-	label = manage (new Label (_("Client timeout")));
-	label->set_alignment (1.0, 0.5);
-	options_packer.attach (timeout_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
-	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+	label = manage (new Label (_("Output channel")));
+	lm_table.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
+	lm_table.attach (lm_output_channel_combo, 1, 2, row, row+1, xopt, (AttachOptions) 0);
 	++row;
 
-#endif /* PROVIDE_TOO_MANY_OPTIONS */
-	label = manage (left_aligned_label (_("Number of ports:")));
-	options_packer.attach (ports_spinner, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
-	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+	label = manage (new Label (_("Input channel")));
+	lm_table.attach (*label, 0, 1, row, row+1, xopt, (AttachOptions) 0);
+	lm_table.attach (lm_input_channel_combo, 1, 2, row, row+1, xopt, (AttachOptions) 0);
 	++row;
 
-	label = manage (left_aligned_label (_("MIDI driver:")));
-	options_packer.attach (midi_driver_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
-	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
+	xopt = AttachOptions(0);
 
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
-	label = manage (left_aligned_label (_("Dither:")));
-	options_packer.attach (dither_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
-	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+	lm_measure_button.signal_toggled().connect (sigc::mem_fun (*this, &EngineControl::latency_button_toggled));
+	lm_use_button.signal_clicked().connect (sigc::mem_fun (*this, &EngineControl::use_latency_button_clicked));
+	lm_use_button.set_sensitive (false);
+		
+	lm_table.attach (lm_measure_button, 0, 2, row, row+1, xopt, (AttachOptions) 0);
+	++row;
+	lm_table.attach (lm_results, 0, 2, row, row+1, AttachOptions(FILL|EXPAND), (AttachOptions) 0);
+	++row;
+	lm_table.attach (lm_use_button, 0, 2, row, row+1, xopt, (AttachOptions) 0);
 	++row;
-#endif
-
-	find_jack_servers (server_strings);
 
-	if (server_strings.empty()) {
-		fatal << _("No JACK server found anywhere on this system. Please install JACK and restart") << endmsg;
-		/*NOTREACHED*/
-	}
+	lm_results.set_markup ("<i>No measurement results yet</i>");
 
-	set_popdown_strings (serverpath_combo, server_strings);
-	serverpath_combo.set_active_text (server_strings.front());
+	lm_vbox.pack_start (lm_table, false, false);
 
-	if (server_strings.size() > 1) {
-		label = manage (left_aligned_label (_("Server:")));
-		options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-		options_packer.attach (serverpath_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
-		++row;
-	}
+	/* pack it all up */
 
-	/* device settings */
+	notebook.pages().push_back (TabElem (basic_vbox, _("Audio")));
+	notebook.pages().push_back (TabElem (midi_hbox, _("MIDI")));
+	notebook.pages().push_back (TabElem (lm_vbox, _("Latency")));
+	notebook.set_border_width (12);
 
-	device_packer.set_spacings (6);
-	row = 0;
+	notebook.set_tab_pos (POS_RIGHT);
+	notebook.show_all ();
 
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
-	label = manage (left_aligned_label (_("Input device:")));
-	device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-	device_packer.attach (input_device_combo, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
-	label = manage (left_aligned_label (_("Output device:")));
-	device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-	device_packer.attach (output_device_combo, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
-#endif
-	label = manage (left_aligned_label (_("Hardware input latency:")));
-	device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-	device_packer.attach (input_latency, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-	label = manage (left_aligned_label (_("samples")));
-	device_packer.attach (*label, 2, 3, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
-	label = manage (left_aligned_label (_("Hardware output latency:")));
-	device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-	device_packer.attach (output_latency, 1, 2, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-	label = manage (left_aligned_label (_("samples")));
-	device_packer.attach (*label, 2, 3, row, row+1, FILL|EXPAND, (AttachOptions) 0);
-	++row;
+	notebook.set_name ("SettingsNotebook");
 
-	basic_hbox.pack_start (basic_packer, false, false);
-	options_hbox.pack_start (options_packer, false, false);
+	/* Connect to signals */
 
-	device_packer.set_border_width (12);
-	options_packer.set_border_width (12);
-	basic_packer.set_border_width (12);
+	backend_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::backend_changed));
+	driver_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::driver_changed));
+	sample_rate_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::sample_rate_changed));
+	buffer_size_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::buffer_size_changed));
+	device_combo.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::device_changed));
 
-	notebook.pages().push_back (TabElem (basic_hbox, _("Device")));
-	notebook.pages().push_back (TabElem (options_hbox, _("Options")));
-	notebook.pages().push_back (TabElem (device_packer, _("Advanced")));
-	notebook.set_border_width (12);
+	input_latency.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed));
+	output_latency.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed));
+	input_channels.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed));
+	output_channels.signal_changed().connect (sigc::mem_fun (*this, &EngineControl::parameter_changed));
 
-	set_border_width (12);
-	pack_start (notebook);
 
-	/* Pick up any existing audio setup configuration, if appropriate */
+	input_channels.signal_output().connect (sigc::bind (sigc::ptr_fun (&EngineControl::print_channel_count), &input_channels));
+	output_channels.signal_output().connect (sigc::bind (sigc::ptr_fun (&EngineControl::print_channel_count), &output_channels));
 
-	XMLNode* audio_setup = ARDOUR::Config->extra_xml ("AudioSetup");
-	
-	if (audio_setup) {
-		set_state (*audio_setup);
-	}
+	notebook.signal_switch_page().connect (sigc::mem_fun (*this, &EngineControl::on_switch_page));
 }
 
 EngineControl::~EngineControl ()
@@ -388,555 +293,581 @@ EngineControl::~EngineControl ()
 }
 
 void
-EngineControl::build_command_line (vector<string>& cmd)
+EngineControl::disable_latency_tab ()
 {
-	string str;
-	string driver;
-	bool using_alsa = false;
-	bool using_coreaudio = false;
-	bool using_dummy = false;
-	bool using_ffado = false;
-
-	/* first, path to jackd */
-
-	cmd.push_back (serverpath_combo.get_active_text ());
-
-	/* now jackd arguments */
-
-	str = timeout_combo.get_active_text ();
-
-	if (str != _("Ignore")) {
-
-		double secs = 0;
-		uint32_t msecs;
-		secs = atof (str);
-		msecs = (uint32_t) floor (secs * 1000.0);
+	vector<string> empty;
+	set_popdown_strings (lm_output_channel_combo, empty);
+	set_popdown_strings (lm_input_channel_combo, empty);
+	lm_measure_button.set_sensitive (false);
+	lm_use_button.set_sensitive (false);
+}
 
-		if (msecs > 0) {
-			cmd.push_back ("-t");
-			cmd.push_back (to_string (msecs, std::dec));
-		}
-	}
+void
+EngineControl::enable_latency_tab ()
+{
+	vector<string> outputs;
+	ARDOUR::AudioEngine::instance()->get_physical_outputs (ARDOUR::DataType::AUDIO, outputs);
+	set_popdown_strings (lm_output_channel_combo, outputs);
+	lm_output_channel_combo.set_active_text (outputs.front());
+
+	vector<string> inputs;
+	ARDOUR::AudioEngine::instance()->get_physical_inputs (ARDOUR::DataType::AUDIO, inputs);
+	set_popdown_strings (lm_input_channel_combo, inputs);
+	lm_input_channel_combo.set_active_text (inputs.front());
+
+	lm_measure_button.set_sensitive (true);
+	lm_use_button.set_sensitive (true);
+}
 
-	if (no_memory_lock_button.get_active()) {
-		cmd.push_back ("-m"); /* no munlock */
+void
+EngineControl::backend_changed ()
+{
+	if (ignore_changes) {
+		return;
 	}
 
-	cmd.push_back ("-p"); /* port max */
-	cmd.push_back (to_string ((uint32_t) floor (ports_spinner.get_value()), std::dec));
+	string backend_name = backend_combo.get_active_text();
+	boost::shared_ptr<ARDOUR::AudioBackend> backend;
 
-	if (realtime_button.get_active()) {
-		cmd.push_back ("-R");
-	} else {
-		cmd.push_back ("-r"); /* override jackd's default --realtime */
+	if (!(backend = ARDOUR::AudioEngine::instance()->set_backend (backend_name, "ardour", ""))) {
+		/* eh? setting the backend failed... how ? */
+		return;
 	}
 
-	if (unlock_memory_button.get_active()) {
-		cmd.push_back ("-u");
+	if (backend->requires_driver_selection()) {
+		vector<string> drivers = backend->enumerate_drivers();
+		driver_combo.set_sensitive (true);
+		set_popdown_strings (driver_combo, drivers);
+		driver_combo.set_active_text (drivers.front());
+		driver_changed ();
+	} else {
+		driver_combo.set_sensitive (false);
+		list_devices ();
 	}
+	
+	maybe_display_saved_state ();
+}
 
-	if (verbose_output_button.get_active()) {
-		cmd.push_back ("-v");
+bool
+EngineControl::print_channel_count (Gtk::SpinButton* sb)
+{
+	uint32_t cnt = (uint32_t) sb->get_value();
+	if (cnt == 0) {
+		sb->set_text (_("all available channels"));
+	} else {
+		char buf[32];
+		snprintf (buf, sizeof (buf), "%d", cnt);
+		sb->set_text (buf);
 	}
+	return true;
+}
 
-	/* now add fixed arguments (not user-selectable) */
+void
+EngineControl::list_devices ()
+{
+	boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+	assert (backend);
 
-	cmd.push_back ("-T"); // temporary */
+	/* now fill out devices, mark sample rates, buffer sizes insensitive */
+	    
+	vector<ARDOUR::AudioBackend::DeviceStatus> all_devices = backend->enumerate_devices ();
+	
+	/* NOTE: Ardour currently does not display the "available" field of the
+	 * returned devices.
+	 *
+	 * Doing so would require a different GUI widget than the combo
+	 * box/popdown that we currently use, since it has no way to list
+	 * items that are not selectable. Something more like a popup menu,
+	 * which could have unselectable items, would be appropriate.
+	 */
 
-	/* setup coremidi before the driver, otherwise jack won't start */
+	vector<string> available_devices;
 
-	if (midi_driver_combo.get_active_text() == _("coremidi")) {
-		cmd.push_back ("-X coremidi");
+	for (vector<ARDOUR::AudioBackend::DeviceStatus>::const_iterator i = all_devices.begin(); i != all_devices.end(); ++i) {
+		available_devices.push_back (i->name);
 	}
 
-	/* next the driver */
-
-	cmd.push_back ("-d");
-
-	driver = driver_combo.get_active_text ();
-
-	if (driver == X_("ALSA")) {
-		using_alsa = true;
-		cmd.push_back ("alsa");
-	} else if (driver == X_("OSS")) {
-		cmd.push_back ("oss");
-	} else if (driver == X_("CoreAudio")) {
-		using_coreaudio = true;
-		cmd.push_back ("coreaudio");
-	} else if (driver == X_("NetJACK")) {
-		cmd.push_back ("netjack");
-	} else if (driver == X_("FreeBoB")) {
-		cmd.push_back ("freebob");
-	} else if (driver == X_("FFADO")) {
-		using_ffado = true;
-		cmd.push_back ("firewire");
-	} else if ( driver == X_("Dummy")) {
-		using_dummy = true;
-		cmd.push_back ("dummy");
+	set_popdown_strings (device_combo, available_devices);
+	
+	if (!available_devices.empty()) {
+		sample_rate_combo.set_sensitive (true);
+		buffer_size_combo.set_sensitive (true);
+		input_latency.set_sensitive (true);
+		output_latency.set_sensitive (true);
+		input_channels.set_sensitive (true);
+		output_channels.set_sensitive (true);
+						
+		/* changing the text in the combo will trigger device_changed()
+		   which should populate the parameter controls
+		*/
+		
+		device_combo.set_active_text (available_devices.front());
+	} else {
+		sample_rate_combo.set_sensitive (true);
+		buffer_size_combo.set_sensitive (true);
+		input_latency.set_sensitive (true);
+		output_latency.set_sensitive (true);
+		input_channels.set_sensitive (true);
+		output_channels.set_sensitive (true);
+	}
+}
+	
+void
+EngineControl::driver_changed ()
+{
+	if (ignore_changes) {
+		return;
 	}
 
-	/* driver arguments */
-
-	if (!using_coreaudio) {
-		str = audio_mode_combo.get_active_text();
-
-		if (str == _("Playback/recording on 1 device")) {
+	boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+	assert (backend);
 
-			/* relax */
+	backend->set_driver (driver_combo.get_active_text());
+	list_devices ();
 
-		} else if (str == _("Playback/recording on 2 devices")) {
+	maybe_display_saved_state ();
+}
 
-			string input_device = get_device_name (driver, input_device_combo.get_active_text());
-			string output_device = get_device_name (driver, output_device_combo.get_active_text());
+void
+EngineControl::device_changed ()
+{
+	if (ignore_changes) {
+		return;
+	}
 
-			if (input_device.empty() || output_device.empty()) {
-				cmd.clear ();
-				return;
-			}
+	boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+	assert (backend);
+	string device_name = device_combo.get_active_text ();
+	vector<string> s;
 
-			cmd.push_back ("-C");
-			cmd.push_back (input_device);
+	/* don't allow programmatic change to sample_rate_combo to cause a
+	   recursive call to this method.
+	*/
+	   
+	ignore_changes++;
 
-			cmd.push_back ("-P");
-			cmd.push_back (output_device);
+	/* sample rates */
+	
+	string desired;
 
-		} else if (str == _("Playback only")) {
-			cmd.push_back ("-P");
-		} else if (str == _("Recording only")) {
-			cmd.push_back ("-C");
+	vector<float> sr = backend->available_sample_rates (device_name);
+	for (vector<float>::const_iterator x = sr.begin(); x != sr.end(); ++x) {
+		char buf[32];
+		if (fmod (*x, 1000.0f)) {
+			snprintf (buf, sizeof (buf), "%.1f kHz", (*x)/1000.0);
+		} else {
+			snprintf (buf, sizeof (buf), "%.0f kHz", (*x)/1000.0);
 		}
-
-		if (!using_dummy) {
-			cmd.push_back ("-n");
-			cmd.push_back (to_string ((uint32_t) floor (periods_spinner.get_value()), std::dec));
+		s.push_back (buf);
+		if (*x == _desired_sample_rate) {
+			desired = buf;
 		}
 	}
 
-	cmd.push_back ("-r");
-	cmd.push_back (to_string (get_rate(), std::dec));
-
-	cmd.push_back ("-p");
-	cmd.push_back (period_size_combo.get_active_text());
-
-	if (using_alsa || using_ffado || using_coreaudio) {
-
-		double val = input_latency_adjustment.get_value();
+	set_popdown_strings (sample_rate_combo, s);
+	if (desired.empty()) {
+		sample_rate_combo.set_active_text (s.front());
+	} else {
+		sample_rate_combo.set_active_text (desired);
+	}
 
-                if (val) {
-                        cmd.push_back ("-I");
-                        cmd.push_back (to_string ((uint32_t) val, std::dec));
-                }
+	vector<uint32_t> bs = backend->available_buffer_sizes(device_name);
+	s.clear ();
+	for (vector<uint32_t>::const_iterator x = bs.begin(); x != bs.end(); ++x) {
+		char buf[32];
+		/* Translators: "samples" is always plural here, so no
+		   need for plural+singular forms.
+		*/
+		snprintf (buf, sizeof (buf), _("%u samples"), *x);
+		s.push_back (buf);
+	}
 
-                val = output_latency_adjustment.get_value();
+	set_popdown_strings (buffer_size_combo, s);
+	buffer_size_combo.set_active_text (s.front());
+	show_buffer_duration ();
 
-		if (val) {
-                        cmd.push_back ("-O");
-                        cmd.push_back (to_string ((uint32_t) val, std::dec));
-                }
-	}
+	manage_control_app_sensitivity ();
 
-	if (using_alsa) {
+	ignore_changes--;
 
-		if (audio_mode_combo.get_active_text() != _("Playback/recording on 2 devices")) {
+	/* pick up any saved state for this device */
 
-			string device = get_device_name (driver, interface_combo.get_active_text());
-			if (device.empty()) {
-				cmd.clear ();
-				return;
-			}
+	maybe_display_saved_state ();
 
-			cmd.push_back ("-d");
-			cmd.push_back (device);
-		}
+	/* and push it to the backend */
 
-		if (hw_meter_button.get_active()) {
-			cmd.push_back ("-M");
-		}
+	push_state_to_backend (false);
+}	
 
-		if (hw_monitor_button.get_active()) {
-			cmd.push_back ("-H");
-		}
+void 
+EngineControl::sample_rate_changed ()
+{
+	if (ignore_changes) {
+		return;
+	}
 
-		str = dither_mode_combo.get_active_text();
+	/* reset the strings for buffer size to show the correct msec value
+	   (reflecting the new sample rate).
+	*/
 
-		if (str == _("None")) {
-		} else if (str == _("Triangular")) {
-			cmd.push_back ("-z triangular");
-		} else if (str == _("Rectangular")) {
-			cmd.push_back ("-z rectangular");
-		} else if (str == _("Shaped")) {
-			cmd.push_back ("-z shaped");
-		}
+	show_buffer_duration ();
+	push_state_to_backend (false);
+	save_state ();
 
-		if (force16bit_button.get_active()) {
-			cmd.push_back ("-S");
-		}
+}
 
-		if (soft_mode_button.get_active()) {
-			cmd.push_back ("-s");
-		}
+void 
+EngineControl::buffer_size_changed ()
+{
+	if (ignore_changes) {
+		return;
+	}
 
-		str = midi_driver_combo.get_active_text ();
+	show_buffer_duration ();
+	push_state_to_backend (false);
+	save_state ();
+}
 
-		if (str == _("seq")) {
-			cmd.push_back ("-X seq");
-		} else if (str == _("raw")) {
-			cmd.push_back ("-X raw");
-		}
-	} else if (using_coreaudio) {
+void
+EngineControl::show_buffer_duration ()
+{
 
-#ifdef __APPLE__
-		// note: older versions of the CoreAudio JACK backend use -n instead of -d here
+	/* buffer sizes  - convert from just samples to samples + msecs for
+	 * the displayed string
+	 */
 
-		string device = get_device_name (driver, interface_combo.get_active_text());
-		if (device.empty()) {
-			cmd.clear ();
-			return;
-		}
+	string bs_text = buffer_size_combo.get_active_text ();
+	uint32_t samples = atoi (bs_text); /* will ignore trailing text */
+	uint32_t rate = get_rate();
 
-		cmd.push_back ("-d");
-		cmd.push_back (device);
-#endif
+	/* Translators: "msecs" is ALWAYS plural here, so we do not
+	   need singular form as well.
+	*/
+	/* Developers: note the hard-coding of a double buffered model
+	   in the (2 * samples) computation of latency. we always start
+	   the audiobackend in this configuration.
+	*/
+	char buf[32];
+	snprintf (buf, sizeof (buf), _("(%.1f msecs)"), (2 * samples) / (rate/1000.0));
+	buffer_size_duration_label.set_text (buf);
+}
 
+void
+EngineControl::parameter_changed ()
+{
+	if (!ignore_changes) {
+		save_state ();
 	}
 }
 
-bool
-EngineControl::need_setup ()
+EngineControl::State*
+EngineControl::get_matching_state (const string& backend,
+				   const string& driver,
+				   const string& device)
 {
-	return !engine_running();
+	for (StateList::iterator i = states.begin(); i != states.end(); ++i) {
+		if ((*i).backend == backend &&
+		    (*i).driver == driver &&
+		    (*i).device == device) {
+			return &(*i);
+		}
+	}
+	return 0;
 }
 
-bool
-EngineControl::engine_running ()
+EngineControl::State*
+EngineControl::get_saved_state_for_currently_displayed_backend_and_device ()
 {
-        EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
-        boost::scoped_ptr<EnvironmentalProtectionAgency> current_epa;
-
-        /* revert all environment settings back to whatever they were when
-	 * ardour started, because ardour's startup script may have reset
-	 * something in ways that interfere with finding/starting JACK.
-         */
+	boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
 
-        if (global_epa) {
-                current_epa.reset (new EnvironmentalProtectionAgency(true)); /* will restore settings when we leave scope */
-                global_epa->restore ();
-        }
+	if (backend) {
+		return get_matching_state (backend_combo.get_active_text(),
+					   (backend->requires_driver_selection() ? (std::string) driver_combo.get_active_text() : string()),
+					   device_combo.get_active_text());
+	}
 
-	jack_status_t status;
-	jack_client_t* c = jack_client_open ("ardourprobe", JackNoStartServer, &status);
 
-	if (status == 0) {
-		jack_client_close (c);
-		return true;
-	}
-	return false;
+	return get_matching_state (backend_combo.get_active_text(),
+				   string(),
+				   device_combo.get_active_text());
 }
 
-int
-EngineControl::setup_engine ()
+EngineControl::State*
+EngineControl::save_state ()
 {
-	vector<string> args;
-	std::string cwd = "/tmp";
-
-	build_command_line (args);
-
-	if (args.empty()) {
-		return 1; // try again
-	}
-
-	std::string jackdrc_path = Glib::get_home_dir();
-	jackdrc_path += "/.jackdrc";
+	bool existing = true;
+	State* state = get_saved_state_for_currently_displayed_backend_and_device ();
 
-	ofstream jackdrc (jackdrc_path.c_str());
-	if (!jackdrc) {
-		error << string_compose (_("cannot open JACK rc file %1 to store parameters"), jackdrc_path) << endmsg;
-		return -1;
+	if (!state) {
+		existing = false;
+		state = new State;
 	}
-
-	for (vector<string>::iterator i = args.begin(); i != args.end(); ++i) {
-		jackdrc << (*i) << ' ';
+	
+	state->backend = backend_combo.get_active_text ();
+	state->driver = driver_combo.get_active_text ();
+	state->device = device_combo.get_active_text ();
+	state->buffer_size = buffer_size_combo.get_active_text ();
+	state->sample_rate = sample_rate_combo.get_active_text ();
+	state->input_latency = (uint32_t) input_latency.get_value();
+	state->output_latency = (uint32_t) output_latency.get_value();
+	state->input_channels = (uint32_t) input_channels.get_value();
+	state->output_channels = (uint32_t) output_channels.get_value();
+
+	if (!existing) {
+		states.push_back (*state);
 	}
 
-	jackdrc << endl;
-	jackdrc.close ();
-
-	_used = true;
-
-	return 0;
+	return state;
 }
 
 void
-EngineControl::enumerate_devices (const string& driver)
+EngineControl::maybe_display_saved_state ()
 {
-	/* note: case matters for the map keys */
-
-	if (driver == "CoreAudio") {
-#ifdef __APPLE__
-		devices[driver] = enumerate_coreaudio_devices ();
-#endif
-
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
-	} else if (driver == "ALSA") {
-		devices[driver] = enumerate_alsa_devices ();
-	} else if (driver == "FreeBOB") {
-		devices[driver] = enumerate_freebob_devices ();
-	} else if (driver == "FFADO") {
-		devices[driver] = enumerate_ffado_devices ();
-	} else if (driver == "OSS") {
-		devices[driver] = enumerate_oss_devices ();
-	} else if (driver == "Dummy") {
-		devices[driver] = enumerate_dummy_devices ();
-	} else if (driver == "NetJACK") {
-		devices[driver] = enumerate_netjack_devices ();
+	State* state = get_saved_state_for_currently_displayed_backend_and_device ();
+
+	if (state) {
+		ignore_changes++;
+		if (!_desired_sample_rate) {
+			sample_rate_combo.set_active_text (state->sample_rate);
+		}
+		buffer_size_combo.set_active_text (state->buffer_size);
+		input_latency.set_value (state->input_latency);
+		output_latency.set_value (state->output_latency);
+		ignore_changes--;
 	}
-#else
-        }
-#endif
 }
-
-#ifdef __APPLE__
-static OSStatus
-getDeviceUIDFromID( AudioDeviceID id, char *name, size_t nsize)
+	
+XMLNode&
+EngineControl::get_state ()
 {
-	UInt32 size = sizeof(CFStringRef);
-	CFStringRef UI;
-	OSStatus res = AudioDeviceGetProperty(id, 0, false,
-		kAudioDevicePropertyDeviceUID, &size, &UI);
-	if (res == noErr)
-		CFStringGetCString(UI,name,nsize,CFStringGetSystemEncoding());
-	CFRelease(UI);
-	return res;
-}
+	XMLNode* root = new XMLNode ("AudioMIDISetup");
+	std::string path;
 
-vector<string>
-EngineControl::enumerate_coreaudio_devices ()
-{
-	vector<string> devs;
-
-	// Find out how many Core Audio devices are there, if any...
-	// (code snippet gently "borrowed" from St?hane Letz jackdmp;)
-	OSStatus err;
-	Boolean isWritable;
-	UInt32 outSize = sizeof(isWritable);
-
-	backend_devs.clear ();
-
-	err = AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices,
-					   &outSize, &isWritable);
-	if (err == noErr) {
-		// Calculate the number of device available...
-		int numCoreDevices = outSize / sizeof(AudioDeviceID);
-		// Make space for the devices we are about to get...
-		AudioDeviceID *coreDeviceIDs = new AudioDeviceID [numCoreDevices];
-		err = AudioHardwareGetProperty(kAudioHardwarePropertyDevices,
-					       &outSize, (void *) coreDeviceIDs);
-		if (err == noErr) {
-			// Look for the CoreAudio device name...
-			char coreDeviceName[256];
-			UInt32 nameSize;
-
-			for (int i = 0; i < numCoreDevices; i++) {
-
-				nameSize = sizeof (coreDeviceName);
-
-				/* enforce duplex devices only */
-
-				err = AudioDeviceGetPropertyInfo(coreDeviceIDs[i],
-								 0, true, kAudioDevicePropertyStreams,
-								 &outSize, &isWritable);
-
-				if (err != noErr || outSize == 0) {
-					continue;
-				}
-
-				err = AudioDeviceGetPropertyInfo(coreDeviceIDs[i],
-								 0, false, kAudioDevicePropertyStreams,
-								 &outSize, &isWritable);
-
-				if (err != noErr || outSize == 0) {
-					continue;
-				}
-
-				err = AudioDeviceGetPropertyInfo(coreDeviceIDs[i],
-								 0, true, kAudioDevicePropertyDeviceName,
-								 &outSize, &isWritable);
-				if (err == noErr) {
-					err = AudioDeviceGetProperty(coreDeviceIDs[i],
-								     0, true, kAudioDevicePropertyDeviceName,
-								     &nameSize, (void *) coreDeviceName);
-					if (err == noErr) {
-						char drivername[128];
-
-						// this returns the unique id for the device
-						// that must be used on the commandline for jack
-
-						if (getDeviceUIDFromID(coreDeviceIDs[i], drivername, sizeof (drivername)) == noErr) {
-							devs.push_back (coreDeviceName);
-							backend_devs.push_back (drivername);
-						}
-					}
-				}
-			}
+	if (!states.empty()) {
+		XMLNode* state_nodes = new XMLNode ("EngineStates");
+		
+		for (StateList::const_iterator i = states.begin(); i != states.end(); ++i) {
+			
+			XMLNode* node = new XMLNode ("State");
+			
+			node->add_property ("backend", (*i).backend);
+			node->add_property ("driver", (*i).driver);
+			node->add_property ("device", (*i).device);
+			node->add_property ("sample-rate", (*i).sample_rate);
+			node->add_property ("buffer-size", (*i).buffer_size);
+			node->add_property ("input-latency", (*i).input_latency);
+			node->add_property ("output-latency", (*i).output_latency);
+			node->add_property ("input-channels", (*i).input_channels);
+			node->add_property ("output-channels", (*i).output_channels);
+			node->add_property ("active", (*i).active ? "yes" : "no");
+			
+			state_nodes->add_child_nocopy (*node);
 		}
-		delete [] coreDeviceIDs;
-	}
-
-
-	if (devs.size() == 0) {
-		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\
-to create an \"aggregrate\" device, or install a suitable\n\
-audio interface.\n\n\
-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\
-%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);
-		msg.run ();
-		exit (1);
+		
+		root->add_child_nocopy (*state_nodes);
 	}
 
-
-	return devs;
+	return *root;
 }
-#else
 
-#if !defined(__FreeBSD__)
-vector<string>
-EngineControl::enumerate_alsa_devices ()
+void
+EngineControl::set_state (const XMLNode& root)
 {
-	vector<string> devs;
+	XMLNodeList          clist, cclist;
+	XMLNodeConstIterator citer, cciter;
+	XMLNode* child;
+	XMLNode* grandchild;
+	XMLProperty* prop = NULL;
 
-	snd_ctl_t *handle;
-	snd_ctl_card_info_t *info;
-	snd_pcm_info_t *pcminfo;
-	snd_ctl_card_info_alloca(&info);
-	snd_pcm_info_alloca(&pcminfo);
-	string devname;
-	int cardnum = -1;
-	int device = -1;
+	if (root.name() != "AudioMIDISetup") {
+		return;
+	}
 
-	backend_devs.clear ();
+	clist = root.children();
 
-	while (snd_card_next (&cardnum) >= 0 && cardnum >= 0) {
+	states.clear ();
 
-		devname = "hw:";
-		devname += to_string (cardnum, std::dec);
+	for (citer = clist.begin(); citer != clist.end(); ++citer) {
 
-		if (snd_ctl_open (&handle, devname.c_str(), 0) >= 0 && snd_ctl_card_info (handle, info) >= 0) {
+		child = *citer;
+		
+		if (child->name() != "EngineStates") {
+			continue;
+		}
 
-			while (snd_ctl_pcm_next_device (handle, &device) >= 0 && device >= 0) {
+		cclist = child->children();
 
-				snd_pcm_info_set_device (pcminfo, device);
-				snd_pcm_info_set_subdevice (pcminfo, 0);
-				snd_pcm_info_set_stream (pcminfo, SND_PCM_STREAM_PLAYBACK);
+		for (cciter = cclist.begin(); cciter != cclist.end(); ++cciter) {
+			State state;
+			
+			grandchild = *cciter;
 
-				if (snd_ctl_pcm_info (handle, pcminfo) >= 0) {
-					devs.push_back (snd_pcm_info_get_name (pcminfo));
-					devname += ',';
-					devname += to_string (device, std::dec);
-					backend_devs.push_back (devname);
-				}
+			if (grandchild->name() != "State") {
+				continue;
+			}
+			
+			if ((prop = grandchild->property ("backend")) == 0) {
+				continue;
+			}
+			state.backend = prop->value ();
+			
+			if ((prop = grandchild->property ("driver")) == 0) {
+				continue;
 			}
+			state.driver = prop->value ();
+			
+			if ((prop = grandchild->property ("device")) == 0) {
+				continue;
+			}
+			state.device = prop->value ();
+			
+			if ((prop = grandchild->property ("sample-rate")) == 0) {
+				continue;
+			}
+			state.sample_rate = prop->value ();
+			
+			if ((prop = grandchild->property ("buffer-size")) == 0) {
+				continue;
+			}
+			state.buffer_size = prop->value ();
+			
+			if ((prop = grandchild->property ("input-latency")) == 0) {
+				continue;
+			}
+			state.input_latency = atoi (prop->value ());
+			
+			if ((prop = grandchild->property ("output-latency")) == 0) {
+				continue;
+			}
+			state.output_latency = atoi (prop->value ());
+			
+			if ((prop = grandchild->property ("input-channels")) == 0) {
+				continue;
+			}
+			state.input_channels = atoi (prop->value ());
+			
+			if ((prop = grandchild->property ("output-channels")) == 0) {
+				continue;
+			}
+			state.output_channels = atoi (prop->value ());
 
-			snd_ctl_close(handle);
+			if ((prop = grandchild->property ("active")) == 0) {
+				continue;
+			}
+			state.active = string_is_affirmative (prop->value ());
+			
+			states.push_back (state);
 		}
 	}
 
-	return devs;
+	/* now see if there was an active state and switch the setup to it */
+	
+	for (StateList::const_iterator i = states.begin(); i != states.end(); ++i) {
+		if ((*i).active) {
+			ignore_changes++;
+			backend_combo.set_active_text ((*i).backend);
+			driver_combo.set_active_text ((*i).driver);
+			device_combo.set_active_text ((*i).device);
+			sample_rate_combo.set_active_text ((*i).sample_rate);
+			buffer_size_combo.set_active_text ((*i).buffer_size);
+			input_latency.set_value ((*i).input_latency);
+			output_latency.set_value ((*i).output_latency);
+			ignore_changes--;
+
+			push_state_to_backend (false);
+			break;
+		}
+	}
 }
-#endif
 
-vector<string>
-EngineControl::enumerate_ffado_devices ()
-{
-	vector<string> devs;
-	backend_devs.clear ();
-	return devs;
-}
 
-vector<string>
-EngineControl::enumerate_freebob_devices ()
+int
+EngineControl::push_state_to_backend (bool start)
 {
-	vector<string> devs;
-	return devs;
-}
+	boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
 
-vector<string>
-EngineControl::enumerate_oss_devices ()
-{
-	vector<string> devs;
-	return devs;
-}
-vector<string>
-EngineControl::enumerate_dummy_devices ()
-{
-	vector<string> devs;
-	return devs;
-}
-vector<string>
-EngineControl::enumerate_netjack_devices ()
-{
-	vector<string> devs;
-	return devs;
-}
-#endif
+	if (!backend) {
+		return 0;
+	 }
 
-void
-EngineControl::driver_changed ()
-{
-	string driver = driver_combo.get_active_text();
-	string::size_type maxlen = 0;
-	int n = 0;
+	/* grab the parameters from the GUI and apply them */
 
-	enumerate_devices (driver);
+	try {
+		if (backend->requires_driver_selection()) {
+			if (backend->set_driver (get_driver())) {
+				return -1;
+			}
+		}
 
-	vector<string>& strings = devices[driver];
+		if (backend->set_device_name (get_device_name())) {
+			return -1;
+		}
 
-	if (strings.empty() && driver != "FreeBoB" && driver != "FFADO" && driver != "Dummy") {
-		return;
-	}
+		if (backend->set_sample_rate (get_rate())) {
+			error << string_compose (_("Cannot set sample rate to %1"), get_rate()) << endmsg;
+			return -1;
+		}
+		if (backend->set_buffer_size (get_buffer_size())) {
+			error << string_compose (_("Cannot set buffer size to %1"), get_buffer_size()) << endmsg;
+			return -1;
+		}
+		if (backend->set_input_channels (get_input_channels())) {
+			error << string_compose (_("Cannot set input channels to %1"), get_input_channels()) << endmsg;
+			return -1;
+		}
+		if (backend->set_output_channels (get_output_channels())) {
+			error << string_compose (_("Cannot set output channels to %1"), get_output_channels()) << endmsg;
+			return -1;
+		}
+		if (backend->set_systemic_input_latency (get_input_latency())) {
+			error << string_compose (_("Cannot set input latency to %1"), get_input_latency()) << endmsg;
+			return -1;
+		}
+		if (backend->set_systemic_output_latency (get_output_latency())) {
+			error << string_compose (_("Cannot set output latency to %1"), get_output_latency()) << endmsg;
+			return -1;
+		}
+
+		/* get a pointer to the current state object, creating one if
+		 * necessary
+		 */
 
-	for (vector<string>::iterator i = strings.begin(); i != strings.end(); ++i, ++n) {
-		if ((*i).length() > maxlen) {
-			maxlen = (*i).length();
+		State* state = get_saved_state_for_currently_displayed_backend_and_device ();
+
+		if (!state) {
+			state = save_state ();
+			assert (state);
 		}
-	}
 
-	set_popdown_strings (interface_combo, strings);
-	set_popdown_strings (input_device_combo, strings);
-	set_popdown_strings (output_device_combo, strings);
+		/* all off */
 
-	if (!strings.empty()) {
-		interface_combo.set_active_text (strings.front());
-		input_device_combo.set_active_text (strings.front());
-		output_device_combo.set_active_text (strings.front());
-	}
+		for (StateList::iterator i = states.begin(); i != states.end(); ++i) {
+			(*i).active = false;
+		}
 
-	if (driver == "ALSA") {
-		soft_mode_button.set_sensitive (true);
-		force16bit_button.set_sensitive (true);
-		hw_monitor_button.set_sensitive (true);
-		hw_meter_button.set_sensitive (true);
-		monitor_button.set_sensitive (true);
-	} else {
-		soft_mode_button.set_sensitive (false);
-		force16bit_button.set_sensitive (false);
-		hw_monitor_button.set_sensitive (false);
-		hw_meter_button.set_sensitive (false);
-		monitor_button.set_sensitive (false);
+		/* mark this one active (to be used next time the dialog is
+		 * shown)
+		 */
+
+		state->active = true;
+		
+		if (start) {
+			if (ARDOUR::AudioEngine::instance()->start()) {
+				return -1;
+			}
+		}
+
+		manage_control_app_sensitivity ();
+		return 0;
+
+	} catch (...) {
+		cerr << "exception thrown...\n";
+		return -1;
 	}
 }
 
 uint32_t
-EngineControl::get_rate ()
+EngineControl::get_rate () const
 {
 	double r = atof (sample_rate_combo.get_active_text ());
 	/* the string may have been translated with an abbreviation for
@@ -948,412 +879,222 @@ EngineControl::get_rate ()
 	return lrint (r);
 }
 
-void
-EngineControl::redisplay_latency ()
+uint32_t
+EngineControl::get_buffer_size () const
 {
-	uint32_t rate = get_rate();
-#if defined(__APPLE__) || defined(__FreeBSD__)
-	float periods = 2;
-#else
-	float periods = periods_adjustment.get_value();
-#endif
-	float period_size = atof (period_size_combo.get_active_text());
+	string txt = buffer_size_combo.get_active_text ();
+	uint32_t samples;
 
-	char buf[32];
-	snprintf (buf, sizeof(buf), "%.1fmsec", (periods * period_size) / (rate/1000.0));
+	if (sscanf (txt.c_str(), "%d", &samples) != 1) {
+		throw exception ();
+	}
 
-	latency_label.set_text (buf);
-	latency_label.set_alignment (0, 0.5);
+	return samples;
 }
 
-void
-EngineControl::audio_mode_changed ()
+uint32_t
+EngineControl::get_input_channels() const
 {
-	std::string str = audio_mode_combo.get_active_text();
-
-	if (str == _("Playback/recording on 1 device")) {
-		input_device_combo.set_sensitive (false);
-		output_device_combo.set_sensitive (false);
-	} else if (str == _("Playback/recording on 2 devices")) {
-		input_device_combo.set_sensitive (true);
-		output_device_combo.set_sensitive (true);
-	} else if (str == _("Playback only")) {
-		output_device_combo.set_sensitive (true);
-		input_device_combo.set_sensitive (false);
-	} else if (str == _("Recording only")) {
-		input_device_combo.set_sensitive (true);
-		output_device_combo.set_sensitive (false);
-	}
+	return (uint32_t) input_channels_adjustment.get_value();
 }
 
-static bool jack_server_filter(const string& str, void */*arg*/)
+uint32_t
+EngineControl::get_output_channels() const
 {
-   return str == "jackd" || str == "jackdmp";
+	return (uint32_t) output_channels_adjustment.get_value();
 }
 
-void
-EngineControl::find_jack_servers (vector<string>& strings)
+uint32_t
+EngineControl::get_input_latency() const
 {
-#ifdef __APPLE__
-	/* this magic lets us finds the path to the OSX bundle, and then
-	   we infer JACK's location from there
-	*/
+	return (uint32_t) input_latency_adjustment.get_value();
+}
 
-	char execpath[MAXPATHLEN+1];
-	uint32_t pathsz = sizeof (execpath);
+uint32_t
+EngineControl::get_output_latency() const
+{
+	return (uint32_t) output_latency_adjustment.get_value();
+}
 
-	_NSGetExecutablePath (execpath, &pathsz);
+string
+EngineControl::get_driver () const
+{
+	return driver_combo.get_active_text ();
+}
 
-	string path (Glib::path_get_dirname (execpath));
-	path += "/jackd";
+string
+EngineControl::get_device_name () const
+{
+	return device_combo.get_active_text ();
+}
 
-	if (Glib::file_test (path, FILE_TEST_EXISTS)) {
-		strings.push_back (path);
+void
+EngineControl::control_app_button_clicked ()
+{
+	boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+	
+	if (!backend) {
+		return;
 	}
+	
+	backend->launch_control_app ();
+}
 
-	if (getenv ("ARDOUR_WITH_JACK")) {
-		/* no other options - only use the JACK we supply */
-		if (strings.empty()) {
-			fatal << string_compose (_("JACK appears to be missing from the %1 bundle"), PROGRAM_NAME) << endmsg;
-			/*NOTREACHED*/
-		}
+void
+EngineControl::manage_control_app_sensitivity ()
+{
+	boost::shared_ptr<ARDOUR::AudioBackend> backend = ARDOUR::AudioEngine::instance()->current_backend();
+	
+	if (!backend) {
 		return;
 	}
-#else
-	string path;
-#endif
-
-	PathScanner scanner;
-	vector<string *> *jack_servers;
-	std::map<string,int> un;
-	char *p;
-	bool need_minimal_path = false;
-
-	p = getenv ("PATH");
+	
+	string appname = backend->control_app_name();
 
-	if (p && *p) {
-		path = p;
+	if (appname.empty()) {
+		control_app_button.set_sensitive (false);
 	} else {
-		need_minimal_path = true;
+		control_app_button.set_sensitive (true);
 	}
+}
 
-#ifdef __APPLE__
-	// many mac users don't have PATH set up to include
-	// likely installed locations of JACK
-	need_minimal_path = true;
-#endif
+void
+EngineControl::set_desired_sample_rate (uint32_t sr)
+{
+	_desired_sample_rate = sr;
+	device_changed ();
+}
 
-	if (need_minimal_path) {
-		if (path.empty()) {
-			path = "/usr/bin:/bin:/usr/local/bin:/opt/local/bin";
-		} else {
-			path += ":/usr/local/bin:/opt/local/bin";
+void
+EngineControl::on_switch_page (GtkNotebookPage*, guint page_num)
+{
+	if (page_num == 2) {
+		/* latency tab */
+
+		if (!ARDOUR::AudioEngine::instance()->running()) {
+			
+			PBD::Unwinder<uint32_t> protect_ignore_changes (ignore_changes, ignore_changes + 1);
+			
+			/* save any existing latency values */
+			
+			uint32_t il = (uint32_t) input_latency.get_value ();
+			uint32_t ol = (uint32_t) input_latency.get_value ();
+
+			/* reset to zero so that our new test instance of JACK
+			   will be clean of any existing latency measures.
+			*/
+			
+			input_latency.set_value (0);
+			output_latency.set_value (0);
+			
+			push_state_to_backend (false);
+
+			/* reset control */
+
+			input_latency.set_value (il);
+			output_latency.set_value (ol);
 		}
-	}
-
-#ifdef __APPLE__
-	// push it back into the environment so that auto-started JACK can find it.
-	// XXX why can't we just expect OS X users to have PATH set correctly? we can't ...
-	setenv ("PATH", path.c_str(), 1);
-#endif
-
-	jack_servers = scanner (path, jack_server_filter, 0, false, true);
-	if (!jack_servers) {
-		return;
-	}
-
-	vector<string *>::iterator iter;
-
-	for (iter = jack_servers->begin(); iter != jack_servers->end(); iter++) {
-		string p = **iter;
 
-		if (un[p]++ == 0) {
-			strings.push_back(p);
+		if (ARDOUR::AudioEngine::instance()->prepare_for_latency_measurement()) {
+			disable_latency_tab ();
 		}
+		enable_latency_tab ();
+	} else {
+		ARDOUR::AudioEngine::instance()->stop_latency_detection();
 	}
 }
 
+/* latency measurement */
 
-string
-EngineControl::get_device_name (const string& driver, const string& human_readable)
+bool
+EngineControl::check_latency_measurement ()
 {
-	vector<string>::iterator n;
-	vector<string>::iterator i;
-
-	if (human_readable.empty()) {
-		/* this can happen if the user's .ardourrc file has a device name from
-		   another computer system in it
-		*/
-		MessageDialog msg (_("You need to choose an audio device first."));
-                msg.set_position (WIN_POS_MOUSE);
-		msg.run ();
-		return string();
-	}
-
-	if (backend_devs.empty()) {
-		return human_readable;
-	}
-
-	for (i = devices[driver].begin(), n = backend_devs.begin(); i != devices[driver].end(); ++i, ++n) {
-		if (human_readable == (*i)) {
-			return (*n);
+        MTDM* mtdm = ARDOUR::AudioEngine::instance()->mtdm ();
+	static uint32_t cnt = 0;
+
+        if (mtdm->resolve () < 0) {
+		string txt = _("No signal detected ");
+		uint32_t dots = cnt++%10;
+		for (uint32_t i = 0; i < dots; ++i) {
+			txt += '.';
 		}
-	}
-
-	if (i == devices[driver].end()) {
-		warning << string_compose (_("Audio device \"%1\" not known on this computer."), human_readable) << endmsg;
-	}
-
-	return string();
-}
-
-XMLNode&
-EngineControl::get_state ()
-{
-	XMLNode* root = new XMLNode ("AudioSetup");
-	XMLNode* child;
-	std::string path;
-
-	child = new XMLNode ("periods");
-	child->add_property ("val", to_string (periods_adjustment.get_value(), std::dec));
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("ports");
-	child->add_property ("val", to_string (ports_adjustment.get_value(), std::dec));
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("inlatency");
-	child->add_property ("val", to_string (input_latency.get_value(), std::dec));
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("outlatency");
-	child->add_property ("val", to_string (output_latency.get_value(), std::dec));
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("realtime");
-	child->add_property ("val", to_string (realtime_button.get_active(), std::dec));
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("nomemorylock");
-	child->add_property ("val", to_string (no_memory_lock_button.get_active(), std::dec));
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("unlockmemory");
-	child->add_property ("val", to_string (unlock_memory_button.get_active(), std::dec));
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("softmode");
-	child->add_property ("val", to_string (soft_mode_button.get_active(), std::dec));
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("force16bit");
-	child->add_property ("val", to_string (force16bit_button.get_active(), std::dec));
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("hwmonitor");
-	child->add_property ("val", to_string (hw_monitor_button.get_active(), std::dec));
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("hwmeter");
-	child->add_property ("val", to_string (hw_meter_button.get_active(), std::dec));
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("verbose");
-	child->add_property ("val", to_string (verbose_output_button.get_active(), std::dec));
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("samplerate");
-	child->add_property ("val", sample_rate_combo.get_active_text());
-	root->add_child_nocopy (*child);
-
-	child = new XMLNode ("periodsize");
-	child->add_property ("val", period_size_combo.get_active_text());
-	root->add_child_nocopy (*child);
+		lm_results.set_text (txt);
+                return true;
+        }
 
-	child = new XMLNode ("serverpath");
-	child->add_property ("val", serverpath_combo.get_active_text());
-	root->add_child_nocopy (*child);
+        if (mtdm->err () > 0.3) {
+                mtdm->invert ();
+                mtdm->resolve ();
+        }
 
-	child = new XMLNode ("driver");
-	child->add_property ("val", driver_combo.get_active_text());
-	root->add_child_nocopy (*child);
+        char buf[128];
+	ARDOUR::framecnt_t const sample_rate = ARDOUR::AudioEngine::instance()->sample_rate();
 
-	child = new XMLNode ("interface");
-	child->add_property ("val", interface_combo.get_active_text());
-	root->add_child_nocopy (*child);
+        if (sample_rate == 0) {
+                lm_results.set_text (_("Disconnected from audio engine"));
+		ARDOUR::AudioEngine::instance()->stop_latency_detection ();
+                return false;
+        }
 
-	child = new XMLNode ("timeout");
-	child->add_property ("val", timeout_combo.get_active_text());
-	root->add_child_nocopy (*child);
+	uint32_t frames_total = mtdm->del();
+	cerr << "total = " << frames_total << " delay = " << ARDOUR::AudioEngine::instance()->latency_signal_delay() << endl;
+	uint32_t extra = frames_total - ARDOUR::AudioEngine::instance()->latency_signal_delay();
 
-	child = new XMLNode ("dither");
-	child->add_property ("val", dither_mode_combo.get_active_text());
-	root->add_child_nocopy (*child);
+        snprintf (buf, sizeof (buf), "%u samples %10.3lf ms", extra, extra * 1000.0f/sample_rate);
 
-	child = new XMLNode ("audiomode");
-	child->add_property ("val", audio_mode_combo.get_active_text());
-	root->add_child_nocopy (*child);
+        bool solid = true;
 
-	child = new XMLNode ("inputdevice");
-	child->add_property ("val", input_device_combo.get_active_text());
-	root->add_child_nocopy (*child);
+        if (mtdm->err () > 0.2) {
+                strcat (buf, " ??");
+                solid = false;
+        }
 
-	child = new XMLNode ("outputdevice");
-	child->add_property ("val", output_device_combo.get_active_text());
-	root->add_child_nocopy (*child);
+        if (mtdm->inv ()) {
+                strcat (buf, " (Inv)");
+                solid = false;
+        }
 
-	child = new XMLNode ("mididriver");
-	child->add_property ("val", midi_driver_combo.get_active_text());
-	root->add_child_nocopy (*child);
+        if (solid) {
+                lm_measure_button.set_active (false);
+		lm_use_button.set_sensitive (true);
+                strcat (buf, " (set)");
+        }
+	
+        lm_results.set_text (buf);
 
-	return *root;
+        return true;
 }
 
 void
-EngineControl::set_state (const XMLNode& root)
+EngineControl::latency_button_toggled ()
 {
-	XMLNodeList          clist;
-	XMLNodeConstIterator citer;
-	XMLNode* child;
-	XMLProperty* prop = NULL;
-	bool using_dummy = false;
-	bool using_ffado = false;
+        if (lm_measure_button.get_active ()) {
 
-	int val;
-	string strval;
+		ARDOUR::AudioEngine::instance()->set_latency_input_port (lm_input_channel_combo.get_active_text());
+		ARDOUR::AudioEngine::instance()->set_latency_output_port (lm_output_channel_combo.get_active_text());
+		ARDOUR::AudioEngine::instance()->start_latency_detection ();
+                lm_results.set_text (_("Detecting ..."));
+                latency_timeout = Glib::signal_timeout().connect (mem_fun (*this, &EngineControl::check_latency_measurement), 250);
 
-	if ( (child = root.child ("driver"))){
-		prop = child->property("val");
+        } else {
+		ARDOUR::AudioEngine::instance()->stop_latency_detection ();
+                latency_timeout.disconnect ();
+        }
+}
 
-		if (prop && (prop->value() == "Dummy") ) {
-			using_dummy = true;
-		}
-		if (prop && (prop->value() == "FFADO") ) {
-			using_ffado = true;
-		}
+void
+EngineControl::use_latency_button_clicked ()
+{
+        MTDM* mtdm = ARDOUR::AudioEngine::instance()->mtdm ();
 
+	if (!mtdm) {
+		return;
 	}
 
-	clist = root.children();
-
-	for (citer = clist.begin(); citer != clist.end(); ++citer) {
-
-		child = *citer;
-
-		prop = child->property ("val");
-
-		if (!prop || prop->value().empty()) {
+	uint32_t frames_total = mtdm->del();
+	uint32_t extra = frames_total - ARDOUR::AudioEngine::instance()->latency_signal_delay();
+	uint32_t one_way = extra/2;
 
-			if (((using_dummy || using_ffado)
-				&& ( child->name() == "interface"
-					|| child->name() == "inputdevice"
-					|| child->name() == "outputdevice"))
-				|| child->name() == "timeout")
-			{
-				continue;
-			}
-
-			error << string_compose (_("AudioSetup value for %1 is missing data"), child->name()) << endmsg;
-			continue;
-		}
-
-		strval = prop->value();
-
-		/* adjustments/spinners */
-
-		if (child->name() == "periods") {
-			val = atoi (strval);
-			periods_adjustment.set_value(val);
-		} else if (child->name() == "ports") {
-			val = atoi (strval);
-			ports_adjustment.set_value(val);
-		} else if (child->name() == "inlatency") {
-			val = atoi (strval);
-			input_latency.set_value(val);
-		} else if (child->name() == "outlatency") {
-			val = atoi (strval);
-			output_latency.set_value(val);
-		}
-
-		/* buttons */
-
-		else if (child->name() == "realtime") {
-			val = atoi (strval);
-			realtime_button.set_active(val);
-		} else if (child->name() == "nomemorylock") {
-			val = atoi (strval);
-			no_memory_lock_button.set_active(val);
-		} else if (child->name() == "unlockmemory") {
-			val = atoi (strval);
-			unlock_memory_button.set_active(val);
-		} else if (child->name() == "softmode") {
-			val = atoi (strval);
-			soft_mode_button.set_active(val);
-		} else if (child->name() == "force16bit") {
-			val = atoi (strval);
-			force16bit_button.set_active(val);
-		} else if (child->name() == "hwmonitor") {
-			val = atoi (strval);
-			hw_monitor_button.set_active(val);
-		} else if (child->name() == "hwmeter") {
-			val = atoi (strval);
-			hw_meter_button.set_active(val);
-		} else if (child->name() == "verbose") {
-			val = atoi (strval);
-			verbose_output_button.set_active(val);
-		}
-
-		/* combos */
-
-		else if (child->name() == "samplerate") {
-			sample_rate_combo.set_active_text(strval);
-		} else if (child->name() == "periodsize") {
-			period_size_combo.set_active_text(strval);
-		} else if (child->name() == "serverpath") {
-
-                        /* only attempt to set this if we have bothered to look
-                           up server names already. otherwise this is all
-                           redundant (actually, all of this dialog/widget
-                           is redundant in that case ...)
-                        */
-
-                        if (!server_strings.empty()) {
-                                /* do not allow us to use a server path that doesn't
-                                   exist on this system. this handles cases where
-                                   the user has an RC file listing a serverpath
-                                   from some other machine.
-                                */
-                                vector<string>::iterator x;
-                                for (x = server_strings.begin(); x != server_strings.end(); ++x) {
-                                        if (*x == strval) {
-                                                break;
-                                        }
-                                }
-                                if (x != server_strings.end()) {
-                                        serverpath_combo.set_active_text (strval);
-                                } else {
-                                        warning << string_compose (_("configuration files contain a JACK server path that doesn't exist (%1)"),
-                                                                   strval)
-                                                << endmsg;
-                                }
-                        }
-
-		} else if (child->name() == "driver") {
-			driver_combo.set_active_text(strval);
-		} else if (child->name() == "interface") {
-			interface_combo.set_active_text(strval);
-		} else if (child->name() == "timeout") {
-			timeout_combo.set_active_text(strval);
-		} else if (child->name() == "dither") {
-			dither_mode_combo.set_active_text(strval);
-		} else if (child->name() == "audiomode") {
-			audio_mode_combo.set_active_text(strval);
-		} else if (child->name() == "inputdevice") {
-			input_device_combo.set_active_text(strval);
-		} else if (child->name() == "outputdevice") {
-			output_device_combo.set_active_text(strval);
-		} else if (child->name() == "mididriver") {
-			midi_driver_combo.set_active_text(strval);
-		}
-	}
+	input_latency_adjustment.set_value (one_way);
+	output_latency_adjustment.set_value (one_way);
 }
diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h
index 0d7ce29b46..98ddf2c1b3 100644
--- a/gtk2_ardour/engine_dialog.h
+++ b/gtk2_ardour/engine_dialog.h
@@ -26,7 +26,6 @@
 
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/spinbutton.h>
-#include <gtkmm/notebook.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/table.h>
 #include <gtkmm/expander.h>
@@ -34,93 +33,151 @@
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/button.h>
 
-class EngineControl : public Gtk::VBox {
-  public:
-	EngineControl ();
-	~EngineControl ();
-
-	static bool need_setup ();
-	int setup_engine ();
+#include "pbd/signals.h"
 
-	bool was_used() const { return _used; }
-	XMLNode& get_state ();
-	void set_state (const XMLNode&);
+#include "ardour_dialog.h"
 
+class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList {
+  public:
+    EngineControl ();
+    ~EngineControl ();
+    
+    static bool need_setup ();
+    
+    XMLNode& get_state ();
+    void set_state (const XMLNode&);
+    
+    void set_desired_sample_rate (uint32_t);
+    
   private:
-	Gtk::Adjustment periods_adjustment;
-	Gtk::SpinButton periods_spinner;
-	Gtk::Adjustment ports_adjustment;
-	Gtk::SpinButton ports_spinner;
-	Gtk::Adjustment input_latency_adjustment;
-	Gtk::SpinButton input_latency;
-	Gtk::Adjustment output_latency_adjustment;
-	Gtk::SpinButton output_latency;
-	Gtk::Label latency_label;
-
-	Gtk::CheckButton realtime_button;
-	Gtk::CheckButton no_memory_lock_button;
-	Gtk::CheckButton unlock_memory_button;
-	Gtk::CheckButton soft_mode_button;
-	Gtk::CheckButton monitor_button;
-	Gtk::CheckButton force16bit_button;
-	Gtk::CheckButton hw_monitor_button;
-	Gtk::CheckButton hw_meter_button;
-	Gtk::CheckButton verbose_output_button;
-
-	Gtk::Button start_button;
-	Gtk::Button stop_button;
-	Gtk::HButtonBox button_box;
-
-	Gtk::ComboBoxText sample_rate_combo;
-	Gtk::ComboBoxText period_size_combo;
-
-	Gtk::ComboBoxText preset_combo;
-	Gtk::ComboBoxText serverpath_combo;
-	Gtk::ComboBoxText driver_combo;
-	Gtk::ComboBoxText interface_combo;
-	Gtk::ComboBoxText timeout_combo;
-	Gtk::ComboBoxText dither_mode_combo;
-	Gtk::ComboBoxText audio_mode_combo;
-	Gtk::ComboBoxText input_device_combo;
-	Gtk::ComboBoxText output_device_combo;
-	Gtk::ComboBoxText midi_driver_combo;
-
-	Gtk::Table basic_packer;
-	Gtk::Table options_packer;
-	Gtk::Table device_packer;
-	Gtk::HBox basic_hbox;
-	Gtk::HBox options_hbox;
-	Gtk::HBox device_hbox;
-	Gtk::Notebook notebook;
-
-	bool _used;
-
-        static bool engine_running ();
-
-	void driver_changed ();
-	void build_command_line (std::vector<std::string>&);
-
-	std::map<std::string,std::vector<std::string> > devices;
-	std::vector<std::string> backend_devs;
-	void enumerate_devices (const std::string& driver);
-
-#ifdef __APPLE__
-	std::vector<std::string> enumerate_coreaudio_devices ();
-#else
-	std::vector<std::string> enumerate_alsa_devices ();
-	std::vector<std::string> enumerate_oss_devices ();
-	std::vector<std::string> enumerate_netjack_devices ();
-	std::vector<std::string> enumerate_freebob_devices ();
-	std::vector<std::string> enumerate_ffado_devices ();
-	std::vector<std::string> enumerate_dummy_devices ();
-#endif
-
-	void redisplay_latency ();
-	uint32_t get_rate();
-	void audio_mode_changed ();
-	std::vector<std::string> server_strings;
-	void find_jack_servers (std::vector<std::string>&);
-	std::string get_device_name (const std::string& driver, const std::string& human_readable_name);
+    Gtk::Notebook notebook;
+
+    /* core fields used by all backends */
+
+    Gtk::ComboBoxText backend_combo;
+    Gtk::ComboBoxText sample_rate_combo;
+    Gtk::ComboBoxText buffer_size_combo;
+    Gtk::Label        buffer_size_duration_label;
+    Gtk::Adjustment input_latency_adjustment;
+    Gtk::SpinButton input_latency;
+    Gtk::Adjustment output_latency_adjustment;
+    Gtk::SpinButton output_latency;
+    Gtk::Adjustment input_channels_adjustment;
+    Gtk::SpinButton input_channels;
+    Gtk::Adjustment output_channels_adjustment;
+    Gtk::SpinButton output_channels;
+    Gtk::Adjustment ports_adjustment;
+    Gtk::SpinButton ports_spinner;
+
+    Gtk::Button     control_app_button;
+
+    /* latency measurement */
+
+    Gtk::ComboBoxText lm_output_channel_combo;
+    Gtk::ComboBoxText lm_input_channel_combo;
+    Gtk::ToggleButton lm_measure_button;
+    Gtk::Button       lm_use_button;
+    Gtk::Label        lm_title;
+    Gtk::Label        lm_preamble;
+    Gtk::Label        lm_results;
+    Gtk::Table        lm_table;
+    Gtk::VBox         lm_vbox;
+
+    /* JACK specific */
+    
+    Gtk::CheckButton realtime_button;
+    Gtk::CheckButton no_memory_lock_button;
+    Gtk::CheckButton unlock_memory_button;
+    Gtk::CheckButton soft_mode_button;
+    Gtk::CheckButton monitor_button;
+    Gtk::CheckButton force16bit_button;
+    Gtk::CheckButton hw_monitor_button;
+    Gtk::CheckButton hw_meter_button;
+    Gtk::CheckButton verbose_output_button;
+    
+    Gtk::ComboBoxText preset_combo;
+    Gtk::ComboBoxText serverpath_combo;
+    Gtk::ComboBoxText driver_combo;
+    Gtk::ComboBoxText device_combo;
+    Gtk::ComboBoxText timeout_combo;
+    Gtk::ComboBoxText dither_mode_combo;
+    Gtk::ComboBoxText audio_mode_combo;
+    Gtk::ComboBoxText midi_driver_combo;
+    
+    Gtk::Table basic_packer;
+    Gtk::Table midi_packer;
+    Gtk::HBox basic_hbox;
+    Gtk::VBox basic_vbox;
+    Gtk::HBox midi_hbox;
+
+    uint32_t ignore_changes;
+    
+    static bool engine_running ();
+    
+    void driver_changed ();
+    void backend_changed ();
+    void sample_rate_changed ();
+    void buffer_size_changed ();
+    void parameter_changed ();
+
+    uint32_t get_rate() const;
+    uint32_t get_buffer_size() const;
+    uint32_t get_input_channels() const;
+    uint32_t get_output_channels() const;
+    uint32_t get_input_latency() const;
+    uint32_t get_output_latency() const;
+    std::string get_device_name() const;
+    std::string get_driver() const;
+
+    void device_changed ();
+    void list_devices ();
+    void show_buffer_duration ();
+
+    struct State {
+	std::string backend;
+	std::string driver;
+	std::string device;
+	std::string sample_rate;
+	std::string buffer_size;
+	uint32_t input_latency;
+	uint32_t output_latency;
+	uint32_t input_channels;
+	uint32_t output_channels;
+	bool active;
+
+	State() : active (false) {};
+    };
+    
+    typedef std::list<State> StateList;
+
+    StateList states;
+
+    State* get_matching_state (const std::string& backend,
+			       const std::string& driver,
+			       const std::string& device);
+    State* get_saved_state_for_currently_displayed_backend_and_device ();
+    void maybe_display_saved_state ();
+    State* save_state ();
+
+    static bool print_channel_count (Gtk::SpinButton*);
+
+    void build_notebook ();
+
+    void on_response (int);
+    void control_app_button_clicked ();
+    void use_latency_button_clicked ();
+    void manage_control_app_sensitivity ();
+    int push_state_to_backend (bool start);
+    uint32_t _desired_sample_rate;
+
+    /* latency measurement */
+    void latency_button_toggled ();
+    bool check_latency_measurement ();
+    sigc::connection latency_timeout;
+    void enable_latency_tab ();
+    void disable_latency_tab ();
+
+    void on_switch_page (GtkNotebookPage*, guint page_num);
 };
 
 #endif /* __gtk2_ardour_engine_dialog_h__ */
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index 48d09065b7..b1b59fa088 100644
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -62,9 +62,9 @@ using namespace PBD;
 using namespace ARDOUR;
 using namespace VideoUtils;
 
-ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
+ExportVideoDialog::ExportVideoDialog (Session* s, TimeSelection &tme)
 	: ArdourDialog (_("Export Video File "))
-	, editor (ed)
+	, export_range (tme)
 	, outfn_path_label (_("File:"), Gtk::ALIGN_LEFT)
 	, outfn_browse_button (_("Browse"))
 	, invid_path_label (_("Video:"), Gtk::ALIGN_LEFT)
@@ -150,6 +150,9 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
 	} else {
 		insnd_combo.append_text (_("from the video's start to the video's end"));
 	}
+	if (!export_range.empty()) {
+		insnd_combo.append_text (_("Selected range"));  // TODO show export_range.start() -> export_range.end_frame()
+	}
 	insnd_combo.set_active(0);
 
 	outfn_path_entry.set_width_chars(38);
@@ -165,7 +168,7 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
 				filenameset = true;
 			}
 		}
-		else if (!filenameset
+		if (!filenameset
 				&& node->property(X_("Filename"))
 				&& node->property(X_("LocalFile"))
 				&& node->property(X_("LocalFile"))->value() == X_("1")
@@ -179,6 +182,9 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
 				filenameset = true;
 			}
 		}
+		if (!filenameset) {
+			invid_path_entry.set_text (X_(""));
+		}
 	}
 
 	l = manage (new Label (_("<b>Settings:</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
@@ -254,8 +260,7 @@ ExportVideoDialog::ExportVideoDialog (PublicEditor& ed, Session* s)
 	video_codec_combo.append_text("mjpeg");
 	video_codec_combo.append_text("mpeg2video");
 	video_codec_combo.append_text("mpeg4");
-	video_codec_combo.append_text("x264 (baseline)");
-	video_codec_combo.append_text("x264 (hq)");
+	video_codec_combo.append_text("h264");
 	video_codec_combo.append_text("vpx (webm)");
 	video_codec_combo.append_text("copy");
 	video_codec_combo.set_active(4);
@@ -505,6 +510,11 @@ ExportVideoDialog::launch_export ()
 		}
 		end += av_offset;
 	}
+	else if (insnd_combo.get_active_row_number() == 2) {
+		// TODO quantize to video-frame ?!
+		start = export_range.start();
+		end   = export_range.end_frame();
+	}
 	if (end <= 0) {
 		start = _session->current_start_frame();
 		end   = _session->current_end_frame();
@@ -609,13 +619,8 @@ ExportVideoDialog::encode_pass (int pass)
 		ffs["-strict"] = "-2";
 	}
 
-	if (video_codec_combo.get_active_text() == "x264 (hq)" ) {
+	if (video_codec_combo.get_active_text() == "h264" ) {
 		ffs["-vcodec"] = "libx264";
-		ffs["-vprofile"] = "high";
-	}
-	else if (video_codec_combo.get_active_text() == "x264 (baseline)" ) {
-		ffs["-vcodec"] = "libx264";
-		ffs["-vpre"] = "baseline";
 	}
 	else if (video_codec_combo.get_active_text() == "vpx (webm)" ) {
 		ffs["-vcodec"] = "libvpx";
@@ -697,9 +702,14 @@ ExportVideoDialog::encode_pass (int pass)
 	double duration_s  = 0;
 
 	if (insnd_combo.get_active_row_number() == 0) {
+		/* session start to session end */
 		framecnt_t duration_f = _session->current_end_frame() - _session->current_start_frame();
 		duration_s = (double)duration_f / (double)_session->nominal_frame_rate();
+	} else if (insnd_combo.get_active_row_number() == 2) {
+		/* selected range */
+		duration_s = export_range.length() / (double)_session->nominal_frame_rate();
 	} else {
+		/* video start to end */
 		framecnt_t duration_f = ARDOUR_UI::instance()->video_timeline->get_duration();
 		if (av_offset < 0 ) {
 			duration_f += av_offset;
@@ -715,10 +725,16 @@ ExportVideoDialog::encode_pass (int pass)
 		transcoder->set_duration(duration_s * transcoder->get_fps());
 	}
 
-	if (insnd_combo.get_active_row_number() == 0) {
-		const framepos_t start = _session->current_start_frame();
-		const framepos_t snend = _session->current_end_frame();
+	if (insnd_combo.get_active_row_number() == 0 || insnd_combo.get_active_row_number() == 2) {
+		framepos_t start, snend;
 		const frameoffset_t vid_duration = ARDOUR_UI::instance()->video_timeline->get_duration();
+		if (insnd_combo.get_active_row_number() == 0) {
+			start = _session->current_start_frame();
+			snend = _session->current_end_frame();
+		} else {
+			start = export_range.start();
+			snend = export_range.end_frame();
+		}
 
 #if 0 /* DEBUG */
 		printf("AV offset: %lld Vid-len: %lld Vid-end: %lld || start:%lld || end:%lld\n",
@@ -733,9 +749,17 @@ ExportVideoDialog::encode_pass (int pass)
 		} else if (av_offset + vid_duration < snend) {
 			transcoder->set_leadinout(0, (snend - (av_offset + vid_duration)) / (double)_session->nominal_frame_rate());
 			transcoder->set_avoffset((av_offset - start) / (double)_session->nominal_frame_rate());
-		} else {
+		}
+#if 0
+		else if (start > av_offset) {
+			std::ostringstream osstream; osstream << ((start - av_offset) / (double)_session->nominal_frame_rate());
+			ffs["-ss"] = osstream.str();
+		}
+#endif
+		else {
 			transcoder->set_avoffset((av_offset - start) / (double)_session->nominal_frame_rate());
 		}
+
 	} else if (av_offset < 0) {
 		/* from 00:00:00:00 to video-end */
 		transcoder->set_avoffset(av_offset / (double)_session->nominal_frame_rate());
diff --git a/gtk2_ardour/export_video_dialog.h b/gtk2_ardour/export_video_dialog.h
index 2594c2073b..7e3cf442a7 100644
--- a/gtk2_ardour/export_video_dialog.h
+++ b/gtk2_ardour/export_video_dialog.h
@@ -28,6 +28,7 @@
 #include "ardour/template_utils.h"
 #include "ardour_dialog.h"
 
+#include "time_selection.h"
 #include "transcode_ffmpeg.h"
 
 /** @class ExportVideoDialog
@@ -40,13 +41,13 @@
 class ExportVideoDialog : public ArdourDialog , public PBD::ScopedConnectionList
 {
   public:
-	ExportVideoDialog (PublicEditor&, ARDOUR::Session*);
+	ExportVideoDialog (ARDOUR::Session*, TimeSelection &tme);
 	~ExportVideoDialog ();
 
 	std::string get_exported_filename () { return outfn_path_entry.get_text(); }
 
   private:
-	PublicEditor& editor;
+	TimeSelection &export_range;
 
 	void on_show ();
 	void abort_clicked ();
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index b7b53a64bf..edf07a13a5 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -32,7 +32,6 @@
 #include <gtkmm2ext/fastmeter.h>
 #include <gtkmm2ext/barcontroller.h>
 #include <gtkmm2ext/gtk_ui.h>
-#include "midi++/manager.h"
 #include "pbd/fastlog.h"
 #include "pbd/stacktrace.h"
 
@@ -278,16 +277,20 @@ GainMeterBase::setup_meters (int len)
 
 	switch (_width) {
 		case Wide:
-			meter_ticks1_area.show();
-			meter_ticks2_area.show();
+			//meter_ticks1_area.show();
+			//meter_ticks2_area.show();
+			meter_metric_area.show();
 			if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
 				meter_width = 10;
 			}
 			break;
 		case Narrow:
-			meter_width = 2;
-			meter_ticks1_area.hide();
-			meter_ticks2_area.hide();
+			if (_route && _route->shared_peak_meter()->input_streams().n_total() > 1) {
+				meter_width = 4;
+			}
+			//meter_ticks1_area.hide();
+			//meter_ticks2_area.hide();
+			meter_metric_area.hide();
 			break;
 	}
 	level_meter->setup_meters(len, meter_width);
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 0d5b6a48c4..100ab5337e 100644
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -37,8 +37,6 @@
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/slider_controller.h>
 
-#include "midi++/manager.h"
-
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/session.h"
diff --git a/gtk2_ardour/global_port_matrix.cc b/gtk2_ardour/global_port_matrix.cc
index 8c1fde3082..80e2616bd8 100644
--- a/gtk2_ardour/global_port_matrix.cc
+++ b/gtk2_ardour/global_port_matrix.cc
@@ -19,6 +19,7 @@
 
 #include <gtkmm/image.h>
 #include <gtkmm/stock.h>
+
 #include "global_port_matrix.h"
 #include "utils.h"
 
@@ -82,9 +83,9 @@ GlobalPortMatrix::set_state (BundleChannel c[2], bool s)
 			} else {
 				/* two non-Ardour ports */
 				if (s) {
-					jack_connect (_session->engine().jack (), j->c_str(), i->c_str());
+					AudioEngine::instance()->connect (*j, *i);
 				} else {
-					jack_disconnect (_session->engine().jack (), j->c_str(), i->c_str());
+					AudioEngine::instance()->disconnect (*j, *i);
 				}
 			}
 		}
@@ -113,33 +114,25 @@ GlobalPortMatrix::get_state (BundleChannel c[2]) const
 	for (Bundle::PortList::const_iterator i = in_ports.begin(); i != in_ports.end(); ++i) {
 		for (Bundle::PortList::const_iterator j = out_ports.begin(); j != out_ports.end(); ++j) {
 
-			boost::shared_ptr<Port> p = _session->engine().get_port_by_name (*i);
-			boost::shared_ptr<Port> q = _session->engine().get_port_by_name (*j);
+			boost::shared_ptr<Port> p = AudioEngine::instance()->get_port_by_name (*i);
+			boost::shared_ptr<Port> q = AudioEngine::instance()->get_port_by_name (*j);
 
 			if (!p && !q) {
 				/* two non-Ardour ports; things are slightly more involved */
-				/* XXX: is this the easiest way to do this? */
-				/* XXX: isn't this very inefficient? */
 
-				jack_client_t* jack = _session->engine().jack ();
-				jack_port_t* jp = jack_port_by_name (jack, i->c_str());
-				if (jp == 0) {
+				/* get a port handle for one of them .. */
+
+				PortEngine::PortHandle ph = AudioEngine::instance()->port_engine().get_port_by_name (*i);
+				if (!ph) {
 					return PortMatrixNode::NOT_ASSOCIATED;
 				}
 
-				char const ** c = jack_port_get_all_connections (jack, jp);
-
-				char const ** p = c;
+				/* see if it is connected to the other one ... */
 
-				while (p && *p != 0) {
-					if (strcmp (*p, j->c_str()) == 0) {
-						free (c);
-						return PortMatrixNode::ASSOCIATED;
-					}
-					++p;
+				if (AudioEngine::instance()->port_engine().connected_to (ph, *j, false)) {
+					return PortMatrixNode::ASSOCIATED;
 				}
 
-				free (c);
 				return PortMatrixNode::NOT_ASSOCIATED;
 			}
 
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc
index 255b499f0d..194e446115 100644
--- a/gtk2_ardour/level_meter.cc
+++ b/gtk2_ardour/level_meter.cc
@@ -23,7 +23,6 @@
 
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/barcontroller.h>
-#include "midi++/manager.h"
 #include "pbd/fastlog.h"
 
 #include "ardour_ui.h"
diff --git a/gtk2_ardour/lv2_external_ui.h b/gtk2_ardour/lv2_external_ui.h
index 19fa912f04..9f404e6d9a 100644
--- a/gtk2_ardour/lv2_external_ui.h
+++ b/gtk2_ardour/lv2_external_ui.h
@@ -37,6 +37,8 @@
 /** UI extension suitable for out-of-process UIs */
 #define LV2_EXTERNAL_UI_URI "http://lv2plug.in/ns/extensions/ui#external"
 
+#define LV2_EXTERNAL_UI_KX__Host   "http://kxstudio.sf.net/ns/lv2ext/external-ui#Host"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/gtk2_ardour/lv2_plugin_ui.cc b/gtk2_ardour/lv2_plugin_ui.cc
index f9b15714f6..c273c1f4dd 100644
--- a/gtk2_ardour/lv2_plugin_ui.cc
+++ b/gtk2_ardour/lv2_plugin_ui.cc
@@ -113,6 +113,7 @@ LV2PluginUI::update_timeout()
 void
 LV2PluginUI::on_external_ui_closed(void* controller)
 {
+	//printf("LV2PluginUI::on_external_ui_closed\n");
 	LV2PluginUI* me = (LV2PluginUI*)controller;
 	me->_screen_update_connection.disconnect();
 	me->_external_ui_ptr = NULL;
@@ -167,6 +168,19 @@ LV2PluginUI::output_update()
 	//cout << "output_update" << endl;
 	if (_external_ui_ptr) {
 		LV2_EXTERNAL_UI_RUN(_external_ui_ptr);
+		if (_lv2->is_external_kx() && !_external_ui_ptr) {
+			// clean up external UI if it closes itself via
+			// on_external_ui_closed() during run()
+			//printf("LV2PluginUI::output_update -- UI was closed\n");
+			//_screen_update_connection.disconnect();
+			_message_update_connection.disconnect();
+			if (_inst) {
+				suil_instance_free((SuilInstance*)_inst);
+			}
+			_inst = NULL;
+			_external_ui_ptr = NULL;
+			return;
+		}
 	}
 
 	/* FIXME only works with control output ports (which is all we support now anyway) */
@@ -218,12 +232,16 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
 		_external_ui_feature.URI  = LV2_EXTERNAL_UI_URI;
 		_external_ui_feature.data = &_external_ui_host;
 
+		_external_kxui_feature.URI  = LV2_EXTERNAL_UI_KX__Host;
+		_external_kxui_feature.data = &_external_ui_host;
+
 		++features_count;
 		features = (LV2_Feature**)malloc(
-			sizeof(LV2_Feature*) * (features_count + 1));
-		for (size_t i = 0; i < features_count - 1; ++i) {
+			sizeof(LV2_Feature*) * (features_count + 2));
+		for (size_t i = 0; i < features_count - 2; ++i) {
 			features[i] = features_src[i];
 		}
+		features[features_count - 2] = &_external_kxui_feature;
 		features[features_count - 1] = &_external_ui_feature;
 		features[features_count]     = NULL;
 	} else {
@@ -260,6 +278,10 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
 		? NS_UI "external"
 		: NS_UI "GtkUI";
 
+	if (_lv2->has_message_output()) {
+		_lv2->enable_ui_emmission();
+	}
+
 	const LilvUI* ui = (const LilvUI*)_lv2->c_ui();
 	_inst = suil_instance_new(
 		ui_host,
@@ -322,8 +344,7 @@ LV2PluginUI::lv2ui_instantiate(const std::string& title)
 	}
 
 	if (_lv2->has_message_output()) {
-		_lv2->enable_ui_emmission();
-		ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect(
+		_message_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect(
 			sigc::mem_fun(*this, &LV2PluginUI::update_timeout));
 	}
 }
@@ -350,17 +371,14 @@ LV2PluginUI::~LV2PluginUI ()
 		delete[] _values;
 	}
 
-	/* Close and delete GUI. */
-	lv2ui_free();
-
+	_message_update_connection.disconnect();
 	_screen_update_connection.disconnect();
 
-	if (_lv2->is_external_ui()) {
-		/* External UI is no longer valid.
-		   on_window_hide() will not try to use it if is NULL.
-		*/
-		_external_ui_ptr = NULL;
+	if (_external_ui_ptr && _lv2->is_external_kx()) {
+		LV2_EXTERNAL_UI_HIDE(_external_ui_ptr);
 	}
+	lv2ui_free();
+	_external_ui_ptr = NULL;
 }
 
 int
@@ -423,7 +441,15 @@ LV2PluginUI::on_window_show(const std::string& title)
 
 	if (_lv2->is_external_ui()) {
 		if (_external_ui_ptr) {
+			_screen_update_connection.disconnect();
+			_message_update_connection.disconnect();
 			LV2_EXTERNAL_UI_SHOW(_external_ui_ptr);
+			_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect
+		        (sigc::mem_fun(*this, &LV2PluginUI::output_update));
+			if (_lv2->has_message_output()) {
+				_message_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect(
+					sigc::mem_fun(*this, &LV2PluginUI::update_timeout));
+			}
 			return false;
 		}
 		lv2ui_instantiate(title);
@@ -431,10 +457,15 @@ LV2PluginUI::on_window_show(const std::string& title)
 			return false;
 		}
 
-		LV2_EXTERNAL_UI_SHOW(_external_ui_ptr);
 		_screen_update_connection.disconnect();
+		_message_update_connection.disconnect();
+		LV2_EXTERNAL_UI_SHOW(_external_ui_ptr);
 		_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect
-		        (sigc::mem_fun(*this, &LV2PluginUI::output_update));
+			(sigc::mem_fun(*this, &LV2PluginUI::output_update));
+		if (_lv2->has_message_output()) {
+			_message_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect(
+				sigc::mem_fun(*this, &LV2PluginUI::update_timeout));
+		}
 		return false;
 	} else {
 		lv2ui_instantiate("gtk2gui");
@@ -446,13 +477,17 @@ LV2PluginUI::on_window_show(const std::string& title)
 void
 LV2PluginUI::on_window_hide()
 {
-	//cout << "on_window_hide" << endl; flush(cout);
+	//printf("LV2PluginUI::on_window_hide\n");
+	_message_update_connection.disconnect();
 
-	if (_external_ui_ptr) {
+	if (_lv2->is_external_ui()) {
+		if (!_external_ui_ptr) { return; }
 		LV2_EXTERNAL_UI_HIDE(_external_ui_ptr);
-		//slv2_ui_instance_get_descriptor(_inst)->cleanup(_inst);
-		//_external_ui_ptr = NULL;
-		//_screen_update_connection.disconnect();
+		if (!_lv2->is_external_kx()) { return ; }
+		_screen_update_connection.disconnect();
+		_external_ui_ptr = NULL;
+		suil_instance_free((SuilInstance*)_inst);
+		_inst = NULL;
 	} else {
 		lv2ui_free();
 	}
diff --git a/gtk2_ardour/lv2_plugin_ui.h b/gtk2_ardour/lv2_plugin_ui.h
index edb90cb154..a39386a7e0 100644
--- a/gtk2_ardour/lv2_plugin_ui.h
+++ b/gtk2_ardour/lv2_plugin_ui.h
@@ -71,6 +71,7 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox
 	boost::shared_ptr<ARDOUR::LV2Plugin> _lv2;
 	std::vector<int>                     _output_ports;
 	sigc::connection                     _screen_update_connection;
+	sigc::connection                     _message_update_connection;
 	Gtk::Widget*                         _gui_widget;
 	/** a box containing the focus, bypass, delete, save / add preset buttons etc. */
 	Gtk::HBox                            _ardour_buttons_box;
@@ -78,6 +79,7 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox
 	std::vector<ControllableRef>         _controllables;
 	struct lv2_external_ui_host          _external_ui_host;
 	LV2_Feature                          _external_ui_feature;
+	LV2_Feature                          _external_kxui_feature;
 	struct lv2_external_ui*              _external_ui_ptr;
 	LV2_Feature                          _parent_feature;
 	Gtk::Window*                         _win_ptr;
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index e619c9d83b..c8f8d76a98 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -372,34 +372,30 @@ static void load_custom_fonts() {
 #endif
 
 static gboolean
-tell_about_jack_death (void* /* ignored */)
+tell_about_backend_death (void* /* ignored */)
 {
 	if (AudioEngine::instance()->processed_frames() == 0) {
 		/* died during startup */
-		MessageDialog msg (_("JACK exited"), false);
+		MessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false);
 		msg.set_position (Gtk::WIN_POS_CENTER);
 		msg.set_secondary_text (string_compose (_(
-"JACK exited unexpectedly, and without notifying %1.\n\
+"%2 exited unexpectedly, and without notifying %1.\n\
 \n\
-This could be due to misconfiguration or to an error inside JACK.\n\
+This could be due to misconfiguration or to an error inside %2.\n\
 \n\
-Click OK to exit %1."), PROGRAM_NAME));
+Click OK to exit %1."), PROGRAM_NAME, AudioEngine::instance()->current_backend_name()));
 
 		msg.run ();
 		_exit (0);
 
 	} else {
 
-		/* engine has already run, so this is a mid-session JACK death */
-
-		MessageDialog* msg = manage (new MessageDialog (_("JACK exited"), false));
-		msg->set_secondary_text (string_compose (_(
-"JACK exited unexpectedly, and without notifying %1.\n\
-\n\
-This is probably due to an error inside JACK. You should restart JACK\n\
-and reconnect %1 to it, or exit %1 now. You cannot save your\n\
-session at this time, because we would lose your connection information.\n"), PROGRAM_NAME));
-		msg->present ();
+		/* engine has already run, so this is a mid-session backend death */
+			
+		MessageDialog msg (string_compose (_("The audio backend (%1) has failed, or terminated"), AudioEngine::instance()->current_backend_name()), false);
+		msg.set_secondary_text (string_compose (_("%2 exited unexpectedly, and without notifying %1."),
+							 PROGRAM_NAME, AudioEngine::instance()->current_backend_name()));
+		msg.present ();
 	}
 	return false; /* do not call again */
 }
@@ -407,15 +403,15 @@ session at this time, because we would lose your connection information.\n"), PR
 static void
 sigpipe_handler (int /*signal*/)
 {
-	/* XXX fix this so that we do this again after a reconnect to JACK
+	/* XXX fix this so that we do this again after a reconnect to the backend
 	 */
 
-	static bool done_the_jack_thing = false;
+	static bool done_the_backend_thing = false;
 
-	if (!done_the_jack_thing) {
+	if (!done_the_backend_thing) {
 		AudioEngine::instance()->died ();
-		g_idle_add (tell_about_jack_death, 0);
-		done_the_jack_thing =  true;
+		g_idle_add (tell_about_backend_death, 0);
+		done_the_backend_thing =  true;
 	}
 }
 
diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index 4a4f1dd8dd..8756089e00 100644
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -702,11 +702,11 @@ Meterbridge::sync_order_keys (RouteSortOrderKey)
 
 		MeterType nmt = (*i).s->meter_type();
 		if (nmt == MeterKrms) nmt = MeterPeak; // identical metrics
-		if (pos == 0) {
+		if (vis == 1) {
 			(*i).s->set_tick_bar(1);
 		}
 
-		if ((*i).visible && nmt != lmt && pos == 0) {
+		if ((*i).visible && nmt != lmt && vis == 1) {
 			lmt = nmt;
 			metrics_left.set_metric_mode(1, lmt);
 		} else if ((*i).visible && nmt != lmt) {
diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc
index 5038cc7b0a..ea4b0c2d54 100644
--- a/gtk2_ardour/midi_tracer.cc
+++ b/gtk2_ardour/midi_tracer.cc
@@ -24,7 +24,10 @@
 #include <time.h>
 
 #include "midi++/parser.h"
-#include "midi++/manager.h"
+
+#include "ardour/async_midi_port.h"
+#include "ardour/midi_port.h"
+#include "ardour/audioengine.h"
 
 #include "midi_tracer.h"
 #include "gui_thread.h"
@@ -53,7 +56,8 @@ MidiTracer::MidiTracer ()
 	, collect_button (_("Enabled"))
 	, delta_time_button (_("Delta times"))
 {
-	Manager::instance()->PortsChanged.connect (_manager_connection, invalidator (*this), boost::bind (&MidiTracer::ports_changed, this), gui_context());
+	ARDOUR::AudioEngine::instance()->PortRegisteredOrUnregistered.connect 
+		(_manager_connection, invalidator (*this), boost::bind (&MidiTracer::ports_changed, this), gui_context());
 
 	_last_receipt.tv_sec = 0;
 	_last_receipt.tv_usec = 0;
@@ -126,24 +130,58 @@ MidiTracer::ports_changed ()
 {
 	string const c = _port_combo.get_active_text ();
 	_port_combo.clear ();
+	
+	ARDOUR::PortManager::PortList pl;
+	ARDOUR::AudioEngine::instance()->get_ports (ARDOUR::DataType::MIDI, pl);
+
+	if (pl.empty()) {
+		_port_combo.set_active_text ("");
+		return;
+	}
 
-	boost::shared_ptr<const Manager::PortList> p = Manager::instance()->get_midi_ports ();
-	for (Manager::PortList::const_iterator i = p->begin(); i != p->end(); ++i) {
+	for (ARDOUR::PortManager::PortList::const_iterator i = pl.begin(); i != pl.end(); ++i) {
 		_port_combo.append_text ((*i)->name());
 	}
 
-	_port_combo.set_active_text (c);
+	if (c.empty()) {
+		_port_combo.set_active_text (pl.front()->name());
+	} else {
+		_port_combo.set_active_text (c);
+	}
 }
 
 void
 MidiTracer::port_changed ()
 {
+	using namespace ARDOUR;
+
 	disconnect ();
 
-	Port* p = Manager::instance()->port (_port_combo.get_active_text());
+	boost::shared_ptr<ARDOUR::Port> p = AudioEngine::instance()->get_port_by_name (_port_combo.get_active_text());
+
+	if (!p) {
+		std::cerr << "port not found\n";
+		return;
+	}
+
+	/* The inheritance heirarchy makes this messy. AsyncMIDIPort has two
+	 * available MIDI::Parsers what we could connect to, ::self_parser()
+	 * (from ARDOUR::MidiPort) and ::parser() from MIDI::Port. One day,
+	 * this mess will all go away ...
+	 */
+
+	boost::shared_ptr<AsyncMIDIPort> async = boost::dynamic_pointer_cast<AsyncMIDIPort> (p);
+
+	if (!async) {
 
-	if (p) {
-		p->parser()->any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3));
+		boost::shared_ptr<ARDOUR::MidiPort> mp = boost::dynamic_pointer_cast<ARDOUR::MidiPort> (p);
+
+		if (mp) {
+			mp->self_parser().any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3));
+		}
+		
+	} else {
+		async->parser()->any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3));
 	}
 }
 
@@ -366,9 +404,9 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len)
 
 	fifo.write (&buf, 1);
 
-	if (g_atomic_int_get (const_cast<gint*>(&_update_queued)) == 0) {
-                gui_context()->call_slot (invalidator (*this), boost::bind (&MidiTracer::update, this));
-                g_atomic_int_inc (const_cast<gint*>(&_update_queued));
+	if (g_atomic_int_get (const_cast<gint*> (&_update_queued)) == 0) {
+		gui_context()->call_slot (invalidator (*this), boost::bind (&MidiTracer::update, this));
+		g_atomic_int_inc (const_cast<gint*> (&_update_queued));
 	}
 }
 
@@ -376,7 +414,7 @@ void
 MidiTracer::update ()
 {
 	bool updated = false;
-	g_atomic_int_dec_and_test (const_cast<gint*>(&_update_queued));
+	g_atomic_int_dec_and_test (const_cast<gint*> (&_update_queued));
 
 	RefPtr<TextBuffer> buf (text.get_buffer());
 
diff --git a/gtk2_ardour/nsm.cc b/gtk2_ardour/nsm.cc
index 18d88fec0a..e3ceba355f 100644
--- a/gtk2_ardour/nsm.cc
+++ b/gtk2_ardour/nsm.cc
@@ -50,7 +50,7 @@ NSM_Client::command_open(const char* name,
     int r = ERR_OK;
 
     ARDOUR_COMMAND_LINE::session_name = name;
-    ARDOUR_COMMAND_LINE::jack_client_name = client_id;
+    ARDOUR_COMMAND_LINE::backend_client_name = client_id;
 
     if (ARDOUR_UI::instance()->get_session_parameters(true, false, "")) {
         return ERR_GENERAL;
diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc
index b29f106bfe..90d753af4c 100644
--- a/gtk2_ardour/opts.cc
+++ b/gtk2_ardour/opts.cc
@@ -32,7 +32,8 @@
 using namespace std;
 
 string ARDOUR_COMMAND_LINE::session_name = "";
-string ARDOUR_COMMAND_LINE::jack_client_name = "ardour";
+string ARDOUR_COMMAND_LINE::backend_client_name = "ardour";
+string ARDOUR_COMMAND_LINE::backend_session_uuid;
 bool  ARDOUR_COMMAND_LINE::show_key_actions = false;
 bool ARDOUR_COMMAND_LINE::no_splash = false;
 bool ARDOUR_COMMAND_LINE::just_version = false;
@@ -45,7 +46,6 @@ string ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin de
 std::string ARDOUR_COMMAND_LINE::menus_file = "ardour.menus";
 bool ARDOUR_COMMAND_LINE::finder_invoked_ardour = false;
 string ARDOUR_COMMAND_LINE::immediate_save;
-string ARDOUR_COMMAND_LINE::jack_session_uuid;
 string ARDOUR_COMMAND_LINE::load_template;
 bool ARDOUR_COMMAND_LINE::check_announcements = true;
 
@@ -60,7 +60,7 @@ print_help (const char *execname)
 	     << _("  -h, --help                  Print this message\n")
 	     << _("  -a, --no-announcements      Do not contact website for announcements\n")
 	     << _("  -b, --bindings              Print all possible keyboard binding names\n")
-	     << _("  -c, --name <name>           Use a specific jack client name, default is ardour\n")
+	     << _("  -c, --name <name>           Use a specific backend client name, default is ardour\n")
 	     << _("  -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, --no-splash             Do not show splash screen\n")
@@ -199,7 +199,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 			break;
 
 		case 'c':
-			jack_client_name = optarg;
+			backend_client_name = optarg;
 			break;
 
 		case 'C':
@@ -215,7 +215,7 @@ ARDOUR_COMMAND_LINE::parse_opts (int argc, char *argv[])
 			break;
 
 		case 'U':
-			jack_session_uuid = optarg;
+			backend_session_uuid = optarg;
                         break;
 
 		default:
diff --git a/gtk2_ardour/opts.h b/gtk2_ardour/opts.h
index b9faa36d72..fdf29157d2 100644
--- a/gtk2_ardour/opts.h
+++ b/gtk2_ardour/opts.h
@@ -28,7 +28,8 @@ extern std::string session_name;
 extern bool   show_key_actions;
 extern bool   no_splash;
 extern bool   just_version;
-extern std::string jack_client_name;
+extern std::string backend_client_name;
+extern std::string backend_session_uuid;
 extern bool   use_vst;
 extern bool   new_session;
 extern char*  curvetest_file;
@@ -39,7 +40,6 @@ extern std::string keybindings_path;
 extern std::string menus_file;
 extern bool   finder_invoked_ardour;
 extern std::string immediate_save;
-extern std::string jack_session_uuid;
 extern std::string load_template;
 extern bool        check_announcements;
 
diff --git a/gtk2_ardour/panner_ui.cc b/gtk2_ardour/panner_ui.cc
index 181664bb4e..c82a44f399 100644
--- a/gtk2_ardour/panner_ui.cc
+++ b/gtk2_ardour/panner_ui.cc
@@ -21,7 +21,6 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/barcontroller.h>
 
-#include "midi++/manager.h"
 #include "pbd/fastlog.h"
 
 #include "ardour/pannable.h"
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index d9741f5e39..713b98cdaf 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -40,8 +40,6 @@
 #include <gtkmm2ext/slider_controller.h>
 #include <gtkmm2ext/application.h>
 
-#include "midi++/manager.h"
-
 #include "ardour/session.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
diff --git a/gtk2_ardour/po/cs.po b/gtk2_ardour/po/cs.po
index ca3a9ed176..cec031544b 100644
--- a/gtk2_ardour/po/cs.po
+++ b/gtk2_ardour/po/cs.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk-ardour 0.347.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
-"PO-Revision-Date: 2013-02-09 12:28+0100\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
+"PO-Revision-Date: 2013-06-13 12:05+0200\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: cs\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.4\n"
 "X-Poedit-Country: Czech Republic\n"
 "X-Poedit-Basepath: ../../\n"
 "X-Poedit-SearchPath-0: gtk2_ardour\n"
@@ -148,7 +148,7 @@ msgstr "Armand Klenk"
 
 #: about.cc:153
 msgid "Julien de Kozak"
-msgstr ""
+msgstr "Julien de Kozak"
 
 #: about.cc:154
 msgid "Matt Krai"
@@ -377,9 +377,8 @@ msgstr ""
 "\t Rui-huai Zhang <zrhzrh@mail.ustc.edu.cn>\n"
 
 #: about.cc:580
-#, fuzzy
 msgid "Copyright (C) 1999-2013 Paul Davis\n"
-msgstr "Autorské právo (C) 1999-2012 Paul Davis\n"
+msgstr "Autorské právo (C) 1999-2013 Paul Davis\n"
 
 #: about.cc:584
 msgid "http://ardour.org/"
@@ -413,7 +412,7 @@ msgstr "%1 soubor s vymezením nabídky nenalezen"
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr "%1 nebude pracovat bez platného souboru ardour.menus"
 
-#: add_route_dialog.cc:53 route_params_ui.cc:503
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 msgid "Add Track or Bus"
 msgstr "Přidat stopu nebo sběrnici"
 
@@ -449,8 +448,8 @@ msgstr "Sběrnice"
 msgid "Add:"
 msgstr "Přidat:"
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 msgid "<b>Options</b>"
 msgstr "<b>Volby</b>"
 
@@ -464,21 +463,21 @@ msgid "Group:"
 msgstr "Skupina:"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 msgid "Audio"
 msgstr "Zvuk"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -505,7 +504,7 @@ msgstr ""
 "použijte normální zvukovou nebo MIDI stopu."
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1301
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr "Obvyklá"
 
@@ -549,7 +548,7 @@ msgstr "8 kanálů"
 msgid "12 Channel"
 msgstr "12 kanálů"
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2136
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr "Vlastní"
 
@@ -570,12 +569,11 @@ msgid "Ambiguous File"
 msgstr "Nejednozna�ný soubor"
 
 #: ambiguous_file_dialog.cc:35
-#, fuzzy
 msgid ""
 "%1 has found the file <i>%2</i> in the following places:\n"
 "\n"
 msgstr ""
-"Ardour nalezl soubor <i>%1</i> na následujících místech:\n"
+"%1 nalezl soubor <i>%2</i> na následujících místech:\n"
 "\n"
 
 #: ambiguous_file_dialog.cc:44
@@ -638,7 +636,7 @@ msgid "Track"
 msgstr "Stopa"
 
 #: analysis_window.cc:68 editor_actions.cc:616 mixer_ui.cc:125
-#: mixer_ui.cc:1793
+#: mixer_ui.cc:1795
 msgid "Show"
 msgstr "Ukázat"
 
@@ -646,94 +644,90 @@ msgstr "Ukázat"
 msgid "Re-analyze data"
 msgstr "Znovu zpracovat data"
 
-#: ardour_button.cc:658
+#: ardour_button.cc:704
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr "Tla�ítko nemůže sledovat stav neexistujícího ovladatelného prvku\n"
 
-#: ardour_ui.cc:179
+#: ardour_ui.cc:180
 msgid "audition"
 msgstr "Poslech"
 
-#: ardour_ui.cc:180
+#: ardour_ui.cc:181
 msgid "solo"
 msgstr "Sólo"
 
-#: ardour_ui.cc:181
+#: ardour_ui.cc:182
 msgid "feedback"
 msgstr "Zpětná vazba"
 
-#: ardour_ui.cc:183 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 msgid "Speaker Configuration"
 msgstr "Nastavení reproduktoru"
 
-#: ardour_ui.cc:184 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 msgid "Theme Manager"
 msgstr "Správce témat"
 
-#: ardour_ui.cc:185 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr "Klávesové zkratky"
 
-#: ardour_ui.cc:186
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ardour_ui.cc:187 ardour_ui.cc:192
+#: ardour_ui.cc:191 ardour_ui.cc:196
 #, fuzzy
 msgid "Add Tracks/Busses"
 msgstr "Stopy/Sběrnice"
 
-#: ardour_ui.cc:188
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "O programu"
 
-#: ardour_ui.cc:189 location_ui.cc:1134
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "Místa"
 
-#: ardour_ui.cc:190 route_params_ui.cc:57 route_params_ui.cc:604
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 msgid "Tracks and Busses"
 msgstr "Stopy a sběrnice"
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ardour_ui.cc:193 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr "Správce balíků"
 
-#: ardour_ui.cc:194 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "Velký ukazatel �asu"
 
-#: ardour_ui.cc:195
+#: ardour_ui.cc:199
 #, fuzzy
 msgid "Audio Connections"
 msgstr "Spojení vstupů"
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:200
 #, fuzzy
 msgid "MIDI Connections"
 msgstr "Spojení vstupů"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr "Chyby"
 
-#: ardour_ui.cc:299
-msgid "could not initialize %1."
-msgstr "Nepodařilo se zapnout %1."
-
-#: ardour_ui.cc:394
+#: ardour_ui.cc:388
 msgid "Starting audio engine"
 msgstr "Spouští se zvukový stroj"
 
-#: ardour_ui.cc:763 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 msgid "%1 is ready for use"
 msgstr "%1 je připraven pro použití"
 
-#: ardour_ui.cc:811
+#: ardour_ui.cc:806
 msgid ""
 "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"
@@ -748,23 +742,23 @@ msgstr ""
 "Můžete se podívat na omezení pro paměť pomocí příkazu 'ulimit -l', a obvykle "
 "můžete toto nastavení změnit %2."
 
-#: ardour_ui.cc:828
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr "Neukazovat toto okno s hlášením znovu"
 
-#: ardour_ui.cc:870
+#: ardour_ui.cc:865
 msgid "Don't quit"
 msgstr "Neukon�it"
 
-#: ardour_ui.cc:871
+#: ardour_ui.cc:866
 msgid "Just quit"
 msgstr "Pouze ukon�it"
 
-#: ardour_ui.cc:872
+#: ardour_ui.cc:867
 msgid "Save and quit"
 msgstr "Uložit a ukon�it"
 
-#: ardour_ui.cc:882
+#: ardour_ui.cc:877
 msgid ""
 "%1 was unable to save your session.\n"
 "\n"
@@ -778,15 +772,15 @@ msgstr ""
 "\n"
 "\"Pouze ukon�it\"."
 
-#: ardour_ui.cc:913
+#: ardour_ui.cc:908
 msgid "Please wait while %1 cleans up..."
 msgstr "Po�kejte, prosím, zatímco %1 uklízí..."
 
-#: ardour_ui.cc:930
+#: ardour_ui.cc:925
 msgid "Unsaved Session"
 msgstr "Neuložené sezení"
 
-#: ardour_ui.cc:951
+#: ardour_ui.cc:946
 msgid ""
 "The session \"%1\"\n"
 "has not been saved.\n"
@@ -804,7 +798,7 @@ msgstr ""
 "\n"
 "Co chcete dělat?"
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:949
 msgid ""
 "The snapshot \"%1\"\n"
 "has not been saved.\n"
@@ -822,75 +816,75 @@ msgstr ""
 "\n"
 "Co chcete dělat?"
 
-#: ardour_ui.cc:968
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr "Otázka"
 
-#: ardour_ui.cc:1045
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "odpojeno"
 
-#: ardour_ui.cc:1052
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 
-#: ardour_ui.cc:1056
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 
-#: ardour_ui.cc:1074 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 msgid "File:"
 msgstr "Soubor:"
 
-#: ardour_ui.cc:1078
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr "BWF"
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr "WAV"
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr "WAV64"
 
-#: ardour_ui.cc:1087 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr "CAF"
 
-#: ardour_ui.cc:1090
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr "AIFF"
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr "iXML"
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr "RF64"
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr "32-float"
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr "24-int"
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr "16-int"
 
-#: ardour_ui.cc:1129
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr ""
 "Digitální zpracování signálu (DSP): <span foreground=\"%s\">%5.1f%%</span>"
 
-#: ardour_ui.cc:1148
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -901,33 +895,33 @@ msgstr ""
 "\">%<PRIu32>%%</span> <span foreground=\"green\">c:</span><span foreground="
 "\"%s\">%<PRIu32>%%</span>"
 
-#: ardour_ui.cc:1184
+#: ardour_ui.cc:1188
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr "Disk: <span foreground=\"green\">Neznámý</span>"
 
-#: ardour_ui.cc:1186
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr "Disk: <span foreground=\"green\">24 hodin +</span>"
 
-#: ardour_ui.cc:1204
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr "Disk: <span foreground=\"green\">&gt;24 hodin</span>"
 
-#: ardour_ui.cc:1215
+#: ardour_ui.cc:1219
 #, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 
-#: ardour_ui.cc:1241
+#: ardour_ui.cc:1245
 #, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr "Časový kód|ČK: <span foreground=\"%s\">%s</span>"
 
-#: ardour_ui.cc:1358 ardour_ui.cc:1367 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr "Naposledy otevřená sezení"
 
-#: ardour_ui.cc:1447
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
@@ -935,26 +929,26 @@ msgstr ""
 "%1 není spojen s JACKem.\n"
 "Za tohoto stavu není možné otevřít nebo zavřít sezení."
 
-#: ardour_ui.cc:1474
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr "Otevřít sezení"
 
-#: ardour_ui.cc:1492 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 msgid "%1 sessions"
 msgstr "%1 sezení"
 
-#: ardour_ui.cc:1529
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr "Stopy můžete přidat až teprve tehdy, když bylo sezení nahráno."
 
-#: ardour_ui.cc:1537
+#: ardour_ui.cc:1548
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] "Nepodařilo se vytvořit %1 novou smíchanou stopu"
 msgstr[1] "Nepodařilo se vytvořit %1 nové smíchané stopy"
 
-#: ardour_ui.cc:1543 ardour_ui.cc:1604
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 msgid ""
 "There are insufficient JACK ports available\n"
 "to create a new track or bus.\n"
@@ -966,24 +960,24 @@ msgstr ""
 "Měl byste uložit %1, ukon�it Ardour\n"
 "a spustit JACK znovu s větším po�tem přípojek."
 
-#: ardour_ui.cc:1578
+#: ardour_ui.cc:1589
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr ""
 "Stopy nebo sběrnice můžete přidat až teprve tehdy, když bylo sezení nahráno."
 
-#: ardour_ui.cc:1587
+#: ardour_ui.cc:1598
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] "Nelze vytvořit %1 novou zvukovou stopu"
 msgstr[1] "Nelze vytvořit %1 nové zvukové stopy"
 
-#: ardour_ui.cc:1596
+#: ardour_ui.cc:1607
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] "Nepodařilo se vytvořit %1 novou zvukovou sběrnici"
 msgstr[1] "Nepodařilo se vytvořit %1 nové zvukové sběrnice"
 
-#: ardour_ui.cc:1713
+#: ardour_ui.cc:1724
 msgid ""
 "Please create one or more tracks before trying to record.\n"
 "You can do this with the \"Add Track or Bus\" option in the Session menu."
@@ -991,7 +985,7 @@ msgstr ""
 "Vytvořte, prosím, jednu nebo i více stop, předtím než se pokusíte nahrávat.\n"
 "Můžete to udělat volbou \"Přidat stopu nebo sběrnici\" v nabídce pro sezení."
 
-#: ardour_ui.cc:2103
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
@@ -1001,7 +995,7 @@ msgstr ""
 "\n"
 "%1"
 
-#: ardour_ui.cc:2105
+#: ardour_ui.cc:2116
 msgid ""
 "JACK has either been shutdown or it\n"
 "disconnected %1 because %1\n"
@@ -1013,19 +1007,19 @@ msgstr ""
 "Měl byste se pokusit znovu spustit JACK,\n"
 "připojit se a uložit sezení."
 
-#: ardour_ui.cc:2131
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "Nelze spustit nynější sezení"
 
-#: ardour_ui.cc:2211
+#: ardour_ui.cc:2222
 msgid "Take Snapshot"
 msgstr "Udělat snímek obrazovky"
 
-#: ardour_ui.cc:2212
+#: ardour_ui.cc:2223
 msgid "Name of new snapshot"
 msgstr "Název pro nový snímek obrazovky"
 
-#: ardour_ui.cc:2236
+#: ardour_ui.cc:2247
 msgid ""
 "To ensure compatibility with various systems\n"
 "snapshot names may not contain a '%1' character"
@@ -1033,27 +1027,27 @@ msgstr ""
 "Pro zajištění slu�itelnosti s různými systémy\n"
 "nesmí názvy snímků obrazovky obsahovat znak '%1'"
 
-#: ardour_ui.cc:2248
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr "Potvrdit přepsání snímku obrazovky"
 
-#: ardour_ui.cc:2249
+#: ardour_ui.cc:2260
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr "Snímek obrazovky s tímto názvem již existuje. Chcete jej přepsat?"
 
-#: ardour_ui.cc:2252 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 msgid "Overwrite"
 msgstr "Přepsat"
 
-#: ardour_ui.cc:2286
+#: ardour_ui.cc:2297
 msgid "Rename Session"
 msgstr "Přejmenovat sezení"
 
-#: ardour_ui.cc:2287
+#: ardour_ui.cc:2298
 msgid "New session name"
 msgstr "Nový název sezení:"
 
-#: ardour_ui.cc:2301 ardour_ui.cc:2681 ardour_ui.cc:2726
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 msgid ""
 "To ensure compatibility with various systems\n"
 "session names may not contain a '%1' character"
@@ -1061,13 +1055,13 @@ msgstr ""
 "Pro zajištění slu�itelnosti s různými systémy\n"
 "nesmí názvy sezení obsahovat znak '%1'"
 
-#: ardour_ui.cc:2309
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr ""
 "Tento název se již používá jiným adresářem/složkou. Zkuste to, prosím, znovu."
 
-#: ardour_ui.cc:2318
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
@@ -1075,19 +1069,19 @@ msgstr ""
 "Přejmenování tohoto sezení se nezdařilo.\n"
 "Věci by v tuto chvíli mohly být vážně zvorané"
 
-#: ardour_ui.cc:2429
+#: ardour_ui.cc:2440
 msgid "Save Template"
 msgstr "Uložit předlohu"
 
-#: ardour_ui.cc:2430
+#: ardour_ui.cc:2441
 msgid "Name for template:"
 msgstr "Název pro předlohu:"
 
-#: ardour_ui.cc:2431
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-předloha"
 
-#: ardour_ui.cc:2469
+#: ardour_ui.cc:2480
 msgid ""
 "This session\n"
 "%1\n"
@@ -1097,52 +1091,52 @@ msgstr ""
 "%1\n"
 "již existuje. Chcete jej otevřít?"
 
-#: ardour_ui.cc:2479
+#: ardour_ui.cc:2490
 msgid "Open Existing Session"
 msgstr "Otevřít stávající sezení"
 
-#: ardour_ui.cc:2717
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr "V \"%1\" není žádné sezení"
 
-#: ardour_ui.cc:2804
+#: ardour_ui.cc:2815
 msgid "Please wait while %1 loads your session"
 msgstr "Po�kejte, prosím, dokud %1 nenahraje vaše sezení"
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr "Chyba v zápisu přípojky"
 
-#: ardour_ui.cc:2820
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr "Klepněte na tla�ítko Zavřít, abyste to mohli zkusit znovu."
 
-#: ardour_ui.cc:2841
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "Projekt  \"%1 (snímek obrazovky %2)\" nebyl úspěšně nahrán."
 
-#: ardour_ui.cc:2847
+#: ardour_ui.cc:2858
 msgid "Loading Error"
 msgstr "Chyba při nahrávání"
 
-#: ardour_ui.cc:2848
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr "Klepněte na tla�ítko Obnovit, abyste to mohli zkusit znovu."
 
-#: ardour_ui.cc:2930
+#: ardour_ui.cc:2941
 msgid "Could not create session in \"%1\""
 msgstr "V \"%1\" nelze vytvořit žádné sezení"
 
-#: ardour_ui.cc:3030
+#: ardour_ui.cc:3041
 msgid "No files were ready for clean-up"
 msgstr "Pro udělání pořádku nebyly připraveny žádné soubory"
 
-#: ardour_ui.cc:3034 ardour_ui.cc:3044 ardour_ui.cc:3177 ardour_ui.cc:3184
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 msgid "Clean-up"
 msgstr "Udělat pořádek"
 
-#: ardour_ui.cc:3035
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1154,19 +1148,19 @@ msgstr ""
 "jsou pravděpodobně za�leněny ještě v nějakém\n"
 "starším snímku obrazovky jako oblasti."
 
-#: ardour_ui.cc:3094
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr "kilo"
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr "mega"
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr "giga"
 
-#: ardour_ui.cc:3105
+#: ardour_ui.cc:3116
 msgid ""
 "The following file was deleted from %2,\n"
 "releasing %3 %4bytes of disk space"
@@ -1180,7 +1174,7 @@ msgstr[1] ""
 "Následující soubor byl smazán z %2,\n"
 "a tím se na disku uvolnilo %3 %4 bajtů ukládacího prostoru"
 
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3123
 msgid ""
 "The following file was not in use and \n"
 "has been moved to: %2\n"
@@ -1218,11 +1212,11 @@ msgstr[1] ""
 "\n"
 "uvolní se na disku dalších %3 %4 bajtů ukládacího prostoru.\n"
 
-#: ardour_ui.cc:3172
+#: ardour_ui.cc:3183
 msgid "Are you sure you want to clean-up?"
 msgstr "Jste si jistý, že chcete udělat pořádek?"
 
-#: ardour_ui.cc:3179
+#: ardour_ui.cc:3190
 msgid ""
 "Clean-up is a destructive operation.\n"
 "ALL undo/redo information will be lost if you clean-up.\n"
@@ -1234,83 +1228,87 @@ msgstr ""
 "Po udělání pořádku budou všechny nepoužívané a tudíž nepotřebné zvukové "
 "soubory přesunuty do \"mrtvého\" umístění."
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr "Dialog věnovaný dělání pořádku"
 
-#: ardour_ui.cc:3217
+#: ardour_ui.cc:3228
 msgid "Cleaned Files"
 msgstr "Uklizené soubory"
 
-#: ardour_ui.cc:3234
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr "smazané soubory"
 
-#: ardour_ui.cc:3326
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
+"Videoserver nebyl spuštěn Ardourem. Požadavek na jeho zastavení se přehlíží."
 
-#: ardour_ui.cc:3330
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
-msgstr ""
+msgstr "Zastavit videoserver"
 
-#: ardour_ui.cc:3331
-#, fuzzy
+#: ardour_ui.cc:3342
 msgid "Do you really want to stop the Video Server?"
-msgstr "Opravdu chcete odstranit %1 %2?"
+msgstr "Opravdu chcete zastavit videoserver?"
 
-#: ardour_ui.cc:3334
-#, fuzzy
+#: ardour_ui.cc:3345
 msgid "Yes, Stop It"
-msgstr "Ano, odstranit."
+msgstr "Ano, zastavit"
 
-#: ardour_ui.cc:3360
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr ""
+"Videoserver je již spuštěn\n"
+"."
 
-#: ardour_ui.cc:3362
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
 msgstr ""
+"Vnější videoserver je nastaven a je dosažitelný. Nespouští se nová instance."
 
-#: ardour_ui.cc:3370 ardour_ui.cc:3455
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
+"Nepodařilo se připojit k videoserveru. Spusťte jej nebo nastavte adresu pro "
+"přístup k němu v Úpravy -> Nastavení."
 
-#: ardour_ui.cc:3394
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
-msgstr ""
+msgstr "Zadaný kořen dokumentu (docroot) není existujícím adresářem."
 
-#: ardour_ui.cc:3399
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
-msgstr ""
+msgstr "Daný videoserver není spustitelným souborem."
 
-#: ardour_ui.cc:3432
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr ""
 
-#: ardour_ui.cc:3441
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3477 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "\"%\" nelze otevřít"
 
-#: ardour_ui.cc:3481
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
-msgstr ""
+msgstr "Nebyl vybrán žádný videosoubor"
 
-#: ardour_ui.cc:3641
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr ""
 "Nahrávání bylo zastaveno, protože tomu nedosta�ovala rychlost vašeho systému."
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3702
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1324,7 +1322,7 @@ msgstr ""
 "Přesněji ře�eno nebylo možné dostate�ně rychle zapisovat data\n"
 "tak, aby se podařilo udržet krok s nahráváním.\n"
 
-#: ardour_ui.cc:3689
+#: ardour_ui.cc:3721
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1338,12 +1336,11 @@ msgstr ""
 "Přesněji ře�eno nebylo možné dostate�ně rychle �íst data\n"
 "tak, aby se podařilo udržet krok s přehráváním.\n"
 
-#: ardour_ui.cc:3729
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr "Obnovení po havárii"
 
-#: ardour_ui.cc:3730
-#, fuzzy
+#: ardour_ui.cc:3762
 msgid ""
 "This session appears to have been in the\n"
 "middle of recording when %1 or\n"
@@ -1354,26 +1351,26 @@ msgid ""
 "what you would like to do.\n"
 msgstr ""
 "Zdá se, že toto sezení bylo přerušeno během\n"
-"nahrávání, když byl Ardour nebo\n"
+"nahrávání, když byl %1 nebo\n"
 "po�íta� zastaven.\n"
 "\n"
 "%1 pro vás může obnovit jakákoli zachycená\n"
 "zvuková data, nebo je odmítnout.\n"
 "Rozhodněte se, prosím, jak chcete dále pokra�ovat.\n"
 
-#: ardour_ui.cc:3742
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr "Odmítnout data"
 
-#: ardour_ui.cc:3743
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr "Obnovit data"
 
-#: ardour_ui.cc:3763
+#: ardour_ui.cc:3795
 msgid "Sample Rate Mismatch"
 msgstr "Vzorkovací kmito�et neodpovídá"
 
-#: ardour_ui.cc:3764
+#: ardour_ui.cc:3796
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
 "%2 is currently running at %3 Hz.  If you load this session,\n"
@@ -1383,23 +1380,23 @@ msgstr ""
 "%2 nyní běží na %3 Hz. Pokud toto sezení nahrajete,\n"
 "je možné, že zvuk bude přehráván při nesprávném vzorkovacím kmito�tu.\n"
 
-#: ardour_ui.cc:3773
+#: ardour_ui.cc:3805
 msgid "Do not load session"
 msgstr "Projekt nenahrávat"
 
-#: ardour_ui.cc:3774
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr "Projekt přesto nahrát"
 
-#: ardour_ui.cc:3797
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "Nelze se odpojit od JACKa"
 
-#: ardour_ui.cc:3810
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr "Nelze se znovu spojit s JACKem"
 
-#: ardour_ui.cc:4084
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1413,6 +1410,17 @@ msgid ""
 "\n"
 "From now on, use the -2000 version with older versions of %3"
 msgstr ""
+"%4 Toto je sezení ze starší verze %3%5\n"
+"\n"
+"%3 zkopíroval soubor se starým sezením\n"
+"\n"
+"%6%1%7\n"
+"\n"
+"do\n"
+"\n"
+"%6%2%7\n"
+"\n"
+"Od nynějška používejte verzi -2000 staršími verzemif %3"
 
 #: ardour_ui2.cc:72
 msgid "UI: cannot setup editor"
@@ -1422,35 +1430,40 @@ msgstr "Uživatelské rozhraní: editor nemohl být spuštěn."
 msgid "UI: cannot setup mixer"
 msgstr "Uživatelské rozhraní: směšova� nemohl být spuštěn."
 
-#: ardour_ui2.cc:125
+#: ardour_ui2.cc:82
+#, fuzzy
+msgid "UI: cannot setup meterbridge"
+msgstr "Uživatelské rozhraní: směšova� nemohl být spuštěn."
+
+#: ardour_ui2.cc:130
 msgid "Play from playhead"
 msgstr "Přehrávat od ukazatele polohy přehrávání"
 
-#: ardour_ui2.cc:126
+#: ardour_ui2.cc:131
 msgid "Stop playback"
 msgstr "Zastavit přehrávání"
 
-#: ardour_ui2.cc:127
+#: ardour_ui2.cc:132
 msgid "Toggle record"
 msgstr "Spustit nahrávání"
 
-#: ardour_ui2.cc:128
+#: ardour_ui2.cc:133
 msgid "Play range/selection"
 msgstr "Přehrávat rozsah/výběr"
 
-#: ardour_ui2.cc:129
+#: ardour_ui2.cc:134
 msgid "Go to start of session"
 msgstr "Přejít na za�átek sezení"
 
-#: ardour_ui2.cc:130
+#: ardour_ui2.cc:135
 msgid "Go to end of session"
 msgstr "Přejít na konec sezení"
 
-#: ardour_ui2.cc:131
+#: ardour_ui2.cc:136
 msgid "Play loop range"
 msgstr "Přehrávat rozsah smy�ky"
 
-#: ardour_ui2.cc:132
+#: ardour_ui2.cc:137
 msgid ""
 "MIDI Panic\n"
 "Send note off and reset controller messages on all MIDI channels"
@@ -1458,23 +1471,23 @@ msgstr ""
 "Nouzové zastavení MIDI\n"
 "Poslat nota vypnuta a nastavit znovu zprávy ovlada�e na všech kanálech MIDI"
 
-#: ardour_ui2.cc:133
+#: ardour_ui2.cc:138
 msgid "Return to last playback start when stopped"
 msgstr "Při zastavení se vrátit na za�átek posledního přehrávání"
 
-#: ardour_ui2.cc:134
+#: ardour_ui2.cc:139
 msgid "Playhead follows Range Selections and Edits"
 msgstr "Ukazatele polohy následuje výběry rozsahu a úpravy"
 
-#: ardour_ui2.cc:135
+#: ardour_ui2.cc:140
 msgid "Be sensible about input monitoring"
 msgstr "Spustit automatické sledování vstupu"
 
-#: ardour_ui2.cc:136
+#: ardour_ui2.cc:141
 msgid "Enable/Disable audio click"
 msgstr "Povolit/Zakázat slyšitelné klapnutí"
 
-#: ardour_ui2.cc:137 monitor_section.cc:101
+#: ardour_ui2.cc:142 monitor_section.cc:101
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
@@ -1482,7 +1495,7 @@ msgstr ""
 "Je v �innosti při sólovém přehrávání některé ze stop.\n"
 "Pro vypnutí sóla klepněte."
 
-#: ardour_ui2.cc:138
+#: ardour_ui2.cc:143
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
@@ -1490,12 +1503,11 @@ msgstr ""
 "Je v �innosti při poslechu.\n"
 "Klepnutím se poslech zastaví."
 
-#: ardour_ui2.cc:139
+#: ardour_ui2.cc:144
 msgid "When active, there is a feedback loop."
 msgstr "Je-li v �innosti, je tu smy�ka se zpětnou vazbou."
 
-#: ardour_ui2.cc:140
-#, fuzzy
+#: ardour_ui2.cc:145
 msgid ""
 "<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1508,11 +1520,8 @@ msgstr ""
 "Úpravy textu: přepis zprava doleva <tt>Esc</tt>: zrušit; <tt>Enter</tt>: "
 "potvrdit; úpravy připojit '+' nebo '-' pro zadání �asů delta (nárůst "
 "proměnné).\n"
-"Podrobnosti hledejte na <span color=\"blue\">http://ardour.org/"
-"a3_features_clocks</span>."
 
-#: ardour_ui2.cc:141
-#, fuzzy
+#: ardour_ui2.cc:146
 msgid ""
 "<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1525,30 +1534,33 @@ msgstr ""
 "Úpravy textu: přepis zprava doleva <tt>Esc</tt>: zrušit; <tt>Enter</tt>: "
 "potvrdit; úpravy připojit '+' nebo '-' pro zadání �asů delta (nárůst "
 "proměnné).\n"
-"Podrobnosti hledejte na <span color=\"blue\">http://ardour.org/"
-"a3_features_clocks</span>."
 
-#: ardour_ui2.cc:173
+#: ardour_ui2.cc:147
+#, fuzzy
+msgid "Reset Level Meter"
+msgstr "Nastavit křivku síly zvuku znovu"
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr "[CHYBA]:"
 
-#: ardour_ui2.cc:175
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr "[VAROV�N�]:"
 
-#: ardour_ui2.cc:177
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr "[INFORMACE]: "
 
-#: ardour_ui2.cc:241 ardour_ui_ed.cc:376
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 msgid "Auto Return"
 msgstr "Automatický návrat"
 
-#: ardour_ui2.cc:243 ardour_ui_ed.cc:379
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr "Následovat úpravy"
 
-#: ardour_ui2.cc:621 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1568,23 +1580,23 @@ msgstr "Nachystat editor"
 msgid "Setup Mixer"
 msgstr "Nachystat směšova�"
 
-#: ardour_ui_dependents.cc:84
+#: ardour_ui_dependents.cc:85
 msgid "Reload Session History"
 msgstr "Znovu nahrát průběh sezení"
 
-#: ardour_ui_dialogs.cc:206
+#: ardour_ui_dialogs.cc:242
 msgid "Don't close"
 msgstr "Nezavírat"
 
-#: ardour_ui_dialogs.cc:207
+#: ardour_ui_dialogs.cc:243
 msgid "Just close"
 msgstr "Pouze zavřít"
 
-#: ardour_ui_dialogs.cc:208
+#: ardour_ui_dialogs.cc:244
 msgid "Save and close"
 msgstr "Uložit a zavřít"
 
-#: ardour_ui_dialogs.cc:293
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr ""
 "Tato obrazovka není dostate�ně velká na to, aby zobrazila okno směšova�e"
@@ -1598,7 +1610,7 @@ msgstr "Projekt"
 msgid "Sync"
 msgstr "Seřídit"
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr "Volby"
 
@@ -1626,15 +1638,15 @@ msgstr "Typ souboru"
 msgid "Sample Format"
 msgstr "Vzorkovací formát"
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr "Ovládací spína�e"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "Přídavné moduly"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr "Ukazatel hladiny"
 
@@ -1650,7 +1662,7 @@ msgstr "Čas udržení"
 msgid "Denormal Handling"
 msgstr "Zacházení s neobvyklými vzorky "
 
-#: ardour_ui_ed.cc:123 route_time_axis.cc:1475
+#: ardour_ui_ed.cc:123 route_time_axis.cc:1489
 msgid "New..."
 msgstr "Nový..."
 
@@ -1671,19 +1683,16 @@ msgid "Add Track or Bus..."
 msgstr "Přidat stopu nebo sběrnici..."
 
 #: ardour_ui_ed.cc:135
-#, fuzzy
 msgid "Open Video"
-msgstr "Otevřít sezení"
+msgstr "Otevřít video"
 
 #: ardour_ui_ed.cc:138
-#, fuzzy
 msgid "Remove Video"
-msgstr "Odstranit rozsah"
+msgstr "Odstranit video"
 
 #: ardour_ui_ed.cc:141
-#, fuzzy
 msgid "Export To Video File"
-msgstr "Vyvést jako zvukový soubor"
+msgstr "Vyvést jako videosoubor"
 
 #: ardour_ui_ed.cc:145
 msgid "Snapshot..."
@@ -1693,8 +1702,8 @@ msgstr "Snímek obrazovky..."
 msgid "Save As..."
 msgstr "Uložit jako..."
 
-#: ardour_ui_ed.cc:153 editor_actions.cc:1710 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1464 route_time_axis.cc:1471
+#: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 msgid "Rename..."
 msgstr "Přejmenovat..."
 
@@ -1723,7 +1732,7 @@ msgid "Stem export..."
 msgstr "Vyvést vybranou stopu jako jeden soubor..."
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "Vyvést"
 
@@ -1735,11 +1744,11 @@ msgstr "Odstranit nepoužívané zdroje..."
 msgid "Flush Wastebasket"
 msgstr "Vyprázdnit koš"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr "JACK"
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr "Prodleva"
 
@@ -1747,8 +1756,8 @@ msgstr "Prodleva"
 msgid "Reconnect"
 msgstr "Připojit znovu"
 
-#: ardour_ui_ed.cc:195 global_port_matrix.cc:198 io_selector.cc:210
-#: mixer_strip.cc:712 mixer_strip.cc:838
+#: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr "Odpojit"
 
@@ -1764,7 +1773,7 @@ msgstr "Zvětšit okno editoru"
 msgid "Show Toolbars"
 msgstr "Ukázat nástrojové panely"
 
-#: ardour_ui_ed.cc:230 mixer_ui.cc:1863 mixer_ui.cc:1869
+#: ardour_ui_ed.cc:230 mixer_ui.cc:1865 mixer_ui.cc:1871
 msgid "Window|Mixer"
 msgstr "Okno/Směšova�"
 
@@ -1773,27 +1782,32 @@ msgstr "Okno/Směšova�"
 msgid "Toggle Editor+Mixer"
 msgstr "Ukázat editor nebo mixér navrchu"
 
-#: ardour_ui_ed.cc:233 midi_tracer.cc:39
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
+#, fuzzy
+msgid "Window|Meterbridge"
+msgstr "Okno/Směšova�"
+
+#: ardour_ui_ed.cc:234 midi_tracer.cc:39
 msgid "MIDI Tracer"
 msgstr "Sledova� MIDI"
 
-#: ardour_ui_ed.cc:235
+#: ardour_ui_ed.cc:236
 msgid "Chat"
 msgstr "Povídání"
 
-#: ardour_ui_ed.cc:237
+#: ardour_ui_ed.cc:238
 msgid "Help|Manual"
 msgstr "Nápověda|Příru�ka"
 
-#: ardour_ui_ed.cc:238
+#: ardour_ui_ed.cc:239
 msgid "Reference"
 msgstr "Odkaz"
 
-#: ardour_ui_ed.cc:240 plugin_ui.cc:419
+#: ardour_ui_ed.cc:241 plugin_ui.cc:418
 msgid "Save"
 msgstr "Uložit"
 
-#: ardour_ui_ed.cc:248 rc_option_editor.cc:1114 rc_option_editor.cc:1125
+#: ardour_ui_ed.cc:249 rc_option_editor.cc:1114 rc_option_editor.cc:1125
 #: rc_option_editor.cc:1134 rc_option_editor.cc:1147 rc_option_editor.cc:1160
 #: rc_option_editor.cc:1169 rc_option_editor.cc:1179 rc_option_editor.cc:1181
 #: rc_option_editor.cc:1191 rc_option_editor.cc:1207 rc_option_editor.cc:1220
@@ -1803,99 +1817,99 @@ msgstr "Uložit"
 msgid "Transport"
 msgstr "Přesun"
 
-#: ardour_ui_ed.cc:254 engine_dialog.cc:85 sfdb_ui.cc:559
+#: ardour_ui_ed.cc:255 engine_dialog.cc:85
 msgid "Stop"
 msgstr "Zastavit"
 
-#: ardour_ui_ed.cc:257
+#: ardour_ui_ed.cc:258
 msgid "Roll"
 msgstr "Projíždět"
 
-#: ardour_ui_ed.cc:261
+#: ardour_ui_ed.cc:262
 msgid "Start/Stop"
 msgstr "Spustit/Zastavit"
 
-#: ardour_ui_ed.cc:264
+#: ardour_ui_ed.cc:265
 msgid "Start/Continue/Stop"
 msgstr "Spustit/Pokra�ovat/Zastavit"
 
-#: ardour_ui_ed.cc:267
+#: ardour_ui_ed.cc:268
 msgid "Stop and Forget Capture"
 msgstr "Zastavit a odmítnout zvukový záznam"
 
-#: ardour_ui_ed.cc:277
+#: ardour_ui_ed.cc:278
 msgid "Transition To Roll"
 msgstr "Přehrávat dopředu"
 
-#: ardour_ui_ed.cc:281
+#: ardour_ui_ed.cc:282
 msgid "Transition To Reverse"
 msgstr "Přehrávat dozadu"
 
-#: ardour_ui_ed.cc:285
+#: ardour_ui_ed.cc:286
 msgid "Play Loop Range"
 msgstr "Přehrávat rozsah smy�ky"
 
-#: ardour_ui_ed.cc:288
+#: ardour_ui_ed.cc:289
 msgid "Play Selected Range"
 msgstr "Přehrát vybraný rozsah"
 
-#: ardour_ui_ed.cc:291
+#: ardour_ui_ed.cc:292
 msgid "Play Selection w/Preroll"
 msgstr "Přehrávat vybranou oblast s přetá�ením vpřed"
 
-#: ardour_ui_ed.cc:295
+#: ardour_ui_ed.cc:296
 msgid "Enable Record"
 msgstr "Povolit nahrávání"
 
-#: ardour_ui_ed.cc:298
+#: ardour_ui_ed.cc:299
 msgid "Start Recording"
 msgstr "Za�ít s nahráváním"
 
-#: ardour_ui_ed.cc:302
+#: ardour_ui_ed.cc:303
 msgid "Rewind"
 msgstr "Přeto�it zpět"
 
-#: ardour_ui_ed.cc:305
+#: ardour_ui_ed.cc:306
 msgid "Rewind (Slow)"
 msgstr "Přeto�it zpět (pomalu)"
 
-#: ardour_ui_ed.cc:308
+#: ardour_ui_ed.cc:309
 msgid "Rewind (Fast)"
 msgstr "Přeto�it zpět (rychle)"
 
-#: ardour_ui_ed.cc:311 startup.cc:727
+#: ardour_ui_ed.cc:312 startup.cc:727
 msgid "Forward"
 msgstr "Přeto�it vpřed"
 
-#: ardour_ui_ed.cc:314
+#: ardour_ui_ed.cc:315
 msgid "Forward (Slow)"
 msgstr "Přeto�it vpřed (pomalu)"
 
-#: ardour_ui_ed.cc:317
+#: ardour_ui_ed.cc:318
 msgid "Forward (Fast)"
 msgstr "Přeto�it vpřed (rychle)"
 
-#: ardour_ui_ed.cc:320
+#: ardour_ui_ed.cc:321
 msgid "Goto Zero"
 msgstr "Sko�it k bodu nula"
 
-#: ardour_ui_ed.cc:323
+#: ardour_ui_ed.cc:324
 msgid "Goto Start"
 msgstr "Sko�it na za�átek"
 
-#: ardour_ui_ed.cc:326
+#: ardour_ui_ed.cc:327
 msgid "Goto End"
 msgstr "Sko�it na konec"
 
-#: ardour_ui_ed.cc:329
+#: ardour_ui_ed.cc:330
 msgid "Goto Wall Clock"
 msgstr "Sko�it na přesný místní �as"
 
-#: ardour_ui_ed.cc:333
+#: ardour_ui_ed.cc:334
 msgid "Focus On Clock"
 msgstr "Zaostřit na ukazatel �asu"
 
-#: ardour_ui_ed.cc:337 ardour_ui_ed.cc:346 audio_clock.cc:2046 editor.cc:237
+#: ardour_ui_ed.cc:338 ardour_ui_ed.cc:347 audio_clock.cc:2046 editor.cc:237
 #: editor_actions.cc:544 editor_actions.cc:553 export_timespan_selector.cc:88
 #: session_option_editor.cc:41 session_option_editor.cc:61
 #: session_option_editor.cc:80 session_option_editor.cc:96
@@ -1904,125 +1918,125 @@ msgstr "Zaostřit na ukazatel �asu"
 msgid "Timecode"
 msgstr "Časový kód"
 
-#: ardour_ui_ed.cc:339 ardour_ui_ed.cc:348 editor_actions.cc:542
+#: ardour_ui_ed.cc:340 ardour_ui_ed.cc:349 editor_actions.cc:542
 msgid "Bars & Beats"
 msgstr "Takty & Doby"
 
-#: ardour_ui_ed.cc:341 ardour_ui_ed.cc:350
+#: ardour_ui_ed.cc:342 ardour_ui_ed.cc:351
 msgid "Minutes & Seconds"
 msgstr "Minuty & Sekundy"
 
-#: ardour_ui_ed.cc:343 ardour_ui_ed.cc:352 audio_clock.cc:2050 editor.cc:238
+#: ardour_ui_ed.cc:344 ardour_ui_ed.cc:353 audio_clock.cc:2050 editor.cc:238
 #: editor_actions.cc:543
 msgid "Samples"
 msgstr "Vzorky"
 
-#: ardour_ui_ed.cc:355
+#: ardour_ui_ed.cc:356
 msgid "Punch In"
 msgstr "Za�ít přepis oblasti"
 
-#: ardour_ui_ed.cc:356 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr "Vstup"
 
-#: ardour_ui_ed.cc:359
+#: ardour_ui_ed.cc:360
 msgid "Punch Out"
 msgstr "Ukon�it přepis oblasti"
 
-#: ardour_ui_ed.cc:360 time_info_box.cc:114
+#: ardour_ui_ed.cc:361 time_info_box.cc:114
 msgid "Out"
 msgstr "Výstup"
 
-#: ardour_ui_ed.cc:363
+#: ardour_ui_ed.cc:364
 msgid "Punch In/Out"
 msgstr "Přepsat oblast"
 
-#: ardour_ui_ed.cc:364
+#: ardour_ui_ed.cc:365
 msgid "In/Out"
 msgstr "Vstup/Výstup"
 
-#: ardour_ui_ed.cc:367 rc_option_editor.cc:1071
+#: ardour_ui_ed.cc:368 rc_option_editor.cc:1071
 msgid "Click"
 msgstr "Klepnout"
 
-#: ardour_ui_ed.cc:370
+#: ardour_ui_ed.cc:371
 msgid "Auto Input"
 msgstr "Automatický vstup"
 
-#: ardour_ui_ed.cc:373
+#: ardour_ui_ed.cc:374
 msgid "Auto Play"
 msgstr "Automatické přehrávání"
 
-#: ardour_ui_ed.cc:384
+#: ardour_ui_ed.cc:385
 msgid "Sync Startup to Video"
 msgstr "Seřídit spuštění s videem"
 
-#: ardour_ui_ed.cc:386
+#: ardour_ui_ed.cc:387
 msgid "Time Master"
 msgstr "Řízení �asu"
 
-#: ardour_ui_ed.cc:393
+#: ardour_ui_ed.cc:394
 msgid "Toggle Record Enable Track %1"
 msgstr "Spustit nahrávání stopy %1"
 
-#: ardour_ui_ed.cc:400
+#: ardour_ui_ed.cc:401
 msgid "Percentage"
 msgstr "Procentní podíl"
 
-#: ardour_ui_ed.cc:401 shuttle_control.cc:169
+#: ardour_ui_ed.cc:402 shuttle_control.cc:169
 msgid "Semitones"
 msgstr "Polotóny"
 
-#: ardour_ui_ed.cc:405
+#: ardour_ui_ed.cc:406
 msgid "Send MTC"
 msgstr "Poslat MTC"
 
-#: ardour_ui_ed.cc:407
+#: ardour_ui_ed.cc:408
 msgid "Send MMC"
 msgstr "Poslat MMC"
 
-#: ardour_ui_ed.cc:409
+#: ardour_ui_ed.cc:410
 msgid "Use MMC"
 msgstr "Použít MMC"
 
-#: ardour_ui_ed.cc:411 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 msgid "Send MIDI Clock"
 msgstr "Poslat �as MIDI"
 
-#: ardour_ui_ed.cc:413
+#: ardour_ui_ed.cc:414
 msgid "Send MIDI Feedback"
 msgstr "Poslat zpětnou vazbu MIDI"
 
-#: ardour_ui_ed.cc:419
+#: ardour_ui_ed.cc:420
 msgid "Panic"
 msgstr "Nouzové zastavení"
 
-#: ardour_ui_ed.cc:559
+#: ardour_ui_ed.cc:560
 msgid "Wall Clock"
 msgstr "Nástěnné hodiny"
 
-#: ardour_ui_ed.cc:560
+#: ardour_ui_ed.cc:561
 msgid "Disk Space"
 msgstr "Místo na disku"
 
-#: ardour_ui_ed.cc:561
+#: ardour_ui_ed.cc:562
 msgid "DSP"
 msgstr "Digitální zpracování signálu (DSP)"
 
-#: ardour_ui_ed.cc:562
+#: ardour_ui_ed.cc:563
 msgid "Buffers"
 msgstr "Vyrovnávací paměti"
 
-#: ardour_ui_ed.cc:563
+#: ardour_ui_ed.cc:564
 msgid "JACK Sampling Rate and Latency"
 msgstr "Vzorkovací kmito�et a prodleva JACK"
 
-#: ardour_ui_ed.cc:564
+#: ardour_ui_ed.cc:565
 msgid "Timecode Format"
 msgstr "Formát �asového kódu"
 
-#: ardour_ui_ed.cc:565
+#: ardour_ui_ed.cc:566
 msgid "File Format"
 msgstr "Souborový formát"
 
@@ -2038,11 +2052,11 @@ msgstr ""
 msgid "Internal"
 msgstr "Vnitřní"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 msgid "Enable/Disable external positional sync"
 msgstr "Povolit/Zakázat vnější seřízení podle polohy"
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr "Seřízení k JACKovi není možné: je nastaveno vytáhnutí/stáhnutí videa"
 
@@ -2072,7 +2086,7 @@ msgstr "Tempo"
 msgid "Meter"
 msgstr "Druh taktu"
 
-#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1030
+#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1039
 #: midi_region_view.cc:2991 session_metadata_dialog.cc:331
 #: session_metadata_dialog.cc:379 session_metadata_dialog.cc:435
 #: session_metadata_dialog.cc:716
@@ -2161,32 +2175,32 @@ msgid "hide track"
 msgstr "Skrýt tuto stopu"
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:196 generic_pluginui.cc:456
-#: generic_pluginui.cc:733 panner_ui.cc:150
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
+#: generic_pluginui.cc:746 panner_ui.cc:150
 msgid "Automation|Manual"
 msgstr "Automatizace|Příru�ka"
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1856 gain_meter.cc:199
-#: generic_pluginui.cc:459 generic_pluginui.cc:735 midi_time_axis.cc:1488
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
+#: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr "Přehrát"
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:202 generic_pluginui.cc:462
-#: generic_pluginui.cc:737 panner_ui.cc:156
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
+#: generic_pluginui.cc:750 panner_ui.cc:156
 msgid "Write"
 msgstr "Zapsat"
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:205 generic_pluginui.cc:465
-#: generic_pluginui.cc:739 panner_ui.cc:159
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
+#: generic_pluginui.cc:752 panner_ui.cc:159
 msgid "Touch"
 msgstr "Dotknout se"
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr "???"
 
@@ -2195,7 +2209,7 @@ msgid "clear automation"
 msgstr "Vyprázdnit automatizaci"
 
 #: automation_time_axis.cc:485 editor_actions.cc:613 editor_markers.cc:857
-#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:699
+#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:708
 msgid "Hide"
 msgstr "Skrýt"
 
@@ -2216,7 +2230,7 @@ msgstr "Samostatný"
 msgid "Linear"
 msgstr "Čárový"
 
-#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:638
+#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:647
 #: shuttle_control.cc:188
 msgid "Mode"
 msgstr "Režim"
@@ -2233,13 +2247,13 @@ msgstr "Upravit balík"
 msgid "Direction:"
 msgstr "Směr:"
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:156
-#: mixer_strip.cc:2132
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 msgid "Input"
 msgstr "Vstup"
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:161 mixer_strip.cc:2135
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 msgid "Output"
 msgstr "Výstup"
 
@@ -2249,8 +2263,8 @@ msgid "Edit"
 msgstr "Upravit"
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:420 processor_box.cc:2227
-#: route_time_axis.cc:704
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
+#: route_time_axis.cc:713
 msgid "Delete"
 msgstr "Smazat"
 
@@ -2418,7 +2432,7 @@ msgstr "ÄŒas"
 
 #: edit_note_dialog.cc:98 editor_regions.cc:114
 #: export_timespan_selector.cc:359 export_timespan_selector.cc:421
-#: location_ui.cc:313 midi_list_editor.cc:114 time_info_box.cc:105
+#: location_ui.cc:317 midi_list_editor.cc:114 time_info_box.cc:105
 msgid "Length"
 msgstr "Délka"
 
@@ -2637,7 +2651,7 @@ msgstr "Zna�ky na CD"
 
 #: editor.cc:245
 msgid "Video Timeline"
-msgstr ""
+msgstr "Časová osa videa"
 
 #: editor.cc:260
 msgid "mode"
@@ -2664,17 +2678,17 @@ msgid "Ranges & Marks"
 msgstr "Rozsahy a zna�ky"
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 msgid "Editor"
 msgstr "Editor"
 
 #: editor.cc:1215 editor.cc:1225 editor.cc:4440 editor_actions.cc:130
-#: editor_actions.cc:1804
+#: editor_actions.cc:1813
 msgid "Loop"
 msgstr "Smy�ka"
 
@@ -2699,8 +2713,8 @@ msgstr "Souměrný"
 msgid "Slow"
 msgstr "Pomalu"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1606
-#: sfdb_ui.cc:1715
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "Rychle"
 
@@ -2722,7 +2736,7 @@ msgstr "Spustit"
 msgid "Slowest"
 msgstr "Velmi pomalu"
 
-#: editor.cc:1572 route_time_axis.cc:1863 selection.cc:1009 selection.cc:1064
+#: editor.cc:1572 route_time_axis.cc:1877 selection.cc:1009 selection.cc:1064
 msgid "programming error: "
 msgstr "Chyba v programování:"
 
@@ -2839,7 +2853,7 @@ msgid "Select All in Track"
 msgstr "Vybrat vše ve stopě"
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2235
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr "Vybrat vše"
 
@@ -2891,15 +2905,15 @@ msgstr "Vybrat rozsah mezi ukazatelem polohy a pracovním bodem"
 msgid "Select"
 msgstr "Vybrat"
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2220
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr "Vyjmout"
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2223
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2231
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr "Vložit"
 
@@ -3055,7 +3069,7 @@ msgstr "Znovu"
 msgid "Redo (%1)"
 msgstr "Znovu (%1)"
 
-#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1785
+#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1794
 msgid "Duplicate"
 msgstr "Zdvojit"
 
@@ -3086,8 +3100,8 @@ msgstr "Smazat seznam skladeb"
 msgid "Keep Playlist"
 msgstr "Ponechat seznam skladeb"
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -3107,7 +3121,7 @@ msgstr "Vyprázdnit seznam skladeb"
 msgid "Please wait while %1 loads visual data."
 msgstr "Po�kejte, prosím, zatímco %1 nahrává vizuální data."
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2251
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 msgid "Edit..."
 msgstr "Upravit..."
 
@@ -3156,7 +3170,7 @@ msgstr "Vrstvení"
 msgid "Position"
 msgstr "Poloha"
 
-#: editor_actions.cc:101 gain_meter.cc:124 gain_meter.cc:755 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr "Ustřihnout"
@@ -3169,7 +3183,7 @@ msgstr "Zesílení signálu"
 msgid "Ranges"
 msgstr "Rozsahy"
 
-#: editor_actions.cc:104 editor_actions.cc:1781 session_option_editor.cc:145
+#: editor_actions.cc:104 editor_actions.cc:1790 session_option_editor.cc:145
 #: session_option_editor.cc:147 session_option_editor.cc:156
 #: session_option_editor.cc:163
 msgid "Fades"
@@ -3207,7 +3221,7 @@ msgstr "Volby pro MIDI"
 msgid "Misc Options"
 msgstr "Různé volby"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr "Sledování"
@@ -3248,8 +3262,8 @@ msgstr "Vedlejší údaj o �ase"
 msgid "Separate"
 msgstr "Rozdělit"
 
-#: editor_actions.cc:132 mixer_strip.cc:1916 route_time_axis.cc:199
-#: route_time_axis.cc:2397
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
+#: route_time_axis.cc:2417
 msgid "Solo"
 msgstr "Sólo"
 
@@ -3261,7 +3275,7 @@ msgstr "Podřízené snímky"
 msgid "Timecode fps"
 msgstr "Časový kód FPS"
 
-#: editor_actions.cc:137 route_time_axis.cc:421
+#: editor_actions.cc:137 route_time_axis.cc:430
 msgid "Height"
 msgstr "Výška"
 
@@ -3385,7 +3399,7 @@ msgstr "Ukazatele polohy na za�átek rozsahu výběru"
 msgid "Playhead to Range End"
 msgstr "Ukazatele polohy na konec rozsahu výběru"
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2237
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 msgid "Deselect All"
 msgstr "Odzna�it vše"
 
@@ -3653,9 +3667,9 @@ msgstr "Vložit ticho"
 msgid "Toggle Active"
 msgstr "Spustit/Zastavit stopu"
 
-#: editor_actions.cc:370 editor_actions.cc:1707 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1488
-#: route_time_axis.cc:701
+#: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
+#: route_time_axis.cc:710
 msgid "Remove"
 msgstr "Odstranit"
 
@@ -3663,19 +3677,19 @@ msgstr "Odstranit"
 msgid "Fit Selected Tracks"
 msgstr "Přizpůsobit na vybrané stopy"
 
-#: editor_actions.cc:376 time_axis_view.cc:1298
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr "Největší"
 
-#: editor_actions.cc:379 time_axis_view.cc:1299
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr "Větší"
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1300
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr "Velká"
 
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr "Malá"
 
@@ -3771,7 +3785,7 @@ msgstr "Slepit"
 msgid "Slide"
 msgstr "Vsunout"
 
-#: editor_actions.cc:478 editor_actions.cc:1728 editor_markers.cc:860
+#: editor_actions.cc:478 editor_actions.cc:1737 editor_markers.cc:860
 #: editor_rulers.cc:386 location_ui.cc:56
 msgid "Lock"
 msgstr "Zamknout"
@@ -3941,43 +3955,37 @@ msgid "Min:Sec"
 msgstr "Min:Sek"
 
 #: editor_actions.cc:547 editor_actions.cc:550
-#, fuzzy
 msgid "Video Monitor"
-msgstr "Sledování"
+msgstr "Sledování videa"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
-msgstr ""
+msgstr "Video"
 
 #: editor_actions.cc:552
-#, fuzzy
 msgid "Always on Top"
-msgstr "Pozvednout zcela nahoru"
+msgstr "Vždy nahoře"
 
 #: editor_actions.cc:554
 #, fuzzy
-msgid "Framenumber"
-msgstr "Režim stopy"
+msgid "Frame number"
+msgstr "Číslo snímku"
 
 #: editor_actions.cc:555
-#, fuzzy
 msgid "Timecode Background"
-msgstr "Sekundy �asového kódu"
+msgstr "Pozadí �asového kódu"
 
 #: editor_actions.cc:556
-#, fuzzy
 msgid "Fullscreen"
-msgstr "Plné ticho"
+msgstr "Celá obrazovka"
 
 #: editor_actions.cc:557
-#, fuzzy
 msgid "Letterbox"
-msgstr "Lepší"
+msgstr "Širokoúhlý formát"
 
 #: editor_actions.cc:558
-#, fuzzy
 msgid "Original Size"
-msgstr "Původní poloha"
+msgstr "Původní velikost"
 
 #: editor_actions.cc:608
 msgid "Sort"
@@ -4049,7 +4057,7 @@ msgstr "Odstranit nepoužívané"
 
 #: editor_actions.cc:652 editor_audio_import.cc:279
 #: session_import_dialog.cc:74 session_import_dialog.cc:94
-#: session_metadata_dialog.cc:297 editor_videotimeline.cc:107
+#: session_metadata_dialog.cc:297 editor_videotimeline.cc:108
 msgid "Import"
 msgstr "Zavést"
 
@@ -4089,289 +4097,289 @@ msgstr "Nahrané vazby editoru z %1"
 msgid "Could not find editor.bindings in search path %1"
 msgstr "V prohledávané cestě %1 se editor.bindings nalézt nepodařilo"
 
-#: editor_actions.cc:1019 editor_actions.cc:1415 editor_actions.cc:1426
-#: editor_actions.cc:1479 editor_actions.cc:1490 editor_actions.cc:1537
-#: editor_actions.cc:1547 editor_regions.cc:1561
+#: editor_actions.cc:1028 editor_actions.cc:1424 editor_actions.cc:1435
+#: editor_actions.cc:1488 editor_actions.cc:1499 editor_actions.cc:1546
+#: editor_actions.cc:1556 editor_regions.cc:1561
 msgid "programming error: %1: %2"
 msgstr "Chyba v programování: %1: %2"
 
-#: editor_actions.cc:1713
+#: editor_actions.cc:1722
 msgid "Raise"
 msgstr "Pozvednout"
 
-#: editor_actions.cc:1716
+#: editor_actions.cc:1725
 msgid "Raise to Top"
 msgstr "Pozvednout zcela nahoru"
 
-#: editor_actions.cc:1719 gtk-custom-ruler.c:132
+#: editor_actions.cc:1728 gtk-custom-ruler.c:132
 msgid "Lower"
 msgstr "Dát dolů"
 
-#: editor_actions.cc:1722
+#: editor_actions.cc:1731
 msgid "Lower to Bottom"
 msgstr "Dát zcela dolů"
 
-#: editor_actions.cc:1725
+#: editor_actions.cc:1734
 msgid "Move to Original Position"
 msgstr "Posunout na původní polohu"
 
-#: editor_actions.cc:1730
+#: editor_actions.cc:1739
 msgid "Lock to Video"
-msgstr ""
+msgstr "Uzamknout k videu"
 
-#: editor_actions.cc:1735 editor_markers.cc:867
+#: editor_actions.cc:1744 editor_markers.cc:867
 msgid "Glue to Bars and Beats"
 msgstr "Přilepit k taktům a dobám"
 
-#: editor_actions.cc:1740
+#: editor_actions.cc:1749
 msgid "Remove Sync"
 msgstr "Odstranit bod zapadnutí"
 
-#: editor_actions.cc:1743 mixer_strip.cc:1903 route_time_axis.cc:200
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr "Ztlumit"
 
-#: editor_actions.cc:1746
+#: editor_actions.cc:1755
 msgid "Normalize..."
 msgstr "Normalizovat..."
 
-#: editor_actions.cc:1749
+#: editor_actions.cc:1758
 msgid "Reverse"
 msgstr "Obrátit"
 
-#: editor_actions.cc:1752
+#: editor_actions.cc:1761
 msgid "Make Mono Regions"
 msgstr "Přeměnit na monofonní oblasti"
 
-#: editor_actions.cc:1755
+#: editor_actions.cc:1764
 msgid "Boost Gain"
 msgstr "Zvýšit sílu hlasitosti"
 
-#: editor_actions.cc:1758
+#: editor_actions.cc:1767
 msgid "Cut Gain"
 msgstr "Snížit sílu hlasitosti"
 
-#: editor_actions.cc:1761
+#: editor_actions.cc:1770
 msgid "Pitch Shift..."
 msgstr "Posun výšky tónu..."
 
-#: editor_actions.cc:1764
+#: editor_actions.cc:1773
 msgid "Transpose..."
 msgstr "Převést..."
 
-#: editor_actions.cc:1767
+#: editor_actions.cc:1776
 msgid "Opaque"
 msgstr "Neprůhledný"
 
-#: editor_actions.cc:1771 editor_regions.cc:116
+#: editor_actions.cc:1780 editor_regions.cc:116
 msgid "Fade In"
 msgstr "Postupné zesílení signálu"
 
-#: editor_actions.cc:1776 editor_regions.cc:117
+#: editor_actions.cc:1785 editor_regions.cc:117
 msgid "Fade Out"
 msgstr "Postupné zeslabení signálu"
 
-#: editor_actions.cc:1791
+#: editor_actions.cc:1800
 msgid "Multi-Duplicate..."
 msgstr "Vícekrát zdvojit..."
 
-#: editor_actions.cc:1796
+#: editor_actions.cc:1805
 msgid "Fill Track"
 msgstr "Doplnit stopu"
 
-#: editor_actions.cc:1800 editor_markers.cc:955
+#: editor_actions.cc:1809 editor_markers.cc:955
 msgid "Set Loop Range"
 msgstr "Zřídit oblast smy�ky"
 
-#: editor_actions.cc:1807
+#: editor_actions.cc:1816
 msgid "Set Punch"
 msgstr "Zřídit oblast přepsání"
 
-#: editor_actions.cc:1811
+#: editor_actions.cc:1820
 msgid "Add Single Range Marker"
 msgstr "Přidat zna�ku jednoho rozsahu"
 
-#: editor_actions.cc:1816
+#: editor_actions.cc:1825
 msgid "Add Range Marker Per Region"
 msgstr "Vložit zna�ku rozsahu na oblast"
 
-#: editor_actions.cc:1820
+#: editor_actions.cc:1829
 msgid "Snap Position To Grid"
 msgstr "Zapadnout polohu do mřížky"
 
-#: editor_actions.cc:1823
+#: editor_actions.cc:1832
 msgid "Close Gaps"
 msgstr "Zavřít mezery"
 
-#: editor_actions.cc:1826
+#: editor_actions.cc:1835
 msgid "Rhythm Ferret..."
 msgstr "Rytmická páska..."
 
-#: editor_actions.cc:1829
+#: editor_actions.cc:1838
 msgid "Export..."
 msgstr "Vyvést..."
 
-#: editor_actions.cc:1835
+#: editor_actions.cc:1844
 msgid "Separate Under"
 msgstr "Rozdělit pod"
 
-#: editor_actions.cc:1839
+#: editor_actions.cc:1848
 msgid "Set Fade In Length"
 msgstr "Změnit délku postupného zesílení signálu"
 
-#: editor_actions.cc:1840
+#: editor_actions.cc:1849
 msgid "Set Fade Out Length"
 msgstr "Změnit délku postupného zeslabení signálu"
 
-#: editor_actions.cc:1841
+#: editor_actions.cc:1850
 msgid "Set Tempo from Region = Bar"
 msgstr "Stanovit tempo z \"oblast = takt\""
 
-#: editor_actions.cc:1846
+#: editor_actions.cc:1855
 msgid "Split at Percussion Onsets"
 msgstr "Rozdělit oblasti na za�átcích úderů bicích"
 
-#: editor_actions.cc:1851
+#: editor_actions.cc:1860
 msgid "List Editor..."
 msgstr "Editor seznamu..."
 
-#: editor_actions.cc:1854
+#: editor_actions.cc:1863
 msgid "Properties..."
 msgstr "Vlastnosti..."
 
-#: editor_actions.cc:1858
+#: editor_actions.cc:1867
 msgid "Bounce (with processing)"
 msgstr "Vrazit (se zpracováním)"
 
-#: editor_actions.cc:1859
+#: editor_actions.cc:1868
 msgid "Bounce (without processing)"
 msgstr "Vrazit (bez zpracování)"
 
-#: editor_actions.cc:1860
+#: editor_actions.cc:1869
 msgid "Combine"
 msgstr "Spojit"
 
-#: editor_actions.cc:1861
+#: editor_actions.cc:1870
 msgid "Uncombine"
 msgstr "Zrušit spojení"
 
-#: editor_actions.cc:1863
+#: editor_actions.cc:1872
 msgid "Spectral Analysis..."
 msgstr "Spektrální analýza..."
 
-#: editor_actions.cc:1865
+#: editor_actions.cc:1874
 msgid "Reset Envelope"
 msgstr "Nastavit křivku síly zvuku znovu"
 
-#: editor_actions.cc:1867
+#: editor_actions.cc:1876
 msgid "Reset Gain"
 msgstr "Nastavit sílu hlasitosti znovu"
 
-#: editor_actions.cc:1872
+#: editor_actions.cc:1881
 msgid "Envelope Active"
 msgstr "Činná křivka síly zvuku"
 
-#: editor_actions.cc:1876
+#: editor_actions.cc:1885
 msgid "Quantize..."
 msgstr "Kvantovat..."
 
-#: editor_actions.cc:1877 editor_actions.cc:1878
+#: editor_actions.cc:1886 editor_actions.cc:1887
 msgid "Insert Patch Change..."
 msgstr "Vložit změnu zapojení..."
 
-#: editor_actions.cc:1879
+#: editor_actions.cc:1888
 msgid "Unlink from other copies"
 msgstr "Odpojit od jiných kopií"
 
-#: editor_actions.cc:1880
+#: editor_actions.cc:1889
 msgid "Strip Silence..."
 msgstr "Obnažit ticho..."
 
-#: editor_actions.cc:1881
+#: editor_actions.cc:1890
 msgid "Set Range Selection"
 msgstr "Vybrat rozsah oblasti"
 
-#: editor_actions.cc:1883
+#: editor_actions.cc:1892
 msgid "Nudge Later"
 msgstr "Postr�it o krok později"
 
-#: editor_actions.cc:1884
+#: editor_actions.cc:1893
 msgid "Nudge Earlier"
 msgstr "Postr�it o krok dříve"
 
-#: editor_actions.cc:1889
+#: editor_actions.cc:1898
 msgid "Nudge Later by Capture Offset"
 msgstr "Postr�it o krok později podle odsazení nahrávání"
 
-#: editor_actions.cc:1896
+#: editor_actions.cc:1905
 msgid "Nudge Earlier by Capture Offset"
 msgstr "Postr�it o krok dříve podle odsazení nahrávání"
 
-#: editor_actions.cc:1900
+#: editor_actions.cc:1909
 msgid "Trim to Loop"
 msgstr "Zkrátit na oblast smy�ky"
 
-#: editor_actions.cc:1901
+#: editor_actions.cc:1910
 msgid "Trim to Punch"
 msgstr "Zkrátit na oblast přepsání"
 
-#: editor_actions.cc:1903
+#: editor_actions.cc:1912
 msgid "Trim to Previous"
 msgstr "Zkrátit na předchozí"
 
-#: editor_actions.cc:1904
+#: editor_actions.cc:1913
 msgid "Trim to Next"
 msgstr "Zkrátit na další"
 
-#: editor_actions.cc:1911
+#: editor_actions.cc:1920
 msgid "Insert Region From Region List"
 msgstr "Vložit oblast ze seznamu oblastí"
 
-#: editor_actions.cc:1917
+#: editor_actions.cc:1926
 msgid "Set Sync Position"
 msgstr "Nastavit polohu bodu zapadnutí oblasti"
 
-#: editor_actions.cc:1918
+#: editor_actions.cc:1927
 msgid "Place Transient"
 msgstr "Umístit přechod"
 
-#: editor_actions.cc:1919
+#: editor_actions.cc:1928
 msgid "Split"
 msgstr "Rozdělit"
 
-#: editor_actions.cc:1920
+#: editor_actions.cc:1929
 msgid "Trim Start at Edit Point"
 msgstr "Zastřihnout za�átek oblasti na pracovním bodu"
 
-#: editor_actions.cc:1921
+#: editor_actions.cc:1930
 msgid "Trim End at Edit Point"
 msgstr "Zastřihnout konec oblasti na pracovním bodu"
 
-#: editor_actions.cc:1926
+#: editor_actions.cc:1935
 msgid "Align Start"
 msgstr "Zarovnat za�átek"
 
-#: editor_actions.cc:1933
+#: editor_actions.cc:1942
 msgid "Align Start Relative"
 msgstr "Zarovnat za�átek poměrně"
 
-#: editor_actions.cc:1937
+#: editor_actions.cc:1946
 msgid "Align End"
 msgstr "Zarovnat konec"
 
-#: editor_actions.cc:1942
+#: editor_actions.cc:1951
 msgid "Align End Relative"
 msgstr "Zarovnat konec poměrně"
 
-#: editor_actions.cc:1949
+#: editor_actions.cc:1958
 msgid "Align Sync"
 msgstr "Zarovnat bod zapadnutí"
 
-#: editor_actions.cc:1956
+#: editor_actions.cc:1965
 msgid "Align Sync Relative"
 msgstr "Zarovnat bod zapadnutí poměrně"
 
-#: editor_actions.cc:1960 editor_actions.cc:1963
+#: editor_actions.cc:1969 editor_actions.cc:1972
 msgid "Choose Top..."
 msgstr "Vybrat vrchní..."
 
@@ -4400,32 +4408,32 @@ msgstr ""
 "Projekt již obsahuje zdrojový soubor nazvaný %1. Chcete zavést %2 jako nový "
 "soubor nebo jej přesko�it?"
 
-#: editor_audio_import.cc:279 editor_videotimeline.cc:107
+#: editor_audio_import.cc:279 editor_videotimeline.cc:108
 msgid "Cancel Import"
 msgstr "Zrušit zavedení"
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr "Editor: soubor \"%1\" nelze otevřít (%2)"
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 msgid "Cancel entire import"
 msgstr "Zrušit celé zavedení"
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 msgid "Don't embed it"
 msgstr "Toto nevložit"
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr "Vložit vše bez ptaní"
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 msgid "Sample rate"
 msgstr "Vzorkovací kmito�et"
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
@@ -4434,7 +4442,7 @@ msgstr ""
 "Vzorkovací kmito�et tohoto souboru se neshoduje se vzorkovacím kmito�tem "
 "sezení!"
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 msgid "Embed it anyway"
 msgstr "Přesto vložit"
 
@@ -4443,17 +4451,16 @@ msgid "fixed time region drag"
 msgstr "Oblast sou�asně přesunout"
 
 #: editor_drag.cc:1700
-#, fuzzy
 msgid "Video Start:"
-msgstr "Mike Start"
+msgstr "Za�átek videa:"
 
 #: editor_drag.cc:1702
 msgid "Diff:"
-msgstr ""
+msgstr "Rozdíly:"
 
 #: editor_drag.cc:1722
 msgid "Move Video"
-msgstr ""
+msgstr "Posunout video"
 
 #: editor_drag.cc:2200
 msgid "copy meter mark"
@@ -4471,31 +4478,31 @@ msgstr "Kopírovat zna�ku tempa"
 msgid "move tempo mark"
 msgstr "Posunout zna�ku tempa"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr "Změnit délku postupného zesílení signálu"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr "Změnit délku postupného slábnutí signálu"
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr "Pohnout zna�kou"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr "Při provádění operace protáhnutí �asu se vyskytla chyba"
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 msgid "programming_error: %1"
 msgstr "Chyba v programování: %1"
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr "Nová zna�ka rozsahu"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 msgid "rubberband selection"
 msgstr "Pružný výběr oblasti"
 
@@ -4564,7 +4571,7 @@ msgid "Sharing Solo?"
 msgstr "Sdílení sóla?"
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 msgid "Rec"
 msgstr "Nahr"
 
@@ -4638,7 +4645,7 @@ msgid "end"
 msgstr "Konec"
 
 #: editor_markers.cc:646 editor_ops.cc:1744 editor_ops.cc:1764
-#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1005
+#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1017
 msgid "add marker"
 msgstr "Přidat zna�ku"
 
@@ -4646,7 +4653,7 @@ msgstr "Přidat zna�ku"
 msgid "range"
 msgstr "Rozsah"
 
-#: editor_markers.cc:713 location_ui.cc:840
+#: editor_markers.cc:713 location_ui.cc:852
 msgid "remove marker"
 msgstr "Odstranit zna�ky"
 
@@ -4667,24 +4674,20 @@ msgid "Create Range to Next Marker"
 msgstr "Vytvořit rozsah až k další zna�ce"
 
 #: editor_markers.cc:896
-#, fuzzy
 msgid "Locate to Marker"
-msgstr "Ukazatele polohy postavit na zna�ky"
+msgstr "Umístit ke zna�ce"
 
 #: editor_markers.cc:897
-#, fuzzy
 msgid "Play from Marker"
-msgstr "Přehrávat od tohoto bodu"
+msgstr "Přehrávat od zna�ky"
 
 #: editor_markers.cc:900
-#, fuzzy
 msgid "Set Marker from Playhead"
-msgstr "Nastavit zna�ku rozsahu od ukazatele polohy"
+msgstr "Nastavit zna�ku od ukazatele polohy"
 
 #: editor_markers.cc:902
-#, fuzzy
 msgid "Set Range from Selection"
-msgstr "Nastavit rozsah z výběru rozsahu"
+msgstr "Nastavit rozsah z výběru"
 
 #: editor_markers.cc:905
 msgid "Zoom to Range"
@@ -4726,8 +4729,8 @@ msgstr "Přejmenovat zna�ku"
 msgid "Rename Range"
 msgstr "Přejmenovat rozsah"
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2233 route_time_axis.cc:968 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr "Přejmenovat"
 
@@ -4864,7 +4867,7 @@ msgstr "Dát oblasti zcela dolů"
 msgid "Rename Region"
 msgstr "Přejmenovat oblast"
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 msgid "New name:"
 msgstr "Nový název:"
 
@@ -4976,7 +4979,6 @@ msgid "Cancel Freeze"
 msgstr "Zrušit zmrazení"
 
 #: editor_ops.cc:3553
-#, fuzzy
 msgid ""
 "You can't perform this operation because the processing of the signal will "
 "cause one or more of the tracks to end up with a region with more channels "
@@ -5042,7 +5044,7 @@ msgstr ""
 "(Toto nelze vrátit zpět!)"
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr "Ne, nedělat nic."
 
@@ -5083,9 +5085,8 @@ msgid "toggle region lock"
 msgstr "Přepnout zámek oblasti"
 
 #: editor_ops.cc:5067
-#, fuzzy
 msgid "Toggle Video Lock"
-msgstr "Přepnout zámek oblasti"
+msgstr "Přepnout zámek videa"
 
 #: editor_ops.cc:5091
 msgid "region lock style"
@@ -5232,11 +5233,11 @@ msgstr "OK"
 msgid "close region gaps"
 msgstr "Zavřít mezery oblastí"
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr "To by byly nepříjemné zprávy..."
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5256,7 +5257,7 @@ msgstr ""
 msgid "tracks"
 msgstr "Stopy"
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 msgid "track"
 msgstr "Stopa"
 
@@ -5264,7 +5265,7 @@ msgstr "Stopa"
 msgid "busses"
 msgstr "Sběrnice"
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 msgid "bus"
 msgstr "Sběrnice"
 
@@ -5306,7 +5307,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr "Ano, odstranit."
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr "Ano, odstranit."
 
@@ -5380,7 +5381,7 @@ msgstr ""
 "Délka postupné zeslabení signálu oblasti (jednotky: vedlejší hodiny), (), "
 "pokud je zakázáno"
 
-#: editor_regions.cc:118 mixer_strip.cc:1960 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr "Zam"
@@ -5397,8 +5398,9 @@ msgstr "PÅ™"
 msgid "Region position glued to Bars|Beats time?"
 msgstr "Poloha oblasti přilepena k taktům|dobám?"
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:723
-#: mixer_strip.cc:1934 panner_ui.cc:554 stereo_panner.cc:237
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
+#: stereo_panner.cc:237
 msgid "M"
 msgstr "Z"
 
@@ -5467,7 +5469,8 @@ msgstr "Název stopy/sběrnice"
 msgid "Track/Bus visible ?"
 msgstr "Stopa/Sběrnice viditelná?"
 
-#: editor_routes.cc:204 mixer_strip.cc:1951 route_time_axis.cc:2387
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
+#: route_time_axis.cc:2407
 msgid "A"
 msgstr "Č"
 
@@ -5475,7 +5478,7 @@ msgstr "Č"
 msgid "Track/Bus active ?"
 msgstr "Stopa/Sběrnice �inná?"
 
-#: editor_routes.cc:205 mixer_strip.cc:1935
+#: editor_routes.cc:205 mixer_strip.cc:1932
 msgid "I"
 msgstr "Vst"
 
@@ -5483,7 +5486,7 @@ msgstr "Vst"
 msgid "MIDI input enabled"
 msgstr "Vstup MIDI povolen"
 
-#: editor_routes.cc:206 mixer_strip.cc:1933 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr "N"
@@ -5496,7 +5499,7 @@ msgstr "Nahrávání povoleno"
 msgid "Muted"
 msgstr "Ztlumeno"
 
-#: editor_routes.cc:208 mixer_strip.cc:1947
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr "S"
 
@@ -5508,7 +5511,7 @@ msgstr "Sólo"
 msgid "SI"
 msgstr "SamS"
 
-#: editor_routes.cc:209 mixer_strip.cc:351 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 msgid "Solo Isolated"
 msgstr "Samostatné sólo"
 
@@ -5585,14 +5588,12 @@ msgid "New Meter"
 msgstr "Nový druh taktu"
 
 #: editor_rulers.cc:373
-#, fuzzy
 msgid "Timeline height"
-msgstr "Výška"
+msgstr "Výška �asové osy"
 
 #: editor_rulers.cc:383
-#, fuzzy
 msgid "Align Video Track"
-msgstr "Přidat zvukovou stopu"
+msgstr "Zarovnat videostopu"
 
 #: editor_selection.cc:889 editor_selection.cc:932
 msgid "set selected regions"
@@ -5796,142 +5797,145 @@ msgid "192000Hz"
 msgstr "192000 Hz"
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr "Žádný"
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr "Trojúhelníkový"
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr "Obdélníkový"
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 msgid "Shaped"
 msgstr "Tvarovaný"
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr "Přehrávání/Nahrávání s jedním zařízením"
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr "Přehrávání/Nahrávání se dvěma zařízeními"
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr "Pouze přehrávání"
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 msgid "Recording only"
 msgstr "Pouze nahrávání"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr "sekv"
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 msgid "raw"
 msgstr "nezpracovaný"
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr "Ovlada�:"
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 msgid "Audio Interface:"
 msgstr "Rozhraní pro zvuk:"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:148 sfdb_ui.cc:261 sfdb_ui.cc:266
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 msgid "Sample rate:"
 msgstr "Vzorkovací kmito�et:"
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr "Velikost vyrovnávací paměti:"
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr "Po�et vyrovnávacích pamětí:"
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr "Přibližná prodleva:"
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 msgid "Audio mode:"
 msgstr "Režim zvuku:"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr "Nevšímat si"
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr "Přerušení klienta"
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr "Po�et přípojek:"
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr "Ovlada� MIDI:"
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 msgid "Dither:"
 msgstr "Vložení šumu do signálu:"
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr ""
 "V tomto systému nebyl nalezen žádný server JACK. Nainstalujte, prosím, JACK "
 "a spusťte Ardour znovu"
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr "Server:"
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr "Vstupní zařízení:"
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 msgid "Output device:"
 msgstr "Výstupní zařízení:"
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 msgid "Hardware input latency:"
 msgstr "Vstupní prodleva technického vybavení po�íta�e:"
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 msgid "samples"
 msgstr "Vzorky"
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 msgid "Hardware output latency:"
 msgstr "Výstupní prodleva technického vybavení po�íta�e:"
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr "Zařízení"
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 msgid "Advanced"
 msgstr "Pokro�ilé"
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr "Nelze otevřít JACK soubor rc %1 pro uložení pomocných proměnných"
 
-#: engine_dialog.cc:777
-#, fuzzy
+#: engine_dialog.cc:787
 msgid ""
 "You do not have any audio devices capable of\n"
 "simultaneous playback and recording.\n"
@@ -5959,34 +5963,34 @@ msgstr ""
 "\n"
 "Popřípadě, pokud skute�ně chcete pouze přehrávat\n"
 "nebo nahrávat, ale nikoli sou�asně obojí, spusťte JACK před spuštěním\n"
-"Ardouru a potom vyberte příslušné zařízení."
+"%1 a potom vyberte příslušné zařízení."
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr "Žádné vhodné zvukové zařízení"
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr "Vypadá to, že JACK chybí v balíku %1"
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr "Nejprve musíte vybrat zvukové zařízení."
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr "Zdá se, že zařízení %1 v tomto po�íta�i neexistuje."
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr "Chybí data pro hodnotu nastavení zvuku %1"
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 "Soubory s nastavením obsahují cestu k JACK serveru, která neexistuje (%1)"
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:146
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 msgid "Channels:"
 msgstr "Kanály:"
 
@@ -6011,14 +6015,12 @@ msgid "Track output (channels: %1)"
 msgstr "Výstup stopy (kanály: %1)"
 
 #: export_channel_selector.cc:536
-#, fuzzy
 msgid "Export region contents"
-msgstr "Vyvést oblast"
+msgstr "Vyvést obsah oblasti"
 
 #: export_channel_selector.cc:537
-#, fuzzy
 msgid "Export track output"
-msgstr "Spojit výstupy stop a sběrnic"
+msgstr "Vyvést výstup stopy"
 
 #: export_dialog.cc:46
 msgid ""
@@ -6141,9 +6143,9 @@ msgid "Folder:"
 msgstr "Složka:"
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "Procházet"
 
@@ -6271,6 +6273,11 @@ msgstr "Volby pro FLAC"
 msgid "Broadcast Wave options"
 msgstr "Volby pro Broadcast Wave"
 
+#: export_format_selector.cc:136
+#, fuzzy
+msgid "Do you really want to remove the format?"
+msgstr "Opravdu chcete zastavit videoserver?"
+
 #: export_preset_selector.cc:28
 msgid "Preset"
 msgstr "Přednastavení"
@@ -6283,6 +6290,11 @@ msgstr ""
 "Vybrané přednastavení nebylo nahráno úspěšně!\n"
 "Možná zmiňuje formát, který byl odstraněn?"
 
+#: export_preset_selector.cc:156
+#, fuzzy
+msgid "Do you really want to remove this preset?"
+msgstr "Opravdu chcete zastavit videoserver?"
+
 #: export_timespan_selector.cc:46
 msgid "Show Times as:"
 msgstr "Ukázat �asy jako:"
@@ -6295,36 +6307,50 @@ msgstr " do "
 msgid "Range"
 msgstr "Rozsah"
 
-#: gain_meter.cc:109 gain_meter.cc:431 gain_meter.cc:820
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+#, fuzzy
+msgid "curl error %1 (%2)"
+msgstr "Chyba v programování: %1 (%2)"
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+#, fuzzy
+msgid "%1"
+msgstr "%"
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr "-inf"
 
-#: gain_meter.cc:115 gain_meter.cc:869
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr "Režim automatizace prolína�e"
 
-#: gain_meter.cc:116 gain_meter.cc:870
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr "Druh automatizace prolína�e"
 
-#: gain_meter.cc:125 gain_meter.cc:759 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr "Abs"
 
-#: gain_meter.cc:334
-msgid "-Inf"
-msgstr "-Inf"
-
-#: gain_meter.cc:726 mixer_strip.cc:1954 panner_ui.cc:557
-#: route_time_axis.cc:2391
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
+#: route_time_axis.cc:2411
 msgid "P"
 msgstr "P"
 
-#: gain_meter.cc:729 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr "D"
 
-#: gain_meter.cc:732 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr "Z"
 
@@ -6336,7 +6362,7 @@ msgstr "<span size=\"large\">Předvolby</span>"
 msgid "Switches"
 msgstr "Přepína�e"
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2210
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 msgid "Controls"
 msgstr "Ovládání"
 
@@ -6366,63 +6392,63 @@ msgstr "Správce zvukových spojení"
 msgid "MIDI Connection Manager"
 msgstr "Správce MIDI spojení"
 
-#: global_port_matrix.cc:204 io_selector.cc:216
+#: global_port_matrix.cc:213 io_selector.cc:216
 msgid "port"
 msgstr "Přípojka"
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 msgid "Selection..."
 msgstr "Výběr..."
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr "Nahrávání povoleno..."
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 msgid "Soloed..."
 msgstr "Sólo..."
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 msgid "Create New Group ..."
 msgstr "Vytvořit novou skupinu..."
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr "Vytvořit novou skupinu z"
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 msgid "Edit Group..."
 msgstr "Upravit skupinu..."
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 msgid "Collect Group"
 msgstr "Sebrat skupinu"
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 msgid "Remove Subgroup Bus"
 msgstr "Odstranit sběrnici podskupiny"
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 msgid "Add New Subgroup Bus"
 msgstr "Přidat novou sběrnici podskupiny"
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr "Přidat novou pomocnou sběrnici (před-prolína�)"
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 msgid "Add New Aux Bus (post-fader)"
 msgstr "Přidat novou pomocnou sběrnici (po-prolína�)"
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 msgid "Enable All Groups"
 msgstr "Povolit všechny skupiny"
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 msgid "Disable All Groups"
 msgstr "Zakázat všechny skupiny"
 
@@ -6518,11 +6544,11 @@ msgstr "Zavádí se soubor: %1 z %2"
 msgid "I/O selector"
 msgstr "Voli� vstupu/výstupu"
 
-#: io_selector.cc:266
+#: io_selector.cc:265
 msgid "%1 input"
 msgstr "%1 vstup"
 
-#: io_selector.cc:268
+#: io_selector.cc:267
 msgid "%1 output"
 msgstr "%1 výstup"
 
@@ -6601,7 +6627,7 @@ msgstr[1] "%1 vzorků"
 msgid "Reset"
 msgstr "Nastavit znovu"
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1734
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 msgid "programming error: %1 (%2)"
 msgstr "Chyba v programování: %1 (%2)"
 
@@ -6629,63 +6655,63 @@ msgstr "Skladatel:"
 msgid "Pre-Emphasis"
 msgstr "Předzdůraznění"
 
-#: location_ui.cc:310
+#: location_ui.cc:314
 msgid "Remove this range"
 msgstr "Odstranit tento rozsah"
 
-#: location_ui.cc:311
+#: location_ui.cc:315
 msgid "Start time - middle click to locate here"
 msgstr "Čas za�átku - klepnutí prostředním tla�ítkem myši pro postavení se sem"
 
-#: location_ui.cc:312
+#: location_ui.cc:316
 msgid "End time - middle click to locate here"
 msgstr "Čas konce - klepnutí prostředním tla�ítkem myši pro postavení se sem"
 
-#: location_ui.cc:315
+#: location_ui.cc:319
 msgid "Set range start from playhead location"
 msgstr "Nastavit za�átek rozsahu z místa ukazatele polohy"
 
-#: location_ui.cc:316
+#: location_ui.cc:320
 msgid "Set range end from playhead location"
 msgstr "Nastavit konec rozsahu z místa ukazatele polohy"
 
-#: location_ui.cc:320
+#: location_ui.cc:324
 msgid "Remove this marker"
 msgstr "Odstranit tuto zna�ku"
 
-#: location_ui.cc:321
+#: location_ui.cc:325
 msgid "Position - middle click to locate here"
 msgstr "Poloha - klepnutí prostředním tla�ítkem myši pro postavení se sem"
 
-#: location_ui.cc:323
+#: location_ui.cc:327
 msgid "Set marker time from playhead location"
 msgstr "Nastavit �as zna�ky z místa ukazatele polohy"
 
-#: location_ui.cc:462
+#: location_ui.cc:494
 msgid "You cannot put a CD marker at the start of the session"
 msgstr "Na za�átku sezení nemůžete zřídit žádnou zna�ku na CD"
 
-#: location_ui.cc:708
+#: location_ui.cc:720
 msgid "New Marker"
 msgstr "Nová zna�ka"
 
-#: location_ui.cc:709
+#: location_ui.cc:721
 msgid "New Range"
 msgstr "Nový rozsah"
 
-#: location_ui.cc:722
+#: location_ui.cc:734
 msgid "<b>Loop/Punch Ranges</b>"
 msgstr "<b>Rozsahy smy�ky/přepsání</b>"
 
-#: location_ui.cc:747
+#: location_ui.cc:759
 msgid "<b>Markers (Including CD Index)</b>"
 msgstr "<b>Zna�ky (v�etně rejstříku CD)</b>"
 
-#: location_ui.cc:782
+#: location_ui.cc:794
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
 msgstr "<b>Zna�ky (v�etně rozsahů stop CD)</b>"
 
-#: location_ui.cc:1024
+#: location_ui.cc:1036
 msgid "add range marker"
 msgstr "Přidat zna�ku rozsahu"
 
@@ -6694,7 +6720,6 @@ msgid "%1 could not connect to JACK."
 msgstr "%1 se nepodařilo spojit se s JACKem."
 
 #: main.cc:87
-#, fuzzy
 msgid ""
 "There are several possible reasons:\n"
 "\n"
@@ -6708,14 +6733,13 @@ msgstr ""
 "\n"
 "1) JACK neběží.\n"
 "2) JACK byl spuštěn pod jiným uživatelem, možná pod superuživatelem (root).\n"
-"3) Je tu již jiný klient nazvaný \"ardour\".\n"
+"3) Je tu již jiný klient nazvaný \"%1\".\n"
 "\n"
 "Zvažte, prosím, tyto možnosti, a případně spusťte JACKa znovu."
 
 #: main.cc:203 main.cc:324
-#, fuzzy
 msgid "cannot create user %3 folder %1 (%2)"
-msgstr "Nelze vytvořit uživatelův adresář ur�ený pro Ardour %1 (%2)"
+msgstr "Nelze vytvořit uživatelův adresář ur�ený pro %3 %1 (%2)"
 
 #: main.cc:210 main.cc:331
 msgid "cannot open pango.rc file %1"
@@ -6723,20 +6747,22 @@ msgstr "Nelze otevřít soubor pango.rc %1"
 
 #: main.cc:235 main.cc:358
 msgid "Cannot find ArdourMono TrueType font"
-msgstr ""
+msgstr "Nelze nalézt písmo ArdourMono TrueType"
 
 #: main.cc:247 main.cc:364
 msgid "Cannot load ArdourMono TrueType font."
-msgstr ""
+msgstr "Nelze nahrát písmo ArdourMono TrueType."
 
 #: main.cc:312
 msgid ""
 "No fontconfig file found on your system. Things may looked very odd or ugly"
 msgstr ""
+"Ve vašem systému nebyl nalezen žádný soubor s nastavením písma. Věci v "
+"rozhraní mohou vypadat velice divně a ošklivě."
 
 #: main.cc:368
 msgid "Failed to set fontconfig configuration."
-msgstr ""
+msgstr "Nepodařilo se nastavit nastavení písma."
 
 #: main.cc:379 main.cc:395
 msgid "JACK exited"
@@ -6771,19 +6797,19 @@ msgstr ""
 "a připojit k němu %1 znovu, nebo nyní %1 ukon�it. V této chvíli nemůžete\n"
 "uložit své sezení, protože by došlo ke ztrátě informací o vašem spojení.\n"
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr " (sestaveno s verzí "
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr " a GCC verze "
 
-#: main.cc:504
+#: main.cc:500
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr "Autorské právo (C) 1999-2012 Paul Davis"
 
-#: main.cc:505
+#: main.cc:501
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
@@ -6791,36 +6817,39 @@ msgstr ""
 "Některé �ásti: autorské právo (C) Steve Harris, Ari Johnson, Brett Viren, "
 "Joel Baker, Robin Gareus"
 
-#: main.cc:507
+#: main.cc:503
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr "%1 je poskytován bez NAPROSTO Ž�DNÉ Z�RUKY"
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr "ani pro vhodnost pro OBCHOD nebo způsobilost pro ZVL�ŠTN� POUŽ�V�N�."
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "Je to svobodný program a vaše pomoc s jeho dalším šířením je vítána"
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr "dokud dbáte na ur�ité podmínky, které jsou uvedeny v souboru COPYING."
 
-#: main.cc:519
+#: main.cc:513
+msgid "could not initialize %1."
+msgstr "Nepodařilo se zapnout %1."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr "Nelze nainstalovat SIGPIPE, který má na starosti chyby"
 
-#: main.cc:525
-#, fuzzy
+#: main.cc:528
 msgid "could not create %1 GUI"
-msgstr "Nepodařilo se vytvořit obrazové uživatelské rozhraní k Ardouru"
+msgstr "Nepodařilo se vytvořit obrazové uživatelské rozhraní k %1"
 
 #: main_clock.cc:51
 msgid "Display delta to edit cursor"
 msgstr "Zobrazit deltu pro úpravu ukazovátka"
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 msgid "MarkerText"
 msgstr "Text u zna�ky"
 
@@ -6839,89 +6868,80 @@ msgid "Force"
 msgstr "Vynutit"
 
 #: midi_channel_selector.cc:330 midi_channel_selector.cc:372
-#, fuzzy
 msgid "MIDI Channel Control"
-msgstr "Ovládání MIDI"
+msgstr "Ovládání kanálu MIDI"
 
 #: midi_channel_selector.cc:332
-#, fuzzy
 msgid "Playback all channels"
-msgstr "Skrýt všechny kanály"
+msgstr "Přehrávat všechny kanály"
 
 #: midi_channel_selector.cc:333
-#, fuzzy
 msgid "Play only selected channels"
-msgstr "Přehrát vybraný rozsah"
+msgstr "Přehrát pouze vybrané kanály"
 
 #: midi_channel_selector.cc:334
 msgid "Use a single fixed channel for all playback"
-msgstr ""
+msgstr "Použít pro přehrávání jeden pevný kanál"
 
 #: midi_channel_selector.cc:335
-#, fuzzy
 msgid "Record all channels"
-msgstr "Skrýt všechny kanály"
+msgstr "Nahrávat všechny kanály"
 
 #: midi_channel_selector.cc:336
-#, fuzzy
 msgid "Record only selected channels"
-msgstr "Upravit kanál noty"
+msgstr "Nahrávat pouze vybrané kanály"
 
 #: midi_channel_selector.cc:337
-#, fuzzy
 msgid "Force all channels to 1 channel"
-msgstr "Změnit kanál noty"
+msgstr "Vynutit všechny kanály do jednoho kanálu"
 
 #: midi_channel_selector.cc:378
-#, fuzzy
 msgid "Inbound"
-msgstr "Hranice oblasti"
+msgstr "Na vstupu"
 
 #: midi_channel_selector.cc:398
-#, fuzzy
 msgid "Click to enable recording all channels"
-msgstr "Povolit/Zakázat tento přídavný modul"
+msgstr "Klepnout pro povolení nahrávání všech kanálů"
 
 #: midi_channel_selector.cc:403
 msgid "Click to disable recording all channels"
-msgstr ""
+msgstr "Klepnout pro zakázání nahrávání všech kanálů"
 
 #: midi_channel_selector.cc:408
 msgid "Click to invert currently selected recording channels"
-msgstr ""
+msgstr "Klepnout pro obrácení nyní vybraných nahrávacích kanálů"
 
 #: midi_channel_selector.cc:415
-#, fuzzy
 msgid "Playback"
-msgstr "Pouze přehrávání"
+msgstr "Přehrávání"
 
 #: midi_channel_selector.cc:434
 msgid "Click to enable playback of all channels"
-msgstr ""
+msgstr "Klepnout pro povolení přehrávání všech kanálů"
 
 #: midi_channel_selector.cc:439
 msgid "Click to disable playback of all channels"
-msgstr ""
+msgstr "Klepnout pro zakázání přehrávání všech kanálů"
 
 #: midi_channel_selector.cc:444
 msgid "Click to invert current selected playback channels"
-msgstr ""
+msgstr "Klepnout pro obrácení nyní vybraných přehrávacích kanálů"
 
 #: midi_channel_selector.cc:622
 msgid "Click to toggle playback of channel %1"
-msgstr ""
+msgstr "Klepnout pro přepnutí přehrávání kanálu %1"
 
 #: midi_channel_selector.cc:630
 msgid "Click to force all MIDI channel messages to channel %1"
-msgstr ""
+msgstr "Klepnout pro vynucení všech zpráv kanálu MIDI do kanálu %1"
 
 #: midi_channel_selector.cc:720
 msgid "Click to toggle recording of channel %1"
-msgstr ""
+msgstr "Klepnout pro přepnutí nahrávání kanálu %1"
 
 #: midi_channel_selector.cc:728
 msgid "Click to force all recorded channels to %1"
-msgstr ""
+msgstr "Klepnout pro vynucení všech nahrávaných kanálů do %1"
 
 #: midi_export_dialog.cc:35
 msgid "Export MIDI: %1"
@@ -7041,7 +7061,7 @@ msgstr "Přidání kroku"
 
 #: midi_region_view.cc:1862
 msgid "insane MIDI patch key %1:%2"
-msgstr ""
+msgstr "Nesmyslný klí� zapojení MIDI %1:%2"
 
 #: midi_region_view.cc:1870 midi_region_view.cc:1890
 msgid "alter patch change"
@@ -7096,19 +7116,16 @@ msgid "change channel"
 msgstr "Změnit kanál"
 
 #: midi_region_view.cc:3130
-#, fuzzy
 msgid "Bank "
-msgstr "Banka"
+msgstr "Banka "
 
 #: midi_region_view.cc:3131
-#, fuzzy
 msgid "Program "
-msgstr "Program"
+msgstr "Program "
 
 #: midi_region_view.cc:3132
-#, fuzzy
 msgid "Channel "
-msgstr "Kanál"
+msgstr "Kanál "
 
 #: midi_region_view.cc:3301 midi_region_view.cc:3303
 msgid "paste"
@@ -7119,9 +7136,8 @@ msgid "delete sysex"
 msgstr "Smazat SysEx"
 
 #: midi_streamview.cc:479
-#, fuzzy
 msgid "failed to create MIDI region"
-msgstr "Vytvořit oblast"
+msgstr "Nepodařilo se vytvořit oblast MIDI"
 
 #: midi_time_axis.cc:262
 msgid "External MIDI Device"
@@ -7133,12 +7149,11 @@ msgstr "Režim vnějšího zařízení "
 
 #: midi_time_axis.cc:271
 msgid "Chns"
-msgstr ""
+msgstr "Kan"
 
 #: midi_time_axis.cc:272
-#, fuzzy
 msgid "Click to edit channel settings"
-msgstr "Klepněte pro přidání nového umístění"
+msgstr "Klepněte pro úpravu nastavení kanálu"
 
 #: midi_time_axis.cc:486
 msgid "Show Full Range"
@@ -7157,9 +7172,8 @@ msgid "Note Mode"
 msgstr "Režim noty"
 
 #: midi_time_axis.cc:497
-#, fuzzy
 msgid "Channel Selector"
-msgstr "Barvy kanálů"
+msgstr "Voli� kanálů"
 
 #: midi_time_axis.cc:502
 msgid "Color Mode"
@@ -7198,9 +7212,8 @@ msgid "Controllers %1-%2"
 msgstr "Ovládací prvky %1-%2"
 
 #: midi_time_axis.cc:933 midi_time_axis.cc:936
-#, fuzzy
 msgid "Controller %1"
-msgstr "Ovládací prvky %1-%2"
+msgstr "Ovládací prvek %1"
 
 #: midi_time_axis.cc:959
 msgid "Sustained"
@@ -7316,7 +7329,7 @@ msgstr "Klepnout pro výběr dodate�né složky"
 msgid "Missing Plugins"
 msgstr "Chybějící přídavné moduly"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr "OK"
 
@@ -7388,20 +7401,20 @@ msgstr "Nahrané vazby směšova�e z %1"
 msgid "Could not find mixer.bindings in search path %1"
 msgstr "V prohledávané cestě %1 se nepodařilo nalézt vazby směšova�e"
 
-#: mixer_strip.cc:91 mixer_strip.cc:119 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr "Před"
 
-#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:352 mixer_strip.cc:1293
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 msgid "Comments"
 msgstr "Poznámka"
 
-#: mixer_strip.cc:145
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr "Klepněte pro přepnutí šířky proužku tohoto směšova�e."
 
-#: mixer_strip.cc:147
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
@@ -7409,59 +7422,59 @@ msgstr ""
 "\n"
 "%1-%2 klepnutí pro přepnutí šířky všech proužků."
 
-#: mixer_strip.cc:154
+#: mixer_strip.cc:156
 msgid "Hide this mixer strip"
 msgstr "Skrýt tento proužek směšova�e"
 
-#: mixer_strip.cc:165
+#: mixer_strip.cc:167
 msgid "Click to select metering point"
 msgstr "Vybrat měřicí bod ukazatele hladin"
 
-#: mixer_strip.cc:171
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr "výstup"
 
-#: mixer_strip.cc:190
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr "Samostatné sólo"
 
-#: mixer_strip.cc:199
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr "Zamknout stav sóla"
 
-#: mixer_strip.cc:201 mixer_strip.cc:1929
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 msgid "lock"
 msgstr "Zam"
 
-#: mixer_strip.cc:202 mixer_strip.cc:1928
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 msgid "iso"
 msgstr "Sam"
 
-#: mixer_strip.cc:256
+#: mixer_strip.cc:258
 msgid "Mix group"
 msgstr "Skupina směsi"
 
-#: mixer_strip.cc:349 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 msgid "Phase Invert"
 msgstr "Obrácení fáze"
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 msgid "Solo Safe"
 msgstr "Zajištěné sólo"
 
-#: mixer_strip.cc:353 mixer_ui.cc:124 route_time_axis.cc:664
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 msgid "Group"
 msgstr "Skupina"
 
-#: mixer_strip.cc:354 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 msgid "Meter Point"
 msgstr "Měřicí bod"
 
-#: mixer_strip.cc:466
+#: mixer_strip.cc:470
 msgid "Enable/Disable MIDI input"
 msgstr "Povolit/Zakázat vstup MIDI"
 
-#: mixer_strip.cc:616
+#: mixer_strip.cc:622
 msgid ""
 "Aux\n"
 "Sends"
@@ -7469,139 +7482,152 @@ msgstr ""
 "Pomocné\n"
 "poslání"
 
-#: mixer_strip.cc:640
+#: mixer_strip.cc:646
 msgid "Snd"
 msgstr "Posl"
 
-#: mixer_strip.cc:694 mixer_strip.cc:822 processor_box.cc:2152
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr ""
 "Nespojeno s JACKem - na vstupech/výstupech (I/O) nejsou možné žádné změny"
 
-#: mixer_strip.cc:1089
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr "<b>VSTUP</b> do %1"
 
-#: mixer_strip.cc:1092
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr "<b>V�STUP</b> z %1"
 
-#: mixer_strip.cc:1167
+#: mixer_strip.cc:1174
 msgid "Disconnected"
 msgstr "Odpojeno"
 
-#: mixer_strip.cc:1296
+#: mixer_strip.cc:1303
 msgid "*Comments*"
 msgstr "*Poznámky*"
 
-#: mixer_strip.cc:1303
+#: mixer_strip.cc:1310
 msgid "Cmt"
 msgstr "Pozn"
 
-#: mixer_strip.cc:1306
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr "*Pozn*"
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr "Klepnout pro Přidat/Upravit poznámky"
 
-#: mixer_strip.cc:1351
+#: mixer_strip.cc:1358
 msgid ": comment editor"
 msgstr ": editor poznámek"
 
-#: mixer_strip.cc:1428
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr "Skup"
 
-#: mixer_strip.cc:1431
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr "~S"
 
-#: mixer_strip.cc:1460
+#: mixer_strip.cc:1467
 msgid "Comments..."
 msgstr "Poznámky..."
 
-#: mixer_strip.cc:1462
+#: mixer_strip.cc:1469
 msgid "Save As Template..."
 msgstr "Uložit jako předlohu..."
 
-#: mixer_strip.cc:1468 route_group_dialog.cc:39 route_time_axis.cc:687
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr "Činné"
 
-#: mixer_strip.cc:1475
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr "Upravit prodlevu..."
 
-#: mixer_strip.cc:1478
+#: mixer_strip.cc:1485
 msgid "Protect Against Denormals"
 msgstr "Chránit proti neobvyklým hodnotám"
 
-#: mixer_strip.cc:1484 route_time_axis.cc:426
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 msgid "Remote Control ID..."
 msgstr "ID dálkového ovládání..."
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 msgid "in"
 msgstr "Vst"
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 msgid "post"
 msgstr "Po"
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 msgid "out"
 msgstr "Výst"
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr "Vlastní"
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 msgid "pr"
 msgstr "Pre"
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 msgid "po"
 msgstr "Po"
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 msgid "o"
 msgstr "o"
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr "c"
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr "Disk"
 
-#: mixer_strip.cc:1920 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr "AFL"
 
-#: mixer_strip.cc:1923 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr "PFL"
 
-#: mixer_strip.cc:1936
+#: mixer_strip.cc:1933
 msgid "D"
 msgstr "D"
 
-#: mixer_strip.cc:1959
+#: mixer_strip.cc:1953
 msgid "i"
 msgstr "Vst"
 
-#: mixer_strip.cc:2133
+#: mixer_strip.cc:2128
 msgid "Pre-fader"
 msgstr "Před-prolína�"
 
-#: mixer_strip.cc:2134
+#: mixer_strip.cc:2129
 msgid "Post-fader"
 msgstr "Po-prolína�"
 
+#: mixer_strip.cc:2166 meter_strip.cc:728
+msgid "Change all in Group to %1"
+msgstr ""
+
+#: mixer_strip.cc:2168 meter_strip.cc:730
+#, fuzzy
+msgid "Change all to %1"
+msgstr "Kanál %1"
+
+#: mixer_strip.cc:2170 meter_strip.cc:732
+msgid "Change same track-type to %1"
+msgstr ""
+
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr ""
@@ -7612,10 +7638,69 @@ msgstr ""
 msgid "-all-"
 msgstr "-vše-"
 
-#: mixer_ui.cc:1792
+#: mixer_ui.cc:1794
 msgid "Strips"
 msgstr "Proužky"
 
+#: meter_strip.cc:764
+#, fuzzy
+msgid "Variable height"
+msgstr "Výška �asové osy"
+
+#: meter_strip.cc:765
+#, fuzzy
+msgid "Short"
+msgstr "Krátký"
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr ""
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr ""
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+#, fuzzy
+msgid "VU"
+msgstr "V"
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr "SiP"
@@ -7715,7 +7800,7 @@ msgstr "Ztlumit"
 
 #: monitor_section.cc:238
 msgid "dim"
-msgstr "Tlumený"
+msgstr "Zeslabit"
 
 #: monitor_section.cc:245
 msgid "mono"
@@ -7726,28 +7811,24 @@ msgid "Monitor"
 msgstr "Sledování"
 
 #: monitor_section.cc:678
-#, fuzzy
 msgid "Switch monitor to mono"
-msgstr "Přejít na druhou oktávu"
+msgstr "Přepnout sledování na mono"
 
 #: monitor_section.cc:681
-#, fuzzy
 msgid "Cut monitor"
-msgstr ":sledování"
+msgstr "Vyjmout sledování"
 
 #: monitor_section.cc:684
-#, fuzzy
 msgid "Dim monitor"
-msgstr ":sledování"
+msgstr "Zeslabit sledování"
 
 #: monitor_section.cc:687
-#, fuzzy
 msgid "Toggle exclusive solo mode"
-msgstr "Výhradní sólo"
+msgstr "Přepnout režim výhradní sólo"
 
 #: monitor_section.cc:693
 msgid "Toggle mute overrides solo mode"
-msgstr ""
+msgstr "Přepnout režim ztlumení potla�í sólo"
 
 #: monitor_section.cc:705
 msgid "Cut monitor channel %1"
@@ -7766,24 +7847,21 @@ msgid "Invert monitor channel %1"
 msgstr "Obrátit kanál pro sledování %1"
 
 #: monitor_section.cc:730
-#, fuzzy
 msgid "In-place solo"
-msgstr "Uzavřené sólo"
+msgstr "Sólo přímo na místě"
 
 #: monitor_section.cc:732
-#, fuzzy
 msgid "After Fade Listen (AFL) solo"
-msgstr "Poslech po-prolína�i (AFL)"
+msgstr "Sólo poslech po prolínání (AFL)"
 
 #: monitor_section.cc:734
-#, fuzzy
 msgid "Pre Fade Listen (PFL) solo"
-msgstr "Poslech před-prolína�em (PFL)"
+msgstr "Sólo poslech před prolínáním (PFL)"
 
 #: mono_panner.cc:101
-#, fuzzy, c-format
+#, c-format
 msgid "L:%3d R:%3d"
-msgstr "L:%1 P:%2"
+msgstr "L:%3d P:%3d"
 
 #: mono_panner_editor.cc:33
 msgid "Mono Panner"
@@ -7795,9 +7873,8 @@ msgid "%"
 msgstr "%"
 
 #: nag.cc:41
-#, fuzzy
 msgid "Support %1 Development"
-msgstr "Podpořte vývoj Ardouru"
+msgstr "Podpořte vývoj %1"
 
 #: nag.cc:42
 msgid "I'd like to make a one-time donation"
@@ -7921,6 +7998,8 @@ msgstr "  -h, --help                       Ukázat toto sdělení\n"
 msgid ""
 "  -a, --no-announcements      Do not contact website for announcements\n"
 msgstr ""
+"  -a, --no-announcements      Nespojovat se se stránkami projektu kvůli "
+"oznámením\n"
 
 #: opts.cc:62
 msgid ""
@@ -7976,6 +8055,8 @@ msgstr ""
 #: opts.cc:70
 msgid "  -P, --no-connect-ports      Do not connect any ports at startup\n"
 msgstr ""
+"  -P, --no-connect-ports      Nespojovat se při spuštění s jakýmikoli "
+"přípojkami\n"
 
 #: opts.cc:71
 msgid "  -S, --sync                  Draw the gui synchronously \n"
@@ -8011,7 +8092,7 @@ msgstr ""
 msgid "Panner (2D)"
 msgstr "Vyvažova� (2D)"
 
-#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:452
+#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:451
 msgid "Bypass"
 msgstr "Obejít"
 
@@ -8191,45 +8272,43 @@ msgstr ""
 "Pozoruhodné... Přídavné moduly LADSPA nemají žádné grafické uživatelské "
 "rozhraní!"
 
-#: plugin_ui.cc:125 plugin_ui.cc:228
-#, fuzzy
+#: plugin_ui.cc:125 plugin_ui.cc:227
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
 "version of %1)"
 msgstr ""
-"Neznámý druh přídavného modulu (Upozornění: tato verze Ardouru nepodporuje "
-"žádné přídavné moduly VST)"
+"Neznámý druh přídavného modulu (Upozornění: tato verze %1 nepodporuje žádné "
+"přídavné moduly VST)"
 
 #: plugin_ui.cc:128
 msgid "unknown type of editor-supplying plugin"
 msgstr "Neznámý druh přídavného modulu"
 
-#: plugin_ui.cc:258
-#, fuzzy
+#: plugin_ui.cc:257
 msgid ""
 "unknown type of editor-supplying plugin (note: no linuxVST support in this "
 "version of %1)"
 msgstr ""
-"Neznámý druh přídavného modulu pro editor (Upozornění: tato verze Ardouru "
+"Neznámý druh přídavného modulu pro editor (Upozornění: tato verze %1 "
 "nepodporuje linuxové VST)"
 
-#: plugin_ui.cc:330
+#: plugin_ui.cc:329
 msgid "create_lv2_editor called on non-LV2 plugin"
 msgstr "create_lv2_editor používaný na ne-LV2 přídavný modul"
 
-#: plugin_ui.cc:418
+#: plugin_ui.cc:417
 msgid "Add"
 msgstr "Přidat"
 
-#: plugin_ui.cc:422
+#: plugin_ui.cc:421
 msgid "Description"
 msgstr "Popis"
 
-#: plugin_ui.cc:423
+#: plugin_ui.cc:422
 msgid "Plugin analysis"
 msgstr "Rozbor přídavného modulu"
 
-#: plugin_ui.cc:430
+#: plugin_ui.cc:429
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
@@ -8237,23 +8316,23 @@ msgstr ""
 "Přednastavení (jsou-li) pro tento přídavný modul\n"
 "(tovární i vytvořená uživatelem)"
 
-#: plugin_ui.cc:431
+#: plugin_ui.cc:430
 msgid "Save a new preset"
 msgstr "Uložit nové přednastavení"
 
-#: plugin_ui.cc:432
+#: plugin_ui.cc:431
 msgid "Save the current preset"
 msgstr "Uložit nynější přednastavení"
 
-#: plugin_ui.cc:433
+#: plugin_ui.cc:432
 msgid "Delete the current preset"
 msgstr "Smazat nynější přednastavení"
 
-#: plugin_ui.cc:434
+#: plugin_ui.cc:433
 msgid "Disable signal processing by the plugin"
 msgstr "Zakázat zpracování signálu přídavným modulem"
 
-#: plugin_ui.cc:467 plugin_ui.cc:632
+#: plugin_ui.cc:466 plugin_ui.cc:662
 msgid ""
 "Click to allow the plugin to receive keyboard events that %1 would normally "
 "use as a shortcut"
@@ -8261,29 +8340,41 @@ msgstr ""
 "Klepněte pro povolení přídavného modulu pro přijímání událostí klávesnice, "
 "kterých by %1 oby�ejně použil jako zkratek"
 
-#: plugin_ui.cc:468
+#: plugin_ui.cc:467
 msgid "Click to enable/disable this plugin"
 msgstr "Povolit/Zakázat tento přídavný modul"
 
-#: plugin_ui.cc:507
+#: plugin_ui.cc:506
 msgid "latency (%1 sample)"
 msgid_plural "latency (%1 samples)"
 msgstr[0] "Prodleva (%1 vzorky)"
 msgstr[1] "Prodleva (%1 vzorků)"
 
-#: plugin_ui.cc:509
+#: plugin_ui.cc:508
 msgid "latency (%1 ms)"
 msgstr "Prodleva (%1 ms)"
 
-#: plugin_ui.cc:520
+#: plugin_ui.cc:519
 msgid "Edit Latency"
 msgstr "Upravit prodlevu"
 
-#: plugin_ui.cc:559
+#: plugin_ui.cc:558
 msgid "Plugin preset %1 not found"
 msgstr "Přednastavení přídavného modulu %1 nenalezeno"
 
-#: plugin_ui.cc:639
+#: plugin_ui.cc:595
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin_ui.cc:615 plugin_ui.cc:630
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"newer version"
+msgstr ""
+
+#: plugin_ui.cc:669
 msgid "Click to allow normal use of %1 keyboard shortcuts"
 msgstr "Klepněte pro povolení obvyklého používání klávesových zkratek v %1"
 
@@ -8387,46 +8478,46 @@ msgstr "Zjišťuje se..."
 msgid "Port Insert "
 msgstr "Vložení přípojky "
 
-#: port_matrix.cc:323 port_matrix.cc:342
+#: port_matrix.cc:331 port_matrix.cc:357
 msgid "<b>Sources</b>"
 msgstr "<b>Zdroje</b>"
 
-#: port_matrix.cc:324 port_matrix.cc:343
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr "<b>Cíle</b>"
 
-#: port_matrix.cc:419 port_matrix.cc:427
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr "Přidat %s %s"
 
-#: port_matrix.cc:435
+#: port_matrix.cc:456
 #, c-format
 msgid "Rename '%s'..."
 msgstr "Přejmenovat '%s'..."
 
-#: port_matrix.cc:451
+#: port_matrix.cc:472
 msgid "Remove all"
 msgstr "Odstranit vše"
 
-#: port_matrix.cc:471 port_matrix.cc:483
+#: port_matrix.cc:492 port_matrix.cc:504
 #, c-format
 msgid "%s all"
 msgstr "%s vše"
 
-#: port_matrix.cc:506
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr "Znovu prohlédnout"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr "Ukázat jednotlivé přípojky"
 
-#: port_matrix.cc:514
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr "Přepnout"
 
-#: port_matrix.cc:702
+#: port_matrix.cc:723
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
 "or buss cannot support the new configuration."
@@ -8434,33 +8525,35 @@ msgstr ""
 "Přípojku zde nelze přidat, protože první procesor ve stopě nebo sběrnici "
 "nedokáže podporovat nové nastavení."
 
-#: port_matrix.cc:705
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr "Nelze přidat přípojku"
 
-#: port_matrix.cc:727
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr "Odstranění přípojky nepovoleno"
 
-#: port_matrix.cc:728
+#: port_matrix.cc:749
+#, fuzzy
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
 "Tuto přípojku nelze odstranit, protože první přídavný modul ve stopě nebo "
 "sběrnici nemůže přijmout nový po�et vstupů."
 
-#: port_matrix.cc:945
+#: port_matrix.cc:966
 #, c-format
 msgid "Remove '%s'"
 msgstr "Odstranit '%s'"
 
-#: port_matrix.cc:960
+#: port_matrix.cc:981
 #, c-format
 msgid "%s all from '%s'"
 msgstr "%s vše z '%s'"
 
-#: port_matrix.cc:1026
+#: port_matrix.cc:1047
 msgid "channel"
 msgstr "Kanál"
 
@@ -8472,36 +8565,36 @@ msgstr "Nejsou zde žádné přípojky k připojení."
 msgid "There are no %1 ports to connect."
 msgstr "Nejsou zde žádné %1 přípojky k připojení."
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
 "Alt+double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 msgid "Show All Controls"
 msgstr "Ukázat všechny ovládací prvky"
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 msgid "Hide All Controls"
 msgstr "Skrýt všechny ovládací prvky"
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 msgid "on"
 msgstr "Zapnuto"
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr "Vypnuto"
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
@@ -8509,15 +8602,15 @@ msgstr ""
 "Klepnutí pravým tla�ítkem myši pro přidání/odstranění/upravení\n"
 "přídavných modulů, vložení, poslání a další"
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 msgid "Plugin Incompatibility"
 msgstr "Neslu�itelnost přídavného modulu"
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr "Pokusil jste se přidat přídavný modul \"%1\" do místa %2.\n"
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
@@ -8525,19 +8618,19 @@ msgstr ""
 "\n"
 "Tento přídavný modul má:\n"
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
 msgstr[0] "\t%1 vstup MIDI\n"
 msgstr[1] "\t%1 vstupů MIDI"
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
 msgstr[0] "\t%1 vstup pro zvuk\n"
 msgstr[1] "\t%1 vstupů pro zvuk"
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
@@ -8545,19 +8638,19 @@ msgstr ""
 "\n"
 "Ale v bodě vložení jsou:\n"
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
 msgstr[0] "\t%1 kanál MIDI\n"
 msgstr[1] "\t%1 kanálů MIDI\n"
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
 msgstr[0] "\t%1 kanál pro zvuk\n"
 msgstr[1] "\t%1 kanálů pro zvuk\n"
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
@@ -8565,11 +8658,11 @@ msgstr ""
 "\n"
 "%1 není schopen vložit tento přídavný modul zde."
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 msgid "Cannot set up new send: %1"
 msgstr "Nelze nastavit nové odeslání: %1"
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
 "in that way because the inputs and\n"
@@ -8579,21 +8672,21 @@ msgstr ""
 "přeuspořádat tímto způsobem, protože vstupy a\n"
 "výstupy nebudou nepracovat správně."
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 msgid "Rename Processor"
 msgstr "Přejmenovat procesor"
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr ""
 "Je nejméně 100 I/O (vstupních/výstupních) objektů, které nesou název %1 - "
 "název nezměněn"
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr "Vložení přídavného modulu se nezdařilo"
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
@@ -8603,7 +8696,7 @@ msgstr ""
 "Pravděpodobně se neshoduje vstupní/výstupní nastavení (I/O)\n"
 "přídavných modulů s nastavením pro tuto stopu."
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 msgid ""
 "Do you really want to remove all processors from %1?\n"
 "(this cannot be undone)"
@@ -8611,15 +8704,15 @@ msgstr ""
 "Doopravdy chcete odstranit všechny zpracovatele z %1?\n"
 "(Toto se pak nedá vrátit zpátky)"
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 msgid "Yes, remove them all"
 msgstr "Ano, všechny odstranit"
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 msgid "Remove processors"
 msgstr "Přejmenovat zpracovatele"
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
 "(this cannot be undone)"
@@ -8627,7 +8720,7 @@ msgstr ""
 "Opravdu chcete odstranit všechny zpracovatele před-prolína�e z %1?\n"
 "(Toto se pak nedá vrátit zpátky)"
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
 "(this cannot be undone)"
@@ -8635,52 +8728,52 @@ msgstr ""
 "Opravdu chcete odstranit všechny zpracovatele po-prolína�e z %1?\n"
 "(Toto se pak nedá vrátit zpátky)"
 
-#: processor_box.cc:2198
+#: processor_box.cc:2200
 msgid "New Plugin"
 msgstr "Vložit nový přídavný modul"
 
-#: processor_box.cc:2201
+#: processor_box.cc:2203
 msgid "New Insert"
 msgstr "Vložit novou vložku"
 
-#: processor_box.cc:2204
+#: processor_box.cc:2206
 msgid "New External Send ..."
 msgstr "Nové vnější odeslání..."
 
-#: processor_box.cc:2208
+#: processor_box.cc:2210
 msgid "New Aux Send ..."
 msgstr "Vložit nové pomocné odeslání (Aux)..."
 
-#: processor_box.cc:2212
+#: processor_box.cc:2214
 msgid "Clear (all)"
 msgstr "Smazat (vše)"
 
-#: processor_box.cc:2214
+#: processor_box.cc:2216
 msgid "Clear (pre-fader)"
 msgstr "Smazat (před-prolína�)"
 
-#: processor_box.cc:2216
+#: processor_box.cc:2218
 msgid "Clear (post-fader)"
 msgstr "Smazat (po-prolína�)"
 
-#: processor_box.cc:2242
+#: processor_box.cc:2244
 msgid "Activate All"
 msgstr "Zapnout vše"
 
-#: processor_box.cc:2244
+#: processor_box.cc:2246
 msgid "Deactivate All"
 msgstr "Vypnout vše"
 
-#: processor_box.cc:2246
+#: processor_box.cc:2248
 msgid "A/B Plugins"
 msgstr "Přídavné moduly A/B"
 
-#: processor_box.cc:2255
+#: processor_box.cc:2257
 #, fuzzy
 msgid "Edit with generic controls..."
 msgstr "Upravit pomocí základních ovládacích prvků..."
 
-#: processor_box.cc:2531
+#: processor_box.cc:2557
 msgid "%1: %2 (by %3)"
 msgstr "%1: %2 (podle %3)"
 
@@ -8815,37 +8908,42 @@ msgstr "Dvojité poklepání na název pro úpravu nastavení povoleného protok
 
 #: rc_option_editor.cc:817
 msgid "Show Video Export Info before export"
-msgstr ""
+msgstr "Ukázat před uložením do souboru informace o způsobu vyvedení videa"
 
 #: rc_option_editor.cc:818
 msgid "Show Video Server Startup Dialog"
-msgstr ""
+msgstr "Ukázat spouštěcí dialog videoserveru"
 
 #: rc_option_editor.cc:819
 msgid "Advanced Setup (remote video server)"
-msgstr ""
+msgstr "Pokro�ilé nastavení (vzdálený videoserver)"
 
 #: rc_option_editor.cc:827
 msgid ""
 "<b>When enabled</b> you can speficify a custom video-server URL and docroot. "
 "- Do not enable this option unless you know what you are doing."
 msgstr ""
+"<b>Je-li povoleno</b>, můžete ur�it adresu vlastního videoserveru (URL) a "
+"kořen dokumentu (docroot). - Nepovolujte tuto volbu, pokud nevíte, co děláte."
 
 #: rc_option_editor.cc:829
 msgid "Video Server URL:"
-msgstr ""
+msgstr "Adresa videoserveru (URL):"
 
 #: rc_option_editor.cc:834
+#, fuzzy
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
+"Základní adresa videoserveru (URL) v�etně úvodních písmen http. Obvykle to "
+"je 'http://hostname.example.org:1554/' a výchozí 'http://localhost:1554/', "
+"když běží videoserver místně"
 
 #: rc_option_editor.cc:836
-#, fuzzy
 msgid "Video Folder:"
-msgstr "Složka:"
+msgstr "Složka s videem:"
 
 #: rc_option_editor.cc:841
 msgid ""
@@ -8855,18 +8953,28 @@ msgid ""
 "docroot or be left empty if it is unvailable. It is used for the local video-"
 "monitor and file-browsing when opening/adding a video file."
 msgstr ""
+"Místní cesta ke kořenu dokumentu (docroot) videoserveru. Videoserver bude "
+"moci přistupovat pouze k souborům v tomto adresáři. Pokud server poběží na "
+"vzdáleném po�íta�i, měla by cesta ukazovat na síťově připojenou složku "
+"kořenu dokumentu (docroot) serveru, nebo být ponechána prázdná, pokud je "
+"nedostupný. Používá se pro místní sledování videa a procházení souborů, když "
+"je soubor s videem otevírán/přidáván."
 
 #: rc_option_editor.cc:848
 msgid ""
 "<b>When enabled</b> an information window with details is displayed before "
 "the video-export dialog."
 msgstr ""
+"<b>Je-li povoleno</b>, je před dialogem pro ukládání videa zobrazeno "
+"informa�ní okno s podrobnostmi."
 
 #: rc_option_editor.cc:853
 msgid ""
 "<b>When enabled</b> the video server is never launched automatically without "
 "confirmation"
 msgstr ""
+"<b>Je-li povoleno</b>, videoserver není nikdy spuštěn automaticky bez "
+"potvrzení"
 
 #: rc_option_editor.cc:993
 msgid "%1 Preferences"
@@ -8928,7 +9036,7 @@ msgstr "Nejvyšší po�et nedávných sezení"
 msgid "Click gain level"
 msgstr "Úroveň hlasitosti klepnutí"
 
-#: rc_option_editor.cc:1083 route_time_axis.cc:206 route_time_axis.cc:667
+#: rc_option_editor.cc:1083 route_time_axis.cc:215 route_time_axis.cc:676
 msgid "Automation"
 msgstr "Automatizace"
 
@@ -8949,13 +9057,12 @@ msgid "Stop recording when an xrun occurs"
 msgstr "Zastavit nahrávání v případě xrun (�asového rozdílu)"
 
 #: rc_option_editor.cc:1123
-#, fuzzy
 msgid ""
 "<b>When enabled</b> %1 will stop recording if an over- or underrun is "
 "detected by the audio engine"
 msgstr ""
-"<b>Když je povoleno</b>, Ardour zastaví nahrávání, pokud je zjištěno "
-"přete�ení nebo podte�ení"
+"<b>Když je povoleno</b>, %1 zastaví nahrávání, pokud je zjištěno přete�ení "
+"nebo podte�ení"
 
 #: rc_option_editor.cc:1129
 msgid "Create markers where xruns occur"
@@ -8966,7 +9073,6 @@ msgid "Stop at the end of the session"
 msgstr "Zastavit na konci sezení"
 
 #: rc_option_editor.cc:1143
-#, fuzzy
 msgid ""
 "<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"
@@ -8974,17 +9080,16 @@ msgid ""
 "<b>When disabled</b> %1 will continue to roll past the session end marker at "
 "all times"
 msgstr ""
-"<b>Když je povoleno</b>, a Ardour <b>nenahrává</b>, je při dosažení zna�ky "
-"konce sezení přehrávání zastaveno.\n"
+"<b>Když je povoleno</b>, a %1 <b>nenahrává</b>, je při dosažení zna�ky konce "
+"sezení přehrávání zastaveno.\n"
 "\n"
-"<b>Když je zakázáno</b> Ardour bude pokra�ovat vždy až na konec sezení"
+"<b>Když je zakázáno</b> %1 bude pokra�ovat vždy až na konec sezení"
 
 #: rc_option_editor.cc:1151
 msgid "Do seamless looping (not possible when slaved to MTC, JACK etc)"
 msgstr "Dělat souvislou smy�ku (není možné, když MTC, JACK atd. jsou hlavní)"
 
 #: rc_option_editor.cc:1156
-#, fuzzy
 msgid ""
 "<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 "
@@ -8997,7 +9102,8 @@ msgstr ""
 "sko�í zpět, �ímž se vyhne novému umístění na konci smy�ky.\n"
 "\n"
 "<b>Když je zakázáno</b>, sko�í se při dosažení konce smy�ky na za�átek "
-"smy�ky, což �asto způsobí slyšitelné prasknutí nebo zpoždění"
+"smy�ky, když  %1 dosáhne konce, což �asto způsobí slyšitelné prasknutí nebo "
+"zpoždění"
 
 #: rc_option_editor.cc:1164
 msgid "Disable per-track record disarm while rolling"
@@ -9037,7 +9143,6 @@ msgid "Match session video frame rate to external timecode"
 msgstr "Přizpůsobit rychlost snímkování obrazu vnějšímu �asovému kódu"
 
 #: rc_option_editor.cc:1201
-#, fuzzy
 msgid ""
 "This option controls the value of the video frame rate <i>while chasing</i> "
 "an external timecode source.\n"
@@ -9058,7 +9163,7 @@ msgstr ""
 "\n"
 "<b>Když je zakázáno</b>, rychlost snímkování obrazu sezení nebude změněna "
 "tak, aby odpovídala vybranému vnějšímu zdroji �asového kódu. Místo toho "
-"ukazatel rychlosti snímkování v hlavních hodinách z�ervená a Ardour bude "
+"ukazatel rychlosti snímkování v hlavních hodinách z�ervená a %1 bude "
 "převádět mezi standardem vnějšího �asového kódu a standardem sezení."
 
 #: rc_option_editor.cc:1211
@@ -9078,7 +9183,6 @@ msgid "Lock to 29.9700 fps instead of 30000/1001"
 msgstr "Pevně na 29.9700 fps namísto 30000/1001"
 
 #: rc_option_editor.cc:1230
-#, fuzzy
 msgid ""
 "<b>When enabled</b> the external timecode source is assumed to use 29.97 fps "
 "instead of 30000/1001.\n"
@@ -9121,13 +9225,12 @@ msgid "send LTC while stopped"
 msgstr "Poslat LTC, když přehrávání stojí"
 
 #: rc_option_editor.cc:1275
-#, fuzzy
 msgid ""
 "<b>When enabled</b> %1 will continue to send LTC information even when the "
 "transport (playhead) is not moving"
 msgstr ""
-"<b>Když je povoleno</b>, Ardour bude pokra�ovat v posílání informací LTC, i "
-"když se ukazatel polohy přehrávání nepohybuje"
+"<b>Když je povoleno</b>, %1 bude pokra�ovat v posílání informací LTC, i když "
+"se ukazatel polohy přehrávání nepohybuje"
 
 #: rc_option_editor.cc:1281
 msgid "LTC generator level"
@@ -9154,92 +9257,95 @@ msgstr ""
 msgid "Show meters on tracks in the editor"
 msgstr "Ukázat měřidla na stopách v editoru"
 
-#: rc_option_editor.cc:1320
-msgid "Regions in active edit groups are edited together"
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
 msgstr ""
 
-#: rc_option_editor.cc:1321
-#, fuzzy
+#: rc_option_editor.cc:1328
+msgid "Regions in active edit groups are edited together"
+msgstr "Oblasti ve skupinách, které se upravují, jsou upravovány spole�ně"
+
+#: rc_option_editor.cc:1329
 msgid "whenever they overlap in time"
-msgstr "Zkrátit překrývající novou notu"
+msgstr "Vždycky když se �asově překrývají"
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
-msgstr ""
+msgstr "Jen když mají stejnou délku, polohu a původ"
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr "Udělat z pružného výběru oblasti obdélníkové zapadnutí do mřížky"
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 msgid "Show waveforms in regions"
 msgstr "Ukázat tvary vln v oblastech"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 msgid "Show gain envelopes in audio regions"
 msgstr "Ukázat obálky zesílení v oblastech zvuku"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr "Ve všech režimech"
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr "Pouze v režimu zesílení oblasti"
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 msgid "Waveform scale"
 msgstr "Velikost tvaru vlny"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "Přímý"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr "Logaritmický"
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 msgid "Waveform shape"
 msgstr "Podoba tvaru vlny"
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 msgid "traditional"
 msgstr "Tradi�ní"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 msgid "rectified"
 msgstr "Narovnaná"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr "Ukázat tvary vln zvuku, když je nahráván"
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr "Ukázat nástrojový pruh pro zvětšení"
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr "Obarvit oblasti barvou jejich stopy"
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr "Obnovit okno editoru během tažení shrnutí"
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 msgid "Synchronise editor and mixer track order"
 msgstr "Seřídit pořadí stop v editoru a ve směšova�i"
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 msgid "Synchronise editor and mixer selection"
 msgstr "Seřídit výběr v editoru a ve směšova�i"
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 msgid "Name new markers"
 msgstr "Pojmenovat nové zna�ky"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9251,339 +9357,429 @@ msgstr ""
 "\n"
 "Zna�ky můžete vždy klepnutím pravým tla�ítkem myši na ně přejmenovat"
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr "Automaticky projíždět okno editoru při tažení blízko jeho okrajů"
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr "Ukládání do vyrovnávací paměti"
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 msgid "Record monitoring handled by"
 msgstr "Sledování nahrávání řízené"
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 msgid "ardour"
 msgstr "ardour"
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 msgid "audio hardware"
 msgstr "Zvukové technické vybavení"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 msgid "Tape machine mode"
 msgstr "Režim páskového stroje"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr "Spojení stop a sběrnic"
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr "Automaticky spojit hlavní/sledovací sběrnice"
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 msgid "Connect track inputs"
 msgstr "Spojit vstupy stop"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 msgid "automatically to physical inputs"
 msgstr "Automaticky s fyzickými vstupy"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr "Ru�ně"
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 msgid "Connect track and bus outputs"
 msgstr "Spojit výstupy stop a sběrnic"
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 msgid "automatically to physical outputs"
 msgstr "Automaticky s fyzickými výstupy"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 msgid "automatically to master bus"
 msgstr "Automaticky s hlavní sběrnicí"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 msgid "Denormals"
 msgstr "Neobvyklé hodnoty"
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 msgid "Use DC bias to protect against denormals"
 msgstr ""
 "Použít předpětí přímého proudu (DC bias) pro ochranu proti neobvyklým "
 "hodnotám"
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr "Řízení zpracování"
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr "Žádné řízení zpracování"
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 msgid "use FlushToZero"
 msgstr "Použít ZrudnoutKNule"
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr "Použít NeobvykléHodnotyJsouNula"
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr "Použít ZrudnoutKNule a NeobvykléHodnotyJsouNula"
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 msgid "Silence plugins when the transport is stopped"
 msgstr "Ztišit přídavné moduly, když je přesun zastaven "
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr "Uvést nové přídavné moduly do �innosti"
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr "Povolit automatický rozbor zvuku"
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 msgid "Replicate missing region channels"
 msgstr "Zreprodukovat chybějící kanály oblasti"
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 msgid "Solo / mute"
 msgstr "Sólo/Ztlumit"
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 msgid "Solo-in-place mute cut (dB)"
 msgstr "Vyjmutí ztlumení sóla (dB)"
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr "Ovládací prvky pro sólo jsou ovládacími prvky pro poslech"
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 msgid "Listen Position"
 msgstr "Poloha poslechu"
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 msgid "after-fader (AFL)"
 msgstr "Po-prolína� (AFL)"
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 msgid "pre-fader (PFL)"
 msgstr "Před-prolína� (PFL)"
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr "PFL signály přicházejí z"
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 msgid "before pre-fader processors"
 msgstr "Zpracovatelé před před-prolína�e"
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr "Zpracovatelé před-prolína�e ale po před-prolína�e"
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr "AFL signály přicházejí z"
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 msgid "immediately post-fader"
 msgstr "Okamžitě po-prolína�"
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 msgid "after post-fader processors (before pan)"
 msgstr "Zpracovatelé po po-prolína�e (před vyvážením)"
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr "Výhradní sólo"
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 msgid "Show solo muting"
 msgstr "Sólo ukázat jako oněmělé"
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr "Sólo má přednost před ztlumením"
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 msgid "Default track / bus muting options"
 msgstr "Výchozí volby pro ztlumení stopy/sběrnice"
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr "Ztlumení ovlivní odeslání před-prolína�e"
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr "Ztlumení ovlivní odeslání po-prolína�e"
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 msgid "Mute affects control outputs"
 msgstr "Ztlumení ovlivní ovládací výstupy"
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr "Ztlumení ovlivní hlavní výstupy"
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 msgid "Send MIDI Time Code"
 msgstr "Poslat �asový kód MIDI"
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 "Procento kterékoli strany běžné rychlosti přesunu k odeslání �asového kódu "
 "MIDI (MTC)"
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr "Dodržovat příkazy pro ovládání stroje MIDI"
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr "Poslat příkazy pro ovládání stroje MIDI"
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 msgid "Send MIDI control feedback"
 msgstr "Poslat zpětnou vazbu k ovládání MIDI"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr "ID zařízení MMC (ovládání stroje MIDI) na vstupu"
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr "ID zařízení MMC (ovládání stroje MIDI) na výstupu"
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr "Po�áte�ní změna programu"
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr "Zobrazit první banku/program MIDI jako 0"
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr "Nikdy nezobrazovat periodické zprávy MIDI (MTC, hodiny MIDI)"
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 msgid "Sound MIDI notes as they are selected"
 msgstr "Zahrát noty MIDI, když jsou vybrány"
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 msgid "User interaction"
 msgstr "Uživatelská interakce"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
 "   <i>(if available for your language preferences)</i>"
 msgstr ""
+"Použít překlady %1 zpráv\n"
+"   <i>(aby se projevilo, vyžaduje opětovné spuštění %1)</i>\n"
+"   <i>(je-li dostupné pro vaše jazykové nastavení)</i>"
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr "Klávesnice"
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 msgid "Control surface remote ID"
 msgstr "ID vzdálené ovládací plochy"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 msgid "assigned by user"
 msgstr "ur�eno uživatelem"
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr "následuje pořadí ve směšova�i"
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr "následuje pořadí v editoru"
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1925
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 #, fuzzy
 msgid "Preferences|GUI"
 msgstr "Nastavení"
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr "Obrazově nazna�ovat přejetí ukazatele myši nad různými prvky"
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr "Ukázat nástrojové rady, když myš přejede nad prvkem"
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr "GUI"
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr ""
+"Aktualizovat zobrazení hodin ukazujících stav přehrávání každých 40 ms "
+"namísto každých 100 ms"
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 msgid "Mixer Strip"
 msgstr "Proužek směšova�e"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 msgid "Use narrow strips in the mixer by default"
 msgstr "Použít úzké proužky ve směšova�i jako výchozí"
 
-#: rc_option_editor.cc:1898
-msgid "Meter hold time"
+#: rc_option_editor.cc:1906
+#, fuzzy
+msgid "Peak hold time"
 msgstr "Čas držení měřidla"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 msgid "short"
 msgstr "Krátký"
 
-#: rc_option_editor.cc:1905 rc_option_editor.cc:1920
+#: rc_option_editor.cc:1913
 msgid "medium"
 msgstr "Střední"
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr "Dlouhý"
 
-#: rc_option_editor.cc:1912
-msgid "Meter fall-off"
+#: rc_option_editor.cc:1920
+#, fuzzy
+msgid "DPM fall-off"
 msgstr "Klesání měřidla"
 
-#: rc_option_editor.cc:1918
-msgid "slowest"
-msgstr "Nejpomalejší"
+#: rc_option_editor.cc:1926
+msgid "slowest [6.6dB/sec]"
+msgstr ""
 
-#: rc_option_editor.cc:1919
-msgid "slow"
-msgstr "Pomalý"
+#: rc_option_editor.cc:1927
+msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
+msgstr ""
 
-#: rc_option_editor.cc:1921
-msgid "fast"
-msgstr "Rychlý"
+#: rc_option_editor.cc:1928
+msgid "slowish [12.0dB/sec] (DIN)"
+msgstr ""
 
-#: rc_option_editor.cc:1922
-msgid "faster"
-msgstr "Rychlejší"
+#: rc_option_editor.cc:1929
+msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
+msgstr ""
 
-#: rc_option_editor.cc:1923
-msgid "fastest"
-msgstr "Nejrychlejší"
+#: rc_option_editor.cc:1930
+msgid "medium [20dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1931
+msgid "fast [32dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1932
+msgid "faster [46dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1933
+msgid "fastest [70dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1939
+msgid "Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
+
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+msgid "-20dBFS (SMPTE RP.0155)"
+msgstr ""
+
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+msgid "-18dBFS (EBU, BBC)"
+msgstr ""
+
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
+
+#: rc_option_editor.cc:1955
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
+msgstr ""
+
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
+msgstr ""
+
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
+msgstr ""
+
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
+
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
+
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1985
+#, fuzzy
+msgid "Peak threshold [dBFS]"
+msgstr "Prahová hodnota zvuku (dB)"
+
+#: rc_option_editor.cc:1993
+msgid ""
+"Specify the audio signal level in dbFS at and above which the meter-peak "
+"indicator will flash red."
+msgstr ""
+
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
+msgstr ""
 
 #: region_editor.cc:79
 msgid "audition this region"
@@ -9593,11 +9789,11 @@ msgstr "Poslech této oblasti"
 msgid "Position:"
 msgstr "Poloha:"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr "Konec:"
 
-#: region_editor.cc:92 sfdb_ui.cc:140
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr "Délka:"
 
@@ -9621,23 +9817,23 @@ msgstr "Zdroje:"
 msgid "Source:"
 msgstr "Zdroj:"
 
-#: region_editor.cc:167
+#: region_editor.cc:166
 msgid "Region '%1'"
 msgstr "Oblast '%1'"
 
-#: region_editor.cc:274
+#: region_editor.cc:273
 msgid "change region start position"
 msgstr "Změnit za�áte�ní polohu oblasti"
 
-#: region_editor.cc:290
+#: region_editor.cc:289
 msgid "change region end position"
 msgstr "Změnit koncovou polohu oblasti"
 
-#: region_editor.cc:310
+#: region_editor.cc:309
 msgid "change region length"
 msgstr "Změnit délku oblasti"
 
-#: region_editor.cc:404 region_editor.cc:416
+#: region_editor.cc:403 region_editor.cc:415
 msgid "change region sync point"
 msgstr "Změnit bod zapadnutí oblasti"
 
@@ -9829,319 +10025,318 @@ msgid ""
 msgstr ""
 "Skupina cesty s tímto názvem již existuje. Použijte, prosím, jiný název."
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 msgid "Tracks/Busses"
 msgstr "Stopy/Sběrnice"
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr "Vstupy"
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr "Výstupy"
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr "Přídavné moduly, vložky & odeslání"
 
-#: route_params_ui.cc:211
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr "Položka v seznamu s cestami pro přejmenovanou cestu nebyla nalezena!"
 
-#: route_params_ui.cc:258 route_params_ui.cc:286
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr "Zpoždění přehrávání: %<PRId64> vzorků"
 
-#: route_params_ui.cc:478
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr "Ž�DN� STOPA"
 
-#: route_params_ui.cc:611 route_params_ui.cc:612
+#: route_params_ui.cc:613 route_params_ui.cc:614
 msgid "No Track or Bus Selected"
 msgstr "Nebyla vybrána žádná stopa nebo sběrnice"
 
-#: route_time_axis.cc:96
+#: route_time_axis.cc:97
 msgid "g"
 msgstr "sk"
 
-#: route_time_axis.cc:97
+#: route_time_axis.cc:98
 msgid "p"
 msgstr "se"
 
-#: route_time_axis.cc:98
+#: route_time_axis.cc:99
 msgid "a"
 msgstr "a"
 
-#: route_time_axis.cc:168
+#: route_time_axis.cc:173
 msgid "Record (Right-click for Step Edit)"
 msgstr "Nahrávat (klepnutí pravým tla�ítkem myši pro Úpravu kroku)"
 
-#: route_time_axis.cc:171
+#: route_time_axis.cc:176
 msgid "Record"
 msgstr "Nahrávat"
 
-#: route_time_axis.cc:201
+#: route_time_axis.cc:210
 msgid "Route Group"
 msgstr "Skupina cest"
 
-#: route_time_axis.cc:204
+#: route_time_axis.cc:213
 msgid "MIDI Controllers and Automation"
 msgstr "Ovládací prvky MIDI a automatizace"
 
-#: route_time_axis.cc:381
+#: route_time_axis.cc:390
 msgid "Show All Automation"
 msgstr "Ukázat všechny automatizace"
 
-#: route_time_axis.cc:384
+#: route_time_axis.cc:393
 msgid "Show Existing Automation"
 msgstr "Ukázat stávající automatizace"
 
-#: route_time_axis.cc:387
+#: route_time_axis.cc:396
 msgid "Hide All Automation"
 msgstr "Skrýt všechny automatizace"
 
-#: route_time_axis.cc:396
-#, fuzzy
+#: route_time_axis.cc:405
 msgid "Processor automation"
-msgstr "Vyprázdnit automatizaci"
+msgstr "Automatizace procesoru"
 
-#: route_time_axis.cc:415
+#: route_time_axis.cc:424
 msgid "Color..."
 msgstr "Barva..."
 
-#: route_time_axis.cc:472
+#: route_time_axis.cc:481
 msgid "Overlaid"
 msgstr "Překryto"
 
-#: route_time_axis.cc:478
+#: route_time_axis.cc:487
 msgid "Stacked"
 msgstr "Naskládáno"
 
-#: route_time_axis.cc:486
+#: route_time_axis.cc:495
 msgid "Layers"
 msgstr "Vrstvy"
 
-#: route_time_axis.cc:555
+#: route_time_axis.cc:564
 msgid "Automatic (based on I/O connections)"
 msgstr "Automaticky (založeno na spojení vstup/výstup)"
 
-#: route_time_axis.cc:564
+#: route_time_axis.cc:573
 msgid "(Currently: Existing Material)"
 msgstr "(Nyní: stávající materiál)"
 
-#: route_time_axis.cc:567
+#: route_time_axis.cc:576
 msgid "(Currently: Capture Time)"
 msgstr "(Nyní: �as zachycení)"
 
-#: route_time_axis.cc:575
+#: route_time_axis.cc:584
 msgid "Align With Existing Material"
 msgstr "Zarovnat se stávajícím materiálem"
 
-#: route_time_axis.cc:580
+#: route_time_axis.cc:589
 msgid "Align With Capture Time"
 msgstr "Zarovnat s �asem nahrávky"
 
-#: route_time_axis.cc:585
+#: route_time_axis.cc:594
 msgid "Alignment"
 msgstr "Zarovnání"
 
-#: route_time_axis.cc:620
+#: route_time_axis.cc:629
 msgid "Normal Mode"
 msgstr "Obvyklý režim"
 
-#: route_time_axis.cc:626
+#: route_time_axis.cc:635
 msgid "Tape Mode"
 msgstr "Páskový režim"
 
-#: route_time_axis.cc:632
+#: route_time_axis.cc:641
 msgid "Non-Layered Mode"
 msgstr "Nevrstvený režim"
 
-#: route_time_axis.cc:645 route_time_axis.cc:1587
+#: route_time_axis.cc:654 route_time_axis.cc:1601
 msgid "Playlist"
 msgstr "Seznam skladeb"
 
-#: route_time_axis.cc:965
+#: route_time_axis.cc:979
 msgid "Rename Playlist"
 msgstr "Přejmenovat seznam skladeb"
 
-#: route_time_axis.cc:966
+#: route_time_axis.cc:980
 msgid "New name for playlist:"
 msgstr "Nový název pro seznam skladeb:"
 
-#: route_time_axis.cc:1051
+#: route_time_axis.cc:1065
 msgid "New Copy Playlist"
 msgstr "Seznam skladeb nové kopie"
 
-#: route_time_axis.cc:1052 route_time_axis.cc:1105
+#: route_time_axis.cc:1066 route_time_axis.cc:1119
 msgid "Name for new playlist:"
 msgstr "Název pro nový seznam skladeb:"
 
-#: route_time_axis.cc:1104
+#: route_time_axis.cc:1118
 msgid "New Playlist"
 msgstr "Nový seznam skladeb"
 
-#: route_time_axis.cc:1295
+#: route_time_axis.cc:1309
 msgid "You cannot create a track with that name as it is reserved for %1"
 msgstr "Nemůžete vytvořit stopu s tímto názvem, protože je zamluvený pro %1"
 
-#: route_time_axis.cc:1476
+#: route_time_axis.cc:1490
 msgid "New Copy..."
 msgstr "Nová kopie..."
 
-#: route_time_axis.cc:1480
+#: route_time_axis.cc:1494
 msgid "New Take"
 msgstr "Nový záběr"
 
-#: route_time_axis.cc:1481
+#: route_time_axis.cc:1495
 msgid "Copy Take"
 msgstr "Kopírovat záběr"
 
-#: route_time_axis.cc:1486
+#: route_time_axis.cc:1500
 msgid "Clear Current"
 msgstr "Smazat vybrané"
 
-#: route_time_axis.cc:1489
+#: route_time_axis.cc:1503
 msgid "Select From All..."
 msgstr "Vybrat ze všeho..."
 
-#: route_time_axis.cc:1577
+#: route_time_axis.cc:1591
 msgid "Take: %1.%2"
 msgstr "Vzít: %1.%2"
 
-#: route_time_axis.cc:2267
+#: route_time_axis.cc:2291
 msgid "Underlays"
 msgstr "Podložky"
 
-#: route_time_axis.cc:2270
+#: route_time_axis.cc:2294
 msgid "Remove \"%1\""
 msgstr "Odstranit \"%1\""
 
-#: route_time_axis.cc:2320 route_time_axis.cc:2357
+#: route_time_axis.cc:2344 route_time_axis.cc:2381
 msgid "programming error: underlay reference pointer pairs are inconsistent!"
 msgstr ""
 "Chyba v programování: dvojice vodítek odkazující na podložku jsou "
 "neslu�itelné!"
 
-#: route_time_axis.cc:2388
+#: route_time_axis.cc:2408
 msgid "After-fade listen (AFL)"
 msgstr "Poslech po-prolína�i (AFL)"
 
-#: route_time_axis.cc:2392
+#: route_time_axis.cc:2412
 msgid "Pre-fade listen (PFL)"
 msgstr "Poslech před-prolína�em (PFL)"
 
-#: route_time_axis.cc:2396
+#: route_time_axis.cc:2416
 msgid "s"
 msgstr "s"
 
-#: route_time_axis.cc:2400
+#: route_time_axis.cc:2419
 msgid "m"
 msgstr "z"
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 msgid "Mute this track"
 msgstr "Ztlumit tuto stopu"
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr "Ztlumit ostatní stopy (nesólové)"
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr "Spustit nahrávání do této stopy"
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr "Proužky směšova�e ukazují odeslání do této sběrnice"
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 msgid "Monitor input"
 msgstr "Sledovat vstup"
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 msgid "Monitor playback"
 msgstr "Sledovat přehrávání"
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 msgid "Not connected to JACK - cannot engage record"
 msgstr "Nespojeno s JACKem - nelze za�ít s nahráváním"
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 msgid "Step Entry"
 msgstr "Zápis kroku"
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr "Přiřadit všechny stopy (před-prolína�)"
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 msgid "Assign all tracks and buses (prefader)"
 msgstr "Přiřadit všechny stopy a sběrnice (před-prolína�)"
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr "Přiřadit všechny stopy (po-prolína�)"
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 msgid "Assign all tracks and buses (postfader)"
 msgstr "Přiřadit všechny stopy a sběrnice (po-prolína�)"
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 msgid "Assign selected tracks (prefader)"
 msgstr "Přiřadit vybrané stopy (před-prolína�)"
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 msgid "Assign selected tracks and buses (prefader)"
 msgstr "Přiřadit vybrané stopy a sběrnice (před-prolína�)"
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 msgid "Assign selected tracks (postfader)"
 msgstr "Přiřadit vybrané stopy (po-prolína�)"
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 msgid "Assign selected tracks and buses (postfader)"
 msgstr "Přiřadit vybrané stopy a sběrnice (po-prolína�)"
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 msgid "Copy track/bus gains to sends"
 msgstr "Kopírovat zesílení stop/sběrnic do odeslání"
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr "Nastavit zesílení odeslání na -inf."
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr "Nastavit zesílení odeslání na 0dB"
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 msgid "Solo Isolate"
 msgstr "Samostatné sólo"
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr "Před-prolína�"
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr "Po-prolína�"
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr "Ovládací výstupy"
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr "Hlavní výstupy"
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 msgid "Color Selection"
 msgstr "Výběr barvy"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "\n"
@@ -10156,7 +10351,7 @@ msgstr ""
 "\n"
 "(Toto nelze vrátit zpět, a soubor se sezením bude přepsán!)"
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
 "\n"
@@ -10166,15 +10361,15 @@ msgstr ""
 "\n"
 "(Tento krok nelze vrátit zpět, a soubor se sezením bude přepsán)"
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 msgid "Remove track"
 msgstr "Odstranit stopu"
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 msgid "Remove bus"
 msgstr "Odstranit sběrnici"
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
@@ -10182,47 +10377,47 @@ msgstr ""
 "Od použití dvojte�ky (':') se odrazuje v názvech stop a sběrnic.\n"
 "Chcete použít tento nový název?"
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 msgid "Use the new name"
 msgstr "Použít nový název"
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 msgid "Re-edit the name"
 msgstr "Upravit název znovu"
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 msgid "Rename Track"
 msgstr "Přejmenovat stopu"
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 msgid "Rename Bus"
 msgstr "Přejmenovat sběrnici"
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 msgid " latency"
 msgstr " Prodleva"
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr "Nelze vytvořit adresář %1 pro předlohu cesty"
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 msgid "Save As Template"
 msgstr "Uložit jako předlohu"
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 msgid "Template name:"
 msgstr "Název předlohy:"
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 msgid "Remote Control ID"
 msgstr "ID dálkového ovládání"
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 msgid "Remote control ID:"
 msgstr "ID dálkového ovládání:"
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -10234,15 +10429,15 @@ msgstr ""
 "\n"
 "ID dálkového ovládání %3 nelze změnit."
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 msgid "the master bus"
 msgstr "Hlavní sběrnice"
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 msgid "the monitor bus"
 msgstr "Sledovací sběrnice"
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -10261,15 +10456,15 @@ msgstr ""
 "%4Použijte kartu Uživatelská interakce v okně pro Nastavení, pokud to chcete "
 "změnit%5"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 msgid "the mixer"
 msgstr "Směšova�"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 msgid "the editor"
 msgstr "Editor"
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
@@ -10277,7 +10472,7 @@ msgstr ""
 "Klepnutí levým tla�ítkem myši pro obrácení (oto�ení fáze) kanálu %1 této "
 "stopy. Klepnutí pravým tla�ítkem myši pro ukázání nabídky."
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr "Klepněte pro ukázání kanálů pro obrácení (oto�ení fáze)"
 
@@ -10293,7 +10488,7 @@ msgstr "Klepněte pro přidání nového umístění"
 msgid "the session folder"
 msgstr "složka se sezením"
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 msgid "Send "
 msgstr "Poslat "
 
@@ -10596,11 +10791,15 @@ msgid ""
 "Use Video File's FPS Instead of Timecode Value for Timeline and Video "
 "Monitor."
 msgstr ""
+"Použít FPS videosouboru namísto hodnoty �asového kódu pro �asovou osu a "
+"sledování videa."
 
 #: session_option_editor.cc:91
 msgid ""
 "Apply Pull-Up/Down to Video Timeline and Video Monitor (Unless in JACK-sync)."
 msgstr ""
+"Použít vytažení nahoru/stažení dolů na �asovou osu videa a sledování videa "
+"(jestliže není v JACK-sync)."
 
 #: session_option_editor.cc:96
 msgid "Ext Timecode Offsets"
@@ -10775,51 +10974,107 @@ msgstr "Přilepit nové zna�ky k taktům a dobám"
 msgid "Glue new regions to bars and beats"
 msgstr "Přilepit nové oblasti k taktům a dobám"
 
-#: sfdb_ui.cc:87 sfdb_ui.cc:107 sfdb_ui.cc:116
+#: session_option_editor.cc:275 session_option_editor.cc:277
+#: session_option_editor.cc:284 session_option_editor.cc:291
+#: session_option_editor.cc:298 session_option_editor.cc:300
+#: session_option_editor.cc:307 session_option_editor.cc:314
+#: session_option_editor.cc:321 session_option_editor.cc:323
+#, fuzzy
+msgid "Meterbridge"
+msgstr "Ukazatel hladiny"
+
+#: session_option_editor.cc:275
+msgid "Route Display"
+msgstr ""
+
+#: session_option_editor.cc:279
+#, fuzzy
+msgid "Show Midi Tracks"
+msgstr "Ukázat všechny MIDI stopy"
+
+#: session_option_editor.cc:286
+#, fuzzy
+msgid "Show Busses"
+msgstr "Sběrnice"
+
+#: session_option_editor.cc:293
+#, fuzzy
+msgid "Include Master Bus"
+msgstr "Hlavní sběrnice"
+
+#: session_option_editor.cc:298
+msgid "Button Area"
+msgstr ""
+
+#: session_option_editor.cc:302
+#, fuzzy
+msgid "Rec-enable Button"
+msgstr "Změnit stav nahrávání"
+
+#: session_option_editor.cc:309
+#, fuzzy
+msgid "Mute Button"
+msgstr "s tla�ítkem myši"
+
+#: session_option_editor.cc:316
+#, fuzzy
+msgid "Solo Button"
+msgstr "Povzbuzení sóla"
+
+#: session_option_editor.cc:321
+msgid "Name Labels"
+msgstr ""
+
+#: session_option_editor.cc:325
+#, fuzzy
+msgid "Track Name"
+msgstr "Název stopy/sběrnice"
+
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 msgid "as new tracks"
 msgstr "Jako nové stopy"
 
-#: sfdb_ui.cc:89 sfdb_ui.cc:109
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 msgid "to selected tracks"
 msgstr "K vybraným stopám"
 
-#: sfdb_ui.cc:91 sfdb_ui.cc:111
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 msgid "to region list"
 msgstr "Na seznam s oblastmi"
 
-#: sfdb_ui.cc:93 sfdb_ui.cc:113
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 msgid "as new tape tracks"
 msgstr "Jako nové páskové stopy"
 
-#: sfdb_ui.cc:97
+#: sfdb_ui.cc:96
 msgid "programming error: unknown import mode string %1"
 msgstr "Chyba v programování: neznámý řetězec režimu zavedení %1"
 
-#: sfdb_ui.cc:124
+#: sfdb_ui.cc:123
 msgid "Auto-play"
 msgstr "Automatické přehrávání"
 
-#: sfdb_ui.cc:130 sfdb_ui.cc:237
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 msgid "<b>Sound File Information</b>"
 msgstr "<b>Informace o zvukovém souboru</b>"
 
-#: sfdb_ui.cc:142
+#: sfdb_ui.cc:141
 msgid "Timestamp:"
 msgstr "Časové razítko:"
 
-#: sfdb_ui.cc:144
+#: sfdb_ui.cc:143
 msgid "Format:"
 msgstr "Formát:"
 
-#: sfdb_ui.cc:183 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr "Zna�ky:"
 
-#: sfdb_ui.cc:320
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr "Poslech MIDI souborů ještě není podporován"
 
-#: sfdb_ui.cc:327
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "Soubor nelze pře�íst: %1 (%2)."
 
@@ -10847,11 +11102,11 @@ msgstr "Zvukové soubory"
 msgid "MIDI files"
 msgstr "Soubory MIDI"
 
-#: sfdb_ui.cc:458 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 msgid "All files"
 msgstr "VÅ¡echny soubory"
 
-#: sfdb_ui.cc:477 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 msgid "Browse Files"
 msgstr "Procházet soubory"
 
@@ -10859,169 +11114,157 @@ msgstr "Procházet soubory"
 msgid "Paths"
 msgstr "Cesty"
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr "Hledat zna�ky"
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 msgid "Sort:"
 msgstr "Třídit:"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 msgid "Longest"
 msgstr "Nejdelší"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 msgid "Shortest"
 msgstr "Nejkratší"
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 msgid "Newest"
 msgstr "Nejnovější"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr "Nejstarší"
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr "Nejvíce stahované"
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 msgid "Least downloaded"
 msgstr "Nejméně stahované"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr "Nejvýše hodnocené"
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr "Nejníže hodnocené"
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
+msgstr "Více"
+
+#: sfdb_ui.cc:555
+msgid "Similar"
 msgstr ""
 
-#: sfdb_ui.cc:572
+#: sfdb_ui.cc:567
 msgid "ID"
 msgstr "ID"
 
-#: sfdb_ui.cc:573 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 msgid "Filename"
 msgstr "Souborový název"
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:570
 msgid "Duration"
 msgstr "Doba trvání"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:571
 msgid "Size"
 msgstr "Velikost"
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:572
 msgid "Samplerate"
 msgstr "Vzorkovací kmito�et"
 
-#: sfdb_ui.cc:578
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr "Licence"
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr "Hledat volné zvuky"
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr "Stiskněte pro zavedení vybraných souborů a zavřete toto okno"
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr "Stiskněte pro zavedení vybraných souborů a ponechte toto okno otevřené"
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr "Stiskněte pro zavření tohoto okna bez zavedení jakýchkoli souborů"
 
-#: sfdb_ui.cc:846
-msgid "found %1 match"
-msgid_plural "found %1 matches"
-msgstr[0] "Nalezena %1 shoda"
-msgstr[1] "Nalezeny %1 shody"
-
-#: sfdb_ui.cc:862
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr "Prohlíže� zvukových souborů: Nelze rozebrat řetězec znaků:"
 
-#: sfdb_ui.cc:960
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dostupná %1 další strana ze sta výsledků"
+msgstr[1] "Dostupné %1 další strany ze sta výsledků"
 
-#: sfdb_ui.cc:965
+#: sfdb_ui.cc:1014
 msgid "No more results available"
-msgstr ""
+msgstr "Nejsou dostupné žádné další výsledky"
 
-#: sfdb_ui.cc:1029
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr "B"
 
-#: sfdb_ui.cc:1031
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr "kB "
 
-#: sfdb_ui.cc:1033 sfdb_ui.cc:1035
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr "MB"
 
-#: sfdb_ui.cc:1037
+#: sfdb_ui.cc:1086
 msgid "GB"
 msgstr "GB"
 
-#: sfdb_ui.cc:1070
-msgid "Search returned no results."
-msgstr "Hledání nevrátilo žádné výsledky."
-
-#: sfdb_ui.cc:1072
-msgid "Found %1 match"
-msgid_plural "Found %1 matches"
-msgstr[0] "Nalezena %1 shoda"
-msgstr[1] "Nalezeny %1 shody"
-
-#: sfdb_ui.cc:1277 sfdb_ui.cc:1585 sfdb_ui.cc:1635 sfdb_ui.cc:1653
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr "Jedna stopa na soubor"
 
-#: sfdb_ui.cc:1280 sfdb_ui.cc:1636 sfdb_ui.cc:1654
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 msgid "one track per channel"
 msgstr "Jedna stopa na kanál"
 
-#: sfdb_ui.cc:1288 sfdb_ui.cc:1638 sfdb_ui.cc:1655
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 msgid "sequence files"
 msgstr "Soubory seřadit vedle sebe"
 
-#: sfdb_ui.cc:1291 sfdb_ui.cc:1643
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 msgid "all files in one track"
 msgstr "Všechny soubory do jedné stopy"
 
-#: sfdb_ui.cc:1292 sfdb_ui.cc:1637
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 msgid "merge files"
 msgstr "Slou�it soubory"
 
-#: sfdb_ui.cc:1298 sfdb_ui.cc:1640
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 msgid "one region per file"
 msgstr "Jedna oblast na soubor"
 
-#: sfdb_ui.cc:1301 sfdb_ui.cc:1641
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 msgid "one region per channel"
 msgstr "Jedna oblast na kanál"
 
-#: sfdb_ui.cc:1306 sfdb_ui.cc:1642 sfdb_ui.cc:1656
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 msgid "all files in one region"
 msgstr "Všechny soubory v jedné oblasti"
 
-#: sfdb_ui.cc:1373
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
@@ -11029,55 +11272,55 @@ msgstr ""
 "Jeden nebo více vybraných souborů\n"
 "nemůže být použito %1"
 
-#: sfdb_ui.cc:1513
+#: sfdb_ui.cc:1534
 msgid "Copy files to session"
 msgstr "Zkopírovat soubory do sezení"
 
-#: sfdb_ui.cc:1530 sfdb_ui.cc:1693
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 msgid "file timestamp"
 msgstr "Časové razítko souboru"
 
-#: sfdb_ui.cc:1531 sfdb_ui.cc:1695
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 msgid "edit point"
 msgstr "Pracovní bod"
 
-#: sfdb_ui.cc:1532 sfdb_ui.cc:1697
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 msgid "playhead"
 msgstr "Ukazatel polohy"
 
-#: sfdb_ui.cc:1533
+#: sfdb_ui.cc:1554
 msgid "session start"
 msgstr "Za�átek sezení"
 
-#: sfdb_ui.cc:1538
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr "<b>Přidat soubory jako...</b>"
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1581
 msgid "<b>Insert at</b>"
 msgstr "<b>Vložit v</b>"
 
-#: sfdb_ui.cc:1573
+#: sfdb_ui.cc:1594
 msgid "<b>Mapping</b>"
 msgstr "<b>Přiřazení</b>"
 
-#: sfdb_ui.cc:1591
+#: sfdb_ui.cc:1612
 msgid "<b>Conversion quality</b>"
 msgstr "<b>Kvalita převodu</b>"
 
-#: sfdb_ui.cc:1603 sfdb_ui.cc:1709
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr "Nejlepší"
 
-#: sfdb_ui.cc:1604 sfdb_ui.cc:1711
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr "Dobrá"
 
-#: sfdb_ui.cc:1605 sfdb_ui.cc:1713
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr "Rychlý převod"
 
-#: sfdb_ui.cc:1607
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "Co nejrychleji"
 
@@ -11148,14 +11391,13 @@ msgid "Open an existing session"
 msgstr "Otevřít stávající sezení"
 
 #: startup.cc:74
-#, fuzzy
 msgid ""
 "Use an external mixer or the hardware mixer of your audio interface.\n"
 "%1 will play NO role in monitoring"
 msgstr ""
 "Použít vnější směšova� nebo směšova� technického vybavení vašeho rozhraní "
 "pro zvuk.\n"
-"Ardour ve sledování NEBUDE hrát žádnou úlohu"
+"%1 ve sledování NEBUDE hrát žádnou úlohu"
 
 #: startup.cc:76
 msgid "Ask %1 to play back material as it is being recorded"
@@ -11167,21 +11409,21 @@ msgstr "Rád bych měl pro toto sezení více voleb"
 
 #: startup.cc:194
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -11316,15 +11558,11 @@ msgstr "Část pro sledování"
 
 #: startup.cc:573
 msgid "Check the website for more..."
-msgstr ""
+msgstr "Najít více na internetových stránkách..."
 
 #: startup.cc:576
 msgid "Click to open the program website in your web browser"
-msgstr ""
-
-#: startup.cc:594
-msgid "What would you like to do ?"
-msgstr "Co nyní chcete dělat?"
+msgstr "Klepnout pro otevření stránek programu v prohlíže�i"
 
 #: startup.cc:729
 msgid "Open"
@@ -11338,83 +11576,83 @@ msgstr "Název sezení:"
 msgid "Create session folder in:"
 msgstr "Složku se sezením vytvořit v:"
 
-#: startup.cc:813
+#: startup.cc:821
 msgid "Select folder for session"
 msgstr "Vybrat složku pro sezení"
 
-#: startup.cc:845
+#: startup.cc:853
 msgid "Use this template"
 msgstr "Použít tuto předlohu"
 
-#: startup.cc:848
+#: startup.cc:856
 msgid "no template"
 msgstr "Žádná předloha"
 
-#: startup.cc:876
+#: startup.cc:884
 msgid "Use an existing session as a template:"
 msgstr "Použít stávající sezení jako předlohu:"
 
-#: startup.cc:888
+#: startup.cc:896
 msgid "Select template"
 msgstr "Vybrat předlohu"
 
-#: startup.cc:914
+#: startup.cc:922
 msgid "New Session"
 msgstr "Nové sezení"
 
-#: startup.cc:1068
+#: startup.cc:1077
 msgid "Select session file"
 msgstr "Vybrat soubor se sezením"
 
-#: startup.cc:1084
+#: startup.cc:1093
 msgid "Browse:"
 msgstr "Procházet:"
 
-#: startup.cc:1093
+#: startup.cc:1102
 msgid "Select a session"
 msgstr "Vybrat sezení"
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 msgid "channels"
 msgstr "Kanály"
 
-#: startup.cc:1135
+#: startup.cc:1145
 msgid "<b>Busses</b>"
 msgstr "<b>Sběrnice</b>"
 
-#: startup.cc:1136
+#: startup.cc:1146
 msgid "<b>Inputs</b>"
 msgstr "<b>Vstupy</b>"
 
-#: startup.cc:1137
+#: startup.cc:1147
 msgid "<b>Outputs</b>"
 msgstr "<b>Výstupy</b>"
 
-#: startup.cc:1145
+#: startup.cc:1155
 msgid "Create master bus"
 msgstr "Vytvořit hlavní sběrnici"
 
-#: startup.cc:1155
+#: startup.cc:1165
 msgid "Automatically connect to physical inputs"
 msgstr "Automaticky spojit s fyzickými vstupy"
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr "Použít pouze"
 
-#: startup.cc:1215
+#: startup.cc:1225
 msgid "Automatically connect outputs"
 msgstr "Automaticky spojit výstupy"
 
-#: startup.cc:1237
+#: startup.cc:1247
 msgid "... to master bus"
 msgstr "... s hlavní sběrnicí"
 
-#: startup.cc:1247
+#: startup.cc:1257
 msgid "... to physical outputs"
 msgstr "... s fyzickými výstupy"
 
-#: startup.cc:1297
+#: startup.cc:1307
 msgid "Advanced Session Options"
 msgstr "Pokro�ilé volby pro sezení"
 
@@ -11803,9 +12041,9 @@ msgid "Sustain Selected Notes by Note Length"
 msgstr "Držet vybrané noty podle délky noty"
 
 #: stereo_panner.cc:108
-#, fuzzy, c-format
+#, c-format
 msgid "L:%3d R:%3d Width:%d%%"
-msgstr "L:%1 P:%2 Šířka: %3%%"
+msgstr "L:%3d P:%3d Šířka: %d%%"
 
 #: stereo_panner_editor.cc:35
 msgid "Stereo Panner"
@@ -11964,7 +12202,7 @@ msgstr ""
 
 #: time_axis_view.cc:114
 msgid "Track/Bus name (double click to edit)"
-msgstr ""
+msgstr "Název stopy/sběrnice (pro úpravy dvakrát klepnout)"
 
 #: time_axis_view_item.cc:332
 msgid "new duration %1 frame is out of bounds for %2"
@@ -12096,19 +12334,19 @@ msgstr "Soubor s nastavením %1 nebyl uložen"
 msgid "bad XPM header %1"
 msgstr "Chybná XPM hlavi�ka %1"
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr "Chybějící RGBA styl pro \"%1\""
 
-#: utils.cc:544
+#: utils.cc:591
 msgid "cannot find XPM file for %1"
 msgstr "Nelze najít soubor XPM pro %1"
 
-#: utils.cc:570
+#: utils.cc:617
 msgid "cannot find icon image for %1 using %2"
 msgstr "Nelze najít obrázek s ikonou pro %1 pomocí %2"
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr "během nahrávání ikony s názvem %1 byla zachycena výjimka"
 
@@ -12116,85 +12354,88 @@ msgstr "během nahrávání ikony s názvem %1 byla zachycena výjimka"
 msgid "VerboseCanvasCursor"
 msgstr "Ukazovátko podrobného plátna"
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 #, fuzzy
 msgid "Set Video Track"
-msgstr "Přidat zvukovou stopu"
+msgstr "Zarovnat videostopu"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 #, fuzzy
 msgid "Launch External Video Monitor"
 msgstr "Sledování pomocí technického vybavení"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr ""
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
+#, fuzzy
 msgid "VideoServerIndex"
-msgstr ""
+msgstr "Zastavit videoserver"
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 #, fuzzy
 msgid "Video files"
 msgstr "Zvukové soubory"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 #, fuzzy
 msgid "<b>Video Information</b>"
 msgstr "<b>Informace o zvukovém souboru</b>"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 #, fuzzy
 msgid "Start:"
 msgstr "Spustit"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 #, fuzzy
 msgid "Frame rate:"
 msgstr "Vzorkovací kmito�et:"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr ""
 
-#: editor_videotimeline.cc:138
+#: editor_videotimeline.cc:146
 #, fuzzy
 msgid "Export Successful: %1"
 msgstr "Vyvést jako MIDI: %1"
 
-#: video_timeline.cc:467
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:501
-msgid "Failed to set session-framerate: "
-msgstr ""
-
-#: video_timeline.cc:501
-msgid " does not have a corresponding option setting in Ardour."
+#: video_timeline.cc:507
+msgid ""
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:507
+#: video_timeline.cc:515
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:508
-msgid " vs "
+#: video_timeline.cc:588
+msgid ""
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:690
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12202,18 +12443,18 @@ msgid ""
 "xjadeo's remote-control interface 'xjremote')."
 msgstr ""
 
-#: video_monitor.cc:282
+#: video_monitor.cc:281
 #, fuzzy
 msgid "Video Monitor: File Not Found."
-msgstr "Sledování"
+msgstr "Sledování videa"
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -12223,423 +12464,417 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 #, fuzzy
 msgid "Transcode/Import Video File "
-msgstr "Vyvést jako zvukový soubor"
+msgstr "Vyvést jako videosoubor"
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 #, fuzzy
 msgid "Output File:"
 msgstr "Výstupní zařízení:"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr ""
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 #, fuzzy
 msgid "Height = "
 msgstr "Výška"
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr ""
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 #, fuzzy
 msgid "<b>File Information</b>"
 msgstr "<b>Informace o zvukovém souboru</b>"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr ""
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 #, fuzzy
 msgid "Duration:"
 msgstr "Doba trvání"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr ""
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr ""
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 #, fuzzy
 msgid "??"
 msgstr "???"
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 #, fuzzy
 msgid "<b>Import Settings</b>"
 msgstr "<b>Volby</b>"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
+#, fuzzy
 msgid "Do Not Import Video"
-msgstr ""
+msgstr "Uzamknout k videu"
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr ""
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 #, fuzzy
 msgid "Import/Transcode Video to Session"
 msgstr "Zavést ze sezení"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr ""
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 #, fuzzy
 msgid "Original Width"
-msgstr "Původní poloha"
+msgstr "Původní velikost"
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr ""
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 #, fuzzy
 msgid "Extract Audio:"
 msgstr "Vyvést zvuk"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 #, fuzzy
 msgid "Extracting Audio.."
 msgstr "Vyvést zvuk"
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr ""
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 #, fuzzy
 msgid "Transcoding Failed."
 msgstr "Překlady povoleny"
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 #, fuzzy
 msgid "Save Transcoded Video File"
-msgstr "Vyvést jako zvukový soubor"
+msgstr "Vyvést jako videosoubor"
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
+#, fuzzy
 msgid "Launch Video Server"
-msgstr ""
+msgstr "Adresa videoserveru (URL):"
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr ""
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 #, fuzzy
 msgid "Server Docroot:"
 msgstr "Server:"
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr ""
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 #, fuzzy
 msgid "Listen Port:"
 msgstr "Poloha poslechu"
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 #, fuzzy
 msgid "Cache Size:"
 msgstr "Největší velikost"
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
+#, fuzzy
 msgid "Set Video Server Executable"
-msgstr ""
+msgstr "Daný videoserver není spustitelným souborem."
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr ""
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 #, fuzzy
 msgid "Confirm Overwrite"
 msgstr "Potvrdit přepsání snímku obrazovky"
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 #, fuzzy
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr "Snímek obrazovky s tímto názvem již existuje. Chcete jej přepsat?"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 #, fuzzy
 msgid "Cannot create video folder \"%1\" (%2)"
-msgstr "Nelze vytvořit uživatelův adresář ur�ený pro Ardour %1 (%2)"
+msgstr "Nelze vytvořit uživatelův adresář ur�ený pro %3 %1 (%2)"
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 #, fuzzy
 msgid "Export Video File "
-msgstr "Vyvést jako zvukový soubor"
+msgstr "Vyvést jako videosoubor"
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 #, fuzzy
 msgid "Video:"
-msgstr "Mike Start"
+msgstr "Video"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr ""
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr ""
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 #, fuzzy
 msgid "Normalize Audio"
 msgstr "Normalizovat:"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr ""
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr ""
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 #, fuzzy
 msgid "Deinterlace"
 msgstr "Vystředit ukazatele polohy"
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr ""
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 #, fuzzy
 msgid "Include Session Metadata"
 msgstr "Upravit popisná data k sezení"
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr ""
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 #, fuzzy
 msgid "<b>Output:</b>"
 msgstr "<b>Výstupy</b>"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 #, fuzzy
 msgid "<b>Input:</b>"
 msgstr "<b>Vstupy</b>"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 #, fuzzy
 msgid "Audio:"
 msgstr "Zvuk"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 #, fuzzy
 msgid "Master Bus"
 msgstr "Hlavní sběrnice"
 
-#: export_video_dialog.cc:166
+#: export_video_dialog.cc:145
+msgid "from the %1 session's start to the session's end"
+msgstr ""
+
+#: export_video_dialog.cc:149
+msgid "from 00:00:00:00 to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:151
+msgid "from the video's start to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:184
 #, fuzzy
 msgid "<b>Settings:</b>"
 msgstr "<b>Cíle</b>"
 
-#: export_video_dialog.cc:174
+#: export_video_dialog.cc:192
 #, fuzzy
 msgid "Range:"
 msgstr "Rozsah"
 
-#: export_video_dialog.cc:177
+#: export_video_dialog.cc:195
 #, fuzzy
 msgid "Preset:"
 msgstr "Přednastavení"
 
-#: export_video_dialog.cc:180
+#: export_video_dialog.cc:198
 #, fuzzy
 msgid "Video Codec:"
-msgstr "Složka:"
+msgstr "Složka s videem:"
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:201
 #, fuzzy
 msgid "Video KBit/s:"
-msgstr "Mike Start"
+msgstr "Za�átek videa:"
 
-#: export_video_dialog.cc:186
+#: export_video_dialog.cc:204
 #, fuzzy
 msgid "Audio Codec:"
 msgstr "Režim zvuku:"
 
-#: export_video_dialog.cc:189
+#: export_video_dialog.cc:207
 #, fuzzy
 msgid "Audio KBit/s:"
 msgstr "Zvukové soubory"
 
-#: export_video_dialog.cc:192
+#: export_video_dialog.cc:210
 #, fuzzy
 msgid "Audio Samplerate:"
 msgstr "Vzorkovací kmito�et:"
 
-#: export_video_dialog.cc:369
+#: export_video_dialog.cc:387
 #, fuzzy
 msgid "Normalizing audio"
 msgstr "Normalizovat hodnoty"
 
-#: export_video_dialog.cc:373
+#: export_video_dialog.cc:391
 #, fuzzy
 msgid "Exporting audio"
 msgstr "Vyvést zvuk"
 
-#: export_video_dialog.cc:419
+#: export_video_dialog.cc:437
 #, fuzzy
-msgid "Exporting Audio.."
+msgid "Exporting Audio..."
 msgstr "Vyvést zvuk"
 
-#: export_video_dialog.cc:476
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:505
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:544
-msgid "Encoding Video.."
+#: export_video_dialog.cc:562
+msgid "Encoding Video..."
 msgstr ""
 
-#: export_video_dialog.cc:563
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:661
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr ""
 
-#: export_video_dialog.cc:673
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr ""
 
-#: export_video_dialog.cc:761
+#: export_video_dialog.cc:779
 #, fuzzy
 msgid "Transcoding failed."
 msgstr "Překlady povoleny"
 
-#: export_video_dialog.cc:930 export_video_dialog.cc:950
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 #, fuzzy
 msgid "Save Exported Video File"
-msgstr "Vyvést jako zvukový soubor"
+msgstr "Vyvést jako videosoubor"
 
 #: export_video_infobox.cc:30
 #, fuzzy
 msgid "Video Export Info"
-msgstr "Sledování"
+msgstr "Ukázat před uložením do souboru informace o způsobu vyvedení videa"
 
 #: export_video_infobox.cc:31
 msgid "Do Not Show This Dialog Again (Reset in Edit > Preferences > Video)."
 msgstr ""
 
 #: export_video_infobox.cc:43
+#, fuzzy
 msgid "<b>Video Export Info</b>"
-msgstr ""
+msgstr "Ukázat před uložením do souboru informace o způsobu vyvedení videa"
 
-#: export_video_infobox.cc:46
+#: export_video_infobox.cc:48
 msgid ""
-"Ardour video export is not recommended for mastering!\n"
-"While 'ffmpeg' (which is used by ardour) can produce high-quality files, "
-"this export lacks the possibility to tweak many settings. We recommend to "
-"use 'winff', 'devede' or 'dvdauthor' to mux & master. Nevertheless this "
-"video-export comes in handy to do quick snapshots, intermediates, dailies or "
-"online videos.\n"
+"Video encoding is a non-trivial task with many details.\n"
 "\n"
-"The soundtrack is created from the master-bus of the current Ardour "
-"session.\n"
+"Please see the manual at %1/video-timeline/operations/#export.\n"
 "\n"
-"The video soure defaults to the file used in the video timeline, which may "
-"not the best quality to start with, you should the original video file.\n"
-"\n"
-"If the export-range is longer than the original video, black video frames "
-"are prefixed and/or appended. This process may fail with non-standard pixel-"
-"aspect-ratios.\n"
-"\n"
-"The file-format is determined by the extension that you choose for the "
-"output file (.avi, .mov, .flv, .ogv,...)\n"
-"Note: not all combinations of format+codec+settings produce files which are "
-"according so spec. e.g. flv files require sample-rates of 22.1kHz or "
-"44.1kHz, mpeg containers can not be used with ac3 audio-codec, etc. If in "
-"doubt, use one of the built-in presets."
+"Open Manual in Browser? "
 msgstr ""
 
 #~ msgid "Connect"
@@ -12657,12 +12892,45 @@ msgstr ""
 #~ msgid "Add MIDI Track"
 #~ msgstr "Přidat MIDI stopu"
 
+#~ msgid "-Inf"
+#~ msgstr "-Inf"
+
 #~ msgid "Control surfaces"
 #~ msgstr "Ovládací spína�e"
 
-#, fuzzy
 #~ msgid "Use plugins' own interfaces instead of %1's"
-#~ msgstr "Použít vlastní rozhraní přídavných modulů, namísto rozhraní Ardouru"
+#~ msgstr "Použít vlastní rozhraní přídavných modulů, namísto rozhraní %1"
+
+#~ msgid "slowest"
+#~ msgstr "Nejpomalejší"
+
+#~ msgid "slow"
+#~ msgstr "Pomalý"
+
+#~ msgid "fast"
+#~ msgstr "Rychlý"
+
+#~ msgid "faster"
+#~ msgstr "Rychlejší"
+
+#~ msgid "fastest"
+#~ msgstr "Nejrychlejší"
+
+#~ msgid "found %1 match"
+#~ msgid_plural "found %1 matches"
+#~ msgstr[0] "Nalezena %1 shoda"
+#~ msgstr[1] "Nalezeny %1 shody"
+
+#~ msgid "Search returned no results."
+#~ msgstr "Hledání nevrátilo žádné výsledky."
+
+#~ msgid "Found %1 match"
+#~ msgid_plural "Found %1 matches"
+#~ msgstr[0] "Nalezena %1 shoda"
+#~ msgstr[1] "Nalezeny %1 shody"
+
+#~ msgid "What would you like to do ?"
+#~ msgstr "Co nyní chcete dělat?"
 
 #~ msgid "Hid"
 #~ msgstr "Skryté"
@@ -14412,9 +14680,6 @@ msgstr ""
 #~ msgid "Name for new connection:"
 #~ msgstr "Název nového spojení:"
 
-#~ msgid "rec-enable change"
-#~ msgstr "Změnit stav nahrávání"
-
 #~ msgid "mix group solo  change"
 #~ msgstr "Změnit stav sóla skupiny mixéru"
 
diff --git a/gtk2_ardour/po/de.po b/gtk2_ardour/po/de.po
index c9efd566d1..74288bde3f 100644
--- a/gtk2_ardour/po/de.po
+++ b/gtk2_ardour/po/de.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk-ardour 0.347.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-28 12:10+0200\n"
-"PO-Revision-Date: 2013-07-28 15:37+0200\n"
+"POT-Creation-Date: 2013-09-03 10:44+0200\n"
+"PO-Revision-Date: 2013-09-03 11:41+0200\n"
 "Last-Translator: Edgar Aichinger <edogawa@aon.at>\n"
 "Language-Team: German <ardour-dev@lists.ardour.org>\n"
 "Language: de\n"
@@ -449,7 +449,7 @@ msgid "Add:"
 msgstr "Erstelle:"
 
 #: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:111
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 msgid "<b>Options</b>"
 msgstr "<b>Optionen</b>"
 
@@ -463,21 +463,21 @@ msgid "Group:"
 msgstr "Gruppe:"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 msgid "Audio"
 msgstr "Audio"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -662,75 +662,71 @@ msgstr "Solo"
 msgid "feedback"
 msgstr "Feedback"
 
-#: ardour_ui.cc:186 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 msgid "Speaker Configuration"
 msgstr "Lautsprechereinstellung"
 
-#: ardour_ui.cc:187 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 msgid "Theme Manager"
 msgstr "Thema"
 
-#: ardour_ui.cc:188 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr "Tastenkombinationen"
 
-#: ardour_ui.cc:189
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr "Globale Einstellungen"
 
-#: ardour_ui.cc:190 ardour_ui.cc:195
+#: ardour_ui.cc:191 ardour_ui.cc:196
 msgid "Add Tracks/Busses"
 msgstr "Spuren/Busse hinzufügen"
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "Ãœber..."
 
-#: ardour_ui.cc:192 location_ui.cc:1146
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "Positionen"
 
-#: ardour_ui.cc:193 route_params_ui.cc:58 route_params_ui.cc:606
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 msgid "Tracks and Busses"
 msgstr "Spuren/Busse"
 
-#: ardour_ui.cc:194
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr "Projekteinstellungen"
 
-#: ardour_ui.cc:196 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr "Bundle Manager"
 
-#: ardour_ui.cc:197 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "Große Zeitanzeige"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:199
 msgid "Audio Connections"
 msgstr "Audio-Verbindungen"
 
-#: ardour_ui.cc:199
+#: ardour_ui.cc:200
 msgid "MIDI Connections"
 msgstr "MIDI-Verbindungen"
 
-#: ardour_ui.cc:201
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr "Fehlermeldungen"
 
-#: ardour_ui.cc:303
-msgid "could not initialize %1."
-msgstr "Konnte %1 nicht initialisieren."
-
-#: ardour_ui.cc:398
+#: ardour_ui.cc:388
 msgid "Starting audio engine"
 msgstr "Starte Audio-Engine"
 
-#: ardour_ui.cc:768 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 msgid "%1 is ready for use"
 msgstr "%1 ist bereit"
 
-#: ardour_ui.cc:816
+#: ardour_ui.cc:806
 msgid ""
 "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"
@@ -745,23 +741,23 @@ msgstr ""
 "Sie können die Speicherbegrenzung mit 'ulimit -l' einsehen und normalerweise "
 "in %2 verändern."
 
-#: ardour_ui.cc:833
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr "Diese Meldung nicht erneut anzeigen"
 
-#: ardour_ui.cc:875
+#: ardour_ui.cc:865
 msgid "Don't quit"
 msgstr "Abbrechen"
 
-#: ardour_ui.cc:876
+#: ardour_ui.cc:866
 msgid "Just quit"
 msgstr "Beenden ohne zu speichern"
 
-#: ardour_ui.cc:877
+#: ardour_ui.cc:867
 msgid "Save and quit"
 msgstr "Speichern und beenden"
 
-#: ardour_ui.cc:887
+#: ardour_ui.cc:877
 msgid ""
 "%1 was unable to save your session.\n"
 "\n"
@@ -775,15 +771,15 @@ msgstr ""
 "\n"
 "\"Trotzdem beenden\"."
 
-#: ardour_ui.cc:918
+#: ardour_ui.cc:908
 msgid "Please wait while %1 cleans up..."
 msgstr "Bitte warten Sie, während %1 aufräumt."
 
-#: ardour_ui.cc:935
+#: ardour_ui.cc:925
 msgid "Unsaved Session"
 msgstr "Nicht gespeichertes Projekt"
 
-#: ardour_ui.cc:956
+#: ardour_ui.cc:946
 msgid ""
 "The session \"%1\"\n"
 "has not been saved.\n"
@@ -801,7 +797,7 @@ msgstr ""
 "\n"
 "Wie wollen Sie vorgehen?"
 
-#: ardour_ui.cc:959
+#: ardour_ui.cc:949
 msgid ""
 "The snapshot \"%1\"\n"
 "has not been saved.\n"
@@ -819,74 +815,74 @@ msgstr ""
 "\n"
 "Wie wollen Sie vorgehen?"
 
-#: ardour_ui.cc:973
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr "Frage"
 
-#: ardour_ui.cc:1053
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "getrennt"
 
-#: ardour_ui.cc:1060
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 
-#: ardour_ui.cc:1064
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 
-#: ardour_ui.cc:1082 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 msgid "File:"
 msgstr "Datei:"
 
-#: ardour_ui.cc:1086
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr "BWF"
 
-#: ardour_ui.cc:1089
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr "WAV"
 
-#: ardour_ui.cc:1092
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr "WAV64"
 
-#: ardour_ui.cc:1095 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr "CAF"
 
-#: ardour_ui.cc:1098
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr "AIFF"
 
-#: ardour_ui.cc:1101
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr "iXML"
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr "RF64"
 
-#: ardour_ui.cc:1112
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr "32-float"
 
-#: ardour_ui.cc:1115
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr "24-int"
 
-#: ardour_ui.cc:1118
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr "16-int"
 
-#: ardour_ui.cc:1137
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 
-#: ardour_ui.cc:1156
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -897,33 +893,33 @@ msgstr ""
 "%%</span> <span foreground=\"green\">c:</span><span foreground=\"%s\">"
 "%<PRIu32>%%</span>"
 
-#: ardour_ui.cc:1192
+#: ardour_ui.cc:1188
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr "Disk: <span foreground=\"green\">Unbekannt</span>"
 
-#: ardour_ui.cc:1194
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr "Disk: <span foreground=\"green\">24h+</span>"
 
-#: ardour_ui.cc:1212
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr "Disk: <span foreground=\"green\">&gt;24 h</span>"
 
-#: ardour_ui.cc:1223
+#: ardour_ui.cc:1219
 #, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 
-#: ardour_ui.cc:1249
+#: ardour_ui.cc:1245
 #, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr "Timecode|TC: <span foreground=\"%s\">%s</span>"
 
-#: ardour_ui.cc:1366 ardour_ui.cc:1375 startup.cc:1054
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr "Zuletzt verwendete Projekte"
 
-#: ardour_ui.cc:1455
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
@@ -931,27 +927,27 @@ msgstr ""
 "%1 ist derzeit nicht mit JACK verbunden.\n"
 "Dadurch können keine Projekte geöffnet oder geschlossen werden."
 
-#: ardour_ui.cc:1482
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr "Projekt öffnen"
 
-#: ardour_ui.cc:1507 session_import_dialog.cc:169
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
 #: session_metadata_dialog.cc:729 startup.cc:1083
 msgid "%1 sessions"
 msgstr "%1 Projekte"
 
-#: ardour_ui.cc:1544
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr ""
 "Sie können erst Spuren oder Busse hinzufügen, wenn ein Projekt geladen wurde."
 
-#: ardour_ui.cc:1552
+#: ardour_ui.cc:1548
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] "konnte %1 neue Audio+MIDI-Spur nicht erstellen"
 msgstr[1] "konnte %1 neue Audio+MIDI-Spuren nicht erstellen"
 
-#: ardour_ui.cc:1558 ardour_ui.cc:1619
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 msgid ""
 "There are insufficient JACK ports available\n"
 "to create a new track or bus.\n"
@@ -964,24 +960,24 @@ msgstr ""
 "%1 und starten Sie JACK mit einer größeren\n"
 "Anzahl Ports neu."
 
-#: ardour_ui.cc:1593
+#: ardour_ui.cc:1589
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr ""
 "Sie können erst Spuren oder Busse hinzufügen, wenn ein Projekt geladen wurde."
 
-#: ardour_ui.cc:1602
+#: ardour_ui.cc:1598
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] "konnte %1 neue Audiospur nicht erstellen."
 msgstr[1] "konnte %1 neue Audiospuren nicht erstellen."
 
-#: ardour_ui.cc:1611
+#: ardour_ui.cc:1607
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] "konnte %1 neuen Audiobus nicht erstellen"
 msgstr[1] "konnte %1 neue Audiobusse nicht erstellen"
 
-#: ardour_ui.cc:1728
+#: ardour_ui.cc:1724
 msgid ""
 "Please create one or more tracks before trying to record.\n"
 "You can do this with the \"Add Track or Bus\" option in the Session menu."
@@ -990,7 +986,7 @@ msgstr ""
 "eine oder mehrere Spur hinzu. Die geht über \"Spur/Bus hinzufügen\"\n"
 "im Menüpunkt Projekt."
 
-#: ardour_ui.cc:2118
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
@@ -1000,7 +996,7 @@ msgstr ""
 "\n"
 "%1"
 
-#: ardour_ui.cc:2120
+#: ardour_ui.cc:2116
 msgid ""
 "JACK has either been shutdown or it\n"
 "disconnected %1 because %1\n"
@@ -1012,19 +1008,19 @@ msgstr ""
 "war. Sie sollten versuchen, JACK neu zu starten,\n"
 "neu zu verbinden, und das Projekt zu speichern."
 
-#: ardour_ui.cc:2146
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "Konnte das aktuelle Projekt nicht starten"
 
-#: ardour_ui.cc:2226
+#: ardour_ui.cc:2222
 msgid "Take Snapshot"
 msgstr "Schnappschuss machen"
 
-#: ardour_ui.cc:2227
+#: ardour_ui.cc:2223
 msgid "Name of new snapshot"
 msgstr "Name für neuen Schnappschuss"
 
-#: ardour_ui.cc:2251
+#: ardour_ui.cc:2247
 msgid ""
 "To ensure compatibility with various systems\n"
 "snapshot names may not contain a '%1' character"
@@ -1032,29 +1028,29 @@ msgstr ""
 "Um die Kompatibilität mit verschiedenen Systemen sicher zu stellen,\n"
 "dürfen Namen von Schnappschüssen kein '%1'-Zeichen enthalten"
 
-#: ardour_ui.cc:2263
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr "Bestätige das Überschreiben des Schnappschusses"
 
-#: ardour_ui.cc:2264
+#: ardour_ui.cc:2260
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr ""
 "Ein Schnappschuss mit diesem Namen existiert bereits. Wollen Sie ihn "
 "überschreiben?"
 
-#: ardour_ui.cc:2267 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 msgid "Overwrite"
 msgstr "Ãœberschreiben"
 
-#: ardour_ui.cc:2301
+#: ardour_ui.cc:2297
 msgid "Rename Session"
 msgstr "Projekt umbenennen"
 
-#: ardour_ui.cc:2302
+#: ardour_ui.cc:2298
 msgid "New session name"
 msgstr "Neuer Projektname"
 
-#: ardour_ui.cc:2316 ardour_ui.cc:2696 ardour_ui.cc:2741
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 msgid ""
 "To ensure compatibility with various systems\n"
 "session names may not contain a '%1' character"
@@ -1062,14 +1058,14 @@ msgstr ""
 "Um die Kompatibilität mit verschiedenen Systemen sicher zu stellen,\n"
 "dürfen Projektnamen kein '%1'-Zeichen enthalten"
 
-#: ardour_ui.cc:2324
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr ""
 "Dieser Name wird schon von einem anderen Verzeichnis/Ordner benutzt. Bitte "
 "versuchen Sie einen anderen Namen."
 
-#: ardour_ui.cc:2333
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
@@ -1077,19 +1073,19 @@ msgstr ""
 "Das Umbenennen des Projekts ist fehlgeschlagen.\n"
 "Dies könnte auf schwerwiegende Probleme hinweisen."
 
-#: ardour_ui.cc:2444
+#: ardour_ui.cc:2440
 msgid "Save Template"
 msgstr "Als Vorlage Speichern"
 
-#: ardour_ui.cc:2445
+#: ardour_ui.cc:2441
 msgid "Name for template:"
 msgstr "Name für Vorlage"
 
-#: ardour_ui.cc:2446
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-Vorlage"
 
-#: ardour_ui.cc:2484
+#: ardour_ui.cc:2480
 msgid ""
 "This session\n"
 "%1\n"
@@ -1099,52 +1095,52 @@ msgstr ""
 "%1\n"
 "existiert bereits. Wollen Sie sie öffnen?"
 
-#: ardour_ui.cc:2494
+#: ardour_ui.cc:2490
 msgid "Open Existing Session"
 msgstr "Vorhandenes Projekt öffnen"
 
-#: ardour_ui.cc:2732
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr "Es gibt kein Projekt in: \"%1\""
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2815
 msgid "Please wait while %1 loads your session"
 msgstr "Bitte warten Sie, während %1 das Projekt lädt"
 
-#: ardour_ui.cc:2834
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr "Fehler bei der Registrierung von Ports"
 
-#: ardour_ui.cc:2835
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr "Klicken Sie auf Schließen, um es erneut zu versuchen."
 
-#: ardour_ui.cc:2856
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "Projekt  \"%1 (Schnappschuss %2)\" konnte nicht geladen werden."
 
-#: ardour_ui.cc:2862
+#: ardour_ui.cc:2858
 msgid "Loading Error"
 msgstr "Fehler beim Laden"
 
-#: ardour_ui.cc:2863
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr "Klicken Sie auf Aktualisieren, um es erneut zu versuchen."
 
-#: ardour_ui.cc:2945
+#: ardour_ui.cc:2941
 msgid "Could not create session in \"%1\""
 msgstr "Konnte kein Projekt in \"%1\" anlegen"
 
-#: ardour_ui.cc:3045
+#: ardour_ui.cc:3041
 msgid "No files were ready for clean-up"
 msgstr "Keine Audiodateien zum Aufräumen vorhanden"
 
-#: ardour_ui.cc:3049 ardour_ui.cc:3059 ardour_ui.cc:3192 ardour_ui.cc:3199
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 msgid "Clean-up"
 msgstr "Aufräumen"
 
-#: ardour_ui.cc:3050
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1156,19 +1152,19 @@ msgstr ""
 "sind sie wahrscheinlich noch in einem\n"
 "älteren Schnappschuss als Region eingebunden."
 
-#: ardour_ui.cc:3109
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr "kilo"
 
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr "mega"
 
-#: ardour_ui.cc:3115
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr "giga"
 
-#: ardour_ui.cc:3120
+#: ardour_ui.cc:3116
 msgid ""
 "The following file was deleted from %2,\n"
 "releasing %3 %4bytes of disk space"
@@ -1182,7 +1178,7 @@ msgstr[1] ""
 "Die folgenden %1 Dateien wurden von %2\n"
 "gelöscht und gaben %3 %4bytes Speicherplatz frei"
 
-#: ardour_ui.cc:3127
+#: ardour_ui.cc:3123
 msgid ""
 "The following file was not in use and \n"
 "has been moved to: %2\n"
@@ -1220,11 +1216,11 @@ msgstr[1] ""
 "\n"
 "%3 %4bytes Speicherplatz freigegeben werden.\n"
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3183
 msgid "Are you sure you want to clean-up?"
 msgstr "Wollen Sie wirklich aufräumen?"
 
-#: ardour_ui.cc:3194
+#: ardour_ui.cc:3190
 msgid ""
 "Clean-up is a destructive operation.\n"
 "ALL undo/redo information will be lost if you clean-up.\n"
@@ -1236,42 +1232,42 @@ msgstr ""
 "Nach dem Aufräumen werden alle nicht benötigten Audiodateien in den \"dead "
 "sounds\" Ordner verschoben."
 
-#: ardour_ui.cc:3202
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr "Aufräumdialog"
 
-#: ardour_ui.cc:3232
+#: ardour_ui.cc:3228
 msgid "Cleaned Files"
 msgstr "Aufgeräumte Dateien"
 
-#: ardour_ui.cc:3249
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr "gelöschte Datei"
 
-#: ardour_ui.cc:3341
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 "Der Video-Server wurde nicht von Ardour gestartet, der Befehl ihn anzuhalten "
 "wird ignoriert."
 
-#: ardour_ui.cc:3345
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr "Video-Server anhalten"
 
-#: ardour_ui.cc:3346
+#: ardour_ui.cc:3342
 msgid "Do you really want to stop the Video Server?"
 msgstr "Wollen Sie den Video-Server wirklich anhalten?"
 
-#: ardour_ui.cc:3349
+#: ardour_ui.cc:3345
 msgid "Yes, Stop It"
 msgstr "Ja, anhalten."
 
-#: ardour_ui.cc:3375
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr "Der Video-Server läuft bereits"
 
-#: ardour_ui.cc:3377
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
@@ -1279,7 +1275,7 @@ msgstr ""
 "Ein externer Video-Server wurde konfiguriert, ist aber nicht erreichbar. Es "
 "wird keine neue Instanz gestartet."
 
-#: ardour_ui.cc:3385 ardour_ui.cc:3475
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
@@ -1288,36 +1284,36 @@ msgstr ""
 "ihn vorher starten oder die Adresse in Bearbeiten -> Globale Einstellungen "
 "anpassen"
 
-#: ardour_ui.cc:3409
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr "Das eingestellte Dokumentenverzeichnis existiert nicht."
 
-#: ardour_ui.cc:3414
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr "Der eingestellte Video-Server ist keine ausführbare Datei."
 
-#: ardour_ui.cc:3447
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr "Kann den Videoserver nicht starten "
 
-#: ardour_ui.cc:3456
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr "Viideoserver wurde gestartet, reagiert aber nicht auf Anfragen..."
 
-#: ardour_ui.cc:3501 editor_audio_import.cc:632
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "Konnte \"%s\" nicht öffnen."
 
-#: ardour_ui.cc:3505
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
 msgstr "Es wurde keine Video-Datei ausgewählt."
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr ""
 "Die Aufnahme wurde gestoppt, da Ihr System nicht schnell genug folgen konnte."
 
-#: ardour_ui.cc:3699
+#: ardour_ui.cc:3702
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1331,7 +1327,7 @@ msgstr ""
 "Die Daten konnten nicht schnell genug geschrieben\n"
 "werden, um die Aufnahme fortzuführen.\n"
 
-#: ardour_ui.cc:3718
+#: ardour_ui.cc:3721
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1345,11 +1341,11 @@ msgstr ""
 "Die Daten konnten nicht schnell genug gelesen\n"
 "werden, um die Wiedergabe aufrechtzuerhalten.\n"
 
-#: ardour_ui.cc:3758
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr "Absturz-Wiederherstellung"
 
-#: ardour_ui.cc:3759
+#: ardour_ui.cc:3762
 msgid ""
 "This session appears to have been in the\n"
 "middle of recording when %1 or\n"
@@ -1367,19 +1363,19 @@ msgstr ""
 "für Sie wiederherstellen oder sie verwerfen.\n"
 "Bitte entscheiden Sie, wie Sie vorgehen möchten.\n"
 
-#: ardour_ui.cc:3771
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr "Daten verwerfen"
 
-#: ardour_ui.cc:3772
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr "Daten wiederherstellen"
 
-#: ardour_ui.cc:3792
+#: ardour_ui.cc:3795
 msgid "Sample Rate Mismatch"
 msgstr "Samplerate passt nicht"
 
-#: ardour_ui.cc:3793
+#: ardour_ui.cc:3796
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
 "%2 is currently running at %3 Hz.  If you load this session,\n"
@@ -1390,23 +1386,23 @@ msgstr ""
 "%2 läuft derzeit mit %3 Hz. Wenn Sie dieses Projekt laden, \n"
 "wird Ihr Audiomaterial mit der falschen Samplerate abgespielt.\n"
 
-#: ardour_ui.cc:3802
+#: ardour_ui.cc:3805
 msgid "Do not load session"
 msgstr "Projekt nicht laden"
 
-#: ardour_ui.cc:3803
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr "Projekt trotzdem laden"
 
-#: ardour_ui.cc:3826
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "Konnte Verbindung mit JACK nicht trennen"
 
-#: ardour_ui.cc:3839
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr "Konnte nicht erneut zu JACK verbinden"
 
-#: ardour_ui.cc:4113
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1550,27 +1546,31 @@ msgstr ""
 "Siehe <span color=\"blue\">http://ardour.org/a3_features_clocks</span> für "
 "Einzelheiten."
 
-#: ardour_ui2.cc:178
+#: ardour_ui2.cc:147
+msgid "Reset Level Meter"
+msgstr "Lautstärkepegelanzeige zurücksetzen"
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr "[FEHLER]:"
 
-#: ardour_ui2.cc:180
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr "[WARNUNG]:"
 
-#: ardour_ui2.cc:182
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr "[INFO]: "
 
-#: ardour_ui2.cc:246 ardour_ui_ed.cc:377
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 msgid "Auto Return"
 msgstr "Auto Return"
 
-#: ardour_ui2.cc:248 ardour_ui_ed.cc:380
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr "Folge Bearbeitungen"
 
-#: ardour_ui2.cc:626 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1594,19 +1594,19 @@ msgstr "Mixer laden"
 msgid "Reload Session History"
 msgstr "Projekt-Aktionsverlauf laden"
 
-#: ardour_ui_dialogs.cc:221
+#: ardour_ui_dialogs.cc:242
 msgid "Don't close"
 msgstr "Abbrechen"
 
-#: ardour_ui_dialogs.cc:222
+#: ardour_ui_dialogs.cc:243
 msgid "Just close"
 msgstr "Ohne speichern schließen"
 
-#: ardour_ui_dialogs.cc:223
+#: ardour_ui_dialogs.cc:244
 msgid "Save and close"
 msgstr "Speichern und schließen"
 
-#: ardour_ui_dialogs.cc:318
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr ""
 "Dieser Bildschirm ist nicht hoch genug, um das Mixerfenster darzustellen"
@@ -1620,7 +1620,7 @@ msgstr "Projekt"
 msgid "Sync"
 msgstr "Sync"
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr "Optionen"
 
@@ -1648,15 +1648,15 @@ msgstr "Dateiformat"
 msgid "Sample Format"
 msgstr "Sampleformat"
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr "Eingabegeräte / Controller"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr "Pegelanzeige"
 
@@ -1742,7 +1742,7 @@ msgid "Stem export..."
 msgstr "Stems exportieren..."
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "Exportieren"
 
@@ -1754,7 +1754,7 @@ msgstr "Nicht benutzte Dateien entfernen..."
 msgid "Flush Wastebasket"
 msgstr "Müll leeren"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr "JACK"
 
@@ -2008,7 +2008,7 @@ msgstr "MMC senden"
 msgid "Use MMC"
 msgstr "Benutze MMC"
 
-#: ardour_ui_ed.cc:412 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 msgid "Send MIDI Clock"
 msgstr "MIDI Clock senden"
 
@@ -2060,11 +2060,11 @@ msgstr ""
 msgid "Internal"
 msgstr "Intern"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 msgid "Enable/Disable external positional sync"
 msgstr "Aktiviere/Deaktiviere externe Positionssynchronisierung"
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr "Synchronisation ist nicht möglich: Video pull-up/down ist aktiviert"
 
@@ -2686,12 +2686,12 @@ msgid "Ranges & Marks"
 msgstr "Bereiche & Marker"
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 msgid "Editor"
 msgstr "Editor"
 
@@ -2721,8 +2721,8 @@ msgstr "Symmetrisch"
 msgid "Slow"
 msgstr "Langsam"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1634
-#: sfdb_ui.cc:1743
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "Schnell"
 
@@ -3109,7 +3109,7 @@ msgid "Keep Playlist"
 msgstr "Wiedergabeliste behalten"
 
 #: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
-#: processor_box.cc:2003 processor_box.cc:2028
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -3178,7 +3178,7 @@ msgstr "Layering"
 msgid "Position"
 msgstr "Position"
 
-#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:788 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr "Anpassen"
@@ -3229,7 +3229,7 @@ msgstr "MIDI Optionen"
 msgid "Misc Options"
 msgstr "Sonstiges"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr "Monitoring"
@@ -3966,7 +3966,7 @@ msgstr "Min:Sek"
 msgid "Video Monitor"
 msgstr "Videomonitor"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr "Video"
 
@@ -4485,31 +4485,31 @@ msgstr "Tempomarker kopieren"
 msgid "move tempo mark"
 msgstr "Tempowechsel bewegen"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr "Ändere Fade-In Länge"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr "Fade-Out verändern"
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr "Marker bewegen"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr "Beim Ausführen der Timestretch-Operation trat ein Fehler auf"
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 msgid "programming_error: %1"
 msgstr "Programmierfehler: %1"
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr "Neuer Bereich"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 msgid "rubberband selection"
 msgstr "Gummiband-Auswahl"
 
@@ -5401,8 +5401,8 @@ msgstr "G"
 msgid "Region position glued to Bars|Beats time?"
 msgstr "Regionenposition an Takt und Schäge gebunden?"
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:756
-#: mixer_strip.cc:1931 meter_strip.cc:312 panner_ui.cc:554
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
 #: stereo_panner.cc:237
 msgid "M"
 msgstr "M"
@@ -5472,7 +5472,7 @@ msgstr "Spur/Busname"
 msgid "Track/Bus visible ?"
 msgstr "Spuren/Busse sichtbar?"
 
-#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:326
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
 #: route_time_axis.cc:2407
 msgid "A"
 msgstr "A"
@@ -5502,7 +5502,7 @@ msgstr "Aufnahme bereit"
 msgid "Muted"
 msgstr "Stumm"
 
-#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:322
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr "S"
 
@@ -5514,7 +5514,7 @@ msgstr "Solo ein"
 msgid "SI"
 msgstr "SI"
 
-#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 msgid "Solo Isolated"
 msgstr "Isoliertes Solo"
 
@@ -5798,141 +5798,145 @@ msgid "192000Hz"
 msgstr "192000 Hz"
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr "Kein"
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr "dreieckig"
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr "rechteckig"
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 msgid "Shaped"
 msgstr "shaped"
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr "Wiedergabe/Aufnahme mit einem Gerät"
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr "Wiedergabe/Aufnahme mit zwei Geräten"
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr "Nur Wiedergabe"
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 msgid "Recording only"
 msgstr "Nur Aufnahme"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr "coremidi"
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr "seq"
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 msgid "raw"
 msgstr "raw"
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr "Treiber:"
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 msgid "Audio Interface:"
 msgstr "Audio-Schnittstelle:"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:149 sfdb_ui.cc:262 sfdb_ui.cc:267
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 msgid "Sample rate:"
 msgstr "Samplerate:"
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr "Puffergröße"
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr "Pufferanzahl:"
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr "Latenz (ca.)"
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 msgid "Audio mode:"
 msgstr "Audio-Modus:"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr "ignorieren"
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr "Client Timeout"
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr "Portanzahl"
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr "MIDI-Treiber:"
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 msgid "Dither:"
 msgstr "Dithering:"
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr ""
 "Es wurde kein JACK Server auf diesem System gefunden. Bitte installieren Sie "
 "JACK vor einem Neuversuch."
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr "Server:"
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr "Eingangsgerät:"
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 msgid "Output device:"
 msgstr "Ausgabegerät:"
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 msgid "Hardware input latency:"
 msgstr "Hardware Eingangslatenz (Samples)"
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 msgid "samples"
 msgstr "Samples"
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 msgid "Hardware output latency:"
 msgstr "Hardware Ausgangslatenz (Samples)"
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr "Gerät"
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr "kann die JACK rc-Datei %1 nicht öffnen, um die Parameter zu sichern"
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 msgid ""
 "You do not have any audio devices capable of\n"
 "simultaneous playback and recording.\n"
@@ -5963,32 +5967,32 @@ msgstr ""
 "können Sie JACK vor dem Starten von %1 aufrufen und das entsprechende Gerät "
 "auswählen."
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr "Keine passenden Audiogeräte."
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr "JACK scheint im %1-Paket zu fehlen."
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr "Sie müssen zuerst ein Audiogerät auswählen."
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr "Audiogerät %1 scheint auf diesem Computer nicht vorhanden zu sein."
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr "Es fehlen Daten zum AudioSetup-Wert von %1"
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 "die Konfiguration enthält einen JACK-Serverpfad, der nicht existiert (%1)"
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:147
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 msgid "Channels:"
 msgstr "Kanäle:"
 
@@ -6142,9 +6146,9 @@ msgid "Folder:"
 msgstr "Ordner:"
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "Durchsuchen"
 
@@ -6305,32 +6309,48 @@ msgstr " bis"
 msgid "Range"
 msgstr "Bereiche"
 
-#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:853
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+msgid "curl error %1 (%2)"
+msgstr "curl Fehler %1 (%2)"
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr "getSoundResourceFile: Keine gültige Wurzel in der XML-Datei"
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr "getSoundResourceFile: Wurzel = %1, != Antwort"
+
+#: sfdb_freesound_mootcher.cc:410
+msgid "%1"
+msgstr "%1"
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr "-inf"
 
-#: gain_meter.cc:112 gain_meter.cc:910
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr "Fader Automationsmodus"
 
-#: gain_meter.cc:113 gain_meter.cc:911
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr "Fader-Automationstyp"
 
-#: gain_meter.cc:122 gain_meter.cc:792 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr "Abs"
 
-#: gain_meter.cc:759 mixer_strip.cc:1948 meter_strip.cc:329 panner_ui.cc:557
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
 #: route_time_axis.cc:2411
 msgid "P"
 msgstr "P"
 
-#: gain_meter.cc:762 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr "T"
 
-#: gain_meter.cc:765 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr "W"
 
@@ -6606,7 +6626,7 @@ msgstr[1] "%1 Samples"
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1762
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 msgid "programming error: %1 (%2)"
 msgstr "Programmierfehler: %1 (%2)"
 
@@ -6778,19 +6798,19 @@ msgstr ""
 "Momentan läßt sich das Projekt nicht speichern, da alle Informationen\n"
 "über Verbindungen verloren gehen würden.\n"
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr " (kompiliert mit Version "
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr " und GCC Version"
 
-#: main.cc:504
+#: main.cc:500
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr "Copyright (C) 1999-2012 Paul Davis"
 
-#: main.cc:505
+#: main.cc:501
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
@@ -6798,30 +6818,34 @@ msgstr ""
 "Einige Teile Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
 
-#: main.cc:507
+#: main.cc:503
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr "%1 wird Ihnen ohne jegliche Gewährleistung"
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 "für allgemeine oder spezielle Gebrauchstauglichkeit zur Verfügung gestellt."
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "Dies ist freie Software, die Sie gerne weitergeben dürfen"
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr ""
 "solange Sie sich an die Bedingungen, die in der Datei COPYING aufgeführt "
 "sind halten."
 
-#: main.cc:519
+#: main.cc:513
+msgid "could not initialize %1."
+msgstr "Konnte %1 nicht initialisieren."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr "Kann die SIGPIPE Fehlerbehandlung nicht installieren"
 
-#: main.cc:525
+#: main.cc:528
 msgid "could not create %1 GUI"
 msgstr "konnte das %1 GUI nicht erstellen"
 
@@ -6829,7 +6853,7 @@ msgstr "konnte das %1 GUI nicht erstellen"
 msgid "Display delta to edit cursor"
 msgstr "Zeige Abstand zu Arbeitspunkt"
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 msgid "MarkerText"
 msgstr "MarkerText"
 
@@ -7310,7 +7334,7 @@ msgstr "Einen weiteren Ordner für die Suche auswählen"
 msgid "Missing Plugins"
 msgstr "Fehlende Plugins"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr "OK"
 
@@ -7387,7 +7411,7 @@ msgid "pre"
 msgstr "Pre"
 
 #: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
-#: rc_option_editor.cc:1873
+#: rc_option_editor.cc:1881
 msgid "Comments"
 msgstr "Kommentare"
 
@@ -7435,11 +7459,11 @@ msgstr "iso"
 msgid "Mix group"
 msgstr "Bearbeitungsgruppe"
 
-#: mixer_strip.cc:351 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 msgid "Phase Invert"
 msgstr "Phaseninvertierung"
 
-#: mixer_strip.cc:352 rc_option_editor.cc:1871 route_ui.cc:1218
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 msgid "Solo Safe"
 msgstr "Solo sperren"
 
@@ -7447,7 +7471,7 @@ msgstr "Solo sperren"
 msgid "Group"
 msgstr "Gruppe"
 
-#: mixer_strip.cc:356 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 msgid "Meter Point"
 msgstr "Abgreifpunkt der Pegelanzeige"
 
@@ -7596,15 +7620,15 @@ msgstr "Pre-Fader"
 msgid "Post-fader"
 msgstr "Post-Fader"
 
-#: mixer_strip.cc:2166 meter_strip.cc:688
+#: mixer_strip.cc:2166 meter_strip.cc:728
 msgid "Change all in Group to %1"
 msgstr "Alle in Gruppe zu %1 ändern"
 
-#: mixer_strip.cc:2168 meter_strip.cc:690
+#: mixer_strip.cc:2168 meter_strip.cc:730
 msgid "Change all to %1"
 msgstr "Alle zu %1 ändern"
 
-#: mixer_strip.cc:2170 meter_strip.cc:692
+#: mixer_strip.cc:2170 meter_strip.cc:732
 msgid "Change same track-type to %1"
 msgstr "Gleichen Spurtyp zu %1 ändern"
 
@@ -7621,6 +7645,26 @@ msgstr "-alle-"
 msgid "Strips"
 msgstr "Spur"
 
+#: meter_strip.cc:764
+msgid "Variable height"
+msgstr "Variable Höhe"
+
+#: meter_strip.cc:765
+msgid "Short"
+msgstr "Short"
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr "Tall"
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr "Grande"
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr "Venti"
+
 #: meter_patterns.cc:81
 msgid "Peak"
 msgstr "Spitzenwert"
@@ -8434,46 +8478,46 @@ msgstr "Messe..."
 msgid "Port Insert "
 msgstr "Port Insert "
 
-#: port_matrix.cc:325 port_matrix.cc:344
+#: port_matrix.cc:331 port_matrix.cc:357
 msgid "<b>Sources</b>"
 msgstr "<b>Quellen</b>"
 
-#: port_matrix.cc:326 port_matrix.cc:345
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr "<b>Ziele</b>"
 
-#: port_matrix.cc:421 port_matrix.cc:429
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr "Füge %s %s hinzu"
 
-#: port_matrix.cc:437
+#: port_matrix.cc:456
 #, c-format
 msgid "Rename '%s'..."
 msgstr "Benenne '%s' um..."
 
-#: port_matrix.cc:453
+#: port_matrix.cc:472
 msgid "Remove all"
 msgstr "Alle löschen"
 
-#: port_matrix.cc:473 port_matrix.cc:485
+#: port_matrix.cc:492 port_matrix.cc:504
 #, c-format
 msgid "%s all"
 msgstr "%s alle"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr "Aktualisieren"
 
-#: port_matrix.cc:510
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr "Individuelle Ports anzeigen"
 
-#: port_matrix.cc:516
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr "Drehen"
 
-#: port_matrix.cc:704
+#: port_matrix.cc:723
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
 "or buss cannot support the new configuration."
@@ -8481,33 +8525,36 @@ msgstr ""
 "Hier kann kein Port hinzugefügt werden, da der erste Prozessor der Spur/des "
 "Busses die neue Portanzahl nicht unterstützt."
 
-#: port_matrix.cc:707
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr "Kann Port nicht hinzufügen"
 
-#: port_matrix.cc:729
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr "Entfernen des Ports nicht erlaubt"
 
-#: port_matrix.cc:730
+#: port_matrix.cc:749
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
-"Der Port kann nicht entfernt werden, da das erste Plugin der Spur die neue "
-"Portanzahl nicht unterstützt."
+"Dieser Port kann nicht entfernt werden.\n"
+"Entweder kann das erste Plugin auf der Spur oder dem Bus \n"
+"die neue Anzahl an Eingängen nicht verarbeiten, oder das \n"
+"letzte Plugin hat mehr Ausgänge."
 
-#: port_matrix.cc:947
+#: port_matrix.cc:966
 #, c-format
 msgid "Remove '%s'"
 msgstr "Lösche '%s'"
 
-#: port_matrix.cc:962
+#: port_matrix.cc:981
 #, c-format
 msgid "%s all from '%s'"
 msgstr "alle von '%s' %s"
 
-#: port_matrix.cc:1028
+#: port_matrix.cc:1047
 msgid "channel"
 msgstr "Kanal"
 
@@ -8549,7 +8596,7 @@ msgstr "Alle Regler verbergen"
 msgid "on"
 msgstr "an"
 
-#: processor_box.cc:465 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr "Aus"
 
@@ -9215,92 +9262,96 @@ msgstr "Verschiebe relevante Automationen mit Region"
 msgid "Show meters on tracks in the editor"
 msgstr "Aktiviere Pegelanzeigen im Editor"
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr "Master-Pegelanzeige in der Werkzeugleiste anzeigen"
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr "Regionen der aktiven Bearbeitungsgruppen werden gemeinsam bearbeitet"
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 msgid "whenever they overlap in time"
 msgstr "immer, wenn sie sich auf der Zeitachse überlappen"
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr "nur bei identischer Länge, Position und Herkunft"
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr "Gummiband-Auswahl an Raster ausrichten"
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 msgid "Show waveforms in regions"
 msgstr "Zeige Wellenformen in Regionen"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 msgid "Show gain envelopes in audio regions"
 msgstr "Zeige Lautstärkekurven in Regionen an"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr "in allen Modi"
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr "nur im Region-Gain Modus"
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 msgid "Waveform scale"
 msgstr "Wellenformskalierung"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "Linear"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr "Logarithmisch"
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 msgid "Waveform shape"
 msgstr "Wellenform Anzeigeart"
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 msgid "traditional"
 msgstr "Traditionell"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 msgid "rectified"
 msgstr "Rectified"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr "Zeige bei Aufnahmen die Wellenformen des aufgenommenen Audiomaterials"
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr "Zeige Zoom Toolbar"
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr "Färbe Regionen in der Spurfarbe ein"
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr ""
 "Aktualisiere das Editorfenster, während die Projektübersicht verändert wird"
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 msgid "Synchronise editor and mixer track order"
 msgstr "Einheitliche Reihenfolge der Spuren im Editor und Mixer"
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 msgid "Synchronise editor and mixer selection"
 msgstr "Synchronisiere Auswahl der Spuren im Editor und Mixer"
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 msgid "Name new markers"
 msgstr "Neue Marker benennen"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9312,241 +9363,241 @@ msgstr ""
 "\n"
 "Marker können jederzeit per Rechtsklick umbenannt werden"
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr "Bei Mausziehen nahe den Rändern das Editorfenster automatisch scrollen"
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr "Pufferung"
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 msgid "Record monitoring handled by"
 msgstr "Aufnahmemonitoring wird verwaltet von"
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 msgid "ardour"
 msgstr "Ardour"
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 msgid "audio hardware"
 msgstr "Audiohardware"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 msgid "Tape machine mode"
 msgstr "Bandmaschinen-Modus"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr "Verbindung von Spuren und Bussen"
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr "Master/Monitor-Busse automatisch verbinden"
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 msgid "Connect track inputs"
 msgstr "Verbinde Spureingänge"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 msgid "automatically to physical inputs"
 msgstr "automatisch mit Audioeingängen"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr "manuell"
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 msgid "Connect track and bus outputs"
 msgstr "Verbinde Spur- und Busausgänge"
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 msgid "automatically to physical outputs"
 msgstr "automatisch mit Audioausgängen"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 msgid "automatically to master bus"
 msgstr "automatisch mit dem Master-Bus"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 msgid "Denormals"
 msgstr "Denormals"
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 msgid "Use DC bias to protect against denormals"
 msgstr "Nutze DC bias als Schutz vor Denormals"
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr "Umgang des Prozessors mit Denormals"
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr "nicht behandeln"
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 msgid "use FlushToZero"
 msgstr "Benutze FlushToZero"
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr "Benutze DenormalsAreZero"
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr "Benutze FlushToZero & DenormalsAreZero"
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 msgid "Silence plugins when the transport is stopped"
 msgstr "Deaktiviere Plugins, wenn der Transport gestoppt ist."
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr "Neue Plugins sind aktiv"
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr "Audiodaten automatisch analysieren"
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 msgid "Replicate missing region channels"
 msgstr "Fehlende Kanäle von Regionen ersetzen"
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 msgid "Solo / mute"
 msgstr "Solo / Mute"
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 msgid "Solo-in-place mute cut (dB)"
 msgstr "Solo-in-Place Mute Dämpfung (dB)"
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr "Solo-Schalter arbeiten als AFL/PFL"
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 msgid "Listen Position"
 msgstr "Abhörpunkt"
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 msgid "after-fader (AFL)"
 msgstr "After-Fader (AFL)"
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 msgid "pre-fader (PFL)"
 msgstr "Pre-Fader (PFL)"
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr "Abgreifpunkt der PFL Signale"
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 msgid "before pre-fader processors"
 msgstr "Vor den Pre-Fader Prozessoren"
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr "Pre-Fader, aber nach den Prozessoren"
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr "Abgreifpunkt der AFL Signale"
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 msgid "immediately post-fader"
 msgstr "Direkt nach dem Fader"
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 msgid "after post-fader processors (before pan)"
 msgstr "Nach den Post-Fader Prozessoren (vor Pan)"
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr "Exclusives Solo"
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 msgid "Show solo muting"
 msgstr "Solo auf anderen Kanälen als Mute anzeigen"
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr "Solo ist trotz Mute hörbar"
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 msgid "Default track / bus muting options"
 msgstr "Standardeinstellungen für Mute von Spuren / Bussen"
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr "Mute schaltet Pre-Fader Sends stumm"
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr "Mute schaltet Post-Fader Sends stumm"
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 msgid "Mute affects control outputs"
 msgstr "Mute schaltet Abhörausgänge stumm"
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr "Mute schaltet Hauptausgänge stumm"
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 msgid "Send MIDI Time Code"
 msgstr "Sende MIDI Time Code"
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 "Prozentzahl beiderseits der normalen Transportgeschwindigkeit, bis zu der "
 "MTC übertragen wird"
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr "MIDI Machine Control Commands empfangen"
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr "MIDI Machine Control Commands senden"
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 msgid "Send MIDI control feedback"
 msgstr "MIDI Control Feedback senden"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr "ID des eingehenden MMC-Geräts"
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr "ID des ausgehenden MMC-Geräts"
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr "Erstmaliger Programmwechsel"
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr "Erste(s) MIDI Bank/Programm als 0 anzeigen"
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr "Periodische MIDI Nachrichten nie anzeigen (MTC, MIDI Clock)"
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 msgid "Sound MIDI notes as they are selected"
 msgstr "MIDI Noten ertönen bei Auswahl"
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 msgid "User interaction"
 msgstr "Benutzerinteraktion"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
@@ -9556,171 +9607,171 @@ msgstr ""
 "   <i>(erfordert Neustart von %1)</i>\n"
 "   <i>(falls für Ihre gewünschte Sprache verfügbar)</i>"
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 msgid "Control surface remote ID"
 msgstr "Remote ID des Eingabegeräts"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 msgid "assigned by user"
 msgstr "vom Benutzer festgelegt"
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr "folgt Reihenfolge im Mixer"
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr "folgt Reihenfolge im Editor"
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1927 rc_option_editor.cc:1943
-#: rc_option_editor.cc:1959 rc_option_editor.cc:1973 rc_option_editor.cc:1987
-#: rc_option_editor.cc:1989
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 msgid "Preferences|GUI"
 msgstr "GUI"
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr "Mouseover-Effekt über verschiedenen Anzeigen"
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr "Zeige Tooltips, wenn die Maus über einem Element schwebt"
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr "GUI"
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr "Auffrischen der Transport-Zeitanzeige alle 40ms statt 100ms"
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 msgid "Mixer Strip"
 msgstr "Anzeige im Channel strip"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 msgid "Use narrow strips in the mixer by default"
 msgstr "Standardmäßig schmale Mixer-Kanalzüge verwenden"
 
-#: rc_option_editor.cc:1898
+#: rc_option_editor.cc:1906
 msgid "Peak hold time"
 msgstr "Haltezeit für Spitzenwert"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 msgid "short"
 msgstr "Kurz"
 
-#: rc_option_editor.cc:1905
+#: rc_option_editor.cc:1913
 msgid "medium"
 msgstr "Mittel"
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr "Lange"
 
-#: rc_option_editor.cc:1912
+#: rc_option_editor.cc:1920
 msgid "DPM fall-off"
 msgstr "Abfall der digitalen Pegelanzeige"
 
-#: rc_option_editor.cc:1918
+#: rc_option_editor.cc:1926
 msgid "slowest [6.6dB/sec]"
 msgstr "am langsamsten [6.6dB/sec]"
 
-#: rc_option_editor.cc:1919
+#: rc_option_editor.cc:1927
 msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
 msgstr "langsam [8.6dB/sec] (BBC PPM, EBU PPM)"
 
-#: rc_option_editor.cc:1920
+#: rc_option_editor.cc:1928
 msgid "slowish [12.0dB/sec] (DIN)"
 msgstr "etwas langsam [12.0dB/sec] (DIN)"
 
-#: rc_option_editor.cc:1921
+#: rc_option_editor.cc:1929
 msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
 msgstr "mäßig [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
 
-#: rc_option_editor.cc:1922
+#: rc_option_editor.cc:1930
 msgid "medium [20dB/sec]"
 msgstr "mittel [20dB/sec]"
 
-#: rc_option_editor.cc:1923
+#: rc_option_editor.cc:1931
 msgid "fast [32dB/sec]"
 msgstr "schnell [32dB/sec]"
 
-#: rc_option_editor.cc:1924
+#: rc_option_editor.cc:1932
 msgid "faster [46dB/sec]"
 msgstr "schneller [46dB/sec]"
 
-#: rc_option_editor.cc:1925
+#: rc_option_editor.cc:1933
 msgid "fastest [70dB/sec]"
 msgstr "am schnellsten [70dB/sec]"
 
-#: rc_option_editor.cc:1931
+#: rc_option_editor.cc:1939
 msgid "Meter line-up level; 0dBu"
 msgstr "Ausrichtung der Pegelanzeige; 0dBu"
 
-#: rc_option_editor.cc:1936 rc_option_editor.cc:1952
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
 msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
 msgstr "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
 
-#: rc_option_editor.cc:1937 rc_option_editor.cc:1953
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
 msgid "-20dBFS (SMPTE RP.0155)"
 msgstr "-20dBFS (SMPTE RP.0155)"
 
-#: rc_option_editor.cc:1938 rc_option_editor.cc:1954
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
 msgid "-18dBFS (EBU, BBC)"
 msgstr "-18dBFS (EBU, BBC)"
 
-#: rc_option_editor.cc:1939 rc_option_editor.cc:1955
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
 msgid "-15dBFS (DIN)"
 msgstr "-15dBFS (DIN)"
 
-#: rc_option_editor.cc:1941
+#: rc_option_editor.cc:1949
 msgid ""
 "Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
 "level for IEC1/Nordic, IEC2 PPM and VU meter."
 msgstr ""
-"Konfiguriere Skalierung und Farbschwellwert für DPM mit dBFS-Skala, setze"
-"Referenzpegel  für IEC1/Nordisch, IEC2 PPM und VU Pegelanzeigen."
+"Konfiguriere Skalierung und Farbschwellwert für DPM mit dBFS-Skala, "
+"setzeReferenzpegel  für IEC1/Nordisch, IEC2 PPM und VU Pegelanzeigen."
 
-#: rc_option_editor.cc:1947
+#: rc_option_editor.cc:1955
 msgid "IEC1/DIN Meter line-up level; 0dBu"
 msgstr "Ausrichtung der IEC1/DIN Pegelanzeige; 0dBu"
 
-#: rc_option_editor.cc:1957
+#: rc_option_editor.cc:1965
 msgid "Reference level for IEC1/DIN meter."
 msgstr "Referenzpegel  für IEC1/DIN Pegelanzeige."
 
-#: rc_option_editor.cc:1963
+#: rc_option_editor.cc:1971
 msgid "VU Meter standard"
 msgstr "Standard für VU-Pegelanzeige"
 
-#: rc_option_editor.cc:1968
+#: rc_option_editor.cc:1976
 msgid "0VU = -2dBu (France)"
 msgstr "0VU = -2dBu (Frankreich)"
 
-#: rc_option_editor.cc:1969
+#: rc_option_editor.cc:1977
 msgid "0VU = 0dBu (North America, Australia)"
 msgstr "0VU = 0dBu (Nordamerika, Australien)"
 
-#: rc_option_editor.cc:1970
+#: rc_option_editor.cc:1978
 msgid "0VU = +4dBu (standard)"
 msgstr "0VU = +4dBu (Standard)"
 
-#: rc_option_editor.cc:1971
+#: rc_option_editor.cc:1979
 msgid "0VU = +8dBu"
 msgstr "0VU = +8dBu"
 
-#: rc_option_editor.cc:1977
+#: rc_option_editor.cc:1985
 msgid "Peak threshold [dBFS]"
 msgstr "Schwelle für Spitzenwert [dBFS]"
 
-#: rc_option_editor.cc:1985
+#: rc_option_editor.cc:1993
 msgid ""
 "Specify the audio signal level in dbFS at and above which the meter-peak "
 "indicator will flash red."
@@ -9728,7 +9779,7 @@ msgstr ""
 "Geben Sie den Signalpegel in dbFS an, bei dessen Erreichen oder "
 "Ãœberschreitung die Spitzenwertanzeige in der Pegelanzeige rot blinkt"
 
-#: rc_option_editor.cc:1992
+#: rc_option_editor.cc:2000
 msgid "LED meter style"
 msgstr "Pegelanzeigen im LED-Stil"
 
@@ -9740,11 +9791,11 @@ msgstr "Diese Region Vorhören"
 msgid "Position:"
 msgstr "Position:"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr "Ende:"
 
-#: region_editor.cc:92 sfdb_ui.cc:141
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr "Länge:"
 
@@ -10441,7 +10492,7 @@ msgstr "Hier klicken, um einen Pfad hinzuzufügen"
 msgid "the session folder"
 msgstr "Projektordner"
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 msgid "Send "
 msgstr "Send "
 
@@ -10978,246 +11029,246 @@ msgstr "Namensfelder"
 msgid "Track Name"
 msgstr "Spurname"
 
-#: sfdb_ui.cc:88 sfdb_ui.cc:108 sfdb_ui.cc:117
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 msgid "as new tracks"
 msgstr "als neue Spuren"
 
-#: sfdb_ui.cc:90 sfdb_ui.cc:110
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 msgid "to selected tracks"
 msgstr "zu ausgewählten Spuren"
 
-#: sfdb_ui.cc:92 sfdb_ui.cc:112
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 msgid "to region list"
 msgstr "zur Liste der Regionen"
 
-#: sfdb_ui.cc:94 sfdb_ui.cc:114
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 msgid "as new tape tracks"
 msgstr "als neue Band-Spuren"
 
-#: sfdb_ui.cc:98
+#: sfdb_ui.cc:96
 msgid "programming error: unknown import mode string %1"
 msgstr "Programmierfehler: unbekannter Importmodus %1"
 
-#: sfdb_ui.cc:125
+#: sfdb_ui.cc:123
 msgid "Auto-play"
 msgstr "Auto-Play"
 
-#: sfdb_ui.cc:131 sfdb_ui.cc:238
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 msgid "<b>Sound File Information</b>"
 msgstr "<b>Eigenschaften der Audiodatei</b>"
 
-#: sfdb_ui.cc:143
+#: sfdb_ui.cc:141
 msgid "Timestamp:"
 msgstr "Zeitstempel:"
 
-#: sfdb_ui.cc:145
+#: sfdb_ui.cc:143
 msgid "Format:"
 msgstr "Format:"
 
-#: sfdb_ui.cc:184 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr "Stichworte:"
 
-#: sfdb_ui.cc:321
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr "Vorhören von MIDI-Dateien wird noch nicht unterstützt"
 
-#: sfdb_ui.cc:328
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "Konnte Datei nicht lesen: %1 (%2)."
 
-#: sfdb_ui.cc:351
+#: sfdb_ui.cc:349
 msgid "Could not access soundfile: "
 msgstr "Konnte auf Audiodatei nicht zugreifen: "
 
-#: sfdb_ui.cc:405
+#: sfdb_ui.cc:403
 msgid "SoundFileBox: Could not tokenize string: "
 msgstr "SoundFileBox: Konnte Zeichenkette nicht zerlegen: "
 
-#: sfdb_ui.cc:425 sfdb_ui.cc:427
+#: sfdb_ui.cc:423 sfdb_ui.cc:425
 msgid "Search"
 msgstr "Suchen"
 
-#: sfdb_ui.cc:451
+#: sfdb_ui.cc:449
 msgid "Audio and MIDI files"
 msgstr "Audio- und MIDIdateien"
 
-#: sfdb_ui.cc:454
+#: sfdb_ui.cc:452
 msgid "Audio files"
 msgstr "Audiodateien"
 
-#: sfdb_ui.cc:457
+#: sfdb_ui.cc:455
 msgid "MIDI files"
 msgstr "MIDI-Dateien"
 
-#: sfdb_ui.cc:460 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: sfdb_ui.cc:479 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 msgid "Browse Files"
 msgstr "Durchsuchen"
 
-#: sfdb_ui.cc:508
+#: sfdb_ui.cc:506
 msgid "Paths"
 msgstr "Pfade"
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr "Stichwortsuche"
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 msgid "Sort:"
 msgstr "Sortierung:"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 msgid "Longest"
 msgstr "Längste"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 msgid "Shortest"
 msgstr "Kürzeste"
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 msgid "Newest"
 msgstr "Neueste"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr "Ältestes"
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr "Am häufigsten heruntergeladen"
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 msgid "Least downloaded"
 msgstr "Am seltensten heruntergeladen"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr "Bestbewertetes"
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr "Am schlechtesten bewertetes"
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr "Mehr"
 
-#: sfdb_ui.cc:559
+#: sfdb_ui.cc:555
 msgid "Similar"
 msgstr "Ähnlich"
 
-#: sfdb_ui.cc:571
+#: sfdb_ui.cc:567
 msgid "ID"
 msgstr "ID"
 
-#: sfdb_ui.cc:572 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 msgid "Filename"
 msgstr "Dateiname"
 
-#: sfdb_ui.cc:574
+#: sfdb_ui.cc:570
 msgid "Duration"
 msgstr "Dauer"
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:571
 msgid "Size"
 msgstr "Größe"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:572
 msgid "Samplerate"
 msgstr "Samplerate"
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr "Lizenz"
 
-#: sfdb_ui.cc:595
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr "Freesound durchsuchen"
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr ""
 "Drücken Sie hier, um die angewählten Dateien zu importieren und dieses "
 "Fenster zu schließen"
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr ""
 "Drücken Sie hier, um die angewählten Dateien zu importieren und dieses "
 "Fenster offen zu lassen"
 
-#: sfdb_ui.cc:618
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr ""
 "Drücken Sie hier, um dieses Fenster zu schließen, ohne Dateien zu importieren"
 
-#: sfdb_ui.cc:814
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr "SoundFileBrowser: Konnte Zeichenkete nicht zerlegen:"
 
-#: sfdb_ui.cc:1014
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] "%1 weitere Seite von 100 Ergebnissen verfügbar"
 msgstr[1] "%1 weitere Seiten von 100 Ergebnissen verfügbar"
 
-#: sfdb_ui.cc:1019
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr "Keine weiteren Ergebnisse verfügbar"
 
-#: sfdb_ui.cc:1083
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr "B"
 
-#: sfdb_ui.cc:1085
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr "kB"
 
-#: sfdb_ui.cc:1087 sfdb_ui.cc:1089
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr "MB"
 
-#: sfdb_ui.cc:1091
+#: sfdb_ui.cc:1086
 msgid "GB"
 msgstr "GB"
 
-#: sfdb_ui.cc:1305 sfdb_ui.cc:1613 sfdb_ui.cc:1663 sfdb_ui.cc:1681
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr "eine Spur pro Datei"
 
-#: sfdb_ui.cc:1308 sfdb_ui.cc:1664 sfdb_ui.cc:1682
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 msgid "one track per channel"
 msgstr "eine Spur pro Kanal"
 
-#: sfdb_ui.cc:1316 sfdb_ui.cc:1666 sfdb_ui.cc:1683
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 msgid "sequence files"
 msgstr "Dateien aneinanderreihen"
 
-#: sfdb_ui.cc:1319 sfdb_ui.cc:1671
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 msgid "all files in one track"
 msgstr "Alle Dateien in eine Spur"
 
-#: sfdb_ui.cc:1320 sfdb_ui.cc:1665
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 msgid "merge files"
 msgstr "Dateien zusammenfügen"
 
-#: sfdb_ui.cc:1326 sfdb_ui.cc:1668
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 msgid "one region per file"
 msgstr "eine Region pro Datei"
 
-#: sfdb_ui.cc:1329 sfdb_ui.cc:1669
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 msgid "one region per channel"
 msgstr "eine Region pro Kanal"
 
-#: sfdb_ui.cc:1334 sfdb_ui.cc:1670 sfdb_ui.cc:1684
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 msgid "all files in one region"
 msgstr "alle Dateien in einer Region"
 
-#: sfdb_ui.cc:1401
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
@@ -11225,55 +11276,55 @@ msgstr ""
 "Eine oder mehrere der ausgewählten Dateien\n"
 "können von %1 nicht verwendet werden"
 
-#: sfdb_ui.cc:1541
+#: sfdb_ui.cc:1534
 msgid "Copy files to session"
 msgstr "Kopiere Dateien in Projekt"
 
-#: sfdb_ui.cc:1558 sfdb_ui.cc:1721
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 msgid "file timestamp"
 msgstr "Zeitstempel"
 
-#: sfdb_ui.cc:1559 sfdb_ui.cc:1723
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 msgid "edit point"
 msgstr "Arbeitspunkt"
 
-#: sfdb_ui.cc:1560 sfdb_ui.cc:1725
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 msgid "playhead"
 msgstr "Positionszeiger"
 
-#: sfdb_ui.cc:1561
+#: sfdb_ui.cc:1554
 msgid "session start"
 msgstr "Projektanfang"
 
-#: sfdb_ui.cc:1566
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr "<b>Füge Dateien hinzu als...</b>"
 
-#: sfdb_ui.cc:1588
+#: sfdb_ui.cc:1581
 msgid "<b>Insert at</b>"
 msgstr "<b>Einfügen bei</b>"
 
-#: sfdb_ui.cc:1601
+#: sfdb_ui.cc:1594
 msgid "<b>Mapping</b>"
 msgstr "<b>Zuordnung</b>"
 
-#: sfdb_ui.cc:1619
+#: sfdb_ui.cc:1612
 msgid "<b>Conversion quality</b>"
 msgstr "<b>Konvertierungsqualität:</b>"
 
-#: sfdb_ui.cc:1631 sfdb_ui.cc:1737
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr "bestmöglich"
 
-#: sfdb_ui.cc:1632 sfdb_ui.cc:1739
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr "gut"
 
-#: sfdb_ui.cc:1633 sfdb_ui.cc:1741
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr "schnell"
 
-#: sfdb_ui.cc:1635
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "Schnellstmöglich"
 
@@ -12338,47 +12389,47 @@ msgstr ""
 msgid "VerboseCanvasCursor"
 msgstr "Ausführlicher Canvas-Cursor"
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 msgid "Set Video Track"
 msgstr "Videospur-Einstellungen"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 msgid "Launch External Video Monitor"
 msgstr "Externen Videomonitor starten"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr "Projekt-Framerate an Video-Framerate anpassen"
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr "docroot neu laden"
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr "VideoServerIndex"
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 msgid "Video files"
 msgstr "Videodateien"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 msgid "<b>Video Information</b>"
 msgstr "<b>Videoinformationen</b>"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 msgid "Start:"
 msgstr "Start:"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 msgid "Frame rate:"
 msgstr "Framerate:"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr "Seitenverhältnis:"
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr " %1 fps"
 
@@ -12386,7 +12437,7 @@ msgstr " %1 fps"
 msgid "Export Successful: %1"
 msgstr "Export erfolgreich: %1"
 
-#: video_timeline.cc:468
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
@@ -12395,7 +12446,7 @@ msgstr ""
 "den Videoserver lesbar? Ist die docroot passend eingestellt? Ist die Datei "
 "tatsächlich eine Videodatei?"
 
-#: video_timeline.cc:506
+#: video_timeline.cc:507
 msgid ""
 "Failed to set session-framerate: '%1' does not have a corresponding option "
 "setting in %2."
@@ -12403,7 +12454,7 @@ msgstr ""
 "Setzen der Projektframerate fehlgeschlagen: '%1' hat keine entsprechende "
 "Einstellungsoption in %2."
 
-#: video_timeline.cc:514
+#: video_timeline.cc:515
 msgid ""
 "Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
 "vs '%3'"
@@ -12411,7 +12462,7 @@ msgstr ""
 "Framerate der Videodatei entspricht nicht der Framerate des Timecodes im %1-"
 "Projekt: '%2' vs. '%3'"
 
-#: video_timeline.cc:587
+#: video_timeline.cc:588
 msgid ""
 "Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
 "means that the video server was not started by ardour and uses a different "
@@ -12421,7 +12472,7 @@ msgstr ""
 "Das bedeutet üblicherweise, dass der Videoserver nicht von Ardour gestartet "
 "wurde und einen anderen Dokumenten-Wurzelpfad verwendet."
 
-#: video_timeline.cc:736
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12438,7 +12489,7 @@ msgstr ""
 msgid "Video Monitor: File Not Found."
 msgstr "Videomonitor: Datei nicht gefunden."
 
-#: transcode_ffmpeg.cc:72
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
@@ -12468,45 +12519,45 @@ msgstr ""
 "wir, symbolische Links von ffmpeg zu ffmpeg_harvid und von ffprobe zu "
 "ffprobe_harvid anzulegen.\n"
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 msgid "Transcode/Import Video File "
 msgstr "Videodatei transkodieren/importieren"
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 msgid "Output File:"
 msgstr "Ausgabedatei:"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr "Abbruch"
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 msgid "Height = "
 msgstr "Höhe ="
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr "Manuelle Eingabe"
 
-#: transcode_video_dialog.cc:69 export_video_dialog.cc:88
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
 msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr "Debug-Modus: gibt die ffmpeg-Befehlszeile und -Ausgabe an stdout aus."
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 msgid "<b>File Information</b>"
 msgstr "<b>Dateiinformationen</b>"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 "Die Programme ffprobe oder ffmpeg konnten auf diesem System nicht gefunden "
 "werden. Bis diese Werkzeuge installiert sind, ist Videoimport nicht möglich. "
 "Sehen Sie im Log-Fenster nach weiteren Informationen."
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
@@ -12515,96 +12566,96 @@ msgstr ""
 "gültige Videodatei, oder enthält einen nicht unterstützten Videocodec bzw. "
 "ein nicht unterstütztes Videoformat."
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr "FPS:"
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 msgid "Duration:"
 msgstr "Dauer:"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr "Codec:"
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr "Geometrie:"
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 msgid "??"
 msgstr "??"
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 msgid "<b>Import Settings</b>"
 msgstr "<b>Importeinstellungen</b>"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr "Video nicht importieren"
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr "Referenz von momentaner Position"
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 msgid "Import/Transcode Video to Session"
 msgstr "Video ins Projekt transkodieren/importieren"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr "Video skalieren: Breite = "
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 msgid "Original Width"
 msgstr "Originalbreite"
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr "Bitrate (KBit/s):"
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 msgid "Extract Audio:"
 msgstr "Audio extrahieren:"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 msgid "Extracting Audio.."
 msgstr "Extrahiere Audio..."
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr "Extrahieren des Audio gescheitert."
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr "Transkodiere Video.."
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 msgid "Transcoding Failed."
 msgstr "Transkodieren gescheitert"
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 msgid "Save Transcoded Video File"
 msgstr "Sichere transkodierte Videodatei"
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr "Video-Server starten"
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr "Server-Datei:"
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 msgid "Server Docroot:"
 msgstr "Server Docroot:"
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 "Diesen Dialog nicht mehr anzeigen (kann in Einstellungen geändert werden)."
 
-#: video_server_dialog.cc:91
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
 "with the %1 releases from ardour.org, alternatively you can download it from "
@@ -12615,19 +12666,19 @@ msgstr ""
 "alternativ auch von http://x42.github.com/harvid/ herunterladen oder über "
 "das Paketmanagement Ihrer Distribution beziehen."
 
-#: video_server_dialog.cc:119
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr "Eingehende Adresse:"
 
-#: video_server_dialog.cc:124
+#: video_server_dialog.cc:125
 msgid "Listen Port:"
 msgstr "Eingehender Port:"
 
-#: video_server_dialog.cc:129
+#: video_server_dialog.cc:130
 msgid "Cache Size:"
 msgstr "Cachegröße"
 
-#: video_server_dialog.cc:135
+#: video_server_dialog.cc:136
 msgid ""
 "%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
@@ -12638,19 +12689,19 @@ msgstr ""
 "nicht erreichbar.\n"
 "Möchten Sie, daß Ardour \"harvid\" auf diesem Computer startet?"
 
-#: video_server_dialog.cc:175
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr "Setze Video-Serverpfad"
 
-#: video_server_dialog.cc:195
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr "Server-docroot"
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr "Ziel ist ausserhalb der docroot des Videoservers."
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
@@ -12659,150 +12710,150 @@ msgstr ""
 "Videoservers. Die Datei wird für den Videoserver nicht lesbar sein. Wollen "
 "Sie wirklich fortfahren?"
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 msgid "Confirm Overwrite"
 msgstr "Bestätige das Überschreiben"
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr ""
 "Eine Datei mit diesem Namen existiert bereits. Wollen Sie sie überschreiben?"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr "Kann Videoordner \"%1\" nicht erstellen (%2)"
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 msgid "Export Video File "
 msgstr "Exportiere Videodatei"
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 msgid "Video:"
 msgstr "Video:"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr "Skaliere Video (W x H):"
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr "Seitenverhältnis:"
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 msgid "Normalize Audio"
 msgstr "Audio normalisieren"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr "Enkodiere in 2 Durchgängen"
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr "Codec-Optimierungen:"
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 msgid "Deinterlace"
 msgstr "Deinterlacing anwenden"
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr "Verwende [2] B-frames (nur MPEG 2 oder 4)"
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr "FPS erzwingen (Voreinstellung: FPS der Videodatei wird beibehalten):"
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 msgid "Include Session Metadata"
 msgstr "Projekt-Metadaten verwenden"
 
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 "Die Programme ffprobe oder ffmpeg konnten auf diesem System nicht gefunden "
 "werden. Bis diese Werkzeuge installiert sind, ist Videoexport nicht möglich. "
 "Sehen Sie im Log-Fenster nach weiteren Informationen."
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 msgid "<b>Output:</b>"
 msgstr "<b>Ausgang:</b>"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 msgid "<b>Input:</b>"
 msgstr "<b>Eingang:</b>"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 msgid "Audio:"
 msgstr "Audio:"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 msgid "Master Bus"
 msgstr "Masterbus"
 
-#: export_video_dialog.cc:144
+#: export_video_dialog.cc:145
 msgid "from the %1 session's start to the session's end"
 msgstr "von %1 Projektbeginn bis -ende"
 
-#: export_video_dialog.cc:148
+#: export_video_dialog.cc:149
 msgid "from 00:00:00:00 to the video's end"
 msgstr "von 00:00:00:00 bis Videoende"
 
-#: export_video_dialog.cc:150
+#: export_video_dialog.cc:151
 msgid "from the video's start to the video's end"
 msgstr "von Videostart bis Videoende"
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:184
 msgid "<b>Settings:</b>"
 msgstr "<b>Einstellungen:</b>"
 
-#: export_video_dialog.cc:191
+#: export_video_dialog.cc:192
 msgid "Range:"
 msgstr "Bereich:"
 
-#: export_video_dialog.cc:194
+#: export_video_dialog.cc:195
 msgid "Preset:"
 msgstr "Preset:"
 
-#: export_video_dialog.cc:197
+#: export_video_dialog.cc:198
 msgid "Video Codec:"
 msgstr "Videocodec:"
 
-#: export_video_dialog.cc:200
+#: export_video_dialog.cc:201
 msgid "Video KBit/s:"
 msgstr "Video KBit/s:"
 
-#: export_video_dialog.cc:203
+#: export_video_dialog.cc:204
 msgid "Audio Codec:"
 msgstr "Audiocodec:"
 
-#: export_video_dialog.cc:206
+#: export_video_dialog.cc:207
 msgid "Audio KBit/s:"
 msgstr "Audio KBit/s:"
 
-#: export_video_dialog.cc:209
+#: export_video_dialog.cc:210
 msgid "Audio Samplerate:"
 msgstr "Audiosamplerate:"
 
-#: export_video_dialog.cc:386
+#: export_video_dialog.cc:387
 msgid "Normalizing audio"
 msgstr "Audio normalisieren"
 
-#: export_video_dialog.cc:390
+#: export_video_dialog.cc:391
 msgid "Exporting audio"
 msgstr "Exportiere Audio"
 
-#: export_video_dialog.cc:436
+#: export_video_dialog.cc:437
 msgid "Exporting Audio..."
 msgstr "Exportiere Audio..."
 
-#: export_video_dialog.cc:493
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
@@ -12810,33 +12861,33 @@ msgstr ""
 "Exportiere Video: Kann die Dauer der Videodatei nicht eruieren, verwende "
 "statt dessen die Dauer aus der Zeitleiste."
 
-#: export_video_dialog.cc:522
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 "Exportiere Video: Keine Master-Ausgangsports zum Verbinden für den "
 "Audioexport"
 
-#: export_video_dialog.cc:561
+#: export_video_dialog.cc:562
 msgid "Encoding Video..."
 msgstr "Enkodiere Video..."
 
-#: export_video_dialog.cc:580
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr "Exportiere Video: Die Videoquelldatei kann nicht gelesen werden."
 
-#: export_video_dialog.cc:678
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr "Kodiere Video.. Durchgang 1/2"
 
-#: export_video_dialog.cc:690
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr "Kodiere Video.. Durchgang 2/2"
 
-#: export_video_dialog.cc:778
+#: export_video_dialog.cc:779
 msgid "Transcoding failed."
 msgstr "Transkodieren fehlgeschlagen."
 
-#: export_video_dialog.cc:947 export_video_dialog.cc:967
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 msgid "Save Exported Video File"
 msgstr "Sichere exportierte Videodatei"
 
diff --git a/gtk2_ardour/po/el.po b/gtk2_ardour/po/el.po
index da60981daf..47a42cccc7 100644
--- a/gtk2_ardour/po/el.po
+++ b/gtk2_ardour/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk-ardour 0.347.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2007-04-11 02:27+0200\n"
 "Last-Translator: Klearchos Gourgourinis <muadib@in.gr>\n"
 "Language-Team: Hellenic\n"
@@ -368,7 +368,7 @@ msgstr ""
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr ""
 
-#: add_route_dialog.cc:53 route_params_ui.cc:503
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 #, fuzzy
 msgid "Add Track or Bus"
 msgstr "Π�όσθεση καναλιο�/δια�λου"
@@ -411,8 +411,8 @@ msgstr "Δίαυλοι"
 msgid "Add:"
 msgstr ""
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "Επιλογές"
@@ -429,22 +429,22 @@ msgid "Group:"
 msgstr "Διαμό�φωση Group"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 #, fuzzy
 msgid "Audio"
 msgstr "Ακ�όαση"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -468,7 +468,7 @@ msgid ""
 msgstr ""
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1301
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr "Κανονικό"
 
@@ -519,7 +519,7 @@ msgstr "Κανάλια"
 msgid "12 Channel"
 msgstr "Κανάλια"
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2136
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr ""
 
@@ -609,7 +609,7 @@ msgid "Track"
 msgstr "Κανάλι"
 
 #: analysis_window.cc:68 editor_actions.cc:616 mixer_ui.cc:125
-#: mixer_ui.cc:1793
+#: mixer_ui.cc:1795
 #, fuzzy
 msgid "Show"
 msgstr "Ανάδειξη όλων"
@@ -618,101 +618,96 @@ msgstr "Ανάδειξη όλων"
 msgid "Re-analyze data"
 msgstr ""
 
-#: ardour_button.cc:658
+#: ardour_button.cc:704
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr ""
 
-#: ardour_ui.cc:179
+#: ardour_ui.cc:180
 #, fuzzy
 msgid "audition"
 msgstr "Ακ�όαση"
 
-#: ardour_ui.cc:180
+#: ardour_ui.cc:181
 #, fuzzy
 msgid "solo"
 msgstr "σόλο"
 
-#: ardour_ui.cc:181
+#: ardour_ui.cc:182
 msgid "feedback"
 msgstr ""
 
-#: ardour_ui.cc:183 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 #, fuzzy
 msgid "Speaker Configuration"
 msgstr "Διάταξη"
 
-#: ardour_ui.cc:184 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 #, fuzzy
 msgid "Theme Manager"
 msgstr "Απαλοιφή Στίγματος"
 
-#: ardour_ui.cc:185 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr ""
 
-#: ardour_ui.cc:186
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr ""
 
-#: ardour_ui.cc:187 ardour_ui.cc:192
+#: ardour_ui.cc:191 ardour_ui.cc:196
 #, fuzzy
 msgid "Add Tracks/Busses"
 msgstr "Κανάλια/Δίαυλοι"
 
-#: ardour_ui.cc:188
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "Πλη�οφο�ίες"
 
-#: ardour_ui.cc:189 location_ui.cc:1134
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "Τοποθεσίες"
 
-#: ardour_ui.cc:190 route_params_ui.cc:57 route_params_ui.cc:604
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 #, fuzzy
 msgid "Tracks and Busses"
 msgstr "Κανάλια/Δίαυλοι"
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr ""
 
-#: ardour_ui.cc:193 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr ""
 
-#: ardour_ui.cc:194 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "Μεγάλο ω�ολόγιον"
 
-#: ardour_ui.cc:195
+#: ardour_ui.cc:199
 #, fuzzy
 msgid "Audio Connections"
 msgstr "Συνδέσεις"
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:200
 #, fuzzy
 msgid "MIDI Connections"
 msgstr "Συνδέσεις"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr ""
 
-#: ardour_ui.cc:299
-#, fuzzy
-msgid "could not initialize %1."
-msgstr "δεν γινόταν να εκκινηθεί ο  Ardour."
-
-#: ardour_ui.cc:394
+#: ardour_ui.cc:388
 #, fuzzy
 msgid "Starting audio engine"
 msgstr "Ενα�κτή�ιο διάστημα"
 
-#: ardour_ui.cc:763 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 msgid "%1 is ready for use"
 msgstr ""
 
-#: ardour_ui.cc:811
+#: ardour_ui.cc:806
 msgid ""
 "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"
@@ -721,26 +716,26 @@ msgid ""
 "controlled by %2"
 msgstr ""
 
-#: ardour_ui.cc:828
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr ""
 
-#: ardour_ui.cc:870
+#: ardour_ui.cc:865
 #, fuzzy
 msgid "Don't quit"
 msgstr "ΟΧΙ %1"
 
-#: ardour_ui.cc:871
+#: ardour_ui.cc:866
 #, fuzzy
 msgid "Just quit"
 msgstr "Μόνο %1"
 
-#: ardour_ui.cc:872
+#: ardour_ui.cc:867
 #, fuzzy
 msgid "Save and quit"
 msgstr "Αποθήκευση και %1"
 
-#: ardour_ui.cc:882
+#: ardour_ui.cc:877
 #, fuzzy
 msgid ""
 "%1 was unable to save your session.\n"
@@ -755,16 +750,16 @@ msgstr ""
 "\n"
 "επιλογή \"Μόνο Έξοδος\"."
 
-#: ardour_ui.cc:913
+#: ardour_ui.cc:908
 msgid "Please wait while %1 cleans up..."
 msgstr ""
 
-#: ardour_ui.cc:930
+#: ardour_ui.cc:925
 #, fuzzy
 msgid "Unsaved Session"
 msgstr "�έα συνεδ�ία"
 
-#: ardour_ui.cc:951
+#: ardour_ui.cc:946
 #, fuzzy
 msgid ""
 "The session \"%1\"\n"
@@ -783,7 +778,7 @@ msgstr ""
 "\n"
 "τί θέλετε να κάνετε;"
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:949
 #, fuzzy
 msgid ""
 "The snapshot \"%1\"\n"
@@ -802,75 +797,75 @@ msgstr ""
 "\n"
 "τί θέλετε να κάνετε;"
 
-#: ardour_ui.cc:968
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr "Υποβολέας"
 
-#: ardour_ui.cc:1045
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "Αποσυνδέθηκε"
 
-#: ardour_ui.cc:1052
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1056
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1074 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 #, fuzzy
 msgid "File:"
 msgstr "Μετονομασία"
 
-#: ardour_ui.cc:1078
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr ""
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr ""
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr ""
 
-#: ardour_ui.cc:1087 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr ""
 
-#: ardour_ui.cc:1090
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr ""
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr ""
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr ""
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr ""
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr ""
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr ""
 
-#: ardour_ui.cc:1129
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1148
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -878,61 +873,61 @@ msgid ""
 "\">%<PRIu32>%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1184
+#: ardour_ui.cc:1188
 #, fuzzy
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr "χώ�ος: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1186
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr ""
 
-#: ardour_ui.cc:1204
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr ""
 
-#: ardour_ui.cc:1215
+#: ardour_ui.cc:1219
 #, fuzzy, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr "χώ�ος: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1241
+#: ardour_ui.cc:1245
 #, fuzzy, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr "χώ�ος: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1358 ardour_ui.cc:1367 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr "Π�όσφατες συνεδ�ίες"
 
-#: ardour_ui.cc:1447
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
 msgstr ""
 
-#: ardour_ui.cc:1474
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr "Άνοιγμα Συνεδ�ίας"
 
-#: ardour_ui.cc:1492 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 #, fuzzy
 msgid "%1 sessions"
 msgstr "Συνεδ�ία"
 
-#: ardour_ui.cc:1529
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr "Δεν γίνεται να π�οστεθεί κανάλι χω�ίς ήδη φο�τωμένη συνεδ�ία."
 
-#: ardour_ui.cc:1537
+#: ardour_ui.cc:1548
 #, fuzzy
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] "Δεν γίνεται να δημιου�γηθεί νέο ηχητικό κανάλι"
 msgstr[1] "Δεν γίνεται να δημιου�γηθεί νέο ηχητικό κανάλι"
 
-#: ardour_ui.cc:1543 ardour_ui.cc:1604
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 #, fuzzy
 msgid ""
 "There are insufficient JACK ports available\n"
@@ -945,26 +940,26 @@ msgstr ""
 "Αποθηκε�στε τη συνεδ�ία, τε�ματίστε το Ardour\n"
 "και επανεκκινήστε το JACK με πε�ισσότε�ες θ��ες."
 
-#: ardour_ui.cc:1578
+#: ardour_ui.cc:1589
 #, fuzzy
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr "Δεν γίνεται να π�οστεθεί κανάλι χω�ίς ήδη φο�τωμένη συνεδ�ία."
 
-#: ardour_ui.cc:1587
+#: ardour_ui.cc:1598
 #, fuzzy
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] "Δεν γίνεται να δημιου�γηθεί νέο ηχητικό κανάλι"
 msgstr[1] "Δεν γίνεται να δημιου�γηθεί νέο ηχητικό κανάλι"
 
-#: ardour_ui.cc:1596
+#: ardour_ui.cc:1607
 #, fuzzy
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] "Δεν γίνεται να δημιου�γηθεί νέο ηχητικό κανάλι"
 msgstr[1] "Δεν γίνεται να δημιου�γηθεί νέο ηχητικό κανάλι"
 
-#: ardour_ui.cc:1713
+#: ardour_ui.cc:1724
 #, fuzzy
 msgid ""
 "Please create one or more tracks before trying to record.\n"
@@ -974,14 +969,14 @@ msgstr ""
 "κανάλια π�ιν π�οσπαθήστε να ηχογ�αφήσετε.\n"
 "Κοιτάξτε στο μενο� 'Συνεδ�ία'."
 
-#: ardour_ui.cc:2103
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
 "%1"
 msgstr ""
 
-#: ardour_ui.cc:2105
+#: ardour_ui.cc:2116
 #, fuzzy
 msgid ""
 "JACK has either been shutdown or it\n"
@@ -994,82 +989,82 @@ msgstr ""
 "δεν ήταν α�κετά γ�ήγο�ο. Μπο�είτε να αποθηκε�σετε\n"
 "τη συνεδ�ία και/ή να επανακινήσετε το JACK."
 
-#: ardour_ui.cc:2131
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "Σφάλμα στην ένα�ξη της συνεδ�ίας"
 
-#: ardour_ui.cc:2211
+#: ardour_ui.cc:2222
 #, fuzzy
 msgid "Take Snapshot"
 msgstr "Στιγμιότυπο"
 
-#: ardour_ui.cc:2212
+#: ardour_ui.cc:2223
 #, fuzzy
 msgid "Name of new snapshot"
 msgstr "Όνομα νέου στιγμιοτ�που"
 
-#: ardour_ui.cc:2236
+#: ardour_ui.cc:2247
 msgid ""
 "To ensure compatibility with various systems\n"
 "snapshot names may not contain a '%1' character"
 msgstr ""
 
-#: ardour_ui.cc:2248
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr ""
 
-#: ardour_ui.cc:2249
+#: ardour_ui.cc:2260
 #, fuzzy
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr "Το α�χείο ήδη υπά�χει, θέλετε να σώστε από πάνω?"
 
-#: ardour_ui.cc:2252 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 #, fuzzy
 msgid "Overwrite"
 msgstr "awrite"
 
-#: ardour_ui.cc:2286
+#: ardour_ui.cc:2297
 #, fuzzy
 msgid "Rename Session"
 msgstr "αντιστ�οφή πε�ιοχής"
 
-#: ardour_ui.cc:2287
+#: ardour_ui.cc:2298
 #, fuzzy
 msgid "New session name"
 msgstr "�έο Όνομα Συνεδ�ίας:"
 
-#: ardour_ui.cc:2301 ardour_ui.cc:2681 ardour_ui.cc:2726
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 msgid ""
 "To ensure compatibility with various systems\n"
 "session names may not contain a '%1' character"
 msgstr ""
 
-#: ardour_ui.cc:2309
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr ""
 
-#: ardour_ui.cc:2318
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
 msgstr ""
 
-#: ardour_ui.cc:2429
+#: ardour_ui.cc:2440
 #, fuzzy
 msgid "Save Template"
 msgstr "Αποθήκευση π�οσχεδίου..."
 
-#: ardour_ui.cc:2430
+#: ardour_ui.cc:2441
 #, fuzzy
 msgid "Name for template:"
 msgstr "Όνομα για π�οσχεδίο μίξεως:"
 
-#: ardour_ui.cc:2431
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-π�οσχέδιο"
 
-#: ardour_ui.cc:2469
+#: ardour_ui.cc:2480
 #, fuzzy
 msgid ""
 "This session\n"
@@ -1077,57 +1072,57 @@ msgid ""
 "already exists. Do you want to open it?"
 msgstr "Το α�χείο ήδη υπά�χει, θέλετε να σώστε από πάνω?"
 
-#: ardour_ui.cc:2479
+#: ardour_ui.cc:2490
 #, fuzzy
 msgid "Open Existing Session"
 msgstr "Άνοιγμα Συνεδ�ίας"
 
-#: ardour_ui.cc:2717
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr ""
 
-#: ardour_ui.cc:2804
+#: ardour_ui.cc:2815
 msgid "Please wait while %1 loads your session"
 msgstr ""
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr ""
 
-#: ardour_ui.cc:2820
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr ""
 
-#: ardour_ui.cc:2841
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "Η Συνεδ�ία \"%1 (στιγμιότυπο %2)\" δεν φο�τώθηκε επιτυχώς"
 
-#: ardour_ui.cc:2847
+#: ardour_ui.cc:2858
 #, fuzzy
 msgid "Loading Error"
 msgstr "σφάλμα π�ογ�αμματισμο�: "
 
-#: ardour_ui.cc:2848
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr ""
 
-#: ardour_ui.cc:2930
+#: ardour_ui.cc:2941
 #, fuzzy
 msgid "Could not create session in \"%1\""
 msgstr "δεν γινόταν να φο�τωθεί η συνεδ�ία γ�αμμής εντολών  \"%1\""
 
-#: ardour_ui.cc:3030
+#: ardour_ui.cc:3041
 #, fuzzy
 msgid "No files were ready for clean-up"
 msgstr "Δεν υπά�χει α�χείο ήχου για εκκαθά�ιση"
 
-#: ardour_ui.cc:3034 ardour_ui.cc:3044 ardour_ui.cc:3177 ardour_ui.cc:3184
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 #, fuzzy
 msgid "Clean-up"
 msgstr "Εκκαθά�ιση"
 
-#: ardour_ui.cc:3035
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1140,19 +1135,19 @@ msgstr ""
 "χ�ειάζονται κάποια α�χεία που δεν\n"
 "χ�ησιμοποιο�νται αλλο�."
 
-#: ardour_ui.cc:3094
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr ""
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr ""
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr ""
 
-#: ardour_ui.cc:3105
+#: ardour_ui.cc:3116
 #, fuzzy
 msgid ""
 "The following file was deleted from %2,\n"
@@ -1169,7 +1164,7 @@ msgstr[1] ""
 "%3,\n"
 "ελευθε�ώνοντας %4 %5bytes χώ�ου στο δίσκο"
 
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3123
 #, fuzzy
 msgid ""
 "The following file was not in use and \n"
@@ -1202,12 +1197,12 @@ msgstr[1] ""
 "θα ελευθε�ωθο�ν %4 %5bytes\n"
 "στο δίσκο.\n"
 
-#: ardour_ui.cc:3172
+#: ardour_ui.cc:3183
 #, fuzzy
 msgid "Are you sure you want to clean-up?"
 msgstr "Στ'αλήθεια θέλετε να κάνετε εκκαθά�ιση?"
 
-#: ardour_ui.cc:3179
+#: ardour_ui.cc:3190
 #, fuzzy
 msgid ""
 "Clean-up is a destructive operation.\n"
@@ -1219,83 +1214,83 @@ msgstr ""
 "Μετά την εκκαθά�ιση, τα άχ�ηστα α�χεία μεταφέ�ονται στην\n"
 "\"dead sounds\" τοποθεσία."
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3198
 #, fuzzy
 msgid "CleanupDialog"
 msgstr "Εκκαθά�ιση"
 
-#: ardour_ui.cc:3217
+#: ardour_ui.cc:3228
 #, fuzzy
 msgid "Cleaned Files"
 msgstr "καθα�ισμένα α�χεία"
 
-#: ardour_ui.cc:3234
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr "διαγ�αμμένα α�χεία"
 
-#: ardour_ui.cc:3326
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 
-#: ardour_ui.cc:3330
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr ""
 
-#: ardour_ui.cc:3331
+#: ardour_ui.cc:3342
 msgid "Do you really want to stop the Video Server?"
 msgstr ""
 
-#: ardour_ui.cc:3334
+#: ardour_ui.cc:3345
 #, fuzzy
 msgid "Yes, Stop It"
 msgstr "�αι, να καταστ�αφεί."
 
-#: ardour_ui.cc:3360
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr ""
 
-#: ardour_ui.cc:3362
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
 msgstr ""
 
-#: ardour_ui.cc:3370 ardour_ui.cc:3455
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
 
-#: ardour_ui.cc:3394
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr ""
 
-#: ardour_ui.cc:3399
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr ""
 
-#: ardour_ui.cc:3432
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr ""
 
-#: ardour_ui.cc:3441
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3477 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "δεν μπό�εσα να ανοίξω το %1"
 
-#: ardour_ui.cc:3481
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
 msgstr ""
 
-#: ardour_ui.cc:3641
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr "η Εγγ�αφή διεκόπη διότι το σ�στημά δεν μπο�ο�σε να ανταπεξέλθει."
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3702
 #, fuzzy
 msgid ""
 "The disk system on your computer\n"
@@ -1310,7 +1305,7 @@ msgstr ""
 "Συγκεκ�ιμένα, απέτυχε να γ�άψει δεδομένα\n"
 "α�κετά γ�ήγο�α για να π�ολάβει την ηχογ�άφηση.\n"
 
-#: ardour_ui.cc:3689
+#: ardour_ui.cc:3721
 #, fuzzy
 msgid ""
 "The disk system on your computer\n"
@@ -1325,11 +1320,11 @@ msgstr ""
 "Συγκεκ�ιμένα, απέτυχε να διαβάσει δεδομένα\n"
 "α�κετά γ�ήγο�α για να π�ολάβει την αναπα�αγωγή.\n"
 
-#: ardour_ui.cc:3729
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr ""
 
-#: ardour_ui.cc:3730
+#: ardour_ui.cc:3762
 #, fuzzy
 msgid ""
 "This session appears to have been in the\n"
@@ -1347,43 +1342,43 @@ msgstr ""
 "ηχογ�αφημένα α�χεία, ή να τα αγνοήσει.\n"
 "Πα�ακαλώ αποφασίστε τί θέλετε να κάνετε.\n"
 
-#: ardour_ui.cc:3742
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr "Διαγ�αφή τυχόν δεδομένων"
 
-#: ardour_ui.cc:3743
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr "Ανάκληση από 'κ�ασά�ισμα'"
 
-#: ardour_ui.cc:3763
+#: ardour_ui.cc:3795
 msgid "Sample Rate Mismatch"
 msgstr ""
 
-#: ardour_ui.cc:3764
+#: ardour_ui.cc:3796
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
 "%2 is currently running at %3 Hz.  If you load this session,\n"
 "audio may be played at the wrong sample rate.\n"
 msgstr ""
 
-#: ardour_ui.cc:3773
+#: ardour_ui.cc:3805
 #, fuzzy
 msgid "Do not load session"
 msgstr "Zoom στη συνεδ�ία"
 
-#: ardour_ui.cc:3774
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr ""
 
-#: ardour_ui.cc:3797
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "Αποσ�νδεση απ'το JACK είναι αδ�νατη"
 
-#: ardour_ui.cc:3810
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr "Επανασ�νδεση στο JACK αδ�νατη"
 
-#: ardour_ui.cc:4084
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1406,75 +1401,80 @@ msgstr "UI: Ο 'editor' δεν μπο�εί να εγε�θεί"
 msgid "UI: cannot setup mixer"
 msgstr "UI: ο μίκτης δεν μπο�εί να εγε�θεί"
 
-#: ardour_ui2.cc:125
+#: ardour_ui2.cc:82
+#, fuzzy
+msgid "UI: cannot setup meterbridge"
+msgstr "UI: η γέφυ�α μετ�ήσεων δεν μπο�εί να εγε�θεί"
+
+#: ardour_ui2.cc:130
 msgid "Play from playhead"
 msgstr "Αναπα�/γή από τον Αναπα�αγωγέα"
 
-#: ardour_ui2.cc:126
+#: ardour_ui2.cc:131
 msgid "Stop playback"
 msgstr "Διακοπή Αναπα�/γής"
 
-#: ardour_ui2.cc:127
+#: ardour_ui2.cc:132
 #, fuzzy
 msgid "Toggle record"
 msgstr "Εγγ�αφή"
 
-#: ardour_ui2.cc:128
+#: ardour_ui2.cc:133
 msgid "Play range/selection"
 msgstr "Αναπα�/γή διαστήματος/επιλογής"
 
-#: ardour_ui2.cc:129
+#: ardour_ui2.cc:134
 msgid "Go to start of session"
 msgstr "Α�χή της συνεδ�ίας"
 
-#: ardour_ui2.cc:130
+#: ardour_ui2.cc:135
 msgid "Go to end of session"
 msgstr "Τέλος του συνεδ�ίας"
 
-#: ardour_ui2.cc:131
+#: ardour_ui2.cc:136
 msgid "Play loop range"
 msgstr "Επαναληπτική αναπα�/γή διαστήματος"
 
-#: ardour_ui2.cc:132
+#: ardour_ui2.cc:137
 msgid ""
 "MIDI Panic\n"
 "Send note off and reset controller messages on all MIDI channels"
 msgstr ""
 
-#: ardour_ui2.cc:133
+#: ardour_ui2.cc:138
 msgid "Return to last playback start when stopped"
 msgstr "Επιστ�οφή στην τελευταία θεση μετα απο πα�ση"
 
-#: ardour_ui2.cc:134
+#: ardour_ui2.cc:139
 #, fuzzy
 msgid "Playhead follows Range Selections and Edits"
 msgstr "Playhead στην Α�χή Διαστήματος"
 
-#: ardour_ui2.cc:135
+#: ardour_ui2.cc:140
 msgid "Be sensible about input monitoring"
 msgstr "Π�οσοχή στο input monitoring"
 
-#: ardour_ui2.cc:136
+#: ardour_ui2.cc:141
 msgid "Enable/Disable audio click"
 msgstr "Ά�ση/Πα�ση μετ�ονόμου"
 
-#: ardour_ui2.cc:137 monitor_section.cc:101
+#: ardour_ui2.cc:142 monitor_section.cc:101
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
 msgstr ""
 
-#: ardour_ui2.cc:138
+#: ardour_ui2.cc:143
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
 msgstr ""
 
-#: ardour_ui2.cc:139
+#: ardour_ui2.cc:144
 msgid "When active, there is a feedback loop."
 msgstr ""
 
-#: ardour_ui2.cc:140
+#: ardour_ui2.cc:145
 msgid ""
 "<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1482,7 +1482,7 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:141
+#: ardour_ui2.cc:146
 msgid ""
 "<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1490,30 +1490,34 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:173
+#: ardour_ui2.cc:147
+msgid "Reset Level Meter"
+msgstr ""
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr ""
 
-#: ardour_ui2.cc:175
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr ""
 
-#: ardour_ui2.cc:177
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr ""
 
-#: ardour_ui2.cc:241 ardour_ui_ed.cc:376
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 #, fuzzy
 msgid "Auto Return"
 msgstr ""
 "αυτόματη\n"
 "επιστ�οφή"
 
-#: ardour_ui2.cc:243 ardour_ui_ed.cc:379
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr ""
 
-#: ardour_ui2.cc:621 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1535,27 +1539,27 @@ msgstr "Θέση Κέ�σο�α επεξε�γασίας"
 msgid "Setup Mixer"
 msgstr "Ανάδειξη Μίκτη"
 
-#: ardour_ui_dependents.cc:84
+#: ardour_ui_dependents.cc:85
 #, fuzzy
 msgid "Reload Session History"
 msgstr "Δημιου�γία Directory Συνεδ�ίας Στο:"
 
-#: ardour_ui_dialogs.cc:206
+#: ardour_ui_dialogs.cc:242
 #, fuzzy
 msgid "Don't close"
 msgstr "ΟΧΙ %1"
 
-#: ardour_ui_dialogs.cc:207
+#: ardour_ui_dialogs.cc:243
 #, fuzzy
 msgid "Just close"
 msgstr "Κλείσιμο"
 
-#: ardour_ui_dialogs.cc:208
+#: ardour_ui_dialogs.cc:244
 #, fuzzy
 msgid "Save and close"
 msgstr "Αποθήκευση και %1"
 
-#: ardour_ui_dialogs.cc:293
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr ""
 
@@ -1568,7 +1572,7 @@ msgstr "Συνεδ�ία"
 msgid "Sync"
 msgstr "Sync"
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr "Επιλογές"
 
@@ -1597,15 +1601,15 @@ msgstr ""
 msgid "Sample Format"
 msgstr ""
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr "Επιφάνειες ελέγχου"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr "Μέτ�ηση"
 
@@ -1622,7 +1626,7 @@ msgstr ""
 msgid "Denormal Handling"
 msgstr ""
 
-#: ardour_ui_ed.cc:123 route_time_axis.cc:1475
+#: ardour_ui_ed.cc:123 route_time_axis.cc:1489
 msgid "New..."
 msgstr ""
 
@@ -1670,8 +1674,8 @@ msgstr "Στιγμιότυπο"
 msgid "Save As..."
 msgstr "Αποθήκευση π�οσχεδίου..."
 
-#: ardour_ui_ed.cc:153 editor_actions.cc:1710 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1464 route_time_axis.cc:1471
+#: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 #, fuzzy
 msgid "Rename..."
 msgstr "Μετονομασία"
@@ -1704,7 +1708,7 @@ msgid "Stem export..."
 msgstr "Εξαγωγή"
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "Εξαγωγή"
 
@@ -1718,11 +1722,11 @@ msgstr "Εκκαθά�ιση αχ�ήστων πηγών"
 msgid "Flush Wastebasket"
 msgstr "Άδειασμα κάδου"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr ""
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr ""
 
@@ -1730,8 +1734,8 @@ msgstr ""
 msgid "Reconnect"
 msgstr "Επανασ�νδεση"
 
-#: ardour_ui_ed.cc:195 global_port_matrix.cc:198 io_selector.cc:210
-#: mixer_strip.cc:712 mixer_strip.cc:838
+#: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr "Αποσ�νδεση"
 
@@ -1748,7 +1752,7 @@ msgstr "Μεγιστοποίηση χώ�ου για τον Editor"
 msgid "Show Toolbars"
 msgstr "Ανάδειξη Θέσεως"
 
-#: ardour_ui_ed.cc:230 mixer_ui.cc:1863 mixer_ui.cc:1869
+#: ardour_ui_ed.cc:230 mixer_ui.cc:1865 mixer_ui.cc:1871
 #, fuzzy
 msgid "Window|Mixer"
 msgstr "Πα�άθυ�α"
@@ -1758,27 +1762,32 @@ msgstr "Πα�άθυ�α"
 msgid "Toggle Editor+Mixer"
 msgstr "Λειτου�γία Επεξ/σίας"
 
-#: ardour_ui_ed.cc:233 midi_tracer.cc:39
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
+#, fuzzy
+msgid "Window|Meterbridge"
+msgstr "Πα�άθυ�α"
+
+#: ardour_ui_ed.cc:234 midi_tracer.cc:39
 msgid "MIDI Tracer"
 msgstr ""
 
-#: ardour_ui_ed.cc:235
+#: ardour_ui_ed.cc:236
 msgid "Chat"
 msgstr ""
 
-#: ardour_ui_ed.cc:237
+#: ardour_ui_ed.cc:238
 msgid "Help|Manual"
 msgstr ""
 
-#: ardour_ui_ed.cc:238
+#: ardour_ui_ed.cc:239
 msgid "Reference"
 msgstr ""
 
-#: ardour_ui_ed.cc:240 plugin_ui.cc:419
+#: ardour_ui_ed.cc:241 plugin_ui.cc:418
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: ardour_ui_ed.cc:248 rc_option_editor.cc:1114 rc_option_editor.cc:1125
+#: ardour_ui_ed.cc:249 rc_option_editor.cc:1114 rc_option_editor.cc:1125
 #: rc_option_editor.cc:1134 rc_option_editor.cc:1147 rc_option_editor.cc:1160
 #: rc_option_editor.cc:1169 rc_option_editor.cc:1179 rc_option_editor.cc:1181
 #: rc_option_editor.cc:1191 rc_option_editor.cc:1207 rc_option_editor.cc:1220
@@ -1788,105 +1797,105 @@ msgstr "Αποθήκευση"
 msgid "Transport"
 msgstr ""
 
-#: ardour_ui_ed.cc:254 engine_dialog.cc:85 sfdb_ui.cc:559
+#: ardour_ui_ed.cc:255 engine_dialog.cc:85
 msgid "Stop"
 msgstr "Πα�ση"
 
-#: ardour_ui_ed.cc:257
+#: ardour_ui_ed.cc:258
 msgid "Roll"
 msgstr ""
 
-#: ardour_ui_ed.cc:261
+#: ardour_ui_ed.cc:262
 msgid "Start/Stop"
 msgstr ""
 
-#: ardour_ui_ed.cc:264
+#: ardour_ui_ed.cc:265
 msgid "Start/Continue/Stop"
 msgstr ""
 
-#: ardour_ui_ed.cc:267
+#: ardour_ui_ed.cc:268
 #, fuzzy
 msgid "Stop and Forget Capture"
 msgstr "Stop + ξέχασε τη λήψη"
 
-#: ardour_ui_ed.cc:277
+#: ardour_ui_ed.cc:278
 #, fuzzy
 msgid "Transition To Roll"
 msgstr "Πα�αδοσιακή"
 
-#: ardour_ui_ed.cc:281
+#: ardour_ui_ed.cc:282
 msgid "Transition To Reverse"
 msgstr ""
 
-#: ardour_ui_ed.cc:285
+#: ardour_ui_ed.cc:286
 #, fuzzy
 msgid "Play Loop Range"
 msgstr "Επαναληπτική αναπα�/γή διαστήματος"
 
-#: ardour_ui_ed.cc:288
+#: ardour_ui_ed.cc:289
 #, fuzzy
 msgid "Play Selected Range"
 msgstr "Καθο�ισμός Διαστήματος"
 
-#: ardour_ui_ed.cc:291
+#: ardour_ui_ed.cc:292
 #, fuzzy
 msgid "Play Selection w/Preroll"
 msgstr "Αναπα�/γή επιλογής"
 
-#: ardour_ui_ed.cc:295
+#: ardour_ui_ed.cc:296
 msgid "Enable Record"
 msgstr "Ενε�γοποίηση Εγγ�αφής"
 
-#: ardour_ui_ed.cc:298
+#: ardour_ui_ed.cc:299
 #, fuzzy
 msgid "Start Recording"
 msgstr "Ενα�κτή�ιο διάστημα"
 
-#: ardour_ui_ed.cc:302
+#: ardour_ui_ed.cc:303
 msgid "Rewind"
 msgstr ""
 
-#: ardour_ui_ed.cc:305
+#: ardour_ui_ed.cc:306
 msgid "Rewind (Slow)"
 msgstr ""
 
-#: ardour_ui_ed.cc:308
+#: ardour_ui_ed.cc:309
 msgid "Rewind (Fast)"
 msgstr ""
 
-#: ardour_ui_ed.cc:311 startup.cc:727
+#: ardour_ui_ed.cc:312 startup.cc:727
 msgid "Forward"
 msgstr ""
 
-#: ardour_ui_ed.cc:314
+#: ardour_ui_ed.cc:315
 msgid "Forward (Slow)"
 msgstr ""
 
-#: ardour_ui_ed.cc:317
+#: ardour_ui_ed.cc:318
 msgid "Forward (Fast)"
 msgstr ""
 
-#: ardour_ui_ed.cc:320
+#: ardour_ui_ed.cc:321
 msgid "Goto Zero"
 msgstr ""
 
-#: ardour_ui_ed.cc:323
+#: ardour_ui_ed.cc:324
 msgid "Goto Start"
 msgstr "Πήγαινε στην Α�χή"
 
-#: ardour_ui_ed.cc:326
+#: ardour_ui_ed.cc:327
 msgid "Goto End"
 msgstr ""
 
-#: ardour_ui_ed.cc:329
+#: ardour_ui_ed.cc:330
 msgid "Goto Wall Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:333
+#: ardour_ui_ed.cc:334
 msgid "Focus On Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:337 ardour_ui_ed.cc:346 audio_clock.cc:2046 editor.cc:237
+#: ardour_ui_ed.cc:338 ardour_ui_ed.cc:347 audio_clock.cc:2046 editor.cc:237
 #: editor_actions.cc:544 editor_actions.cc:553 export_timespan_selector.cc:88
 #: session_option_editor.cc:41 session_option_editor.cc:61
 #: session_option_editor.cc:80 session_option_editor.cc:96
@@ -1895,140 +1904,140 @@ msgstr ""
 msgid "Timecode"
 msgstr ""
 
-#: ardour_ui_ed.cc:339 ardour_ui_ed.cc:348 editor_actions.cc:542
+#: ardour_ui_ed.cc:340 ardour_ui_ed.cc:349 editor_actions.cc:542
 #, fuzzy
 msgid "Bars & Beats"
 msgstr "Μπά�ες:Κτ�ποι"
 
-#: ardour_ui_ed.cc:341 ardour_ui_ed.cc:350
+#: ardour_ui_ed.cc:342 ardour_ui_ed.cc:351
 #, fuzzy
 msgid "Minutes & Seconds"
 msgstr "Λεπτά:Δε�τε�α"
 
-#: ardour_ui_ed.cc:343 ardour_ui_ed.cc:352 audio_clock.cc:2050 editor.cc:238
+#: ardour_ui_ed.cc:344 ardour_ui_ed.cc:353 audio_clock.cc:2050 editor.cc:238
 #: editor_actions.cc:543
 msgid "Samples"
 msgstr ""
 
-#: ardour_ui_ed.cc:355
+#: ardour_ui_ed.cc:356
 #, fuzzy
 msgid "Punch In"
 msgstr "Punch"
 
-#: ardour_ui_ed.cc:356 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr ""
 
-#: ardour_ui_ed.cc:359
+#: ardour_ui_ed.cc:360
 #, fuzzy
 msgid "Punch Out"
 msgstr "Punch"
 
-#: ardour_ui_ed.cc:360 time_info_box.cc:114
+#: ardour_ui_ed.cc:361 time_info_box.cc:114
 msgid "Out"
 msgstr ""
 
-#: ardour_ui_ed.cc:363
+#: ardour_ui_ed.cc:364
 msgid "Punch In/Out"
 msgstr ""
 
-#: ardour_ui_ed.cc:364
+#: ardour_ui_ed.cc:365
 msgid "In/Out"
 msgstr ""
 
-#: ardour_ui_ed.cc:367 rc_option_editor.cc:1071
+#: ardour_ui_ed.cc:368 rc_option_editor.cc:1071
 msgid "Click"
 msgstr "Μετ�ονόμος"
 
-#: ardour_ui_ed.cc:370
+#: ardour_ui_ed.cc:371
 #, fuzzy
 msgid "Auto Input"
 msgstr "π�όσθεση Input"
 
-#: ardour_ui_ed.cc:373
+#: ardour_ui_ed.cc:374
 #, fuzzy
 msgid "Auto Play"
 msgstr ""
 "αυτόματη\n"
 "αναπα�/γή"
 
-#: ardour_ui_ed.cc:384
+#: ardour_ui_ed.cc:385
 msgid "Sync Startup to Video"
 msgstr ""
 
-#: ardour_ui_ed.cc:386
+#: ardour_ui_ed.cc:387
 #, fuzzy
 msgid "Time Master"
 msgstr "Απόκ�υψη Στίγματος"
 
-#: ardour_ui_ed.cc:393
+#: ardour_ui_ed.cc:394
 #, fuzzy
 msgid "Toggle Record Enable Track %1"
 msgstr "Απ/Ενε�γοποίηση Καναλιο� 1"
 
-#: ardour_ui_ed.cc:400
+#: ardour_ui_ed.cc:401
 msgid "Percentage"
 msgstr "Ποσοστό"
 
-#: ardour_ui_ed.cc:401 shuttle_control.cc:169
+#: ardour_ui_ed.cc:402 shuttle_control.cc:169
 msgid "Semitones"
 msgstr "Ημιτόνια"
 
-#: ardour_ui_ed.cc:405
+#: ardour_ui_ed.cc:406
 msgid "Send MTC"
 msgstr "Αποστολή MTC"
 
-#: ardour_ui_ed.cc:407
+#: ardour_ui_ed.cc:408
 msgid "Send MMC"
 msgstr "Αποστολή MMC"
 
-#: ardour_ui_ed.cc:409
+#: ardour_ui_ed.cc:410
 msgid "Use MMC"
 msgstr ""
 
-#: ardour_ui_ed.cc:411 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 #, fuzzy
 msgid "Send MIDI Clock"
 msgstr "Αποστολή MIDI feedback"
 
-#: ardour_ui_ed.cc:413
+#: ardour_ui_ed.cc:414
 #, fuzzy
 msgid "Send MIDI Feedback"
 msgstr "Αποστολή MIDI feedback"
 
-#: ardour_ui_ed.cc:419
+#: ardour_ui_ed.cc:420
 msgid "Panic"
 msgstr ""
 
-#: ardour_ui_ed.cc:559
+#: ardour_ui_ed.cc:560
 #, fuzzy
 msgid "Wall Clock"
 msgstr "Μεγάλο ω�ολόγιον"
 
-#: ardour_ui_ed.cc:560
+#: ardour_ui_ed.cc:561
 msgid "Disk Space"
 msgstr ""
 
-#: ardour_ui_ed.cc:561
+#: ardour_ui_ed.cc:562
 #, fuzzy
 msgid "DSP"
 msgstr "LADSPA"
 
-#: ardour_ui_ed.cc:562
+#: ardour_ui_ed.cc:563
 msgid "Buffers"
 msgstr ""
 
-#: ardour_ui_ed.cc:563
+#: ardour_ui_ed.cc:564
 msgid "JACK Sampling Rate and Latency"
 msgstr ""
 
-#: ardour_ui_ed.cc:564
+#: ardour_ui_ed.cc:565
 #, fuzzy
 msgid "Timecode Format"
 msgstr "Ηχητικά frames"
 
-#: ardour_ui_ed.cc:565
+#: ardour_ui_ed.cc:566
 #, fuzzy
 msgid "File Format"
 msgstr "Εντόπιο Format"
@@ -2043,12 +2052,12 @@ msgstr ""
 msgid "Internal"
 msgstr "Εσωτε�ικό"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 #, fuzzy
 msgid "Enable/Disable external positional sync"
 msgstr "Ά�ση/Πα�ση μετ�ονόμου"
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr ""
 
@@ -2079,7 +2088,7 @@ msgstr "Χ�όνος"
 msgid "Meter"
 msgstr "Μετ�ητής"
 
-#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1030
+#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1039
 #: midi_region_view.cc:2991 session_metadata_dialog.cc:331
 #: session_metadata_dialog.cc:379 session_metadata_dialog.cc:435
 #: session_metadata_dialog.cc:716
@@ -2174,33 +2183,33 @@ msgid "hide track"
 msgstr "απόκ�υψη καναλιο�"
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:196 generic_pluginui.cc:456
-#: generic_pluginui.cc:733 panner_ui.cc:150
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
+#: generic_pluginui.cc:746 panner_ui.cc:150
 #, fuzzy
 msgid "Automation|Manual"
 msgstr "Αυτοματισμός"
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1856 gain_meter.cc:199
-#: generic_pluginui.cc:459 generic_pluginui.cc:735 midi_time_axis.cc:1488
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
+#: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr "Αναπα�/γή"
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:202 generic_pluginui.cc:462
-#: generic_pluginui.cc:737 panner_ui.cc:156
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
+#: generic_pluginui.cc:750 panner_ui.cc:156
 msgid "Write"
 msgstr "Γ�άψε"
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:205 generic_pluginui.cc:465
-#: generic_pluginui.cc:739 panner_ui.cc:159
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
+#: generic_pluginui.cc:752 panner_ui.cc:159
 msgid "Touch"
 msgstr "Αγγιγμα"
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr "???"
 
@@ -2209,7 +2218,7 @@ msgid "clear automation"
 msgstr "εκκαθά�ιση αυτοματισμο�"
 
 #: automation_time_axis.cc:485 editor_actions.cc:613 editor_markers.cc:857
-#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:699
+#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:708
 msgid "Hide"
 msgstr "Κ��ψιμο"
 
@@ -2231,7 +2240,7 @@ msgstr "Αποσ�νδεση"
 msgid "Linear"
 msgstr "Γ�αμμικό"
 
-#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:638
+#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:647
 #: shuttle_control.cc:188
 msgid "Mode"
 msgstr "Λειτου�γία"
@@ -2250,13 +2259,13 @@ msgstr "Λειτου�γία Επεξ/σίας"
 msgid "Direction:"
 msgstr "ανάλυση"
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:156
-#: mixer_strip.cc:2132
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 msgid "Input"
 msgstr ""
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:161 mixer_strip.cc:2135
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 msgid "Output"
 msgstr ""
 
@@ -2266,8 +2275,8 @@ msgid "Edit"
 msgstr "Επεξε�γασία"
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:420 processor_box.cc:2227
-#: route_time_axis.cc:704
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
+#: route_time_axis.cc:713
 #, fuzzy
 msgid "Delete"
 msgstr "διαγ�αφή"
@@ -2446,7 +2455,7 @@ msgstr ""
 
 #: edit_note_dialog.cc:98 editor_regions.cc:114
 #: export_timespan_selector.cc:359 export_timespan_selector.cc:421
-#: location_ui.cc:313 midi_list_editor.cc:114 time_info_box.cc:105
+#: location_ui.cc:317 midi_list_editor.cc:114 time_info_box.cc:105
 msgid "Length"
 msgstr ""
 
@@ -2714,18 +2723,18 @@ msgid "Ranges & Marks"
 msgstr "Στίγματα διαστημάτων"
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 #, fuzzy
 msgid "Editor"
 msgstr "επεξε�γαστής"
 
 #: editor.cc:1215 editor.cc:1225 editor.cc:4440 editor_actions.cc:130
-#: editor_actions.cc:1804
+#: editor_actions.cc:1813
 msgid "Loop"
 msgstr "Loop"
 
@@ -2750,8 +2759,8 @@ msgstr ""
 msgid "Slow"
 msgstr "Α�γό"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1606
-#: sfdb_ui.cc:1715
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "Ταχ�"
 
@@ -2773,7 +2782,7 @@ msgstr "Ενε�γοποίηση"
 msgid "Slowest"
 msgstr "Α�γότατο"
 
-#: editor.cc:1572 route_time_axis.cc:1863 selection.cc:1009 selection.cc:1064
+#: editor.cc:1572 route_time_axis.cc:1877 selection.cc:1009 selection.cc:1064
 msgid "programming error: "
 msgstr "σφάλμα π�ογ�αμματισμο�: "
 
@@ -2909,7 +2918,7 @@ msgid "Select All in Track"
 msgstr "Επιλογή όλων στο  κανάλι"
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2235
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr "Επιλογή όλων"
 
@@ -2969,15 +2978,15 @@ msgstr ""
 msgid "Select"
 msgstr "Επιλογή"
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2220
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr "Κοπή"
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2223
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr "Αντιγ�αφή"
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2231
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr "Επικόλληση"
 
@@ -3149,7 +3158,7 @@ msgstr "Redo"
 msgid "Redo (%1)"
 msgstr "Redo (%1)"
 
-#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1785
+#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1794
 msgid "Duplicate"
 msgstr "Αντιγ�αφή"
 
@@ -3185,8 +3194,8 @@ msgstr "Διαγ�αφή λίστας αναπα�/γής"
 msgid "Keep Playlist"
 msgstr "Διατή�ηση λίστας αναπα�/γής"
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "Ακ��ωση"
 
@@ -3206,7 +3215,7 @@ msgstr "εκκαθά�ιση playlists"
 msgid "Please wait while %1 loads visual data."
 msgstr ""
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2251
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 #, fuzzy
 msgid "Edit..."
 msgstr "Επεξε�γασία"
@@ -3261,7 +3270,7 @@ msgstr "Στ�ωματοποίηση"
 msgid "Position"
 msgstr "Θέση"
 
-#: editor_actions.cc:101 gain_meter.cc:124 gain_meter.cc:755 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr "Ισοστάθμιση"
@@ -3276,7 +3285,7 @@ msgstr "Ε�γαλείο Gain"
 msgid "Ranges"
 msgstr "Διάστημα"
 
-#: editor_actions.cc:104 editor_actions.cc:1781 session_option_editor.cc:145
+#: editor_actions.cc:104 editor_actions.cc:1790 session_option_editor.cc:145
 #: session_option_editor.cc:147 session_option_editor.cc:156
 #: session_option_editor.cc:163
 #, fuzzy
@@ -3319,7 +3328,7 @@ msgstr "Επιλογές"
 msgid "Misc Options"
 msgstr "Επιλογές"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr ""
@@ -3366,8 +3375,8 @@ msgstr "Δευτε�έυον ω�ολόγιον"
 msgid "Separate"
 msgstr "διαχω�ισμός"
 
-#: editor_actions.cc:132 mixer_strip.cc:1916 route_time_axis.cc:199
-#: route_time_axis.cc:2397
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
+#: route_time_axis.cc:2417
 msgid "Solo"
 msgstr "Σόλο"
 
@@ -3380,7 +3389,7 @@ msgstr "Frames"
 msgid "Timecode fps"
 msgstr ""
 
-#: editor_actions.cc:137 route_time_axis.cc:421
+#: editor_actions.cc:137 route_time_axis.cc:430
 msgid "Height"
 msgstr "Ύψος"
 
@@ -3521,7 +3530,7 @@ msgstr "Playhead στην Α�χή Διαστήματος"
 msgid "Playhead to Range End"
 msgstr "Η playhead στο τέλος του διαστήματος"
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2237
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 msgid "Deselect All"
 msgstr "Αποεπιλογή όλων"
 
@@ -3833,9 +3842,9 @@ msgstr "Π�οσθήκη πε�ιοχής"
 msgid "Toggle Active"
 msgstr "Επανενε�γοποίηση γ�αφήματος"
 
-#: editor_actions.cc:370 editor_actions.cc:1707 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1488
-#: route_time_axis.cc:701
+#: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
+#: route_time_axis.cc:710
 msgid "Remove"
 msgstr "Απαλοιφή"
 
@@ -3844,19 +3853,19 @@ msgstr "Απαλοιφή"
 msgid "Fit Selected Tracks"
 msgstr "θέση επιλεγμένης οπτικής καναλιο�"
 
-#: editor_actions.cc:376 time_axis_view.cc:1298
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr "Μέγιστο"
 
-#: editor_actions.cc:379 time_axis_view.cc:1299
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr "Μεγαλ�τε�ο"
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1300
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr "Μεγάλο"
 
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr "Μικ�ό"
 
@@ -3960,7 +3969,7 @@ msgstr "Splice"
 msgid "Slide"
 msgstr "Ολίσθηση"
 
-#: editor_actions.cc:478 editor_actions.cc:1728 editor_markers.cc:860
+#: editor_actions.cc:478 editor_actions.cc:1737 editor_markers.cc:860
 #: editor_rulers.cc:386 location_ui.cc:56
 msgid "Lock"
 msgstr "Κλείδωμα"
@@ -4171,7 +4180,7 @@ msgstr "Λεπ:Δε�τ"
 msgid "Video Monitor"
 msgstr "Software Monitoring"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr ""
 
@@ -4181,8 +4190,9 @@ msgid "Always on Top"
 msgstr "Ανό�θωση στο ανώτατο στ�ώμα"
 
 #: editor_actions.cc:554
-msgid "Framenumber"
-msgstr ""
+#, fuzzy
+msgid "Frame number"
+msgstr "μετονομασία στίγματος"
 
 #: editor_actions.cc:555
 #, fuzzy
@@ -4274,7 +4284,7 @@ msgstr "Απαλοιφή"
 
 #: editor_actions.cc:652 editor_audio_import.cc:279
 #: session_import_dialog.cc:74 session_import_dialog.cc:94
-#: session_metadata_dialog.cc:297 editor_videotimeline.cc:107
+#: session_metadata_dialog.cc:297 editor_videotimeline.cc:108
 msgid "Import"
 msgstr "Εισαγωγή"
 
@@ -4319,328 +4329,328 @@ msgstr ""
 msgid "Could not find editor.bindings in search path %1"
 msgstr ""
 
-#: editor_actions.cc:1019 editor_actions.cc:1415 editor_actions.cc:1426
-#: editor_actions.cc:1479 editor_actions.cc:1490 editor_actions.cc:1537
-#: editor_actions.cc:1547 editor_regions.cc:1561
+#: editor_actions.cc:1028 editor_actions.cc:1424 editor_actions.cc:1435
+#: editor_actions.cc:1488 editor_actions.cc:1499 editor_actions.cc:1546
+#: editor_actions.cc:1556 editor_regions.cc:1561
 #, fuzzy
 msgid "programming error: %1: %2"
 msgstr "σφάλμα π�ογ�αμματισμο�: %1"
 
-#: editor_actions.cc:1713
+#: editor_actions.cc:1722
 msgid "Raise"
 msgstr ""
 
-#: editor_actions.cc:1716
+#: editor_actions.cc:1725
 #, fuzzy
 msgid "Raise to Top"
 msgstr "Ανό�θωση στο ανώτατο στ�ώμα"
 
-#: editor_actions.cc:1719 gtk-custom-ruler.c:132
+#: editor_actions.cc:1728 gtk-custom-ruler.c:132
 msgid "Lower"
 msgstr "Κατώτε�ο"
 
-#: editor_actions.cc:1722
+#: editor_actions.cc:1731
 #, fuzzy
 msgid "Lower to Bottom"
 msgstr "Υποβίβαση στο κατώτατο στ�ώμα"
 
-#: editor_actions.cc:1725
+#: editor_actions.cc:1734
 #, fuzzy
 msgid "Move to Original Position"
 msgstr "Π�ωτα�χική θέση"
 
-#: editor_actions.cc:1730
+#: editor_actions.cc:1739
 msgid "Lock to Video"
 msgstr ""
 
-#: editor_actions.cc:1735 editor_markers.cc:867
+#: editor_actions.cc:1744 editor_markers.cc:867
 msgid "Glue to Bars and Beats"
 msgstr ""
 
-#: editor_actions.cc:1740
+#: editor_actions.cc:1749
 #, fuzzy
 msgid "Remove Sync"
 msgstr "απαλοιφή συγχ�ονισμο�(sync)"
 
-#: editor_actions.cc:1743 mixer_strip.cc:1903 route_time_axis.cc:200
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr "Σιγή"
 
-#: editor_actions.cc:1746
+#: editor_actions.cc:1755
 #, fuzzy
 msgid "Normalize..."
 msgstr "Εξομάλυνση"
 
-#: editor_actions.cc:1749
+#: editor_actions.cc:1758
 msgid "Reverse"
 msgstr "Αντιστ�οφή"
 
-#: editor_actions.cc:1752
+#: editor_actions.cc:1761
 #, fuzzy
 msgid "Make Mono Regions"
 msgstr "Δημιου�γία mono πε�ιοχών"
 
-#: editor_actions.cc:1755
+#: editor_actions.cc:1764
 msgid "Boost Gain"
 msgstr ""
 
-#: editor_actions.cc:1758
+#: editor_actions.cc:1767
 msgid "Cut Gain"
 msgstr ""
 
-#: editor_actions.cc:1761
+#: editor_actions.cc:1770
 msgid "Pitch Shift..."
 msgstr ""
 
-#: editor_actions.cc:1764
+#: editor_actions.cc:1773
 #, fuzzy
 msgid "Transpose..."
 msgstr "Αναζήτηση"
 
-#: editor_actions.cc:1767
+#: editor_actions.cc:1776
 #, fuzzy
 msgid "Opaque"
 msgstr "αδιαφανής"
 
-#: editor_actions.cc:1771 editor_regions.cc:116
+#: editor_actions.cc:1780 editor_regions.cc:116
 msgid "Fade In"
 msgstr "Fade In"
 
-#: editor_actions.cc:1776 editor_regions.cc:117
+#: editor_actions.cc:1785 editor_regions.cc:117
 msgid "Fade Out"
 msgstr "Fade Out"
 
-#: editor_actions.cc:1791
+#: editor_actions.cc:1800
 #, fuzzy
 msgid "Multi-Duplicate..."
 msgstr "Αντιγ�αφή"
 
-#: editor_actions.cc:1796
+#: editor_actions.cc:1805
 msgid "Fill Track"
 msgstr "Γόμωση καναλιο�"
 
-#: editor_actions.cc:1800 editor_markers.cc:955
+#: editor_actions.cc:1809 editor_markers.cc:955
 msgid "Set Loop Range"
 msgstr "Θέση Loop Διαστήματος"
 
-#: editor_actions.cc:1807
+#: editor_actions.cc:1816
 #, fuzzy
 msgid "Set Punch"
 msgstr "Θέση Punch Διαστήματος"
 
-#: editor_actions.cc:1811
+#: editor_actions.cc:1820
 #, fuzzy
 msgid "Add Single Range Marker"
 msgstr "Π�όσθεση Στιγμάτων Διαστήματος"
 
-#: editor_actions.cc:1816
+#: editor_actions.cc:1825
 #, fuzzy
 msgid "Add Range Marker Per Region"
 msgstr "Π�όσθεση Στιγμάτων Διαστήματος"
 
-#: editor_actions.cc:1820
+#: editor_actions.cc:1829
 #, fuzzy
 msgid "Snap Position To Grid"
 msgstr "Snap σε μπά�ες"
 
-#: editor_actions.cc:1823
+#: editor_actions.cc:1832
 #, fuzzy
 msgid "Close Gaps"
 msgstr "Κλείσιμο"
 
-#: editor_actions.cc:1826
+#: editor_actions.cc:1835
 msgid "Rhythm Ferret..."
 msgstr ""
 
-#: editor_actions.cc:1829
+#: editor_actions.cc:1838
 #, fuzzy
 msgid "Export..."
 msgstr "Εξαγωγή"
 
-#: editor_actions.cc:1835
+#: editor_actions.cc:1844
 #, fuzzy
 msgid "Separate Under"
 msgstr "Χω�ισμός διαστήματος στο κανάλι"
 
-#: editor_actions.cc:1839
+#: editor_actions.cc:1848
 #, fuzzy
 msgid "Set Fade In Length"
 msgstr "αλλαγή μήκους fade in"
 
-#: editor_actions.cc:1840
+#: editor_actions.cc:1849
 #, fuzzy
 msgid "Set Fade Out Length"
 msgstr "αλλαγή μήκους fade out"
 
-#: editor_actions.cc:1841
+#: editor_actions.cc:1850
 #, fuzzy
 msgid "Set Tempo from Region = Bar"
 msgstr "θέση επιλογής από πε�ιοχή"
 
-#: editor_actions.cc:1846
+#: editor_actions.cc:1855
 #, fuzzy
 msgid "Split at Percussion Onsets"
 msgstr "Κόψιμο στον κέ�σο�α επεξε�γασίας"
 
-#: editor_actions.cc:1851
+#: editor_actions.cc:1860
 #, fuzzy
 msgid "List Editor..."
 msgstr "Επεξ/στης Ρυθμίσεων"
 
-#: editor_actions.cc:1854
+#: editor_actions.cc:1863
 msgid "Properties..."
 msgstr ""
 
-#: editor_actions.cc:1858
+#: editor_actions.cc:1867
 msgid "Bounce (with processing)"
 msgstr ""
 
-#: editor_actions.cc:1859
+#: editor_actions.cc:1868
 msgid "Bounce (without processing)"
 msgstr ""
 
-#: editor_actions.cc:1860
+#: editor_actions.cc:1869
 msgid "Combine"
 msgstr ""
 
-#: editor_actions.cc:1861
+#: editor_actions.cc:1870
 msgid "Uncombine"
 msgstr ""
 
-#: editor_actions.cc:1863
+#: editor_actions.cc:1872
 msgid "Spectral Analysis..."
 msgstr ""
 
-#: editor_actions.cc:1865
+#: editor_actions.cc:1874
 msgid "Reset Envelope"
 msgstr ""
 
-#: editor_actions.cc:1867
+#: editor_actions.cc:1876
 msgid "Reset Gain"
 msgstr ""
 
-#: editor_actions.cc:1872
+#: editor_actions.cc:1881
 #, fuzzy
 msgid "Envelope Active"
 msgstr "Επανενε�γοποίηση γ�αφήματος"
 
-#: editor_actions.cc:1876
+#: editor_actions.cc:1885
 #, fuzzy
 msgid "Quantize..."
 msgstr "Εξομάλυνση"
 
-#: editor_actions.cc:1877 editor_actions.cc:1878
+#: editor_actions.cc:1886 editor_actions.cc:1887
 msgid "Insert Patch Change..."
 msgstr ""
 
-#: editor_actions.cc:1879
+#: editor_actions.cc:1888
 msgid "Unlink from other copies"
 msgstr ""
 
-#: editor_actions.cc:1880
+#: editor_actions.cc:1889
 msgid "Strip Silence..."
 msgstr ""
 
-#: editor_actions.cc:1881
+#: editor_actions.cc:1890
 #, fuzzy
 msgid "Set Range Selection"
 msgstr "Ο�ισμός διαστήματος από επιλογή"
 
-#: editor_actions.cc:1883
+#: editor_actions.cc:1892
 #, fuzzy
 msgid "Nudge Later"
 msgstr "ν�ξη εμπ�ός"
 
-#: editor_actions.cc:1884
+#: editor_actions.cc:1893
 #, fuzzy
 msgid "Nudge Earlier"
 msgstr "ν�ξη εμπ�ός"
 
-#: editor_actions.cc:1889
+#: editor_actions.cc:1898
 #, fuzzy
 msgid "Nudge Later by Capture Offset"
 msgstr "��ξη πίσω"
 
-#: editor_actions.cc:1896
+#: editor_actions.cc:1905
 #, fuzzy
 msgid "Nudge Earlier by Capture Offset"
 msgstr "��ξη πίσω"
 
-#: editor_actions.cc:1900
+#: editor_actions.cc:1909
 msgid "Trim to Loop"
 msgstr ""
 
-#: editor_actions.cc:1901
+#: editor_actions.cc:1910
 msgid "Trim to Punch"
 msgstr ""
 
-#: editor_actions.cc:1903
+#: editor_actions.cc:1912
 #, fuzzy
 msgid "Trim to Previous"
 msgstr "ισοστάθμιση π�ος σ�νταξη"
 
-#: editor_actions.cc:1904
+#: editor_actions.cc:1913
 #, fuzzy
 msgid "Trim to Next"
 msgstr "ισοστάθμιση π�ος σ�νταξη"
 
-#: editor_actions.cc:1911
+#: editor_actions.cc:1920
 #, fuzzy
 msgid "Insert Region From Region List"
 msgstr "θέση επιλογής από πε�ιοχή"
 
-#: editor_actions.cc:1917
+#: editor_actions.cc:1926
 #, fuzzy
 msgid "Set Sync Position"
 msgstr "Θέση sync της Πε�ιοχής"
 
-#: editor_actions.cc:1918
+#: editor_actions.cc:1927
 msgid "Place Transient"
 msgstr ""
 
-#: editor_actions.cc:1919
+#: editor_actions.cc:1928
 msgid "Split"
 msgstr "Διαχω�ισμός"
 
-#: editor_actions.cc:1920
+#: editor_actions.cc:1929
 msgid "Trim Start at Edit Point"
 msgstr ""
 
-#: editor_actions.cc:1921
+#: editor_actions.cc:1930
 msgid "Trim End at Edit Point"
 msgstr ""
 
-#: editor_actions.cc:1926
+#: editor_actions.cc:1935
 #, fuzzy
 msgid "Align Start"
 msgstr "Ευθυγ�άμμιση α�χής Πε�ιοχών"
 
-#: editor_actions.cc:1933
+#: editor_actions.cc:1942
 #, fuzzy
 msgid "Align Start Relative"
 msgstr "ευθυγ�άμμιση α�χής πε�ιοχών(σχετική)"
 
-#: editor_actions.cc:1937
+#: editor_actions.cc:1946
 #, fuzzy
 msgid "Align End"
 msgstr "Ευθυγ�άμμιση"
 
-#: editor_actions.cc:1942
+#: editor_actions.cc:1951
 #, fuzzy
 msgid "Align End Relative"
 msgstr "Ευθυγ�άμμιση σχετικών"
 
-#: editor_actions.cc:1949
+#: editor_actions.cc:1958
 #, fuzzy
 msgid "Align Sync"
 msgstr "ευθυγ�άμμιση του sync των πε�ιοχών"
 
-#: editor_actions.cc:1956
+#: editor_actions.cc:1965
 #, fuzzy
 msgid "Align Sync Relative"
 msgstr "Ευθυγ�άμμιση σχετικών"
 
-#: editor_actions.cc:1960 editor_actions.cc:1963
+#: editor_actions.cc:1969 editor_actions.cc:1972
 msgid "Choose Top..."
 msgstr ""
 
@@ -4666,32 +4676,32 @@ msgid ""
 "%2 as a new source, or skip it?"
 msgstr ""
 
-#: editor_audio_import.cc:279 editor_videotimeline.cc:107
+#: editor_audio_import.cc:279 editor_videotimeline.cc:108
 msgid "Cancel Import"
 msgstr "Ακ��ωση Εισαγωγής"
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr "Editor: δεν γίνεται να ανοίξει το α�χείο \"%1\",(%2)"
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 msgid "Cancel entire import"
 msgstr "Ακ��ωση όλης της Εισαγωγής"
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 msgid "Don't embed it"
 msgstr "Μη το εμφυτε�σεις"
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr ""
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 msgid "Sample rate"
 msgstr ""
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
@@ -4700,7 +4710,7 @@ msgstr ""
 "Ο �υθμός δειγματοληψίας αυτο� του α�χείου δεν ται�ιάζει με αυτόν της "
 "συνεδ�ίας!"
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 msgid "Embed it anyway"
 msgstr "Εμφ�τευσέ το ο�τως ή άλλως"
 
@@ -4738,32 +4748,32 @@ msgstr "αντιγ�αφή στίγματος tempo"
 msgid "move tempo mark"
 msgstr "μετακίνηση στίγματος tempo"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr "αλλαγή μήκους fade in"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr "αλλαγή μήκους fade out"
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr "μετακίνηση στίγματος"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr ""
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 #, fuzzy
 msgid "programming_error: %1"
 msgstr "σφάλμα π�ογ�αμματισμο�: %1"
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr "νέο στίγμα διαστήματος"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 #, fuzzy
 msgid "rubberband selection"
 msgstr "επιλογή διαστήματος"
@@ -4843,7 +4853,7 @@ msgid "Sharing Solo?"
 msgstr ""
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 msgid "Rec"
 msgstr ""
 
@@ -4924,7 +4934,7 @@ msgid "end"
 msgstr "Δευτε�όλεπτα"
 
 #: editor_markers.cc:646 editor_ops.cc:1744 editor_ops.cc:1764
-#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1005
+#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1017
 msgid "add marker"
 msgstr "π�όσθεση στίγματος"
 
@@ -4933,7 +4943,7 @@ msgstr "π�όσθεση στίγματος"
 msgid "range"
 msgstr " διαστήματος"
 
-#: editor_markers.cc:713 location_ui.cc:840
+#: editor_markers.cc:713 location_ui.cc:852
 msgid "remove marker"
 msgstr "απαλοιφή στίγματος"
 
@@ -5021,8 +5031,8 @@ msgstr "Μετονομασία Στίγματος"
 msgid "Rename Range"
 msgstr "Μετονομασία Διαστήματος"
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2233 route_time_axis.cc:968 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr "Μετονομασία"
 
@@ -5175,7 +5185,7 @@ msgstr "Υποβίβαση στο κατώτατο στ�ώμα"
 msgid "Rename Region"
 msgstr "αντιστ�οφή πε�ιοχής"
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 #, fuzzy
 msgid "New name:"
 msgstr "νέο όνομα: "
@@ -5354,7 +5364,7 @@ msgstr ""
 "(Η π�άξη είνα‎ι καταστ�επτική και δεν γίνεται επαναφο�ά της)"
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr "Όχι, να μην γίνει τίποτα."
 
@@ -5565,11 +5575,11 @@ msgstr ""
 msgid "close region gaps"
 msgstr "αυτές τις πε�ιοχές"
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr ""
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5584,7 +5594,7 @@ msgstr ""
 msgid "tracks"
 msgstr "Κανάλια"
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 #, fuzzy
 msgid "track"
 msgstr "Κανάλι"
@@ -5594,7 +5604,7 @@ msgstr "Κανάλι"
 msgid "busses"
 msgstr "Δίαυλοι"
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 #, fuzzy
 msgid "bus"
 msgstr "abs"
@@ -5640,7 +5650,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr "�αι, απάλοιψε το."
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr "�αι, απάλοιψε το."
 
@@ -5718,7 +5728,7 @@ msgstr ""
 msgid "Length of region fade-out (units: secondary clock), () if dsisabled"
 msgstr ""
 
-#: editor_regions.cc:118 mixer_strip.cc:1960 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr "L"
@@ -5737,8 +5747,9 @@ msgstr "Πήγαινε"
 msgid "Region position glued to Bars|Beats time?"
 msgstr ""
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:723
-#: mixer_strip.cc:1934 panner_ui.cc:554 stereo_panner.cc:237
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
+#: stereo_panner.cc:237
 msgid "M"
 msgstr ""
 
@@ -5814,7 +5825,8 @@ msgstr "κανάλια/δίαυλοι"
 msgid "Track/Bus visible ?"
 msgstr "Κανάλια/Δίαυλοι"
 
-#: editor_routes.cc:204 mixer_strip.cc:1951 route_time_axis.cc:2387
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
+#: route_time_axis.cc:2407
 msgid "A"
 msgstr ""
 
@@ -5823,7 +5835,7 @@ msgstr ""
 msgid "Track/Bus active ?"
 msgstr "κανάλια/δίαυλοι"
 
-#: editor_routes.cc:205 mixer_strip.cc:1935
+#: editor_routes.cc:205 mixer_strip.cc:1932
 msgid "I"
 msgstr ""
 
@@ -5832,7 +5844,7 @@ msgstr ""
 msgid "MIDI input enabled"
 msgstr "MIDI δεσμός"
 
-#: editor_routes.cc:206 mixer_strip.cc:1933 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr ""
@@ -5847,7 +5859,7 @@ msgstr "Εγγ�αφή"
 msgid "Muted"
 msgstr "Σιγή"
 
-#: editor_routes.cc:208 mixer_strip.cc:1947
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr ""
 
@@ -5860,7 +5872,7 @@ msgstr "Σόλο"
 msgid "SI"
 msgstr ""
 
-#: editor_routes.cc:209 mixer_strip.cc:351 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 #, fuzzy
 msgid "Solo Isolated"
 msgstr "Σόλο"
@@ -6167,147 +6179,151 @@ msgid "192000Hz"
 msgstr ""
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr "Ουδέν"
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr "Τ�ίγωνη"
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr "Τετ�άγωνη"
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 #, fuzzy
 msgid "Shaped"
 msgstr "Μο�φοποιημένος Θό�υβος"
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr ""
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr ""
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr ""
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 #, fuzzy
 msgid "Recording only"
 msgstr "Πα�ση εγγ�αφής στα xrun"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr ""
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 #, fuzzy
 msgid "raw"
 msgstr "σχημάτισε"
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr ""
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 #, fuzzy
 msgid "Audio Interface:"
 msgstr "Εσωτε�ικό"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:148 sfdb_ui.cc:261 sfdb_ui.cc:266
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 msgid "Sample rate:"
 msgstr ""
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr ""
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr ""
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr ""
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 #, fuzzy
 msgid "Audio mode:"
 msgstr "Ηχητικά frames"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr ""
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr ""
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr ""
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr ""
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 msgid "Dither:"
 msgstr ""
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr ""
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr ""
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr ""
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 msgid "Output device:"
 msgstr ""
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 #, fuzzy
 msgid "Hardware input latency:"
 msgstr "Hardware Είσοδοι: χ�ήση"
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 msgid "samples"
 msgstr ""
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 #, fuzzy
 msgid "Hardware output latency:"
 msgstr "Hardware Έξοδοι: χ�ήση"
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr ""
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 #, fuzzy
 msgid "Advanced"
 msgstr "Π�οχω�ημένα..."
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr ""
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 msgid ""
 "You do not have any audio devices capable of\n"
 "simultaneous playback and recording.\n"
@@ -6324,31 +6340,31 @@ msgid ""
 "%1 and choose the relevant device then."
 msgstr ""
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr ""
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr ""
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr ""
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr ""
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr ""
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:146
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 #, fuzzy
 msgid "Channels:"
 msgstr "Κανάλια"
@@ -6512,9 +6528,9 @@ msgid "Folder:"
 msgstr "Όνομα φακέλου:"
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "Αναζήτηση"
 
@@ -6651,6 +6667,13 @@ msgstr "Τοποθεσίες"
 msgid "Broadcast Wave options"
 msgstr "Broadcast WAVE/μεταβλητής υποδ/λής"
 
+#: export_format_selector.cc:136
+#, fuzzy
+msgid "Do you really want to remove the format?"
+msgstr ""
+"Στ'αλήθεια θέλετε να απαλοίψετε το κανάλι \"%1\" ?\n"
+"(δεν μπο�εί να ανακληθεί)"
+
 #: export_preset_selector.cc:28
 msgid "Preset"
 msgstr ""
@@ -6661,6 +6684,13 @@ msgid ""
 "Perhaps it references a format that has been removed?"
 msgstr ""
 
+#: export_preset_selector.cc:156
+#, fuzzy
+msgid "Do you really want to remove this preset?"
+msgstr ""
+"Στ'αλήθεια θέλετε να απαλοίψετε το κανάλι \"%1\" ?\n"
+"(δεν μπο�εί να ανακληθεί)"
+
 #: export_timespan_selector.cc:46
 msgid "Show Times as:"
 msgstr ""
@@ -6674,38 +6704,50 @@ msgstr ""
 msgid "Range"
 msgstr "Διάστημα"
 
-#: gain_meter.cc:109 gain_meter.cc:431 gain_meter.cc:820
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+#, fuzzy
+msgid "curl error %1 (%2)"
+msgstr "σφάλμα π�ογ�αμματισμο�: %1"
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+msgid "%1"
+msgstr ""
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr "-inf"
 
-#: gain_meter.cc:115 gain_meter.cc:869
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr "Λειτου�γία αυτοματισμο� Fader"
 
-#: gain_meter.cc:116 gain_meter.cc:870
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr "Τ�πος αυτοματισμο� Fader"
 
-#: gain_meter.cc:125 gain_meter.cc:759 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 #, fuzzy
 msgid "Abs"
 msgstr "abs"
 
-#: gain_meter.cc:334
-#, fuzzy
-msgid "-Inf"
-msgstr "-inf"
-
-#: gain_meter.cc:726 mixer_strip.cc:1954 panner_ui.cc:557
-#: route_time_axis.cc:2391
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
+#: route_time_axis.cc:2411
 msgid "P"
 msgstr ""
 
-#: gain_meter.cc:729 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr ""
 
-#: gain_meter.cc:732 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr ""
 
@@ -6717,7 +6759,7 @@ msgstr ""
 msgid "Switches"
 msgstr ""
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2210
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 msgid "Controls"
 msgstr "Πίνακας Ελέγχου"
 
@@ -6749,72 +6791,72 @@ msgstr ""
 msgid "MIDI Connection Manager"
 msgstr "Συνδέσεις Εισόδου"
 
-#: global_port_matrix.cc:204 io_selector.cc:216
+#: global_port_matrix.cc:213 io_selector.cc:216
 msgid "port"
 msgstr "θ��α"
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 #, fuzzy
 msgid "Selection..."
 msgstr "Αναπα�/γή επιλογής"
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr ""
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 #, fuzzy
 msgid "Soloed..."
 msgstr "Σόλο"
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 #, fuzzy
 msgid "Create New Group ..."
 msgstr "Χω�ίς group"
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr ""
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 #, fuzzy
 msgid "Edit Group..."
 msgstr "Χω�ίς group"
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 #, fuzzy
 msgid "Collect Group"
 msgstr "Επιλογή"
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 #, fuzzy
 msgid "Remove Group"
 msgstr "Διαμό�φωση Group"
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 #, fuzzy
 msgid "Remove Subgroup Bus"
 msgstr "Π�όσθεση group"
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 #, fuzzy
 msgid "Add New Subgroup Bus"
 msgstr "Π�όσθεση group"
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr ""
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 #, fuzzy
 msgid "Add New Aux Bus (post-fader)"
 msgstr "Εκκαθά�ιση μέτ�ου"
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 msgid "Enable All Groups"
 msgstr ""
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 #, fuzzy
 msgid "Disable All Groups"
 msgstr "Απενε�γοποίηση Όλων"
@@ -6919,11 +6961,11 @@ msgstr ""
 msgid "I/O selector"
 msgstr "Αντιστ�οφή επιλογής"
 
-#: io_selector.cc:266
+#: io_selector.cc:265
 msgid "%1 input"
 msgstr "%1 είσοδος"
 
-#: io_selector.cc:268
+#: io_selector.cc:267
 msgid "%1 output"
 msgstr "%1 έξοδος"
 
@@ -7004,7 +7046,7 @@ msgstr[1] ""
 msgid "Reset"
 msgstr ""
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1734
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 #, fuzzy
 msgid "programming error: %1 (%2)"
 msgstr "σφάλμα π�ογ�αμματισμο�: %1"
@@ -7033,71 +7075,71 @@ msgstr ""
 msgid "Pre-Emphasis"
 msgstr ""
 
-#: location_ui.cc:310
+#: location_ui.cc:314
 #, fuzzy
 msgid "Remove this range"
 msgstr "θέση punch διαστήματος"
 
-#: location_ui.cc:311
+#: location_ui.cc:315
 msgid "Start time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:312
+#: location_ui.cc:316
 msgid "End time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:315
+#: location_ui.cc:319
 #, fuzzy
 msgid "Set range start from playhead location"
 msgstr "Ο�ισμός Στίγματος Διαστήματος από playhead"
 
-#: location_ui.cc:316
+#: location_ui.cc:320
 #, fuzzy
 msgid "Set range end from playhead location"
 msgstr "Ο�ισμός διαστήματος από επιλογή"
 
-#: location_ui.cc:320
+#: location_ui.cc:324
 #, fuzzy
 msgid "Remove this marker"
 msgstr "μετακίνηση στίγματος"
 
-#: location_ui.cc:321
+#: location_ui.cc:325
 msgid "Position - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:323
+#: location_ui.cc:327
 #, fuzzy
 msgid "Set marker time from playhead location"
 msgstr "Ο�ισμός διαστήματος από επιλογή"
 
-#: location_ui.cc:462
+#: location_ui.cc:494
 msgid "You cannot put a CD marker at the start of the session"
 msgstr ""
 
-#: location_ui.cc:708
+#: location_ui.cc:720
 #, fuzzy
 msgid "New Marker"
 msgstr "Στίγμα"
 
-#: location_ui.cc:709
+#: location_ui.cc:721
 #, fuzzy
 msgid "New Range"
 msgstr "Π�όσθεση νέου διαστήματος"
 
-#: location_ui.cc:722
+#: location_ui.cc:734
 #, fuzzy
 msgid "<b>Loop/Punch Ranges</b>"
 msgstr "Διαστήματα Loop/Punch"
 
-#: location_ui.cc:747
+#: location_ui.cc:759
 msgid "<b>Markers (Including CD Index)</b>"
 msgstr ""
 
-#: location_ui.cc:782
+#: location_ui.cc:794
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
 msgstr ""
 
-#: location_ui.cc:1024
+#: location_ui.cc:1036
 msgid "add range marker"
 msgstr "π�όσθεση στίγματος διαστήματος"
 
@@ -7174,20 +7216,20 @@ msgid ""
 "session at this time, because we would lose your connection information.\n"
 msgstr ""
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr ""
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr ""
 
-#: main.cc:504
+#: main.cc:500
 #, fuzzy
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr "Πνευματικα Δικαιώματα 1999-2004 Paul Davis"
 
-#: main.cc:505
+#: main.cc:501
 #, fuzzy
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
@@ -7195,31 +7237,36 @@ msgid ""
 msgstr ""
 "Με�ικά μέ�η Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker"
 
-#: main.cc:507
+#: main.cc:503
 #, fuzzy
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr "Ο Ardour έ�χεται με απολ�τως ΚΑΜΙΑ ΕΓΓΥΗΣΗ"
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr ""
 "Το πα�όν είναι ελε�θε�ο λογισμικό, είστε ελε�θε�οι να το επαναδιανείμετε "
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr ""
 "υπό ο�ισμένους ό�ους, ανατ�έξτε στον κώδικα για τους ό�ους\n"
 " αντιγ�αφής."
 
-#: main.cc:519
+#: main.cc:513
+#, fuzzy
+msgid "could not initialize %1."
+msgstr "δεν γινόταν να εκκινηθεί ο  Ardour."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr ""
 
-#: main.cc:525
+#: main.cc:528
 #, fuzzy
 msgid "could not create %1 GUI"
 msgstr "δεν γινόταν να δημιου�γηθεί ARDOUR GUI"
@@ -7229,7 +7276,7 @@ msgstr "δεν γινόταν να δημιου�γηθεί ARDOUR GUI"
 msgid "Display delta to edit cursor"
 msgstr "Από α�χή μέχ�ι  κέ�σο�α επεξε�γασίας"
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 msgid "MarkerText"
 msgstr "ΚείμενοΣτίγματος"
 
@@ -7767,7 +7814,7 @@ msgstr ""
 msgid "Missing Plugins"
 msgstr "Plugins"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr "OK"
 
@@ -7846,238 +7893,251 @@ msgstr ""
 msgid "Could not find mixer.bindings in search path %1"
 msgstr ""
 
-#: mixer_strip.cc:91 mixer_strip.cc:119 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr "π�ο"
 
-#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:352 mixer_strip.cc:1293
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 #, fuzzy
 msgid "Comments"
 msgstr "Σχόλια"
 
-#: mixer_strip.cc:145
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr ""
 
-#: mixer_strip.cc:147
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
 msgstr ""
 
-#: mixer_strip.cc:154
+#: mixer_strip.cc:156
 #, fuzzy
 msgid "Hide this mixer strip"
 msgstr "Απόκ�υψη όλων των Διαδ�όμωνΜίξεως των δια�λων"
 
-#: mixer_strip.cc:165
+#: mixer_strip.cc:167
 #, fuzzy
 msgid "Click to select metering point"
 msgstr "επιλογή ενε�γειών διαστήματος"
 
-#: mixer_strip.cc:171
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr ""
 
-#: mixer_strip.cc:190
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr ""
 
-#: mixer_strip.cc:199
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr ""
 
-#: mixer_strip.cc:201 mixer_strip.cc:1929
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 msgid "lock"
 msgstr "κλείδωμα"
 
-#: mixer_strip.cc:202 mixer_strip.cc:1928
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 #, fuzzy
 msgid "iso"
 msgstr "ins"
 
-#: mixer_strip.cc:256
+#: mixer_strip.cc:258
 #, fuzzy
 msgid "Mix group"
 msgstr "Χω�ίς group"
 
-#: mixer_strip.cc:349 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 #, fuzzy
 msgid "Phase Invert"
 msgstr "Αντιστ�οφή"
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 #, fuzzy
 msgid "Solo Safe"
 msgstr "Σόλο"
 
-#: mixer_strip.cc:353 mixer_ui.cc:124 route_time_axis.cc:664
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 msgid "Group"
 msgstr ""
 
-#: mixer_strip.cc:354 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 #, fuzzy
 msgid "Meter Point"
 msgstr "Μέτ�ηση"
 
-#: mixer_strip.cc:466
+#: mixer_strip.cc:470
 #, fuzzy
 msgid "Enable/Disable MIDI input"
 msgstr "Ά�ση/Πα�ση μετ�ονόμου"
 
-#: mixer_strip.cc:616
+#: mixer_strip.cc:622
 #, fuzzy
 msgid ""
 "Aux\n"
 "Sends"
 msgstr "Δευτε�όλεπτα"
 
-#: mixer_strip.cc:640
+#: mixer_strip.cc:646
 #, fuzzy
 msgid "Snd"
 msgstr "Δευτε�όλεπτα"
 
-#: mixer_strip.cc:694 mixer_strip.cc:822 processor_box.cc:2152
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr "Μη συνδεδεμένο με τον JACK - I/O αλλαγές αδ�νατες"
 
-#: mixer_strip.cc:1089
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr ""
 
-#: mixer_strip.cc:1092
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr ""
 
-#: mixer_strip.cc:1167
+#: mixer_strip.cc:1174
 #, fuzzy
 msgid "Disconnected"
 msgstr "Αποσυνδέθηκε"
 
-#: mixer_strip.cc:1296
+#: mixer_strip.cc:1303
 msgid "*Comments*"
 msgstr "*Σχόλια*"
 
-#: mixer_strip.cc:1303
+#: mixer_strip.cc:1310
 #, fuzzy
 msgid "Cmt"
 msgstr "Κοπή"
 
-#: mixer_strip.cc:1306
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr ""
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr "Κλίκ για Π�όσθεση/Επεξε�γασία Σχολίων"
 
-#: mixer_strip.cc:1351
+#: mixer_strip.cc:1358
 msgid ": comment editor"
 msgstr ": επεξε�γαστής σχολίων"
 
-#: mixer_strip.cc:1428
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr ""
 
-#: mixer_strip.cc:1431
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr "~G"
 
-#: mixer_strip.cc:1460
+#: mixer_strip.cc:1467
 #, fuzzy
 msgid "Comments..."
 msgstr "Σχόλια"
 
-#: mixer_strip.cc:1462
+#: mixer_strip.cc:1469
 #, fuzzy
 msgid "Save As Template..."
 msgstr "Αποθήκευση π�οσχεδίου..."
 
-#: mixer_strip.cc:1468 route_group_dialog.cc:39 route_time_axis.cc:687
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr "Ενε�γό"
 
-#: mixer_strip.cc:1475
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr ""
 
-#: mixer_strip.cc:1478
+#: mixer_strip.cc:1485
 msgid "Protect Against Denormals"
 msgstr ""
 
-#: mixer_strip.cc:1484 route_time_axis.cc:426
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 #, fuzzy
 msgid "Remote Control ID..."
 msgstr "απαλοιφή σημείου ελέγχου"
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 msgid "in"
 msgstr "in"
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 msgid "post"
 msgstr ""
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 msgid "out"
 msgstr "out"
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr ""
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 #, fuzzy
 msgid "pr"
 msgstr "π�ο"
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 #, fuzzy
 msgid "po"
 msgstr "πολ"
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 #, fuzzy
 msgid "o"
 msgstr "έγινε"
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr ""
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr ""
 
-#: mixer_strip.cc:1920 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr ""
 
-#: mixer_strip.cc:1923 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr ""
 
-#: mixer_strip.cc:1936
+#: mixer_strip.cc:1933
 #, fuzzy
 msgid "D"
 msgstr "CD"
 
-#: mixer_strip.cc:1959
+#: mixer_strip.cc:1953
 #, fuzzy
 msgid "i"
 msgstr "in"
 
-#: mixer_strip.cc:2133
+#: mixer_strip.cc:2128
 #, fuzzy
 msgid "Pre-fader"
 msgstr "Π�ο Fader"
 
-#: mixer_strip.cc:2134
+#: mixer_strip.cc:2129
 #, fuzzy
 msgid "Post-fader"
 msgstr "Μετά Fader"
 
+#: mixer_strip.cc:2166 meter_strip.cc:728
+msgid "Change all in Group to %1"
+msgstr ""
+
+#: mixer_strip.cc:2168 meter_strip.cc:730
+#, fuzzy
+msgid "Change all to %1"
+msgstr "Κανάλια"
+
+#: mixer_strip.cc:2170 meter_strip.cc:732
+msgid "Change same track-type to %1"
+msgstr ""
+
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr "Λίστα αναδείξεως καναλιών για μετονομασμένο διάδ�ομο δεν ευ�έθη!"
@@ -8086,10 +8146,67 @@ msgstr "Λίστα αναδείξεως καναλιών για μετονομα
 msgid "-all-"
 msgstr "-όλα-"
 
-#: mixer_ui.cc:1792
+#: mixer_ui.cc:1794
 msgid "Strips"
 msgstr "Διάδ�ομοι"
 
+#: meter_strip.cc:764
+#, fuzzy
+msgid "Variable height"
+msgstr "Το �ψος"
+
+#: meter_strip.cc:765
+msgid "Short"
+msgstr ""
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr ""
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr ""
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+msgid "VU"
+msgstr ""
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr ""
@@ -8466,7 +8583,7 @@ msgstr ""
 msgid "Panner (2D)"
 msgstr ""
 
-#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:452
+#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:451
 msgid "Bypass"
 msgstr ""
 
@@ -8660,7 +8777,7 @@ msgstr ""
 msgid "Eh? LADSPA plugins don't have editors!"
 msgstr ""
 
-#: plugin_ui.cc:125 plugin_ui.cc:228
+#: plugin_ui.cc:125 plugin_ui.cc:227
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
@@ -8676,7 +8793,7 @@ msgstr ""
 "άγνωστος τ�πος π�ομηθευμένου plugin για τον editor(σημείωση: δεν υπά�χει "
 "υποστή�ιξη VST στην πα�ο�σα έκδοση του ardour)"
 
-#: plugin_ui.cc:258
+#: plugin_ui.cc:257
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no linuxVST support in this "
@@ -8685,77 +8802,89 @@ msgstr ""
 "άγνωστος τ�πος π�ομηθευμένου plugin για τον editor(σημείωση: δεν υπά�χει "
 "υποστή�ιξη VST στην πα�ο�σα έκδοση του ardour)"
 
-#: plugin_ui.cc:330
+#: plugin_ui.cc:329
 msgid "create_lv2_editor called on non-LV2 plugin"
 msgstr ""
 
-#: plugin_ui.cc:418
+#: plugin_ui.cc:417
 msgid "Add"
 msgstr "Π�όσθεση"
 
-#: plugin_ui.cc:422
+#: plugin_ui.cc:421
 #, fuzzy
 msgid "Description"
 msgstr "ανάλυση"
 
-#: plugin_ui.cc:423
+#: plugin_ui.cc:422
 #, fuzzy
 msgid "Plugin analysis"
 msgstr "Plugins"
 
-#: plugin_ui.cc:430
+#: plugin_ui.cc:429
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
 msgstr ""
 
-#: plugin_ui.cc:431
+#: plugin_ui.cc:430
 #, fuzzy
 msgid "Save a new preset"
 msgstr "Όνομα για νέας π�ο���θμισης:"
 
-#: plugin_ui.cc:432
+#: plugin_ui.cc:431
 msgid "Save the current preset"
 msgstr ""
 
-#: plugin_ui.cc:433
+#: plugin_ui.cc:432
 msgid "Delete the current preset"
 msgstr ""
 
-#: plugin_ui.cc:434
+#: plugin_ui.cc:433
 msgid "Disable signal processing by the plugin"
 msgstr ""
 
-#: plugin_ui.cc:467 plugin_ui.cc:632
+#: plugin_ui.cc:466 plugin_ui.cc:662
 msgid ""
 "Click to allow the plugin to receive keyboard events that %1 would normally "
 "use as a shortcut"
 msgstr ""
 
-#: plugin_ui.cc:468
+#: plugin_ui.cc:467
 msgid "Click to enable/disable this plugin"
 msgstr ""
 
-#: plugin_ui.cc:507
+#: plugin_ui.cc:506
 msgid "latency (%1 sample)"
 msgid_plural "latency (%1 samples)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugin_ui.cc:509
+#: plugin_ui.cc:508
 msgid "latency (%1 ms)"
 msgstr ""
 
-#: plugin_ui.cc:520
+#: plugin_ui.cc:519
 #, fuzzy
 msgid "Edit Latency"
 msgstr "Επεξ/σία Χ�όνου"
 
-#: plugin_ui.cc:559
+#: plugin_ui.cc:558
 msgid "Plugin preset %1 not found"
 msgstr "Π�ο-��θμιση plugin %1 δεν ευ�έθη"
 
-#: plugin_ui.cc:639
+#: plugin_ui.cc:595
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin_ui.cc:615 plugin_ui.cc:630
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"newer version"
+msgstr ""
+
+#: plugin_ui.cc:669
 msgid "Click to allow normal use of %1 keyboard shortcuts"
 msgstr ""
 
@@ -8873,79 +9002,80 @@ msgstr ""
 msgid "Port Insert "
 msgstr "�έο Π�οσθήκη"
 
-#: port_matrix.cc:323 port_matrix.cc:342
+#: port_matrix.cc:331 port_matrix.cc:357
 #, fuzzy
 msgid "<b>Sources</b>"
 msgstr "Π�οχω�ημένα..."
 
-#: port_matrix.cc:324 port_matrix.cc:343
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr ""
 
-#: port_matrix.cc:419 port_matrix.cc:427
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr ""
 
-#: port_matrix.cc:435
+#: port_matrix.cc:456
 #, fuzzy, c-format
 msgid "Rename '%s'..."
 msgstr "Μετονομασία"
 
-#: port_matrix.cc:451
+#: port_matrix.cc:472
 #, fuzzy
 msgid "Remove all"
 msgstr "Απαλοιφή Στίγματος"
 
-#: port_matrix.cc:471 port_matrix.cc:483
+#: port_matrix.cc:492 port_matrix.cc:504
 #, fuzzy, c-format
 msgid "%s all"
 msgstr "Επιλογή όλων"
 
-#: port_matrix.cc:506
+#: port_matrix.cc:527
 #, fuzzy
 msgid "Rescan"
 msgstr "Επανα-ανίχνευση"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr ""
 
-#: port_matrix.cc:514
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr ""
 
-#: port_matrix.cc:702
+#: port_matrix.cc:723
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
 "or buss cannot support the new configuration."
 msgstr ""
 
-#: port_matrix.cc:705
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr ""
 
-#: port_matrix.cc:727
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr ""
 
-#: port_matrix.cc:728
+#: port_matrix.cc:749
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
 
-#: port_matrix.cc:945
+#: port_matrix.cc:966
 #, fuzzy, c-format
 msgid "Remove '%s'"
 msgstr "Απαλοιφή"
 
-#: port_matrix.cc:960
+#: port_matrix.cc:981
 #, fuzzy, c-format
 msgid "%s all from '%s'"
 msgstr "Επιλογή όλων από loop"
 
-#: port_matrix.cc:1026
+#: port_matrix.cc:1047
 #, fuzzy
 msgid "channel"
 msgstr "κανάλια"
@@ -8960,66 +9090,66 @@ msgstr "Δεν υπάÏ�χουν άλλες διαθέσιμες θÏ�Ï�ες τοÏ
 msgid "There are no %1 ports to connect."
 msgstr "Δεν υπά�χουν άλλες διαθέσιμες θ��ες του JACK."
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
 "Alt+double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 #, fuzzy
 msgid "Show All Controls"
 msgstr "Ανάδειξη �υθμίσεων send"
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 #, fuzzy
 msgid "Hide All Controls"
 msgstr "Απόκ�υψη όλων των crossfades"
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 #, fuzzy
 msgid "on"
 msgstr "έγινε"
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr "εκτός"
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
 msgstr ""
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 msgid "Plugin Incompatibility"
 msgstr ""
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr ""
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
 msgstr ""
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 #, fuzzy
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
 msgstr[0] "%1 είσοδος"
 msgstr[1] "%1 είσοδος"
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 #, fuzzy
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
@@ -9030,38 +9160,38 @@ msgstr[1] ""
 "αυτόματο\n"
 "input"
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
 msgstr ""
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 #, fuzzy
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
 msgstr[0] "κανάλια"
 msgstr[1] "κανάλια"
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 #, fuzzy
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
 msgstr[0] "κανάλια"
 msgstr[1] "κανάλια"
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
 msgstr ""
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 #, fuzzy
 msgid "Cannot set up new send: %1"
 msgstr "δεν γίνεται να διαμο�φώθεί η διαχεί�ηση σημάτων για %1"
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 #, fuzzy
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
@@ -9072,20 +9202,20 @@ msgstr ""
 "με αυτό τον τ�οπο γιατί οι εισόδοι\n"
 "κ' εξόδοι δεν λειτου�γο�ν καλά."
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 #, fuzzy
 msgid "Rename Processor"
 msgstr "Μετονομασία Καναλιο�"
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr ""
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr ""
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 #, fuzzy
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
@@ -9096,7 +9226,7 @@ msgstr ""
 "πιθανόν γιατί το I/O configuration των plugins\n"
 "δεν ταί�ιαζε το configuration αυτο� του καναλιο�."
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 #, fuzzy
 msgid ""
 "Do you really want to remove all processors from %1?\n"
@@ -9105,16 +9235,16 @@ msgstr ""
 "Στ'αλήθεια θέλετε να απαλοίψετε όλα τα redirects από το δίαυλο?\n"
 "(δεν μπο�εί να ανακληθεί)"
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 msgid "Yes, remove them all"
 msgstr "�αι, απάλοιψέ τα όλα"
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 #, fuzzy
 msgid "Remove processors"
 msgstr "Απαλοιφή Στίγματος"
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 #, fuzzy
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
@@ -9123,7 +9253,7 @@ msgstr ""
 "Στ'αλήθεια θέλετε να απαλοίψετε όλα τα redirects από το δίαυλο?\n"
 "(δεν μπο�εί να ανακληθεί)"
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 #, fuzzy
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
@@ -9132,59 +9262,59 @@ msgstr ""
 "Στ'αλήθεια θέλετε να απαλοίψετε όλα τα redirects από το δίαυλο?\n"
 "(δεν μπο�εί να ανακληθεί)"
 
-#: processor_box.cc:2198
+#: processor_box.cc:2200
 #, fuzzy
 msgid "New Plugin"
 msgstr "�έο Plugin ..."
 
-#: processor_box.cc:2201
+#: processor_box.cc:2203
 msgid "New Insert"
 msgstr "�έο Π�οσθήκη"
 
-#: processor_box.cc:2204
+#: processor_box.cc:2206
 #, fuzzy
 msgid "New External Send ..."
 msgstr "�έο Send ..."
 
-#: processor_box.cc:2208
+#: processor_box.cc:2210
 #, fuzzy
 msgid "New Aux Send ..."
 msgstr "�έο Send ..."
 
-#: processor_box.cc:2212
+#: processor_box.cc:2214
 #, fuzzy
 msgid "Clear (all)"
 msgstr "Εκκαθά�ιση όλων των διαστημάτων"
 
-#: processor_box.cc:2214
+#: processor_box.cc:2216
 #, fuzzy
 msgid "Clear (pre-fader)"
 msgstr "Εκκαθά�ιση μέτ�ου"
 
-#: processor_box.cc:2216
+#: processor_box.cc:2218
 #, fuzzy
 msgid "Clear (post-fader)"
 msgstr "Εκκαθά�ιση μέτ�ου"
 
-#: processor_box.cc:2242
+#: processor_box.cc:2244
 msgid "Activate All"
 msgstr "Ενε�γοποίηση όλων"
 
-#: processor_box.cc:2244
+#: processor_box.cc:2246
 #, fuzzy
 msgid "Deactivate All"
 msgstr "Απενε�γοποίηση όλων"
 
-#: processor_box.cc:2246
+#: processor_box.cc:2248
 #, fuzzy
 msgid "A/B Plugins"
 msgstr "Plugins"
 
-#: processor_box.cc:2255
+#: processor_box.cc:2257
 msgid "Edit with generic controls..."
 msgstr ""
 
-#: processor_box.cc:2531
+#: processor_box.cc:2557
 #, fuzzy
 msgid "%1: %2 (by %3)"
 msgstr "ardour: %1: %2 (by %3)"
@@ -9356,7 +9486,7 @@ msgstr ""
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
 
 #: rc_option_editor.cc:836
@@ -9451,7 +9581,7 @@ msgstr ""
 msgid "Click gain level"
 msgstr "Α�χείο ήχου Μετ�ονόμου"
 
-#: rc_option_editor.cc:1083 route_time_axis.cc:206 route_time_axis.cc:667
+#: rc_option_editor.cc:1083 route_time_axis.cc:215 route_time_axis.cc:676
 msgid "Automation"
 msgstr "Αυτοματισμός"
 
@@ -9638,98 +9768,102 @@ msgstr ""
 msgid "Show meters on tracks in the editor"
 msgstr ""
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr ""
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr ""
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 msgid "whenever they overlap in time"
 msgstr ""
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr ""
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr ""
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 #, fuzzy
 msgid "Show waveforms in regions"
 msgstr "Ανάδειξη αυτομάτων πε�ιοχών"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 #, fuzzy
 msgid "Show gain envelopes in audio regions"
 msgstr "Ανάδειξη αυτομάτων πε�ιοχών"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr ""
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr ""
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 #, fuzzy
 msgid "Waveform scale"
 msgstr "Κυματομο�φή"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "γ�αμμική"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr ""
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 #, fuzzy
 msgid "Waveform shape"
 msgstr "Κυματομο�φή"
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 #, fuzzy
 msgid "traditional"
 msgstr "Πα�αδοσιακή"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 #, fuzzy
 msgid "rectified"
 msgstr "Ανο�θωμένή"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr ""
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr ""
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr ""
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr ""
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 msgid "Synchronise editor and mixer track order"
 msgstr ""
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 msgid "Synchronise editor and mixer selection"
 msgstr ""
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 #, fuzzy
 msgid "Name new markers"
 msgstr "μετονομασία στίγματος"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9737,366 +9871,445 @@ msgid ""
 "You can always rename markers by right-clicking on them"
 msgstr ""
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr ""
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr ""
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 #, fuzzy
 msgid "Record monitoring handled by"
 msgstr "Πα�ση εγγ�αφής στα xrun"
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 #, fuzzy
 msgid "ardour"
 msgstr "ardour: "
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 #, fuzzy
 msgid "audio hardware"
 msgstr "Ηχητικά frames"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 #, fuzzy
 msgid "Tape machine mode"
 msgstr "Λειτου�γία αυτοματισμο� Fader"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr ""
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr ""
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 #, fuzzy
 msgid "Connect track inputs"
 msgstr "Σ�νδεση νέων inputs καναλιο� στο hardware"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 #, fuzzy
 msgid "automatically to physical inputs"
 msgstr "αυτόματη σ�νδεση Inputs"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr ""
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 #, fuzzy
 msgid "Connect track and bus outputs"
 msgstr "Σ�νδεση νέων outputs καναλιου στο master"
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 #, fuzzy
 msgid "automatically to physical outputs"
 msgstr "Αυτόματη σ�νδεση Οutputs"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 #, fuzzy
 msgid "automatically to master bus"
 msgstr "αυτόματη σ�νδεση outputs καναλιών σε master outs"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 #, fuzzy
 msgid "Denormals"
 msgstr "Κανονικό"
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 msgid "Use DC bias to protect against denormals"
 msgstr ""
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr ""
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr ""
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 msgid "use FlushToZero"
 msgstr ""
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr ""
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr ""
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 #, fuzzy
 msgid "Silence plugins when the transport is stopped"
 msgstr "Λήξη των plugins με την πα�ση"
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr ""
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr ""
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 #, fuzzy
 msgid "Replicate missing region channels"
 msgstr "Δημιου�γία μίας πε�ιοχής για κάθε κανάλι"
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 #, fuzzy
 msgid "Solo / mute"
 msgstr "Solo μέσω δια�λου"
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 msgid "Solo-in-place mute cut (dB)"
 msgstr ""
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr ""
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 #, fuzzy
 msgid "Listen Position"
 msgstr "Θέση"
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 msgid "after-fader (AFL)"
 msgstr ""
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 #, fuzzy
 msgid "pre-fader (PFL)"
 msgstr "Εκκαθά�ιση μέτ�ου"
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr ""
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 #, fuzzy
 msgid "before pre-fader processors"
 msgstr "Απαλοιφή Στίγματος"
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr ""
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr ""
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 #, fuzzy
 msgid "immediately post-fader"
 msgstr "Εκκαθά�ιση μέτ�ου"
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 #, fuzzy
 msgid "after post-fader processors (before pan)"
 msgstr "Απαλοιφή Στίγματος"
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr ""
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 #, fuzzy
 msgid "Show solo muting"
 msgstr "Ανάδειξη όλων των αυτοματισμών"
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr ""
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 #, fuzzy
 msgid "Default track / bus muting options"
 msgstr "κανάλια/δίαυλοι"
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr ""
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr ""
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 #, fuzzy
 msgid "Mute affects control outputs"
 msgstr "χ�ήση των control outs"
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr ""
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 #, fuzzy
 msgid "Send MIDI Time Code"
 msgstr "Αποστολή MIDI feedback"
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr ""
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr ""
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 #, fuzzy
 msgid "Send MIDI control feedback"
 msgstr "Αποστολή MIDI feedback"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr ""
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr ""
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr ""
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr ""
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr ""
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 #, fuzzy
 msgid "Sound MIDI notes as they are selected"
 msgstr "Π�οσθήκη επιλεγμένου(ων)"
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 #, fuzzy
 msgid "User interaction"
 msgstr "Ενέ�γειες Πε�ιοχών"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
 "   <i>(if available for your language preferences)</i>"
 msgstr ""
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr ""
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 #, fuzzy
 msgid "Control surface remote ID"
 msgstr "Επιφάνειες ελέγχου"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 msgid "assigned by user"
 msgstr ""
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr ""
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr ""
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1925
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 msgid "Preferences|GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr ""
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr ""
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr ""
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 #, fuzzy
 msgid "Mixer Strip"
 msgstr "Ανάδειξη Μίκτη"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 #, fuzzy
 msgid "Use narrow strips in the mixer by default"
 msgstr "Στενοί διάδ�ομοι μείκτη"
 
-#: rc_option_editor.cc:1898
+#: rc_option_editor.cc:1906
 #, fuzzy
-msgid "Meter hold time"
+msgid "Peak hold time"
 msgstr "Πα�ση Μετ�ητή"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 msgid "short"
 msgstr ""
 
-#: rc_option_editor.cc:1905 rc_option_editor.cc:1920
+#: rc_option_editor.cc:1913
 msgid "medium"
 msgstr ""
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr ""
 
-#: rc_option_editor.cc:1912
-msgid "Meter fall-off"
+#: rc_option_editor.cc:1920
+msgid "DPM fall-off"
 msgstr ""
 
-#: rc_option_editor.cc:1918
-#, fuzzy
-msgid "slowest"
-msgstr "Α�γότατο"
+#: rc_option_editor.cc:1926
+msgid "slowest [6.6dB/sec]"
+msgstr ""
 
-#: rc_option_editor.cc:1919
-msgid "slow"
+#: rc_option_editor.cc:1927
+msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
 msgstr ""
 
-#: rc_option_editor.cc:1921
-#, fuzzy
-msgid "fast"
-msgstr "ταχ�τατη"
+#: rc_option_editor.cc:1928
+msgid "slowish [12.0dB/sec] (DIN)"
+msgstr ""
 
-#: rc_option_editor.cc:1922
-#, fuzzy
-msgid "faster"
-msgstr "Ταχ�τε�α"
+#: rc_option_editor.cc:1929
+msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
+msgstr ""
+
+#: rc_option_editor.cc:1930
+msgid "medium [20dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1931
+msgid "fast [32dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1932
+msgid "faster [46dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1933
+msgid "fastest [70dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1939
+msgid "Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
+
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+msgid "-20dBFS (SMPTE RP.0155)"
+msgstr ""
+
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+msgid "-18dBFS (EBU, BBC)"
+msgstr ""
+
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
+
+#: rc_option_editor.cc:1955
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
+msgstr ""
+
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
+msgstr ""
+
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
+msgstr ""
+
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
 
-#: rc_option_editor.cc:1923
-msgid "fastest"
-msgstr "ταχ�τατη"
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
+
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1985
+msgid "Peak threshold [dBFS]"
+msgstr ""
+
+#: rc_option_editor.cc:1993
+msgid ""
+"Specify the audio signal level in dbFS at and above which the meter-peak "
+"indicator will flash red."
+msgstr ""
+
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
+msgstr ""
 
 #: region_editor.cc:79
 msgid "audition this region"
@@ -10107,11 +10320,11 @@ msgstr "ακ�όαση της πε�ιοχής"
 msgid "Position:"
 msgstr "Θέση"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr "Τέλος:"
 
-#: region_editor.cc:92 sfdb_ui.cc:140
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr ""
 
@@ -10135,27 +10348,27 @@ msgstr ""
 msgid "Source:"
 msgstr ""
 
-#: region_editor.cc:167
+#: region_editor.cc:166
 #, fuzzy
 msgid "Region '%1'"
 msgstr "Πε�ιοχές"
 
-#: region_editor.cc:274
+#: region_editor.cc:273
 #, fuzzy
 msgid "change region start position"
 msgstr "ο�ισμός θέσης sync πε�ιοχής"
 
-#: region_editor.cc:290
+#: region_editor.cc:289
 #, fuzzy
 msgid "change region end position"
 msgstr "ο�ισμός θέσης sync πε�ιοχής"
 
-#: region_editor.cc:310
+#: region_editor.cc:309
 #, fuzzy
 msgid "change region length"
 msgstr "αλλαγή μήκους fade in"
 
-#: region_editor.cc:404 region_editor.cc:416
+#: region_editor.cc:403 region_editor.cc:415
 #, fuzzy
 msgid "change region sync point"
 msgstr "ο�ισμός θέσης sync πε�ιοχής"
@@ -10366,362 +10579,362 @@ msgid ""
 "A route group of this name already exists.  Please use a different name."
 msgstr ""
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 msgid "Tracks/Busses"
 msgstr "Κανάλια/Δίαυλοι"
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr "Είσοδοι"
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr "Έξοδοι"
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr ""
 
-#: route_params_ui.cc:211
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr "Η λίστα ανάδειξης διαδ�ομών για μετονομασμένη διαδ�ομή δεν ευ�έθη!"
 
-#: route_params_ui.cc:258 route_params_ui.cc:286
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr ""
 
-#: route_params_ui.cc:478
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr "Κανένα κανάλι"
 
-#: route_params_ui.cc:611 route_params_ui.cc:612
+#: route_params_ui.cc:613 route_params_ui.cc:614
 #, fuzzy
 msgid "No Track or Bus Selected"
 msgstr "Δεν επελέχθη διαδ�ομή"
 
-#: route_time_axis.cc:96
+#: route_time_axis.cc:97
 msgid "g"
 msgstr "g"
 
-#: route_time_axis.cc:97
+#: route_time_axis.cc:98
 msgid "p"
 msgstr "p"
 
-#: route_time_axis.cc:98
+#: route_time_axis.cc:99
 msgid "a"
 msgstr "a"
 
-#: route_time_axis.cc:168
+#: route_time_axis.cc:173
 msgid "Record (Right-click for Step Edit)"
 msgstr ""
 
-#: route_time_axis.cc:171
+#: route_time_axis.cc:176
 msgid "Record"
 msgstr "Εγγ�αφή"
 
-#: route_time_axis.cc:201
+#: route_time_axis.cc:210
 #, fuzzy
 msgid "Route Group"
 msgstr "Διαμό�φωση Group"
 
-#: route_time_axis.cc:204
+#: route_time_axis.cc:213
 #, fuzzy
 msgid "MIDI Controllers and Automation"
 msgstr "MMC Θ��α"
 
-#: route_time_axis.cc:381
+#: route_time_axis.cc:390
 #, fuzzy
 msgid "Show All Automation"
 msgstr "Ανάδειξη όλων των αυτοματισμών"
 
-#: route_time_axis.cc:384
+#: route_time_axis.cc:393
 #, fuzzy
 msgid "Show Existing Automation"
 msgstr "Ανάδειξη υπα�χόντων αυτοματισμών"
 
-#: route_time_axis.cc:387
+#: route_time_axis.cc:396
 #, fuzzy
 msgid "Hide All Automation"
 msgstr "Κ��ψιμο όλων των αυτοματισμών"
 
-#: route_time_axis.cc:396
+#: route_time_axis.cc:405
 #, fuzzy
 msgid "Processor automation"
 msgstr "εκκαθά�ιση αυτοματισμο�"
 
-#: route_time_axis.cc:415
+#: route_time_axis.cc:424
 #, fuzzy
 msgid "Color..."
 msgstr "Χ�ώμα"
 
-#: route_time_axis.cc:472
+#: route_time_axis.cc:481
 msgid "Overlaid"
 msgstr ""
 
-#: route_time_axis.cc:478
+#: route_time_axis.cc:487
 msgid "Stacked"
 msgstr ""
 
-#: route_time_axis.cc:486
+#: route_time_axis.cc:495
 #, fuzzy
 msgid "Layers"
 msgstr "Στ�ώμα"
 
-#: route_time_axis.cc:555
+#: route_time_axis.cc:564
 #, fuzzy
 msgid "Automatic (based on I/O connections)"
 msgstr "Αυτόματη σ�νδεση Οutputs"
 
-#: route_time_axis.cc:564
+#: route_time_axis.cc:573
 #, fuzzy
 msgid "(Currently: Existing Material)"
 msgstr "Ευθυγ�άμμιση με το υπά�χον υλικό"
 
-#: route_time_axis.cc:567
+#: route_time_axis.cc:576
 #, fuzzy
 msgid "(Currently: Capture Time)"
 msgstr "Ευθυγ�άμμιση με το χ�όνο λήψεως"
 
-#: route_time_axis.cc:575
+#: route_time_axis.cc:584
 #, fuzzy
 msgid "Align With Existing Material"
 msgstr "Ευθυγ�άμμιση με το υπά�χον υλικό"
 
-#: route_time_axis.cc:580
+#: route_time_axis.cc:589
 #, fuzzy
 msgid "Align With Capture Time"
 msgstr "Ευθυγ�άμμιση με το χ�όνο λήψεως"
 
-#: route_time_axis.cc:585
+#: route_time_axis.cc:594
 #, fuzzy
 msgid "Alignment"
 msgstr "Ευθυγ�άμμιση"
 
-#: route_time_axis.cc:620
+#: route_time_axis.cc:629
 #, fuzzy
 msgid "Normal Mode"
 msgstr "Κανονικό"
 
-#: route_time_axis.cc:626
+#: route_time_axis.cc:635
 #, fuzzy
 msgid "Tape Mode"
 msgstr "Λειτου�γία Έλξεως"
 
-#: route_time_axis.cc:632
+#: route_time_axis.cc:641
 #, fuzzy
 msgid "Non-Layered Mode"
 msgstr "Τέλη Πε�ιοχών"
 
-#: route_time_axis.cc:645 route_time_axis.cc:1587
+#: route_time_axis.cc:654 route_time_axis.cc:1601
 msgid "Playlist"
 msgstr "Playlist"
 
-#: route_time_axis.cc:965
+#: route_time_axis.cc:979
 #, fuzzy
 msgid "Rename Playlist"
 msgstr "Όνομα για playlist"
 
-#: route_time_axis.cc:966
+#: route_time_axis.cc:980
 #, fuzzy
 msgid "New name for playlist:"
 msgstr "Όνομα για playlist"
 
-#: route_time_axis.cc:1051
+#: route_time_axis.cc:1065
 #, fuzzy
 msgid "New Copy Playlist"
 msgstr "Όνομα για playlist"
 
-#: route_time_axis.cc:1052 route_time_axis.cc:1105
+#: route_time_axis.cc:1066 route_time_axis.cc:1119
 #, fuzzy
 msgid "Name for new playlist:"
 msgstr "Όνομα για playlist"
 
-#: route_time_axis.cc:1104
+#: route_time_axis.cc:1118
 #, fuzzy
 msgid "New Playlist"
 msgstr "Playlist"
 
-#: route_time_axis.cc:1295
+#: route_time_axis.cc:1309
 #, fuzzy
 msgid "You cannot create a track with that name as it is reserved for %1"
 msgstr "Δεν γίνεται να π�οστεθεί κανάλι χω�ίς ήδη φο�τωμένη συνεδ�ία."
 
-#: route_time_axis.cc:1476
+#: route_time_axis.cc:1490
 #, fuzzy
 msgid "New Copy..."
 msgstr "�έο αντίγ�αφο"
 
-#: route_time_axis.cc:1480
+#: route_time_axis.cc:1494
 #, fuzzy
 msgid "New Take"
 msgstr "�έος Χ�όνος"
 
-#: route_time_axis.cc:1481
+#: route_time_axis.cc:1495
 #, fuzzy
 msgid "Copy Take"
 msgstr "Αντιγ�αφή"
 
-#: route_time_axis.cc:1486
+#: route_time_axis.cc:1500
 msgid "Clear Current"
 msgstr "Εκκαθά�ιση τ�έχοντος"
 
-#: route_time_axis.cc:1489
+#: route_time_axis.cc:1503
 #, fuzzy
 msgid "Select From All..."
 msgstr "Επιλογή όλων ..."
 
-#: route_time_axis.cc:1577
+#: route_time_axis.cc:1591
 msgid "Take: %1.%2"
 msgstr ""
 
-#: route_time_axis.cc:2267
+#: route_time_axis.cc:2291
 msgid "Underlays"
 msgstr ""
 
-#: route_time_axis.cc:2270
+#: route_time_axis.cc:2294
 #, fuzzy
 msgid "Remove \"%1\""
 msgstr "Απαλοιφή"
 
-#: route_time_axis.cc:2320 route_time_axis.cc:2357
+#: route_time_axis.cc:2344 route_time_axis.cc:2381
 #, fuzzy
 msgid "programming error: underlay reference pointer pairs are inconsistent!"
 msgstr ""
 "Σφάλμα π�ογ�αμματισμο�: κανένας  \"rect\" δείκτης δεν σχετίζεται με το "
 "επιλεγμένο αντικείμενο"
 
-#: route_time_axis.cc:2388
+#: route_time_axis.cc:2408
 msgid "After-fade listen (AFL)"
 msgstr ""
 
-#: route_time_axis.cc:2392
+#: route_time_axis.cc:2412
 #, fuzzy
 msgid "Pre-fade listen (PFL)"
 msgstr "Εκκαθά�ιση μέτ�ου"
 
-#: route_time_axis.cc:2396
+#: route_time_axis.cc:2416
 msgid "s"
 msgstr "s"
 
-#: route_time_axis.cc:2400
+#: route_time_axis.cc:2419
 msgid "m"
 msgstr "m"
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 #, fuzzy
 msgid "Mute this track"
 msgstr "Απόκ�υψη πα�όντος καναλιο�"
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr ""
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr ""
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr ""
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 #, fuzzy
 msgid "Monitor input"
 msgstr "ισοστάθμιση π�ος τα επιλεγμένα"
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 #, fuzzy
 msgid "Monitor playback"
 msgstr "Διακοπή Αναπα�/γής"
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 #, fuzzy
 msgid "Not connected to JACK - cannot engage record"
 msgstr "Μη συνδεδεμένο με τον JACK - I/O αλλαγές αδ�νατες"
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 #, fuzzy
 msgid "Step Entry"
 msgstr "Επεξε�γασία"
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr ""
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 #, fuzzy
 msgid "Assign all tracks and buses (prefader)"
 msgstr "θέση επιλεγμένης οπτικής καναλιο�"
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr ""
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 #, fuzzy
 msgid "Assign all tracks and buses (postfader)"
 msgstr "θέση επιλεγμένης οπτικής καναλιο�"
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 #, fuzzy
 msgid "Assign selected tracks (prefader)"
 msgstr "θέση επιλεγμένης οπτικής καναλιο�"
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 #, fuzzy
 msgid "Assign selected tracks and buses (prefader)"
 msgstr "θέση επιλεγμένης οπτικής καναλιο�"
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 #, fuzzy
 msgid "Assign selected tracks (postfader)"
 msgstr "θέση επιλεγμένης οπτικής καναλιο�"
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 #, fuzzy
 msgid "Assign selected tracks and buses (postfader)"
 msgstr "θέση επιλεγμένης οπτικής καναλιο�"
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 #, fuzzy
 msgid "Copy track/bus gains to sends"
 msgstr "ardour: Επιθεω�ητής καναλιών/δια�λων:"
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr ""
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr ""
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 msgid "Solo Isolate"
 msgstr ""
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr "Π�ο Fader"
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr "Μετά Fader"
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr "Control Outs"
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr "Main Outs"
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 #, fuzzy
 msgid "Color Selection"
 msgstr "Αναπα�/γή επιλογής"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 #, fuzzy
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
@@ -10735,7 +10948,7 @@ msgstr ""
 "Πιθανόν να χάσετε και τη λίστα που χ�ησιμοποιείται από το κανάλι.\n"
 "(δεν μπο�εί να ανακληθεί)"
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 #, fuzzy
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
@@ -10745,68 +10958,68 @@ msgstr ""
 "Στ'αλήθεια θέλετε να απαλοίψετε το κανάλι \"%1\" ?\n"
 "(δεν μπο�εί να ανακληθεί)"
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 #, fuzzy
 msgid "Remove track"
 msgstr "Απαλοιφή Στίγματος"
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 #, fuzzy
 msgid "Remove bus"
 msgstr "Απαλοιφή"
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
 msgstr ""
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 #, fuzzy
 msgid "Use the new name"
 msgstr "νέο όνομα: "
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 msgid "Re-edit the name"
 msgstr ""
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 msgid "Rename Track"
 msgstr "Μετονομασία Καναλιο�"
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 #, fuzzy
 msgid "Rename Bus"
 msgstr "Μετονομασία"
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 msgid " latency"
 msgstr ""
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr ""
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 #, fuzzy
 msgid "Save As Template"
 msgstr "Αποθήκευση π�οσχεδίου..."
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 #, fuzzy
 msgid "Template name:"
 msgstr "Όνομα Πεδίου:"
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 msgid "Remote Control ID"
 msgstr ""
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 #, fuzzy
 msgid "Remote control ID:"
 msgstr "απαλοιφή σημείου ελέγχου"
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -10814,17 +11027,17 @@ msgid ""
 "The remote control ID of %3 cannot be changed."
 msgstr ""
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the master bus"
 msgstr "Δημιου�γία Master Bus"
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the monitor bus"
 msgstr "Δημιου�γία Master Bus"
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -10835,25 +11048,25 @@ msgid ""
 "change this%5"
 msgstr ""
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the mixer"
 msgstr ""
 "Μίκτης\n"
 "Επεξε�γαστή"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the editor"
 msgstr "επεξε�γαστής"
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
 msgstr ""
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr ""
 
@@ -10871,7 +11084,7 @@ msgstr "Εκκαθά�ιση όλων των θέσεων"
 msgid "the session folder"
 msgstr "Αντιγ�αφή α�χείου στο φάκελο της συνεδ�ίας"
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 #, fuzzy
 msgid "Send "
 msgstr "Δευτε�όλεπτα"
@@ -11376,62 +11589,118 @@ msgstr ""
 msgid "Glue new regions to bars and beats"
 msgstr ""
 
-#: sfdb_ui.cc:87 sfdb_ui.cc:107 sfdb_ui.cc:116
+#: session_option_editor.cc:275 session_option_editor.cc:277
+#: session_option_editor.cc:284 session_option_editor.cc:291
+#: session_option_editor.cc:298 session_option_editor.cc:300
+#: session_option_editor.cc:307 session_option_editor.cc:314
+#: session_option_editor.cc:321 session_option_editor.cc:323
+#, fuzzy
+msgid "Meterbridge"
+msgstr "Γέφυ�α μετ�ητή"
+
+#: session_option_editor.cc:275
+msgid "Route Display"
+msgstr ""
+
+#: session_option_editor.cc:279
+#, fuzzy
+msgid "Show Midi Tracks"
+msgstr "Ανάδειξη όλων των Audio Καναλιών"
+
+#: session_option_editor.cc:286
+#, fuzzy
+msgid "Show Busses"
+msgstr "Δίαυλοι"
+
+#: session_option_editor.cc:293
+#, fuzzy
+msgid "Include Master Bus"
+msgstr "Δημιου�γία Master Bus"
+
+#: session_option_editor.cc:298
+msgid "Button Area"
+msgstr ""
+
+#: session_option_editor.cc:302
+#, fuzzy
+msgid "Rec-enable Button"
+msgstr "αλλαγή rec-enable"
+
+#: session_option_editor.cc:309
+#, fuzzy
+msgid "Mute Button"
+msgstr "+ κουμπί"
+
+#: session_option_editor.cc:316
+#, fuzzy
+msgid "Solo Button"
+msgstr "Solo μέσω δια�λου"
+
+#: session_option_editor.cc:321
+msgid "Name Labels"
+msgstr ""
+
+#: session_option_editor.cc:325
+#, fuzzy
+msgid "Track Name"
+msgstr "κανάλια/δίαυλοι"
+
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 #, fuzzy
 msgid "as new tracks"
 msgstr "...ώς νέο κανάλι"
 
-#: sfdb_ui.cc:89 sfdb_ui.cc:109
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 #, fuzzy
 msgid "to selected tracks"
 msgstr "θέση επιλεγμένης οπτικής καναλιο�"
 
-#: sfdb_ui.cc:91 sfdb_ui.cc:111
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 #, fuzzy
 msgid "to region list"
 msgstr "Snap στην α�χή πε�ιοχής"
 
-#: sfdb_ui.cc:93 sfdb_ui.cc:113
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 #, fuzzy
 msgid "as new tape tracks"
 msgstr "...ώς νέο κανάλι"
 
-#: sfdb_ui.cc:97
+#: sfdb_ui.cc:96
 #, fuzzy
 msgid "programming error: unknown import mode string %1"
 msgstr "Σφάλμα π�ογ�αμματισμο�: request για μη-υπά�χον ηχητικό διάστημα (%1)!"
 
-#: sfdb_ui.cc:124
+#: sfdb_ui.cc:123
 #, fuzzy
 msgid "Auto-play"
 msgstr ""
 "αυτόματη\n"
 "αναπα�/γή"
 
-#: sfdb_ui.cc:130 sfdb_ui.cc:237
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 #, fuzzy
 msgid "<b>Sound File Information</b>"
 msgstr "Πλη�οφο�ίες για το Soundfile"
 
-#: sfdb_ui.cc:142
+#: sfdb_ui.cc:141
 #, fuzzy
 msgid "Timestamp:"
 msgstr "Με Χ�ονο-στάμπα Πε�ιοχής"
 
-#: sfdb_ui.cc:144
+#: sfdb_ui.cc:143
 #, fuzzy
 msgid "Format:"
 msgstr "Κανονικό"
 
-#: sfdb_ui.cc:183 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr ""
 
-#: sfdb_ui.cc:320
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr ""
 
-#: sfdb_ui.cc:327
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "Δεν γινόταν να διαβαστεί το α�χείο: %1 (%2)."
 
@@ -11462,12 +11731,12 @@ msgstr "Ηχητικά frames"
 msgid "MIDI files"
 msgstr "MIDI δεσμός"
 
-#: sfdb_ui.cc:458 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 #, fuzzy
 msgid "All files"
 msgstr "καθα�ισμένα α�χεία"
 
-#: sfdb_ui.cc:477 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 #, fuzzy
 msgid "Browse Files"
 msgstr "Αναζήτηση"
@@ -11476,247 +11745,235 @@ msgstr "Αναζήτηση"
 msgid "Paths"
 msgstr "Μονοπάτια"
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr ""
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 #, fuzzy
 msgid "Sort:"
 msgstr "Ταξινόμηση"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 #, fuzzy
 msgid "Longest"
 msgstr "Μέγιστο"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 msgid "Shortest"
 msgstr ""
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 #, fuzzy
 msgid "Newest"
 msgstr "Α�γότατο"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr ""
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr ""
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 #, fuzzy
 msgid "Least downloaded"
 msgstr "Ενα�κτή�ιο διάστημα"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr ""
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr ""
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr ""
 
-#: sfdb_ui.cc:572
+#: sfdb_ui.cc:555
+msgid "Similar"
+msgstr ""
+
+#: sfdb_ui.cc:567
 #, fuzzy
 msgid "ID"
 msgstr "MIDI"
 
-#: sfdb_ui.cc:573 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 #, fuzzy
 msgid "Filename"
 msgstr "Μετονομασία"
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:570
 #, fuzzy
 msgid "Duration"
 msgstr "Διά�κεια (δευτ)"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:571
 #, fuzzy
 msgid "Size"
 msgstr "Μέγ.μέγεθος"
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:572
 #, fuzzy
 msgid "Samplerate"
 msgstr "Εντόπιο Format"
 
-#: sfdb_ui.cc:578
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr ""
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr ""
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr ""
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr ""
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr ""
 
-#: sfdb_ui.cc:846
-msgid "found %1 match"
-msgid_plural "found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:862
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr ""
 
-#: sfdb_ui.cc:960
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sfdb_ui.cc:965
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr ""
 
-#: sfdb_ui.cc:1029
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr ""
 
-#: sfdb_ui.cc:1031
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr ""
 
-#: sfdb_ui.cc:1033 sfdb_ui.cc:1035
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr ""
 
-#: sfdb_ui.cc:1037
+#: sfdb_ui.cc:1086
 #, fuzzy
 msgid "GB"
 msgstr "Πήγαινε"
 
-#: sfdb_ui.cc:1070
-msgid "Search returned no results."
-msgstr ""
-
-#: sfdb_ui.cc:1072
-msgid "Found %1 match"
-msgid_plural "Found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:1277 sfdb_ui.cc:1585 sfdb_ui.cc:1635 sfdb_ui.cc:1653
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr ""
 
-#: sfdb_ui.cc:1280 sfdb_ui.cc:1636 sfdb_ui.cc:1654
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 #, fuzzy
 msgid "one track per channel"
 msgstr "panner για το κανάλι %u"
 
-#: sfdb_ui.cc:1288 sfdb_ui.cc:1638 sfdb_ui.cc:1655
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 #, fuzzy
 msgid "sequence files"
 msgstr "καθα�ισμένα α�χεία"
 
-#: sfdb_ui.cc:1291 sfdb_ui.cc:1643
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 msgid "all files in one track"
 msgstr ""
 
-#: sfdb_ui.cc:1292 sfdb_ui.cc:1637
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 #, fuzzy
 msgid "merge files"
 msgstr "καθα�ισμένα α�χεία"
 
-#: sfdb_ui.cc:1298 sfdb_ui.cc:1640
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 #, fuzzy
 msgid "one region per file"
 msgstr "γόμωση πε�ιοχής"
 
-#: sfdb_ui.cc:1301 sfdb_ui.cc:1641
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 #, fuzzy
 msgid "one region per channel"
 msgstr "Δημιου�γία μίας πε�ιοχής για κάθε κανάλι"
 
-#: sfdb_ui.cc:1306 sfdb_ui.cc:1642 sfdb_ui.cc:1656
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 #, fuzzy
 msgid "all files in one region"
 msgstr "ευθυγ�άμμιση πε�ιοχής"
 
-#: sfdb_ui.cc:1373
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
 msgstr ""
 
-#: sfdb_ui.cc:1513
+#: sfdb_ui.cc:1534
 #, fuzzy
 msgid "Copy files to session"
 msgstr "Αντιγ�αφή α�χείου στο φάκελο της συνεδ�ίας"
 
-#: sfdb_ui.cc:1530 sfdb_ui.cc:1693
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 #, fuzzy
 msgid "file timestamp"
 msgstr "Με Χ�ονο-στάμπα Πε�ιοχής"
 
-#: sfdb_ui.cc:1531 sfdb_ui.cc:1695
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 #, fuzzy
 msgid "edit point"
 msgstr "επεξε�γαστής"
 
-#: sfdb_ui.cc:1532 sfdb_ui.cc:1697
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 #, fuzzy
 msgid "playhead"
 msgstr "Θέση playhead"
 
-#: sfdb_ui.cc:1533
+#: sfdb_ui.cc:1554
 #, fuzzy
 msgid "session start"
 msgstr "Α�χές Πε�ιοχών"
 
-#: sfdb_ui.cc:1538
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1581
 #, fuzzy
 msgid "<b>Insert at</b>"
 msgstr "Αντιστ�οφή"
 
-#: sfdb_ui.cc:1573
+#: sfdb_ui.cc:1594
 #, fuzzy
 msgid "<b>Mapping</b>"
 msgstr "Π�οχω�ημένα..."
 
-#: sfdb_ui.cc:1591
+#: sfdb_ui.cc:1612
 #, fuzzy
 msgid "<b>Conversion quality</b>"
 msgstr "Ποιότητα Μετατ�οπής"
 
-#: sfdb_ui.cc:1603 sfdb_ui.cc:1709
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr ""
 
-#: sfdb_ui.cc:1604 sfdb_ui.cc:1711
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr ""
 
-#: sfdb_ui.cc:1605 sfdb_ui.cc:1713
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr ""
 
-#: sfdb_ui.cc:1607
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "Ταχ�τατο"
 
@@ -11810,21 +12067,21 @@ msgstr ""
 
 #: startup.cc:194
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -11932,10 +12189,6 @@ msgstr ""
 msgid "Click to open the program website in your web browser"
 msgstr ""
 
-#: startup.cc:594
-msgid "What would you like to do ?"
-msgstr ""
-
 #: startup.cc:729
 #, fuzzy
 msgid "Open"
@@ -11951,99 +12204,99 @@ msgstr "�έο Όνομα Συνεδ�ίας:"
 msgid "Create session folder in:"
 msgstr "Δημιου�γία Directory Συνεδ�ίας Στο:"
 
-#: startup.cc:813
+#: startup.cc:821
 #, fuzzy
 msgid "Select folder for session"
 msgstr "επιλογή πε�ιοχών"
 
-#: startup.cc:845
+#: startup.cc:853
 #, fuzzy
 msgid "Use this template"
 msgstr "Επιλογή π�οσχεδίου"
 
-#: startup.cc:848
+#: startup.cc:856
 #, fuzzy
 msgid "no template"
 msgstr "-π�οσχέδιο"
 
-#: startup.cc:876
+#: startup.cc:884
 #, fuzzy
 msgid "Use an existing session as a template:"
 msgstr "Χ�ήση Π�οσχεδίου Συνεδ�ιών"
 
-#: startup.cc:888
+#: startup.cc:896
 #, fuzzy
 msgid "Select template"
 msgstr "Επιλογή π�οσχεδίου"
 
-#: startup.cc:914
+#: startup.cc:922
 msgid "New Session"
 msgstr "�έα συνεδ�ία"
 
-#: startup.cc:1068
+#: startup.cc:1077
 #, fuzzy
 msgid "Select session file"
 msgstr "επιλογή α�χείου συνεδ�ίας"
 
-#: startup.cc:1084
+#: startup.cc:1093
 #, fuzzy
 msgid "Browse:"
 msgstr "Αναζήτηση"
 
-#: startup.cc:1093
+#: startup.cc:1102
 #, fuzzy
 msgid "Select a session"
 msgstr "επιλογή α�χείου συνεδ�ίας"
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 msgid "channels"
 msgstr "κανάλια"
 
-#: startup.cc:1135
+#: startup.cc:1145
 #, fuzzy
 msgid "<b>Busses</b>"
 msgstr "Δίαυλοι"
 
-#: startup.cc:1136
+#: startup.cc:1146
 #, fuzzy
 msgid "<b>Inputs</b>"
 msgstr "<b> Inputs καναλιών/διάυλων</b>"
 
-#: startup.cc:1137
+#: startup.cc:1147
 #, fuzzy
 msgid "<b>Outputs</b>"
 msgstr "<b> Outputs καναλιών/διάυλων</b>"
 
-#: startup.cc:1145
+#: startup.cc:1155
 #, fuzzy
 msgid "Create master bus"
 msgstr "Δημιου�γία Master Bus"
 
-#: startup.cc:1155
+#: startup.cc:1165
 #, fuzzy
 msgid "Automatically connect to physical inputs"
 msgstr "αυτόματη σ�νδεση Inputs"
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr ""
 
-#: startup.cc:1215
+#: startup.cc:1225
 #, fuzzy
 msgid "Automatically connect outputs"
 msgstr "Αυτόματη σ�νδεση Οutputs"
 
-#: startup.cc:1237
+#: startup.cc:1247
 #, fuzzy
 msgid "... to master bus"
 msgstr "Σ�νδεση με Master Δίαυλο"
 
-#: startup.cc:1247
+#: startup.cc:1257
 #, fuzzy
 msgid "... to physical outputs"
 msgstr "Συνδεση με Φυσικές Εξόδους"
 
-#: startup.cc:1297
+#: startup.cc:1307
 #, fuzzy
 msgid "Advanced Session Options"
 msgstr "Επιπλέον Ρυθμίσεις"
@@ -12762,21 +13015,21 @@ msgstr ""
 msgid "bad XPM header %1"
 msgstr "εσφαλμένος XPM header %1"
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr "ελλειπές RGBA στ�λ για \"%1\""
 
-#: utils.cc:544
+#: utils.cc:591
 #, fuzzy
 msgid "cannot find XPM file for %1"
 msgstr "δεν ευ�έθησαν εικόνες για το fader rail"
 
-#: utils.cc:570
+#: utils.cc:617
 #, fuzzy
 msgid "cannot find icon image for %1 using %2"
 msgstr "δεν ευ�έθησαν εικόνες για το fader rail"
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr ""
 
@@ -12784,84 +13037,86 @@ msgstr ""
 msgid "VerboseCanvasCursor"
 msgstr ""
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 #, fuzzy
 msgid "Set Video Track"
 msgstr "Π�όσθεση καναλιο�"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 #, fuzzy
 msgid "Launch External Video Monitor"
 msgstr "Software Monitoring"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr ""
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr ""
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 #, fuzzy
 msgid "Video files"
 msgstr "Ηχητικά frames"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 #, fuzzy
 msgid "<b>Video Information</b>"
 msgstr "Πλη�οφο�ίες για το Soundfile"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 #, fuzzy
 msgid "Start:"
 msgstr "Α�χή:"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 #, fuzzy
 msgid "Frame rate:"
 msgstr "Εντόπιο Format"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr ""
 
-#: editor_videotimeline.cc:138
+#: editor_videotimeline.cc:146
 msgid "Export Successful: %1"
 msgstr ""
 
-#: video_timeline.cc:467
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:501
-msgid "Failed to set session-framerate: "
-msgstr ""
-
-#: video_timeline.cc:501
-msgid " does not have a corresponding option setting in Ardour."
+#: video_timeline.cc:507
+msgid ""
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:507
+#: video_timeline.cc:515
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:508
-msgid " vs "
+#: video_timeline.cc:588
+msgid ""
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:690
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12869,18 +13124,18 @@ msgid ""
 "xjadeo's remote-control interface 'xjremote')."
 msgstr ""
 
-#: video_monitor.cc:282
+#: video_monitor.cc:281
 #, fuzzy
 msgid "Video Monitor: File Not Found."
 msgstr "Software Monitoring"
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -12890,377 +13145,385 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 #, fuzzy
 msgid "Transcode/Import Video File "
 msgstr "Εξαγωγή συνεδ�ίας σε α�χείο..."
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 #, fuzzy
 msgid "Output File:"
 msgstr "κανάλια"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr ""
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 #, fuzzy
 msgid "Height = "
 msgstr "Ύψος"
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr ""
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 #, fuzzy
 msgid "<b>File Information</b>"
 msgstr "Πλη�οφο�ίες για το Soundfile"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr ""
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 #, fuzzy
 msgid "Duration:"
 msgstr "Διά�κεια (δευτ)"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr ""
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr ""
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 #, fuzzy
 msgid "??"
 msgstr "???"
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 #, fuzzy
 msgid "<b>Import Settings</b>"
 msgstr "Επιλογές"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr ""
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr ""
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 #, fuzzy
 msgid "Import/Transcode Video to Session"
 msgstr "Εξαγωγή Συνεδ�ίας"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr ""
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 msgid "Original Width"
 msgstr ""
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr ""
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 #, fuzzy
 msgid "Extract Audio:"
 msgstr "Εξαγωγή Συνεδ�ίας"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 #, fuzzy
 msgid "Extracting Audio.."
 msgstr "Εξαγωγή Συνεδ�ίας"
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr ""
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 msgid "Transcoding Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 #, fuzzy
 msgid "Save Transcoded Video File"
 msgstr "Εξαγωγή συνεδ�ίας σε α�χείο..."
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr ""
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr ""
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 msgid "Server Docroot:"
 msgstr ""
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr ""
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 #, fuzzy
 msgid "Listen Port:"
 msgstr "Θέση"
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 #, fuzzy
 msgid "Cache Size:"
 msgstr "Μέγ.μέγεθος"
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr ""
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr ""
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 #, fuzzy
 msgid "Confirm Overwrite"
 msgstr "awrite"
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 #, fuzzy
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr "Το α�χείο ήδη υπά�χει, θέλετε να σώστε από πάνω?"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 #, fuzzy
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr "δεν γίνεται νέος α�χηγός process group (%1)"
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 #, fuzzy
 msgid "Export Video File "
 msgstr "Εξαγωγή συνεδ�ίας σε α�χείο..."
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 #, fuzzy
 msgid "Video:"
 msgstr "Ευθυγ�άμμιση α�χής Πε�ιοχών"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr ""
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr ""
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 #, fuzzy
 msgid "Normalize Audio"
 msgstr "Εξομάλυνση"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr ""
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr ""
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 #, fuzzy
 msgid "Deinterlace"
 msgstr "εσωτε�ικό"
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr ""
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 #, fuzzy
 msgid "Include Session Metadata"
 msgstr "Εισαγωγή επιλεγμένου(ων)"
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr ""
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 #, fuzzy
 msgid "<b>Output:</b>"
 msgstr "<b> Outputs καναλιών/διάυλων</b>"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 #, fuzzy
 msgid "<b>Input:</b>"
 msgstr "<b> Inputs καναλιών/διάυλων</b>"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 #, fuzzy
 msgid "Audio:"
 msgstr "Ακ�όαση"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 #, fuzzy
 msgid "Master Bus"
 msgstr "Δημιου�γία Master Bus"
 
-#: export_video_dialog.cc:166
+#: export_video_dialog.cc:145
+msgid "from the %1 session's start to the session's end"
+msgstr ""
+
+#: export_video_dialog.cc:149
+msgid "from 00:00:00:00 to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:151
+msgid "from the video's start to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:184
 #, fuzzy
 msgid "<b>Settings:</b>"
 msgstr "Π�οχω�ημένα..."
 
-#: export_video_dialog.cc:174
+#: export_video_dialog.cc:192
 #, fuzzy
 msgid "Range:"
 msgstr "Διάστημα"
 
-#: export_video_dialog.cc:177
+#: export_video_dialog.cc:195
 #, fuzzy
 msgid "Preset:"
 msgstr "�έο Π�οσθήκη"
 
-#: export_video_dialog.cc:180
+#: export_video_dialog.cc:198
 #, fuzzy
 msgid "Video Codec:"
 msgstr "Όνομα φακέλου:"
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:201
 #, fuzzy
 msgid "Video KBit/s:"
 msgstr "Ευθυγ�άμμιση α�χής Πε�ιοχών"
 
-#: export_video_dialog.cc:186
+#: export_video_dialog.cc:204
 #, fuzzy
 msgid "Audio Codec:"
 msgstr "Ηχητικά frames"
 
-#: export_video_dialog.cc:189
+#: export_video_dialog.cc:207
 #, fuzzy
 msgid "Audio KBit/s:"
 msgstr "Ηχητικά frames"
 
-#: export_video_dialog.cc:192
+#: export_video_dialog.cc:210
 #, fuzzy
 msgid "Audio Samplerate:"
 msgstr "Εντόπιο Format"
 
-#: export_video_dialog.cc:369
+#: export_video_dialog.cc:387
 #, fuzzy
 msgid "Normalizing audio"
 msgstr "Εξομάλυνση"
 
-#: export_video_dialog.cc:373
+#: export_video_dialog.cc:391
 #, fuzzy
 msgid "Exporting audio"
 msgstr "Εξαγωγή Συνεδ�ίας"
 
-#: export_video_dialog.cc:419
+#: export_video_dialog.cc:437
 #, fuzzy
-msgid "Exporting Audio.."
+msgid "Exporting Audio..."
 msgstr "Εξαγωγή Συνεδ�ίας"
 
-#: export_video_dialog.cc:476
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:505
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:544
-msgid "Encoding Video.."
+#: export_video_dialog.cc:562
+msgid "Encoding Video..."
 msgstr ""
 
-#: export_video_dialog.cc:563
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:661
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr ""
 
-#: export_video_dialog.cc:673
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr ""
 
-#: export_video_dialog.cc:761
+#: export_video_dialog.cc:779
 msgid "Transcoding failed."
 msgstr ""
 
-#: export_video_dialog.cc:930 export_video_dialog.cc:950
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 #, fuzzy
 msgid "Save Exported Video File"
 msgstr "Εξαγωγή συνεδ�ίας σε α�χείο..."
@@ -13278,33 +13541,34 @@ msgstr ""
 msgid "<b>Video Export Info</b>"
 msgstr ""
 
-#: export_video_infobox.cc:46
+#: export_video_infobox.cc:48
 msgid ""
-"Ardour video export is not recommended for mastering!\n"
-"While 'ffmpeg' (which is used by ardour) can produce high-quality files, "
-"this export lacks the possibility to tweak many settings. We recommend to "
-"use 'winff', 'devede' or 'dvdauthor' to mux & master. Nevertheless this "
-"video-export comes in handy to do quick snapshots, intermediates, dailies or "
-"online videos.\n"
-"\n"
-"The soundtrack is created from the master-bus of the current Ardour "
-"session.\n"
+"Video encoding is a non-trivial task with many details.\n"
 "\n"
-"The video soure defaults to the file used in the video timeline, which may "
-"not the best quality to start with, you should the original video file.\n"
+"Please see the manual at %1/video-timeline/operations/#export.\n"
 "\n"
-"If the export-range is longer than the original video, black video frames "
-"are prefixed and/or appended. This process may fail with non-standard pixel-"
-"aspect-ratios.\n"
-"\n"
-"The file-format is determined by the extension that you choose for the "
-"output file (.avi, .mov, .flv, .ogv,...)\n"
-"Note: not all combinations of format+codec+settings produce files which are "
-"according so spec. e.g. flv files require sample-rates of 22.1kHz or "
-"44.1kHz, mpeg containers can not be used with ac3 audio-codec, etc. If in "
-"doubt, use one of the built-in presets."
+"Open Manual in Browser? "
 msgstr ""
 
+#, fuzzy
+#~ msgid "-Inf"
+#~ msgstr "-inf"
+
+#, fuzzy
+#~ msgid "slowest"
+#~ msgstr "Α�γότατο"
+
+#, fuzzy
+#~ msgid "fast"
+#~ msgstr "ταχ�τατη"
+
+#, fuzzy
+#~ msgid "faster"
+#~ msgstr "Ταχ�τε�α"
+
+#~ msgid "fastest"
+#~ msgstr "ταχ�τατη"
+
 #~ msgid "Connect"
 #~ msgstr "Σ�νδεση"
 
@@ -14962,9 +15226,6 @@ msgstr ""
 #~ msgid "solo change"
 #~ msgstr "αλλαγή σόλο"
 
-#~ msgid "rec-enable change"
-#~ msgstr "αλλαγή rec-enable"
-
 #~ msgid "mix group solo  change"
 #~ msgstr "αλλαγή  solo του mix group"
 
@@ -14995,13 +15256,6 @@ msgstr ""
 #~ msgid "Beat"
 #~ msgstr "Κτ�πος"
 
-#~ msgid ""
-#~ "Do you really want to remove track \"%1\" ?\n"
-#~ "(cannot be undone)"
-#~ msgstr ""
-#~ "Στ'αλήθεια θέλετε να απαλοίψετε το κανάλι \"%1\" ?\n"
-#~ "(δεν μπο�εί να ανακληθεί)"
-
 #~ msgid "set selected regionview"
 #~ msgstr "θέση επιλεγμένης οπτικής πε�ιοχής"
 
@@ -15153,9 +15407,6 @@ msgstr ""
 #~ msgid "Session %1 already exists at %2"
 #~ msgstr "Η Συνεδ�ία %1 υπά�χει ήδη στο %2"
 
-#~ msgid "UI: cannot setup meter_bridge"
-#~ msgstr "UI: η γέφυ�α μετ�ήσεων δεν μπο�εί να εγε�θεί"
-
 #~ msgid "Enable/Disable follow playhead"
 #~ msgstr "Ά�ση/Πα�ση ακολουθίας αναπα�αγωγέα"
 
@@ -15173,9 +15424,6 @@ msgstr ""
 #~ msgid "Audio Library"
 #~ msgstr "Ηχητική βιβλιοθήκη"
 
-#~ msgid "Meter Bridge"
-#~ msgstr "Γέφυ�α μετ�ητή"
-
 #~ msgid "Output Connections"
 #~ msgstr "Συνδέσεις Εξόδου"
 
diff --git a/gtk2_ardour/po/en_GB.po b/gtk2_ardour/po/en_GB.po
index 5773a4433c..d7c9874ecc 100644
--- a/gtk2_ardour/po/en_GB.po
+++ b/gtk2_ardour/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ardour 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2011-12-08 15:38+0100\n"
 "Last-Translator: Colin Fletcher <colin.m.fletcher@googlemail.com>\n"
 "Language-Team: UK English <colin.m.fletcher@googlemail.com>\n"
@@ -370,7 +370,7 @@ msgstr ""
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr ""
 
-#: add_route_dialog.cc:53 route_params_ui.cc:503
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 msgid "Add Track or Bus"
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 msgid "Add:"
 msgstr ""
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 msgid "<b>Options</b>"
 msgstr ""
 
@@ -421,21 +421,21 @@ msgid "Group:"
 msgstr ""
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 msgid "Audio"
 msgstr ""
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr ""
 
@@ -457,7 +457,7 @@ msgid ""
 msgstr ""
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1301
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr ""
 
@@ -501,7 +501,7 @@ msgstr ""
 msgid "12 Channel"
 msgstr ""
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2136
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr ""
 
@@ -584,7 +584,7 @@ msgid "Track"
 msgstr ""
 
 #: analysis_window.cc:68 editor_actions.cc:616 mixer_ui.cc:125
-#: mixer_ui.cc:1793
+#: mixer_ui.cc:1795
 msgid "Show"
 msgstr ""
 
@@ -592,92 +592,88 @@ msgstr ""
 msgid "Re-analyze data"
 msgstr ""
 
-#: ardour_button.cc:658
+#: ardour_button.cc:704
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr ""
 
-#: ardour_ui.cc:179
+#: ardour_ui.cc:180
 msgid "audition"
 msgstr ""
 
-#: ardour_ui.cc:180
+#: ardour_ui.cc:181
 msgid "solo"
 msgstr ""
 
-#: ardour_ui.cc:181
+#: ardour_ui.cc:182
 msgid "feedback"
 msgstr ""
 
-#: ardour_ui.cc:183 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 msgid "Speaker Configuration"
 msgstr ""
 
-#: ardour_ui.cc:184 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 msgid "Theme Manager"
 msgstr ""
 
-#: ardour_ui.cc:185 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr ""
 
-#: ardour_ui.cc:186
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr ""
 
-#: ardour_ui.cc:187 ardour_ui.cc:192
+#: ardour_ui.cc:191 ardour_ui.cc:196
 msgid "Add Tracks/Busses"
 msgstr ""
 
-#: ardour_ui.cc:188
+#: ardour_ui.cc:192
 msgid "About"
 msgstr ""
 
-#: ardour_ui.cc:189 location_ui.cc:1134
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr ""
 
-#: ardour_ui.cc:190 route_params_ui.cc:57 route_params_ui.cc:604
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 msgid "Tracks and Busses"
 msgstr ""
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr ""
 
-#: ardour_ui.cc:193 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr ""
 
-#: ardour_ui.cc:194 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr ""
 
-#: ardour_ui.cc:195
+#: ardour_ui.cc:199
 msgid "Audio Connections"
 msgstr ""
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:200
 #, fuzzy
 msgid "MIDI Connections"
 msgstr "Channel Colours"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr ""
 
-#: ardour_ui.cc:299
-msgid "could not initialize %1."
-msgstr "could not initialise %1."
-
-#: ardour_ui.cc:394
+#: ardour_ui.cc:388
 msgid "Starting audio engine"
 msgstr ""
 
-#: ardour_ui.cc:763 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 msgid "%1 is ready for use"
 msgstr ""
 
-#: ardour_ui.cc:811
+#: ardour_ui.cc:806
 msgid ""
 "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"
@@ -686,23 +682,23 @@ msgid ""
 "controlled by %2"
 msgstr ""
 
-#: ardour_ui.cc:828
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr ""
 
-#: ardour_ui.cc:870
+#: ardour_ui.cc:865
 msgid "Don't quit"
 msgstr ""
 
-#: ardour_ui.cc:871
+#: ardour_ui.cc:866
 msgid "Just quit"
 msgstr ""
 
-#: ardour_ui.cc:872
+#: ardour_ui.cc:867
 msgid "Save and quit"
 msgstr ""
 
-#: ardour_ui.cc:882
+#: ardour_ui.cc:877
 msgid ""
 "%1 was unable to save your session.\n"
 "\n"
@@ -711,15 +707,15 @@ msgid ""
 "\"Just quit\" option."
 msgstr ""
 
-#: ardour_ui.cc:913
+#: ardour_ui.cc:908
 msgid "Please wait while %1 cleans up..."
 msgstr ""
 
-#: ardour_ui.cc:930
+#: ardour_ui.cc:925
 msgid "Unsaved Session"
 msgstr ""
 
-#: ardour_ui.cc:951
+#: ardour_ui.cc:946
 msgid ""
 "The session \"%1\"\n"
 "has not been saved.\n"
@@ -730,7 +726,7 @@ msgid ""
 "What do you want to do?"
 msgstr ""
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:949
 msgid ""
 "The snapshot \"%1\"\n"
 "has not been saved.\n"
@@ -741,74 +737,74 @@ msgid ""
 "What do you want to do?"
 msgstr ""
 
-#: ardour_ui.cc:968
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr ""
 
-#: ardour_ui.cc:1045
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr ""
 
-#: ardour_ui.cc:1052
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1056
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1074 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 msgid "File:"
 msgstr ""
 
-#: ardour_ui.cc:1078
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr ""
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr ""
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr ""
 
-#: ardour_ui.cc:1087 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr ""
 
-#: ardour_ui.cc:1090
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr ""
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr ""
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr ""
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr ""
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr ""
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr ""
 
-#: ardour_ui.cc:1129
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1148
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -816,58 +812,58 @@ msgid ""
 "\">%<PRIu32>%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1184
+#: ardour_ui.cc:1188
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr ""
 
-#: ardour_ui.cc:1186
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr ""
 
-#: ardour_ui.cc:1204
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr ""
 
-#: ardour_ui.cc:1215
+#: ardour_ui.cc:1219
 #, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr ""
 
-#: ardour_ui.cc:1241
+#: ardour_ui.cc:1245
 #, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr ""
 
-#: ardour_ui.cc:1358 ardour_ui.cc:1367 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr ""
 
-#: ardour_ui.cc:1447
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
 msgstr ""
 
-#: ardour_ui.cc:1474
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr ""
 
-#: ardour_ui.cc:1492 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 msgid "%1 sessions"
 msgstr ""
 
-#: ardour_ui.cc:1529
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr ""
 
-#: ardour_ui.cc:1537
+#: ardour_ui.cc:1548
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ardour_ui.cc:1543 ardour_ui.cc:1604
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 msgid ""
 "There are insufficient JACK ports available\n"
 "to create a new track or bus.\n"
@@ -875,36 +871,36 @@ msgid ""
 "restart JACK with more ports."
 msgstr ""
 
-#: ardour_ui.cc:1578
+#: ardour_ui.cc:1589
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr ""
 
-#: ardour_ui.cc:1587
+#: ardour_ui.cc:1598
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ardour_ui.cc:1596
+#: ardour_ui.cc:1607
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ardour_ui.cc:1713
+#: ardour_ui.cc:1724
 msgid ""
 "Please create one or more tracks before trying to record.\n"
 "You can do this with the \"Add Track or Bus\" option in the Session menu."
 msgstr ""
 
-#: ardour_ui.cc:2103
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
 "%1"
 msgstr ""
 
-#: ardour_ui.cc:2105
+#: ardour_ui.cc:2116
 msgid ""
 "JACK has either been shutdown or it\n"
 "disconnected %1 because %1\n"
@@ -912,126 +908,126 @@ msgid ""
 "JACK, reconnect and save the session."
 msgstr ""
 
-#: ardour_ui.cc:2131
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr ""
 
-#: ardour_ui.cc:2211
+#: ardour_ui.cc:2222
 msgid "Take Snapshot"
 msgstr ""
 
-#: ardour_ui.cc:2212
+#: ardour_ui.cc:2223
 msgid "Name of new snapshot"
 msgstr ""
 
-#: ardour_ui.cc:2236
+#: ardour_ui.cc:2247
 msgid ""
 "To ensure compatibility with various systems\n"
 "snapshot names may not contain a '%1' character"
 msgstr ""
 
-#: ardour_ui.cc:2248
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr ""
 
-#: ardour_ui.cc:2249
+#: ardour_ui.cc:2260
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr ""
 
-#: ardour_ui.cc:2252 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 msgid "Overwrite"
 msgstr ""
 
-#: ardour_ui.cc:2286
+#: ardour_ui.cc:2297
 msgid "Rename Session"
 msgstr ""
 
-#: ardour_ui.cc:2287
+#: ardour_ui.cc:2298
 msgid "New session name"
 msgstr ""
 
-#: ardour_ui.cc:2301 ardour_ui.cc:2681 ardour_ui.cc:2726
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 msgid ""
 "To ensure compatibility with various systems\n"
 "session names may not contain a '%1' character"
 msgstr ""
 
-#: ardour_ui.cc:2309
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr ""
 
-#: ardour_ui.cc:2318
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
 msgstr ""
 
-#: ardour_ui.cc:2429
+#: ardour_ui.cc:2440
 msgid "Save Template"
 msgstr ""
 
-#: ardour_ui.cc:2430
+#: ardour_ui.cc:2441
 msgid "Name for template:"
 msgstr ""
 
-#: ardour_ui.cc:2431
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr ""
 
-#: ardour_ui.cc:2469
+#: ardour_ui.cc:2480
 msgid ""
 "This session\n"
 "%1\n"
 "already exists. Do you want to open it?"
 msgstr ""
 
-#: ardour_ui.cc:2479
+#: ardour_ui.cc:2490
 msgid "Open Existing Session"
 msgstr ""
 
-#: ardour_ui.cc:2717
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr ""
 
-#: ardour_ui.cc:2804
+#: ardour_ui.cc:2815
 msgid "Please wait while %1 loads your session"
 msgstr ""
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr ""
 
-#: ardour_ui.cc:2820
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr ""
 
-#: ardour_ui.cc:2841
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr ""
 
-#: ardour_ui.cc:2847
+#: ardour_ui.cc:2858
 msgid "Loading Error"
 msgstr ""
 
-#: ardour_ui.cc:2848
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr ""
 
-#: ardour_ui.cc:2930
+#: ardour_ui.cc:2941
 msgid "Could not create session in \"%1\""
 msgstr ""
 
-#: ardour_ui.cc:3030
+#: ardour_ui.cc:3041
 msgid "No files were ready for clean-up"
 msgstr ""
 
-#: ardour_ui.cc:3034 ardour_ui.cc:3044 ardour_ui.cc:3177 ardour_ui.cc:3184
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 msgid "Clean-up"
 msgstr ""
 
-#: ardour_ui.cc:3035
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1039,19 +1035,19 @@ msgid ""
 "require some unused files to continue to exist."
 msgstr ""
 
-#: ardour_ui.cc:3094
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr ""
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr ""
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr ""
 
-#: ardour_ui.cc:3105
+#: ardour_ui.cc:3116
 msgid ""
 "The following file was deleted from %2,\n"
 "releasing %3 %4bytes of disk space"
@@ -1061,7 +1057,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3123
 msgid ""
 "The following file was not in use and \n"
 "has been moved to: %2\n"
@@ -1083,91 +1079,91 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ardour_ui.cc:3172
+#: ardour_ui.cc:3183
 msgid "Are you sure you want to clean-up?"
 msgstr ""
 
-#: ardour_ui.cc:3179
+#: ardour_ui.cc:3190
 msgid ""
 "Clean-up is a destructive operation.\n"
 "ALL undo/redo information will be lost if you clean-up.\n"
 "Clean-up will move all unused files to a \"dead\" location."
 msgstr ""
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr ""
 
-#: ardour_ui.cc:3217
+#: ardour_ui.cc:3228
 msgid "Cleaned Files"
 msgstr ""
 
-#: ardour_ui.cc:3234
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr ""
 
-#: ardour_ui.cc:3326
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 
-#: ardour_ui.cc:3330
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr ""
 
-#: ardour_ui.cc:3331
+#: ardour_ui.cc:3342
 msgid "Do you really want to stop the Video Server?"
 msgstr ""
 
-#: ardour_ui.cc:3334
+#: ardour_ui.cc:3345
 msgid "Yes, Stop It"
 msgstr ""
 
-#: ardour_ui.cc:3360
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr ""
 
-#: ardour_ui.cc:3362
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
 msgstr ""
 
-#: ardour_ui.cc:3370 ardour_ui.cc:3455
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
 
-#: ardour_ui.cc:3394
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr ""
 
-#: ardour_ui.cc:3399
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr ""
 
-#: ardour_ui.cc:3432
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr ""
 
-#: ardour_ui.cc:3441
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3477 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr ""
 
-#: ardour_ui.cc:3481
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
 msgstr ""
 
-#: ardour_ui.cc:3641
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr ""
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3702
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1176,7 +1172,7 @@ msgid ""
 "quickly enough to keep up with recording.\n"
 msgstr ""
 
-#: ardour_ui.cc:3689
+#: ardour_ui.cc:3721
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1185,11 +1181,11 @@ msgid ""
 "quickly enough to keep up with playback.\n"
 msgstr ""
 
-#: ardour_ui.cc:3729
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr ""
 
-#: ardour_ui.cc:3730
+#: ardour_ui.cc:3762
 msgid ""
 "This session appears to have been in the\n"
 "middle of recording when %1 or\n"
@@ -1200,42 +1196,42 @@ msgid ""
 "what you would like to do.\n"
 msgstr ""
 
-#: ardour_ui.cc:3742
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr ""
 
-#: ardour_ui.cc:3743
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr ""
 
-#: ardour_ui.cc:3763
+#: ardour_ui.cc:3795
 msgid "Sample Rate Mismatch"
 msgstr ""
 
-#: ardour_ui.cc:3764
+#: ardour_ui.cc:3796
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
 "%2 is currently running at %3 Hz.  If you load this session,\n"
 "audio may be played at the wrong sample rate.\n"
 msgstr ""
 
-#: ardour_ui.cc:3773
+#: ardour_ui.cc:3805
 msgid "Do not load session"
 msgstr ""
 
-#: ardour_ui.cc:3774
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr ""
 
-#: ardour_ui.cc:3797
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr ""
 
-#: ardour_ui.cc:3810
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr ""
 
-#: ardour_ui.cc:4084
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1258,73 +1254,77 @@ msgstr ""
 msgid "UI: cannot setup mixer"
 msgstr ""
 
-#: ardour_ui2.cc:125
+#: ardour_ui2.cc:82
+msgid "UI: cannot setup meterbridge"
+msgstr ""
+
+#: ardour_ui2.cc:130
 msgid "Play from playhead"
 msgstr ""
 
-#: ardour_ui2.cc:126
+#: ardour_ui2.cc:131
 msgid "Stop playback"
 msgstr ""
 
-#: ardour_ui2.cc:127
+#: ardour_ui2.cc:132
 msgid "Toggle record"
 msgstr ""
 
-#: ardour_ui2.cc:128
+#: ardour_ui2.cc:133
 msgid "Play range/selection"
 msgstr ""
 
-#: ardour_ui2.cc:129
+#: ardour_ui2.cc:134
 msgid "Go to start of session"
 msgstr ""
 
-#: ardour_ui2.cc:130
+#: ardour_ui2.cc:135
 msgid "Go to end of session"
 msgstr ""
 
-#: ardour_ui2.cc:131
+#: ardour_ui2.cc:136
 msgid "Play loop range"
 msgstr ""
 
-#: ardour_ui2.cc:132
+#: ardour_ui2.cc:137
 msgid ""
 "MIDI Panic\n"
 "Send note off and reset controller messages on all MIDI channels"
 msgstr ""
 
-#: ardour_ui2.cc:133
+#: ardour_ui2.cc:138
 msgid "Return to last playback start when stopped"
 msgstr ""
 
-#: ardour_ui2.cc:134
+#: ardour_ui2.cc:139
 msgid "Playhead follows Range Selections and Edits"
 msgstr ""
 
-#: ardour_ui2.cc:135
+#: ardour_ui2.cc:140
 msgid "Be sensible about input monitoring"
 msgstr ""
 
-#: ardour_ui2.cc:136
+#: ardour_ui2.cc:141
 msgid "Enable/Disable audio click"
 msgstr ""
 
-#: ardour_ui2.cc:137 monitor_section.cc:101
+#: ardour_ui2.cc:142 monitor_section.cc:101
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
 msgstr ""
 
-#: ardour_ui2.cc:138
+#: ardour_ui2.cc:143
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
 msgstr ""
 
-#: ardour_ui2.cc:139
+#: ardour_ui2.cc:144
 msgid "When active, there is a feedback loop."
 msgstr ""
 
-#: ardour_ui2.cc:140
+#: ardour_ui2.cc:145
 msgid ""
 "<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1332,7 +1332,7 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:141
+#: ardour_ui2.cc:146
 msgid ""
 "<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1340,27 +1340,31 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:173
+#: ardour_ui2.cc:147
+msgid "Reset Level Meter"
+msgstr ""
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr ""
 
-#: ardour_ui2.cc:175
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr ""
 
-#: ardour_ui2.cc:177
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr ""
 
-#: ardour_ui2.cc:241 ardour_ui_ed.cc:376
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 msgid "Auto Return"
 msgstr ""
 
-#: ardour_ui2.cc:243 ardour_ui_ed.cc:379
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr ""
 
-#: ardour_ui2.cc:621 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1380,23 +1384,23 @@ msgstr ""
 msgid "Setup Mixer"
 msgstr ""
 
-#: ardour_ui_dependents.cc:84
+#: ardour_ui_dependents.cc:85
 msgid "Reload Session History"
 msgstr ""
 
-#: ardour_ui_dialogs.cc:206
+#: ardour_ui_dialogs.cc:242
 msgid "Don't close"
 msgstr ""
 
-#: ardour_ui_dialogs.cc:207
+#: ardour_ui_dialogs.cc:243
 msgid "Just close"
 msgstr ""
 
-#: ardour_ui_dialogs.cc:208
+#: ardour_ui_dialogs.cc:244
 msgid "Save and close"
 msgstr ""
 
-#: ardour_ui_dialogs.cc:293
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr ""
 
@@ -1409,7 +1413,7 @@ msgstr ""
 msgid "Sync"
 msgstr ""
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr ""
 
@@ -1437,15 +1441,15 @@ msgstr ""
 msgid "Sample Format"
 msgstr ""
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr ""
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr ""
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr ""
 
@@ -1461,7 +1465,7 @@ msgstr ""
 msgid "Denormal Handling"
 msgstr ""
 
-#: ardour_ui_ed.cc:123 route_time_axis.cc:1475
+#: ardour_ui_ed.cc:123 route_time_axis.cc:1489
 msgid "New..."
 msgstr ""
 
@@ -1501,8 +1505,8 @@ msgstr ""
 msgid "Save As..."
 msgstr ""
 
-#: ardour_ui_ed.cc:153 editor_actions.cc:1710 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1464 route_time_axis.cc:1471
+#: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 msgid "Rename..."
 msgstr ""
 
@@ -1531,7 +1535,7 @@ msgid "Stem export..."
 msgstr ""
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr ""
 
@@ -1543,11 +1547,11 @@ msgstr ""
 msgid "Flush Wastebasket"
 msgstr ""
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr ""
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr ""
 
@@ -1555,8 +1559,8 @@ msgstr ""
 msgid "Reconnect"
 msgstr ""
 
-#: ardour_ui_ed.cc:195 global_port_matrix.cc:198 io_selector.cc:210
-#: mixer_strip.cc:712 mixer_strip.cc:838
+#: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr ""
 
@@ -1572,7 +1576,7 @@ msgstr ""
 msgid "Show Toolbars"
 msgstr ""
 
-#: ardour_ui_ed.cc:230 mixer_ui.cc:1863 mixer_ui.cc:1869
+#: ardour_ui_ed.cc:230 mixer_ui.cc:1865 mixer_ui.cc:1871
 msgid "Window|Mixer"
 msgstr ""
 
@@ -1580,27 +1584,31 @@ msgstr ""
 msgid "Toggle Editor+Mixer"
 msgstr ""
 
-#: ardour_ui_ed.cc:233 midi_tracer.cc:39
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
+msgid "Window|Meterbridge"
+msgstr ""
+
+#: ardour_ui_ed.cc:234 midi_tracer.cc:39
 msgid "MIDI Tracer"
 msgstr ""
 
-#: ardour_ui_ed.cc:235
+#: ardour_ui_ed.cc:236
 msgid "Chat"
 msgstr ""
 
-#: ardour_ui_ed.cc:237
+#: ardour_ui_ed.cc:238
 msgid "Help|Manual"
 msgstr ""
 
-#: ardour_ui_ed.cc:238
+#: ardour_ui_ed.cc:239
 msgid "Reference"
 msgstr ""
 
-#: ardour_ui_ed.cc:240 plugin_ui.cc:419
+#: ardour_ui_ed.cc:241 plugin_ui.cc:418
 msgid "Save"
 msgstr ""
 
-#: ardour_ui_ed.cc:248 rc_option_editor.cc:1114 rc_option_editor.cc:1125
+#: ardour_ui_ed.cc:249 rc_option_editor.cc:1114 rc_option_editor.cc:1125
 #: rc_option_editor.cc:1134 rc_option_editor.cc:1147 rc_option_editor.cc:1160
 #: rc_option_editor.cc:1169 rc_option_editor.cc:1179 rc_option_editor.cc:1181
 #: rc_option_editor.cc:1191 rc_option_editor.cc:1207 rc_option_editor.cc:1220
@@ -1610,99 +1618,99 @@ msgstr ""
 msgid "Transport"
 msgstr ""
 
-#: ardour_ui_ed.cc:254 engine_dialog.cc:85 sfdb_ui.cc:559
+#: ardour_ui_ed.cc:255 engine_dialog.cc:85
 msgid "Stop"
 msgstr ""
 
-#: ardour_ui_ed.cc:257
+#: ardour_ui_ed.cc:258
 msgid "Roll"
 msgstr ""
 
-#: ardour_ui_ed.cc:261
+#: ardour_ui_ed.cc:262
 msgid "Start/Stop"
 msgstr ""
 
-#: ardour_ui_ed.cc:264
+#: ardour_ui_ed.cc:265
 msgid "Start/Continue/Stop"
 msgstr ""
 
-#: ardour_ui_ed.cc:267
+#: ardour_ui_ed.cc:268
 msgid "Stop and Forget Capture"
 msgstr ""
 
-#: ardour_ui_ed.cc:277
+#: ardour_ui_ed.cc:278
 msgid "Transition To Roll"
 msgstr ""
 
-#: ardour_ui_ed.cc:281
+#: ardour_ui_ed.cc:282
 msgid "Transition To Reverse"
 msgstr ""
 
-#: ardour_ui_ed.cc:285
+#: ardour_ui_ed.cc:286
 msgid "Play Loop Range"
 msgstr ""
 
-#: ardour_ui_ed.cc:288
+#: ardour_ui_ed.cc:289
 msgid "Play Selected Range"
 msgstr ""
 
-#: ardour_ui_ed.cc:291
+#: ardour_ui_ed.cc:292
 msgid "Play Selection w/Preroll"
 msgstr ""
 
-#: ardour_ui_ed.cc:295
+#: ardour_ui_ed.cc:296
 msgid "Enable Record"
 msgstr ""
 
-#: ardour_ui_ed.cc:298
+#: ardour_ui_ed.cc:299
 msgid "Start Recording"
 msgstr ""
 
-#: ardour_ui_ed.cc:302
+#: ardour_ui_ed.cc:303
 msgid "Rewind"
 msgstr ""
 
-#: ardour_ui_ed.cc:305
+#: ardour_ui_ed.cc:306
 msgid "Rewind (Slow)"
 msgstr ""
 
-#: ardour_ui_ed.cc:308
+#: ardour_ui_ed.cc:309
 msgid "Rewind (Fast)"
 msgstr ""
 
-#: ardour_ui_ed.cc:311 startup.cc:727
+#: ardour_ui_ed.cc:312 startup.cc:727
 msgid "Forward"
 msgstr ""
 
-#: ardour_ui_ed.cc:314
+#: ardour_ui_ed.cc:315
 msgid "Forward (Slow)"
 msgstr ""
 
-#: ardour_ui_ed.cc:317
+#: ardour_ui_ed.cc:318
 msgid "Forward (Fast)"
 msgstr ""
 
-#: ardour_ui_ed.cc:320
+#: ardour_ui_ed.cc:321
 msgid "Goto Zero"
 msgstr ""
 
-#: ardour_ui_ed.cc:323
+#: ardour_ui_ed.cc:324
 msgid "Goto Start"
 msgstr ""
 
-#: ardour_ui_ed.cc:326
+#: ardour_ui_ed.cc:327
 msgid "Goto End"
 msgstr ""
 
-#: ardour_ui_ed.cc:329
+#: ardour_ui_ed.cc:330
 msgid "Goto Wall Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:333
+#: ardour_ui_ed.cc:334
 msgid "Focus On Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:337 ardour_ui_ed.cc:346 audio_clock.cc:2046 editor.cc:237
+#: ardour_ui_ed.cc:338 ardour_ui_ed.cc:347 audio_clock.cc:2046 editor.cc:237
 #: editor_actions.cc:544 editor_actions.cc:553 export_timespan_selector.cc:88
 #: session_option_editor.cc:41 session_option_editor.cc:61
 #: session_option_editor.cc:80 session_option_editor.cc:96
@@ -1711,125 +1719,125 @@ msgstr ""
 msgid "Timecode"
 msgstr ""
 
-#: ardour_ui_ed.cc:339 ardour_ui_ed.cc:348 editor_actions.cc:542
+#: ardour_ui_ed.cc:340 ardour_ui_ed.cc:349 editor_actions.cc:542
 msgid "Bars & Beats"
 msgstr ""
 
-#: ardour_ui_ed.cc:341 ardour_ui_ed.cc:350
+#: ardour_ui_ed.cc:342 ardour_ui_ed.cc:351
 msgid "Minutes & Seconds"
 msgstr ""
 
-#: ardour_ui_ed.cc:343 ardour_ui_ed.cc:352 audio_clock.cc:2050 editor.cc:238
+#: ardour_ui_ed.cc:344 ardour_ui_ed.cc:353 audio_clock.cc:2050 editor.cc:238
 #: editor_actions.cc:543
 msgid "Samples"
 msgstr ""
 
-#: ardour_ui_ed.cc:355
+#: ardour_ui_ed.cc:356
 msgid "Punch In"
 msgstr ""
 
-#: ardour_ui_ed.cc:356 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr ""
 
-#: ardour_ui_ed.cc:359
+#: ardour_ui_ed.cc:360
 msgid "Punch Out"
 msgstr ""
 
-#: ardour_ui_ed.cc:360 time_info_box.cc:114
+#: ardour_ui_ed.cc:361 time_info_box.cc:114
 msgid "Out"
 msgstr ""
 
-#: ardour_ui_ed.cc:363
+#: ardour_ui_ed.cc:364
 msgid "Punch In/Out"
 msgstr ""
 
-#: ardour_ui_ed.cc:364
+#: ardour_ui_ed.cc:365
 msgid "In/Out"
 msgstr ""
 
-#: ardour_ui_ed.cc:367 rc_option_editor.cc:1071
+#: ardour_ui_ed.cc:368 rc_option_editor.cc:1071
 msgid "Click"
 msgstr ""
 
-#: ardour_ui_ed.cc:370
+#: ardour_ui_ed.cc:371
 msgid "Auto Input"
 msgstr ""
 
-#: ardour_ui_ed.cc:373
+#: ardour_ui_ed.cc:374
 msgid "Auto Play"
 msgstr ""
 
-#: ardour_ui_ed.cc:384
+#: ardour_ui_ed.cc:385
 msgid "Sync Startup to Video"
 msgstr ""
 
-#: ardour_ui_ed.cc:386
+#: ardour_ui_ed.cc:387
 msgid "Time Master"
 msgstr ""
 
-#: ardour_ui_ed.cc:393
+#: ardour_ui_ed.cc:394
 msgid "Toggle Record Enable Track %1"
 msgstr ""
 
-#: ardour_ui_ed.cc:400
+#: ardour_ui_ed.cc:401
 msgid "Percentage"
 msgstr ""
 
-#: ardour_ui_ed.cc:401 shuttle_control.cc:169
+#: ardour_ui_ed.cc:402 shuttle_control.cc:169
 msgid "Semitones"
 msgstr ""
 
-#: ardour_ui_ed.cc:405
+#: ardour_ui_ed.cc:406
 msgid "Send MTC"
 msgstr ""
 
-#: ardour_ui_ed.cc:407
+#: ardour_ui_ed.cc:408
 msgid "Send MMC"
 msgstr ""
 
-#: ardour_ui_ed.cc:409
+#: ardour_ui_ed.cc:410
 msgid "Use MMC"
 msgstr ""
 
-#: ardour_ui_ed.cc:411 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 msgid "Send MIDI Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:413
+#: ardour_ui_ed.cc:414
 msgid "Send MIDI Feedback"
 msgstr ""
 
-#: ardour_ui_ed.cc:419
+#: ardour_ui_ed.cc:420
 msgid "Panic"
 msgstr ""
 
-#: ardour_ui_ed.cc:559
+#: ardour_ui_ed.cc:560
 msgid "Wall Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:560
+#: ardour_ui_ed.cc:561
 msgid "Disk Space"
 msgstr ""
 
-#: ardour_ui_ed.cc:561
+#: ardour_ui_ed.cc:562
 msgid "DSP"
 msgstr ""
 
-#: ardour_ui_ed.cc:562
+#: ardour_ui_ed.cc:563
 msgid "Buffers"
 msgstr ""
 
-#: ardour_ui_ed.cc:563
+#: ardour_ui_ed.cc:564
 msgid "JACK Sampling Rate and Latency"
 msgstr ""
 
-#: ardour_ui_ed.cc:564
+#: ardour_ui_ed.cc:565
 msgid "Timecode Format"
 msgstr ""
 
-#: ardour_ui_ed.cc:565
+#: ardour_ui_ed.cc:566
 msgid "File Format"
 msgstr ""
 
@@ -1843,11 +1851,11 @@ msgstr ""
 msgid "Internal"
 msgstr ""
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 msgid "Enable/Disable external positional sync"
 msgstr ""
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr ""
 
@@ -1877,7 +1885,7 @@ msgstr ""
 msgid "Meter"
 msgstr ""
 
-#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1030
+#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1039
 #: midi_region_view.cc:2991 session_metadata_dialog.cc:331
 #: session_metadata_dialog.cc:379 session_metadata_dialog.cc:435
 #: session_metadata_dialog.cc:716
@@ -1966,32 +1974,32 @@ msgid "hide track"
 msgstr ""
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:196 generic_pluginui.cc:456
-#: generic_pluginui.cc:733 panner_ui.cc:150
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
+#: generic_pluginui.cc:746 panner_ui.cc:150
 msgid "Automation|Manual"
 msgstr ""
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1856 gain_meter.cc:199
-#: generic_pluginui.cc:459 generic_pluginui.cc:735 midi_time_axis.cc:1488
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
+#: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr ""
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:202 generic_pluginui.cc:462
-#: generic_pluginui.cc:737 panner_ui.cc:156
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
+#: generic_pluginui.cc:750 panner_ui.cc:156
 msgid "Write"
 msgstr ""
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:205 generic_pluginui.cc:465
-#: generic_pluginui.cc:739 panner_ui.cc:159
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
+#: generic_pluginui.cc:752 panner_ui.cc:159
 msgid "Touch"
 msgstr ""
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr ""
 
@@ -2000,7 +2008,7 @@ msgid "clear automation"
 msgstr ""
 
 #: automation_time_axis.cc:485 editor_actions.cc:613 editor_markers.cc:857
-#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:699
+#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:708
 msgid "Hide"
 msgstr ""
 
@@ -2021,7 +2029,7 @@ msgstr ""
 msgid "Linear"
 msgstr ""
 
-#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:638
+#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:647
 #: shuttle_control.cc:188
 msgid "Mode"
 msgstr ""
@@ -2038,13 +2046,13 @@ msgstr ""
 msgid "Direction:"
 msgstr ""
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:156
-#: mixer_strip.cc:2132
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 msgid "Input"
 msgstr ""
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:161 mixer_strip.cc:2135
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 msgid "Output"
 msgstr ""
 
@@ -2054,8 +2062,8 @@ msgid "Edit"
 msgstr ""
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:420 processor_box.cc:2227
-#: route_time_axis.cc:704
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
+#: route_time_axis.cc:713
 msgid "Delete"
 msgstr ""
 
@@ -2223,7 +2231,7 @@ msgstr ""
 
 #: edit_note_dialog.cc:98 editor_regions.cc:114
 #: export_timespan_selector.cc:359 export_timespan_selector.cc:421
-#: location_ui.cc:313 midi_list_editor.cc:114 time_info_box.cc:105
+#: location_ui.cc:317 midi_list_editor.cc:114 time_info_box.cc:105
 msgid "Length"
 msgstr ""
 
@@ -2469,17 +2477,17 @@ msgid "Ranges & Marks"
 msgstr ""
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 msgid "Editor"
 msgstr ""
 
 #: editor.cc:1215 editor.cc:1225 editor.cc:4440 editor_actions.cc:130
-#: editor_actions.cc:1804
+#: editor_actions.cc:1813
 msgid "Loop"
 msgstr ""
 
@@ -2504,8 +2512,8 @@ msgstr ""
 msgid "Slow"
 msgstr ""
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1606
-#: sfdb_ui.cc:1715
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr ""
 
@@ -2525,7 +2533,7 @@ msgstr ""
 msgid "Slowest"
 msgstr ""
 
-#: editor.cc:1572 route_time_axis.cc:1863 selection.cc:1009 selection.cc:1064
+#: editor.cc:1572 route_time_axis.cc:1877 selection.cc:1009 selection.cc:1064
 msgid "programming error: "
 msgstr ""
 
@@ -2642,7 +2650,7 @@ msgid "Select All in Track"
 msgstr ""
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2235
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr ""
 
@@ -2694,15 +2702,15 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2220
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr ""
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2223
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr ""
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2231
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr ""
 
@@ -2854,7 +2862,7 @@ msgstr ""
 msgid "Redo (%1)"
 msgstr ""
 
-#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1785
+#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1794
 msgid "Duplicate"
 msgstr ""
 
@@ -2881,8 +2889,8 @@ msgstr ""
 msgid "Keep Playlist"
 msgstr ""
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr ""
 
@@ -2902,7 +2910,7 @@ msgstr ""
 msgid "Please wait while %1 loads visual data."
 msgstr ""
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2251
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 msgid "Edit..."
 msgstr ""
 
@@ -2951,7 +2959,7 @@ msgstr ""
 msgid "Position"
 msgstr ""
 
-#: editor_actions.cc:101 gain_meter.cc:124 gain_meter.cc:755 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr ""
@@ -2964,7 +2972,7 @@ msgstr ""
 msgid "Ranges"
 msgstr ""
 
-#: editor_actions.cc:104 editor_actions.cc:1781 session_option_editor.cc:145
+#: editor_actions.cc:104 editor_actions.cc:1790 session_option_editor.cc:145
 #: session_option_editor.cc:147 session_option_editor.cc:156
 #: session_option_editor.cc:163
 msgid "Fades"
@@ -3002,7 +3010,7 @@ msgstr ""
 msgid "Misc Options"
 msgstr ""
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr ""
@@ -3043,8 +3051,8 @@ msgstr ""
 msgid "Separate"
 msgstr ""
 
-#: editor_actions.cc:132 mixer_strip.cc:1916 route_time_axis.cc:199
-#: route_time_axis.cc:2397
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
+#: route_time_axis.cc:2417
 msgid "Solo"
 msgstr ""
 
@@ -3056,7 +3064,7 @@ msgstr ""
 msgid "Timecode fps"
 msgstr ""
 
-#: editor_actions.cc:137 route_time_axis.cc:421
+#: editor_actions.cc:137 route_time_axis.cc:430
 msgid "Height"
 msgstr ""
 
@@ -3180,7 +3188,7 @@ msgstr ""
 msgid "Playhead to Range End"
 msgstr ""
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2237
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 msgid "Deselect All"
 msgstr ""
 
@@ -3448,9 +3456,9 @@ msgstr ""
 msgid "Toggle Active"
 msgstr ""
 
-#: editor_actions.cc:370 editor_actions.cc:1707 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1488
-#: route_time_axis.cc:701
+#: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
+#: route_time_axis.cc:710
 msgid "Remove"
 msgstr ""
 
@@ -3458,19 +3466,19 @@ msgstr ""
 msgid "Fit Selected Tracks"
 msgstr ""
 
-#: editor_actions.cc:376 time_axis_view.cc:1298
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr ""
 
-#: editor_actions.cc:379 time_axis_view.cc:1299
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr ""
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1300
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr ""
 
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr ""
 
@@ -3566,7 +3574,7 @@ msgstr ""
 msgid "Slide"
 msgstr ""
 
-#: editor_actions.cc:478 editor_actions.cc:1728 editor_markers.cc:860
+#: editor_actions.cc:478 editor_actions.cc:1737 editor_markers.cc:860
 #: editor_rulers.cc:386 location_ui.cc:56
 msgid "Lock"
 msgstr ""
@@ -3741,7 +3749,7 @@ msgstr ""
 msgid "Video Monitor"
 msgstr ""
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr ""
 
@@ -3750,7 +3758,7 @@ msgid "Always on Top"
 msgstr ""
 
 #: editor_actions.cc:554
-msgid "Framenumber"
+msgid "Frame number"
 msgstr ""
 
 #: editor_actions.cc:555
@@ -3839,7 +3847,7 @@ msgstr ""
 
 #: editor_actions.cc:652 editor_audio_import.cc:279
 #: session_import_dialog.cc:74 session_import_dialog.cc:94
-#: session_metadata_dialog.cc:297 editor_videotimeline.cc:107
+#: session_metadata_dialog.cc:297 editor_videotimeline.cc:108
 msgid "Import"
 msgstr ""
 
@@ -3879,289 +3887,289 @@ msgstr ""
 msgid "Could not find editor.bindings in search path %1"
 msgstr ""
 
-#: editor_actions.cc:1019 editor_actions.cc:1415 editor_actions.cc:1426
-#: editor_actions.cc:1479 editor_actions.cc:1490 editor_actions.cc:1537
-#: editor_actions.cc:1547 editor_regions.cc:1561
+#: editor_actions.cc:1028 editor_actions.cc:1424 editor_actions.cc:1435
+#: editor_actions.cc:1488 editor_actions.cc:1499 editor_actions.cc:1546
+#: editor_actions.cc:1556 editor_regions.cc:1561
 msgid "programming error: %1: %2"
 msgstr ""
 
-#: editor_actions.cc:1713
+#: editor_actions.cc:1722
 msgid "Raise"
 msgstr ""
 
-#: editor_actions.cc:1716
+#: editor_actions.cc:1725
 msgid "Raise to Top"
 msgstr ""
 
-#: editor_actions.cc:1719 gtk-custom-ruler.c:132
+#: editor_actions.cc:1728 gtk-custom-ruler.c:132
 msgid "Lower"
 msgstr ""
 
-#: editor_actions.cc:1722
+#: editor_actions.cc:1731
 msgid "Lower to Bottom"
 msgstr ""
 
-#: editor_actions.cc:1725
+#: editor_actions.cc:1734
 msgid "Move to Original Position"
 msgstr ""
 
-#: editor_actions.cc:1730
+#: editor_actions.cc:1739
 msgid "Lock to Video"
 msgstr ""
 
-#: editor_actions.cc:1735 editor_markers.cc:867
+#: editor_actions.cc:1744 editor_markers.cc:867
 msgid "Glue to Bars and Beats"
 msgstr ""
 
-#: editor_actions.cc:1740
+#: editor_actions.cc:1749
 msgid "Remove Sync"
 msgstr ""
 
-#: editor_actions.cc:1743 mixer_strip.cc:1903 route_time_axis.cc:200
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr ""
 
-#: editor_actions.cc:1746
+#: editor_actions.cc:1755
 msgid "Normalize..."
 msgstr "Normalise..."
 
-#: editor_actions.cc:1749
+#: editor_actions.cc:1758
 msgid "Reverse"
 msgstr ""
 
-#: editor_actions.cc:1752
+#: editor_actions.cc:1761
 msgid "Make Mono Regions"
 msgstr ""
 
-#: editor_actions.cc:1755
+#: editor_actions.cc:1764
 msgid "Boost Gain"
 msgstr ""
 
-#: editor_actions.cc:1758
+#: editor_actions.cc:1767
 msgid "Cut Gain"
 msgstr ""
 
-#: editor_actions.cc:1761
+#: editor_actions.cc:1770
 msgid "Pitch Shift..."
 msgstr ""
 
-#: editor_actions.cc:1764
+#: editor_actions.cc:1773
 msgid "Transpose..."
 msgstr ""
 
-#: editor_actions.cc:1767
+#: editor_actions.cc:1776
 msgid "Opaque"
 msgstr ""
 
-#: editor_actions.cc:1771 editor_regions.cc:116
+#: editor_actions.cc:1780 editor_regions.cc:116
 msgid "Fade In"
 msgstr ""
 
-#: editor_actions.cc:1776 editor_regions.cc:117
+#: editor_actions.cc:1785 editor_regions.cc:117
 msgid "Fade Out"
 msgstr ""
 
-#: editor_actions.cc:1791
+#: editor_actions.cc:1800
 msgid "Multi-Duplicate..."
 msgstr ""
 
-#: editor_actions.cc:1796
+#: editor_actions.cc:1805
 msgid "Fill Track"
 msgstr ""
 
-#: editor_actions.cc:1800 editor_markers.cc:955
+#: editor_actions.cc:1809 editor_markers.cc:955
 msgid "Set Loop Range"
 msgstr ""
 
-#: editor_actions.cc:1807
+#: editor_actions.cc:1816
 msgid "Set Punch"
 msgstr ""
 
-#: editor_actions.cc:1811
+#: editor_actions.cc:1820
 msgid "Add Single Range Marker"
 msgstr ""
 
-#: editor_actions.cc:1816
+#: editor_actions.cc:1825
 msgid "Add Range Marker Per Region"
 msgstr ""
 
-#: editor_actions.cc:1820
+#: editor_actions.cc:1829
 msgid "Snap Position To Grid"
 msgstr ""
 
-#: editor_actions.cc:1823
+#: editor_actions.cc:1832
 msgid "Close Gaps"
 msgstr ""
 
-#: editor_actions.cc:1826
+#: editor_actions.cc:1835
 msgid "Rhythm Ferret..."
 msgstr ""
 
-#: editor_actions.cc:1829
+#: editor_actions.cc:1838
 msgid "Export..."
 msgstr ""
 
-#: editor_actions.cc:1835
+#: editor_actions.cc:1844
 msgid "Separate Under"
 msgstr ""
 
-#: editor_actions.cc:1839
+#: editor_actions.cc:1848
 msgid "Set Fade In Length"
 msgstr ""
 
-#: editor_actions.cc:1840
+#: editor_actions.cc:1849
 msgid "Set Fade Out Length"
 msgstr ""
 
-#: editor_actions.cc:1841
+#: editor_actions.cc:1850
 msgid "Set Tempo from Region = Bar"
 msgstr ""
 
-#: editor_actions.cc:1846
+#: editor_actions.cc:1855
 msgid "Split at Percussion Onsets"
 msgstr ""
 
-#: editor_actions.cc:1851
+#: editor_actions.cc:1860
 msgid "List Editor..."
 msgstr ""
 
-#: editor_actions.cc:1854
+#: editor_actions.cc:1863
 msgid "Properties..."
 msgstr ""
 
-#: editor_actions.cc:1858
+#: editor_actions.cc:1867
 msgid "Bounce (with processing)"
 msgstr ""
 
-#: editor_actions.cc:1859
+#: editor_actions.cc:1868
 msgid "Bounce (without processing)"
 msgstr ""
 
-#: editor_actions.cc:1860
+#: editor_actions.cc:1869
 msgid "Combine"
 msgstr ""
 
-#: editor_actions.cc:1861
+#: editor_actions.cc:1870
 msgid "Uncombine"
 msgstr ""
 
-#: editor_actions.cc:1863
+#: editor_actions.cc:1872
 msgid "Spectral Analysis..."
 msgstr ""
 
-#: editor_actions.cc:1865
+#: editor_actions.cc:1874
 msgid "Reset Envelope"
 msgstr ""
 
-#: editor_actions.cc:1867
+#: editor_actions.cc:1876
 msgid "Reset Gain"
 msgstr ""
 
-#: editor_actions.cc:1872
+#: editor_actions.cc:1881
 msgid "Envelope Active"
 msgstr ""
 
-#: editor_actions.cc:1876
+#: editor_actions.cc:1885
 msgid "Quantize..."
 msgstr "Quantise..."
 
-#: editor_actions.cc:1877 editor_actions.cc:1878
+#: editor_actions.cc:1886 editor_actions.cc:1887
 msgid "Insert Patch Change..."
 msgstr ""
 
-#: editor_actions.cc:1879
+#: editor_actions.cc:1888
 msgid "Unlink from other copies"
 msgstr ""
 
-#: editor_actions.cc:1880
+#: editor_actions.cc:1889
 msgid "Strip Silence..."
 msgstr ""
 
-#: editor_actions.cc:1881
+#: editor_actions.cc:1890
 msgid "Set Range Selection"
 msgstr ""
 
-#: editor_actions.cc:1883
+#: editor_actions.cc:1892
 msgid "Nudge Later"
 msgstr ""
 
-#: editor_actions.cc:1884
+#: editor_actions.cc:1893
 msgid "Nudge Earlier"
 msgstr ""
 
-#: editor_actions.cc:1889
+#: editor_actions.cc:1898
 msgid "Nudge Later by Capture Offset"
 msgstr ""
 
-#: editor_actions.cc:1896
+#: editor_actions.cc:1905
 msgid "Nudge Earlier by Capture Offset"
 msgstr ""
 
-#: editor_actions.cc:1900
+#: editor_actions.cc:1909
 msgid "Trim to Loop"
 msgstr ""
 
-#: editor_actions.cc:1901
+#: editor_actions.cc:1910
 msgid "Trim to Punch"
 msgstr ""
 
-#: editor_actions.cc:1903
+#: editor_actions.cc:1912
 msgid "Trim to Previous"
 msgstr ""
 
-#: editor_actions.cc:1904
+#: editor_actions.cc:1913
 msgid "Trim to Next"
 msgstr ""
 
-#: editor_actions.cc:1911
+#: editor_actions.cc:1920
 msgid "Insert Region From Region List"
 msgstr ""
 
-#: editor_actions.cc:1917
+#: editor_actions.cc:1926
 msgid "Set Sync Position"
 msgstr ""
 
-#: editor_actions.cc:1918
+#: editor_actions.cc:1927
 msgid "Place Transient"
 msgstr ""
 
-#: editor_actions.cc:1919
+#: editor_actions.cc:1928
 msgid "Split"
 msgstr ""
 
-#: editor_actions.cc:1920
+#: editor_actions.cc:1929
 msgid "Trim Start at Edit Point"
 msgstr ""
 
-#: editor_actions.cc:1921
+#: editor_actions.cc:1930
 msgid "Trim End at Edit Point"
 msgstr ""
 
-#: editor_actions.cc:1926
+#: editor_actions.cc:1935
 msgid "Align Start"
 msgstr ""
 
-#: editor_actions.cc:1933
+#: editor_actions.cc:1942
 msgid "Align Start Relative"
 msgstr ""
 
-#: editor_actions.cc:1937
+#: editor_actions.cc:1946
 msgid "Align End"
 msgstr ""
 
-#: editor_actions.cc:1942
+#: editor_actions.cc:1951
 msgid "Align End Relative"
 msgstr ""
 
-#: editor_actions.cc:1949
+#: editor_actions.cc:1958
 msgid "Align Sync"
 msgstr ""
 
-#: editor_actions.cc:1956
+#: editor_actions.cc:1965
 msgid "Align Sync Relative"
 msgstr ""
 
-#: editor_actions.cc:1960 editor_actions.cc:1963
+#: editor_actions.cc:1969 editor_actions.cc:1972
 msgid "Choose Top..."
 msgstr ""
 
@@ -4185,38 +4193,38 @@ msgid ""
 "%2 as a new source, or skip it?"
 msgstr ""
 
-#: editor_audio_import.cc:279 editor_videotimeline.cc:107
+#: editor_audio_import.cc:279 editor_videotimeline.cc:108
 msgid "Cancel Import"
 msgstr ""
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr ""
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 msgid "Cancel entire import"
 msgstr ""
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 msgid "Don't embed it"
 msgstr ""
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr ""
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 msgid "Sample rate"
 msgstr ""
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
 msgstr ""
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 msgid "Embed it anyway"
 msgstr ""
 
@@ -4252,31 +4260,31 @@ msgstr ""
 msgid "move tempo mark"
 msgstr ""
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr ""
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr ""
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr ""
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr ""
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 msgid "programming_error: %1"
 msgstr ""
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr ""
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 msgid "rubberband selection"
 msgstr ""
 
@@ -4345,7 +4353,7 @@ msgid "Sharing Solo?"
 msgstr ""
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 msgid "Rec"
 msgstr ""
 
@@ -4416,7 +4424,7 @@ msgid "end"
 msgstr ""
 
 #: editor_markers.cc:646 editor_ops.cc:1744 editor_ops.cc:1764
-#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1005
+#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1017
 msgid "add marker"
 msgstr ""
 
@@ -4424,7 +4432,7 @@ msgstr ""
 msgid "range"
 msgstr ""
 
-#: editor_markers.cc:713 location_ui.cc:840
+#: editor_markers.cc:713 location_ui.cc:852
 msgid "remove marker"
 msgstr ""
 
@@ -4500,8 +4508,8 @@ msgstr ""
 msgid "Rename Range"
 msgstr ""
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2233 route_time_axis.cc:968 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr ""
 
@@ -4641,7 +4649,7 @@ msgstr ""
 msgid "Rename Region"
 msgstr ""
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 msgid "New name:"
 msgstr ""
 
@@ -4802,7 +4810,7 @@ msgid ""
 msgstr ""
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr ""
 
@@ -4985,11 +4993,11 @@ msgstr ""
 msgid "close region gaps"
 msgstr ""
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr ""
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5003,7 +5011,7 @@ msgstr ""
 msgid "tracks"
 msgstr ""
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 msgid "track"
 msgstr ""
 
@@ -5011,7 +5019,7 @@ msgstr ""
 msgid "busses"
 msgstr ""
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 msgid "bus"
 msgstr ""
 
@@ -5042,7 +5050,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr ""
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr ""
 
@@ -5111,7 +5119,7 @@ msgstr ""
 msgid "Length of region fade-out (units: secondary clock), () if dsisabled"
 msgstr ""
 
-#: editor_regions.cc:118 mixer_strip.cc:1960 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr ""
@@ -5128,8 +5136,9 @@ msgstr ""
 msgid "Region position glued to Bars|Beats time?"
 msgstr ""
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:723
-#: mixer_strip.cc:1934 panner_ui.cc:554 stereo_panner.cc:237
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
+#: stereo_panner.cc:237
 msgid "M"
 msgstr ""
 
@@ -5196,7 +5205,8 @@ msgstr ""
 msgid "Track/Bus visible ?"
 msgstr ""
 
-#: editor_routes.cc:204 mixer_strip.cc:1951 route_time_axis.cc:2387
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
+#: route_time_axis.cc:2407
 msgid "A"
 msgstr ""
 
@@ -5204,7 +5214,7 @@ msgstr ""
 msgid "Track/Bus active ?"
 msgstr ""
 
-#: editor_routes.cc:205 mixer_strip.cc:1935
+#: editor_routes.cc:205 mixer_strip.cc:1932
 msgid "I"
 msgstr ""
 
@@ -5212,7 +5222,7 @@ msgstr ""
 msgid "MIDI input enabled"
 msgstr ""
 
-#: editor_routes.cc:206 mixer_strip.cc:1933 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr ""
@@ -5225,7 +5235,7 @@ msgstr ""
 msgid "Muted"
 msgstr ""
 
-#: editor_routes.cc:208 mixer_strip.cc:1947
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr ""
 
@@ -5237,7 +5247,7 @@ msgstr ""
 msgid "SI"
 msgstr ""
 
-#: editor_routes.cc:209 mixer_strip.cc:351 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 msgid "Solo Isolated"
 msgstr ""
 
@@ -5513,139 +5523,143 @@ msgid "192000Hz"
 msgstr ""
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr ""
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr ""
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr ""
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 msgid "Shaped"
 msgstr ""
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr ""
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr ""
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr ""
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 msgid "Recording only"
 msgstr ""
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr ""
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 msgid "raw"
 msgstr ""
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr ""
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 msgid "Audio Interface:"
 msgstr ""
 
-#: engine_dialog.cc:187 sfdb_ui.cc:148 sfdb_ui.cc:261 sfdb_ui.cc:266
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 msgid "Sample rate:"
 msgstr ""
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr ""
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr ""
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr ""
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 msgid "Audio mode:"
 msgstr ""
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr ""
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr ""
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr ""
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr ""
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 msgid "Dither:"
 msgstr ""
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr ""
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr ""
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr ""
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 msgid "Output device:"
 msgstr ""
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 msgid "Hardware input latency:"
 msgstr ""
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 msgid "samples"
 msgstr ""
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 msgid "Hardware output latency:"
 msgstr ""
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr ""
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 msgid "Advanced"
 msgstr ""
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr ""
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 msgid ""
 "You do not have any audio devices capable of\n"
 "simultaneous playback and recording.\n"
@@ -5662,31 +5676,31 @@ msgid ""
 "%1 and choose the relevant device then."
 msgstr ""
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr ""
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr ""
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr ""
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr ""
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr ""
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:146
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 msgid "Channels:"
 msgstr ""
 
@@ -5834,9 +5848,9 @@ msgid "Folder:"
 msgstr ""
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr ""
 
@@ -5960,6 +5974,10 @@ msgstr ""
 msgid "Broadcast Wave options"
 msgstr ""
 
+#: export_format_selector.cc:136
+msgid "Do you really want to remove the format?"
+msgstr ""
+
 #: export_preset_selector.cc:28
 msgid "Preset"
 msgstr ""
@@ -5970,6 +5988,10 @@ msgid ""
 "Perhaps it references a format that has been removed?"
 msgstr ""
 
+#: export_preset_selector.cc:156
+msgid "Do you really want to remove this preset?"
+msgstr ""
+
 #: export_timespan_selector.cc:46
 msgid "Show Times as:"
 msgstr ""
@@ -5982,36 +6004,48 @@ msgstr ""
 msgid "Range"
 msgstr ""
 
-#: gain_meter.cc:109 gain_meter.cc:431 gain_meter.cc:820
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+msgid "curl error %1 (%2)"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+msgid "%1"
+msgstr ""
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr ""
 
-#: gain_meter.cc:115 gain_meter.cc:869
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr ""
 
-#: gain_meter.cc:116 gain_meter.cc:870
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr ""
 
-#: gain_meter.cc:125 gain_meter.cc:759 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr ""
 
-#: gain_meter.cc:334
-msgid "-Inf"
-msgstr ""
-
-#: gain_meter.cc:726 mixer_strip.cc:1954 panner_ui.cc:557
-#: route_time_axis.cc:2391
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
+#: route_time_axis.cc:2411
 msgid "P"
 msgstr ""
 
-#: gain_meter.cc:729 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr ""
 
-#: gain_meter.cc:732 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr ""
 
@@ -6023,7 +6057,7 @@ msgstr ""
 msgid "Switches"
 msgstr ""
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2210
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 msgid "Controls"
 msgstr ""
 
@@ -6051,63 +6085,63 @@ msgstr ""
 msgid "MIDI Connection Manager"
 msgstr ""
 
-#: global_port_matrix.cc:204 io_selector.cc:216
+#: global_port_matrix.cc:213 io_selector.cc:216
 msgid "port"
 msgstr ""
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 msgid "Selection..."
 msgstr ""
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr ""
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 msgid "Soloed..."
 msgstr ""
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 msgid "Create New Group ..."
 msgstr ""
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr ""
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 msgid "Edit Group..."
 msgstr ""
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 msgid "Collect Group"
 msgstr ""
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 msgid "Remove Group"
 msgstr ""
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 msgid "Remove Subgroup Bus"
 msgstr ""
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 msgid "Add New Subgroup Bus"
 msgstr ""
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr ""
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 msgid "Add New Aux Bus (post-fader)"
 msgstr ""
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 msgid "Enable All Groups"
 msgstr ""
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 msgid "Disable All Groups"
 msgstr ""
 
@@ -6201,11 +6235,11 @@ msgstr ""
 msgid "I/O selector"
 msgstr ""
 
-#: io_selector.cc:266
+#: io_selector.cc:265
 msgid "%1 input"
 msgstr ""
 
-#: io_selector.cc:268
+#: io_selector.cc:267
 msgid "%1 output"
 msgstr ""
 
@@ -6279,7 +6313,7 @@ msgstr[1] ""
 msgid "Reset"
 msgstr ""
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1734
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 msgid "programming error: %1 (%2)"
 msgstr ""
 
@@ -6307,63 +6341,63 @@ msgstr ""
 msgid "Pre-Emphasis"
 msgstr ""
 
-#: location_ui.cc:310
+#: location_ui.cc:314
 msgid "Remove this range"
 msgstr ""
 
-#: location_ui.cc:311
+#: location_ui.cc:315
 msgid "Start time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:312
+#: location_ui.cc:316
 msgid "End time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:315
+#: location_ui.cc:319
 msgid "Set range start from playhead location"
 msgstr ""
 
-#: location_ui.cc:316
+#: location_ui.cc:320
 msgid "Set range end from playhead location"
 msgstr ""
 
-#: location_ui.cc:320
+#: location_ui.cc:324
 msgid "Remove this marker"
 msgstr ""
 
-#: location_ui.cc:321
+#: location_ui.cc:325
 msgid "Position - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:323
+#: location_ui.cc:327
 msgid "Set marker time from playhead location"
 msgstr ""
 
-#: location_ui.cc:462
+#: location_ui.cc:494
 msgid "You cannot put a CD marker at the start of the session"
 msgstr ""
 
-#: location_ui.cc:708
+#: location_ui.cc:720
 msgid "New Marker"
 msgstr ""
 
-#: location_ui.cc:709
+#: location_ui.cc:721
 msgid "New Range"
 msgstr ""
 
-#: location_ui.cc:722
+#: location_ui.cc:734
 msgid "<b>Loop/Punch Ranges</b>"
 msgstr ""
 
-#: location_ui.cc:747
+#: location_ui.cc:759
 msgid "<b>Markers (Including CD Index)</b>"
 msgstr ""
 
-#: location_ui.cc:782
+#: location_ui.cc:794
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
 msgstr ""
 
-#: location_ui.cc:1024
+#: location_ui.cc:1036
 msgid "add range marker"
 msgstr ""
 
@@ -6429,45 +6463,49 @@ msgid ""
 "session at this time, because we would lose your connection information.\n"
 msgstr ""
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr ""
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr ""
 
-#: main.cc:504
+#: main.cc:500
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr ""
 
-#: main.cc:505
+#: main.cc:501
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
 msgstr ""
 
-#: main.cc:507
+#: main.cc:503
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr ""
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr ""
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr ""
 
-#: main.cc:519
+#: main.cc:513
+msgid "could not initialize %1."
+msgstr "could not initialise %1."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr ""
 
-#: main.cc:525
+#: main.cc:528
 #, fuzzy
 msgid "could not create %1 GUI"
 msgstr "could not initialise %1."
@@ -6476,7 +6514,7 @@ msgstr "could not initialise %1."
 msgid "Display delta to edit cursor"
 msgstr ""
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 msgid "MarkerText"
 msgstr ""
 
@@ -6955,7 +6993,7 @@ msgstr ""
 msgid "Missing Plugins"
 msgstr ""
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr ""
 
@@ -7027,215 +7065,227 @@ msgstr ""
 msgid "Could not find mixer.bindings in search path %1"
 msgstr ""
 
-#: mixer_strip.cc:91 mixer_strip.cc:119 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr ""
 
-#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:352 mixer_strip.cc:1293
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 msgid "Comments"
 msgstr ""
 
-#: mixer_strip.cc:145
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr ""
 
-#: mixer_strip.cc:147
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
 msgstr ""
 
-#: mixer_strip.cc:154
+#: mixer_strip.cc:156
 msgid "Hide this mixer strip"
 msgstr ""
 
-#: mixer_strip.cc:165
+#: mixer_strip.cc:167
 msgid "Click to select metering point"
 msgstr ""
 
-#: mixer_strip.cc:171
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr ""
 
-#: mixer_strip.cc:190
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr ""
 
-#: mixer_strip.cc:199
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr ""
 
-#: mixer_strip.cc:201 mixer_strip.cc:1929
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 msgid "lock"
 msgstr ""
 
-#: mixer_strip.cc:202 mixer_strip.cc:1928
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 msgid "iso"
 msgstr ""
 
-#: mixer_strip.cc:256
+#: mixer_strip.cc:258
 msgid "Mix group"
 msgstr ""
 
-#: mixer_strip.cc:349 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 msgid "Phase Invert"
 msgstr ""
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 msgid "Solo Safe"
 msgstr ""
 
-#: mixer_strip.cc:353 mixer_ui.cc:124 route_time_axis.cc:664
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 msgid "Group"
 msgstr ""
 
-#: mixer_strip.cc:354 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 msgid "Meter Point"
 msgstr ""
 
-#: mixer_strip.cc:466
+#: mixer_strip.cc:470
 msgid "Enable/Disable MIDI input"
 msgstr ""
 
-#: mixer_strip.cc:616
+#: mixer_strip.cc:622
 msgid ""
 "Aux\n"
 "Sends"
 msgstr ""
 
-#: mixer_strip.cc:640
+#: mixer_strip.cc:646
 msgid "Snd"
 msgstr ""
 
-#: mixer_strip.cc:694 mixer_strip.cc:822 processor_box.cc:2152
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr ""
 
-#: mixer_strip.cc:1089
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr ""
 
-#: mixer_strip.cc:1092
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr ""
 
-#: mixer_strip.cc:1167
+#: mixer_strip.cc:1174
 msgid "Disconnected"
 msgstr ""
 
-#: mixer_strip.cc:1296
+#: mixer_strip.cc:1303
 msgid "*Comments*"
 msgstr ""
 
-#: mixer_strip.cc:1303
+#: mixer_strip.cc:1310
 msgid "Cmt"
 msgstr ""
 
-#: mixer_strip.cc:1306
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr ""
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr ""
 
-#: mixer_strip.cc:1351
+#: mixer_strip.cc:1358
 msgid ": comment editor"
 msgstr ""
 
-#: mixer_strip.cc:1428
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr ""
 
-#: mixer_strip.cc:1431
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr ""
 
-#: mixer_strip.cc:1460
+#: mixer_strip.cc:1467
 msgid "Comments..."
 msgstr ""
 
-#: mixer_strip.cc:1462
+#: mixer_strip.cc:1469
 msgid "Save As Template..."
 msgstr ""
 
-#: mixer_strip.cc:1468 route_group_dialog.cc:39 route_time_axis.cc:687
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr ""
 
-#: mixer_strip.cc:1475
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr ""
 
-#: mixer_strip.cc:1478
+#: mixer_strip.cc:1485
 msgid "Protect Against Denormals"
 msgstr ""
 
-#: mixer_strip.cc:1484 route_time_axis.cc:426
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 msgid "Remote Control ID..."
 msgstr ""
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 msgid "in"
 msgstr ""
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 msgid "post"
 msgstr ""
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 msgid "out"
 msgstr ""
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr ""
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 msgid "pr"
 msgstr ""
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 msgid "po"
 msgstr ""
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 msgid "o"
 msgstr ""
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr ""
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr ""
 
-#: mixer_strip.cc:1920 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr ""
 
-#: mixer_strip.cc:1923 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr ""
 
-#: mixer_strip.cc:1936
+#: mixer_strip.cc:1933
 msgid "D"
 msgstr ""
 
-#: mixer_strip.cc:1959
+#: mixer_strip.cc:1953
 msgid "i"
 msgstr ""
 
-#: mixer_strip.cc:2133
+#: mixer_strip.cc:2128
 msgid "Pre-fader"
 msgstr ""
 
-#: mixer_strip.cc:2134
+#: mixer_strip.cc:2129
 msgid "Post-fader"
 msgstr ""
 
+#: mixer_strip.cc:2166 meter_strip.cc:728
+msgid "Change all in Group to %1"
+msgstr ""
+
+#: mixer_strip.cc:2168 meter_strip.cc:730
+msgid "Change all to %1"
+msgstr ""
+
+#: mixer_strip.cc:2170 meter_strip.cc:732
+msgid "Change same track-type to %1"
+msgstr ""
+
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr ""
@@ -7244,10 +7294,66 @@ msgstr ""
 msgid "-all-"
 msgstr ""
 
-#: mixer_ui.cc:1792
+#: mixer_ui.cc:1794
 msgid "Strips"
 msgstr ""
 
+#: meter_strip.cc:764
+msgid "Variable height"
+msgstr ""
+
+#: meter_strip.cc:765
+msgid "Short"
+msgstr ""
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr ""
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr ""
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+msgid "VU"
+msgstr ""
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr ""
@@ -7589,7 +7695,7 @@ msgstr ""
 msgid "Panner (2D)"
 msgstr ""
 
-#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:452
+#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:451
 msgid "Bypass"
 msgstr ""
 
@@ -7762,7 +7868,7 @@ msgstr ""
 msgid "Eh? LADSPA plugins don't have editors!"
 msgstr ""
 
-#: plugin_ui.cc:125 plugin_ui.cc:228
+#: plugin_ui.cc:125 plugin_ui.cc:227
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
 "version of %1)"
@@ -7772,79 +7878,91 @@ msgstr ""
 msgid "unknown type of editor-supplying plugin"
 msgstr ""
 
-#: plugin_ui.cc:258
+#: plugin_ui.cc:257
 msgid ""
 "unknown type of editor-supplying plugin (note: no linuxVST support in this "
 "version of %1)"
 msgstr ""
 
-#: plugin_ui.cc:330
+#: plugin_ui.cc:329
 msgid "create_lv2_editor called on non-LV2 plugin"
 msgstr ""
 
-#: plugin_ui.cc:418
+#: plugin_ui.cc:417
 msgid "Add"
 msgstr ""
 
-#: plugin_ui.cc:422
+#: plugin_ui.cc:421
 msgid "Description"
 msgstr ""
 
-#: plugin_ui.cc:423
+#: plugin_ui.cc:422
 msgid "Plugin analysis"
 msgstr ""
 
-#: plugin_ui.cc:430
+#: plugin_ui.cc:429
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
 msgstr ""
 
-#: plugin_ui.cc:431
+#: plugin_ui.cc:430
 msgid "Save a new preset"
 msgstr ""
 
-#: plugin_ui.cc:432
+#: plugin_ui.cc:431
 msgid "Save the current preset"
 msgstr ""
 
-#: plugin_ui.cc:433
+#: plugin_ui.cc:432
 msgid "Delete the current preset"
 msgstr ""
 
-#: plugin_ui.cc:434
+#: plugin_ui.cc:433
 msgid "Disable signal processing by the plugin"
 msgstr ""
 
-#: plugin_ui.cc:467 plugin_ui.cc:632
+#: plugin_ui.cc:466 plugin_ui.cc:662
 msgid ""
 "Click to allow the plugin to receive keyboard events that %1 would normally "
 "use as a shortcut"
 msgstr ""
 
-#: plugin_ui.cc:468
+#: plugin_ui.cc:467
 msgid "Click to enable/disable this plugin"
 msgstr ""
 
-#: plugin_ui.cc:507
+#: plugin_ui.cc:506
 msgid "latency (%1 sample)"
 msgid_plural "latency (%1 samples)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugin_ui.cc:509
+#: plugin_ui.cc:508
 msgid "latency (%1 ms)"
 msgstr ""
 
-#: plugin_ui.cc:520
+#: plugin_ui.cc:519
 msgid "Edit Latency"
 msgstr ""
 
-#: plugin_ui.cc:559
+#: plugin_ui.cc:558
 msgid "Plugin preset %1 not found"
 msgstr ""
 
-#: plugin_ui.cc:639
+#: plugin_ui.cc:595
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin_ui.cc:615 plugin_ui.cc:630
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"newer version"
+msgstr ""
+
+#: plugin_ui.cc:669
 msgid "Click to allow normal use of %1 keyboard shortcuts"
 msgstr ""
 
@@ -7948,76 +8066,77 @@ msgstr ""
 msgid "Port Insert "
 msgstr ""
 
-#: port_matrix.cc:323 port_matrix.cc:342
+#: port_matrix.cc:331 port_matrix.cc:357
 msgid "<b>Sources</b>"
 msgstr ""
 
-#: port_matrix.cc:324 port_matrix.cc:343
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr ""
 
-#: port_matrix.cc:419 port_matrix.cc:427
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr ""
 
-#: port_matrix.cc:435
+#: port_matrix.cc:456
 #, c-format
 msgid "Rename '%s'..."
 msgstr ""
 
-#: port_matrix.cc:451
+#: port_matrix.cc:472
 msgid "Remove all"
 msgstr ""
 
-#: port_matrix.cc:471 port_matrix.cc:483
+#: port_matrix.cc:492 port_matrix.cc:504
 #, c-format
 msgid "%s all"
 msgstr ""
 
-#: port_matrix.cc:506
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr ""
 
-#: port_matrix.cc:508
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr ""
 
-#: port_matrix.cc:514
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr ""
 
-#: port_matrix.cc:702
+#: port_matrix.cc:723
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
 "or buss cannot support the new configuration."
 msgstr ""
 
-#: port_matrix.cc:705
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr ""
 
-#: port_matrix.cc:727
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr ""
 
-#: port_matrix.cc:728
+#: port_matrix.cc:749
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
 
-#: port_matrix.cc:945
+#: port_matrix.cc:966
 #, c-format
 msgid "Remove '%s'"
 msgstr ""
 
-#: port_matrix.cc:960
+#: port_matrix.cc:981
 #, c-format
 msgid "%s all from '%s'"
 msgstr ""
 
-#: port_matrix.cc:1026
+#: port_matrix.cc:1047
 msgid "channel"
 msgstr ""
 
@@ -8029,192 +8148,192 @@ msgstr ""
 msgid "There are no %1 ports to connect."
 msgstr ""
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
 "Alt+double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 msgid "Show All Controls"
 msgstr ""
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 msgid "Hide All Controls"
 msgstr ""
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 msgid "on"
 msgstr ""
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr ""
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
 msgstr ""
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 msgid "Plugin Incompatibility"
 msgstr ""
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr ""
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
 msgstr ""
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
 msgstr ""
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
 msgstr ""
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 msgid "Cannot set up new send: %1"
 msgstr ""
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
 "in that way because the inputs and\n"
 "outputs will not work correctly."
 msgstr ""
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 msgid "Rename Processor"
 msgstr ""
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr ""
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr ""
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
 "could not match the configuration of this track."
 msgstr ""
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 msgid ""
 "Do you really want to remove all processors from %1?\n"
 "(this cannot be undone)"
 msgstr ""
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 msgid "Yes, remove them all"
 msgstr ""
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 msgid "Remove processors"
 msgstr ""
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
 "(this cannot be undone)"
 msgstr ""
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
 "(this cannot be undone)"
 msgstr ""
 
-#: processor_box.cc:2198
+#: processor_box.cc:2200
 msgid "New Plugin"
 msgstr ""
 
-#: processor_box.cc:2201
+#: processor_box.cc:2203
 msgid "New Insert"
 msgstr ""
 
-#: processor_box.cc:2204
+#: processor_box.cc:2206
 msgid "New External Send ..."
 msgstr ""
 
-#: processor_box.cc:2208
+#: processor_box.cc:2210
 msgid "New Aux Send ..."
 msgstr ""
 
-#: processor_box.cc:2212
+#: processor_box.cc:2214
 msgid "Clear (all)"
 msgstr ""
 
-#: processor_box.cc:2214
+#: processor_box.cc:2216
 msgid "Clear (pre-fader)"
 msgstr ""
 
-#: processor_box.cc:2216
+#: processor_box.cc:2218
 msgid "Clear (post-fader)"
 msgstr ""
 
-#: processor_box.cc:2242
+#: processor_box.cc:2244
 msgid "Activate All"
 msgstr ""
 
-#: processor_box.cc:2244
+#: processor_box.cc:2246
 msgid "Deactivate All"
 msgstr ""
 
-#: processor_box.cc:2246
+#: processor_box.cc:2248
 msgid "A/B Plugins"
 msgstr ""
 
-#: processor_box.cc:2255
+#: processor_box.cc:2257
 msgid "Edit with generic controls..."
 msgstr ""
 
-#: processor_box.cc:2531
+#: processor_box.cc:2557
 msgid "%1: %2 (by %3)"
 msgstr ""
 
@@ -8372,7 +8491,7 @@ msgstr ""
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
 
 #: rc_option_editor.cc:836
@@ -8460,7 +8579,7 @@ msgstr ""
 msgid "Click gain level"
 msgstr ""
 
-#: rc_option_editor.cc:1083 route_time_axis.cc:206 route_time_axis.cc:667
+#: rc_option_editor.cc:1083 route_time_axis.cc:215 route_time_axis.cc:676
 msgid "Automation"
 msgstr ""
 
@@ -8638,91 +8757,95 @@ msgstr ""
 msgid "Show meters on tracks in the editor"
 msgstr ""
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr ""
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr ""
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 msgid "whenever they overlap in time"
 msgstr ""
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr ""
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr ""
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 msgid "Show waveforms in regions"
 msgstr ""
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 msgid "Show gain envelopes in audio regions"
 msgstr ""
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr ""
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr ""
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 msgid "Waveform scale"
 msgstr ""
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr ""
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr ""
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 msgid "Waveform shape"
 msgstr ""
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 msgid "traditional"
 msgstr ""
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 msgid "rectified"
 msgstr ""
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr ""
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr ""
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr "Colour regions using their track's colour"
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr ""
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 msgid "Synchronise editor and mixer track order"
 msgstr ""
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 msgid "Synchronise editor and mixer selection"
 msgstr ""
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 msgid "Name new markers"
 msgstr ""
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -8730,333 +8853,415 @@ msgid ""
 "You can always rename markers by right-clicking on them"
 msgstr ""
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr ""
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr ""
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 msgid "Record monitoring handled by"
 msgstr ""
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 msgid "ardour"
 msgstr ""
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 msgid "audio hardware"
 msgstr ""
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 msgid "Tape machine mode"
 msgstr ""
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr ""
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr ""
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 msgid "Connect track inputs"
 msgstr ""
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 msgid "automatically to physical inputs"
 msgstr ""
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr ""
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 msgid "Connect track and bus outputs"
 msgstr ""
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 msgid "automatically to physical outputs"
 msgstr ""
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 msgid "automatically to master bus"
 msgstr ""
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 msgid "Denormals"
 msgstr ""
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 msgid "Use DC bias to protect against denormals"
 msgstr ""
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr ""
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr ""
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 msgid "use FlushToZero"
 msgstr ""
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr ""
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr ""
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 msgid "Silence plugins when the transport is stopped"
 msgstr ""
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr ""
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr ""
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 msgid "Replicate missing region channels"
 msgstr ""
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 msgid "Solo / mute"
 msgstr ""
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 msgid "Solo-in-place mute cut (dB)"
 msgstr ""
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr ""
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 msgid "Listen Position"
 msgstr ""
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 msgid "after-fader (AFL)"
 msgstr ""
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 msgid "pre-fader (PFL)"
 msgstr ""
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr ""
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 msgid "before pre-fader processors"
 msgstr ""
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr ""
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr ""
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 msgid "immediately post-fader"
 msgstr ""
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 msgid "after post-fader processors (before pan)"
 msgstr ""
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr ""
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 msgid "Show solo muting"
 msgstr ""
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr ""
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 msgid "Default track / bus muting options"
 msgstr ""
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr ""
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr ""
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 msgid "Mute affects control outputs"
 msgstr ""
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr ""
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 msgid "Send MIDI Time Code"
 msgstr ""
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr ""
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr ""
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 msgid "Send MIDI control feedback"
 msgstr ""
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr ""
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr ""
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr ""
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr ""
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr ""
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 msgid "Sound MIDI notes as they are selected"
 msgstr ""
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 msgid "User interaction"
 msgstr ""
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
 "   <i>(if available for your language preferences)</i>"
 msgstr ""
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr ""
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 msgid "Control surface remote ID"
 msgstr ""
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 msgid "assigned by user"
 msgstr ""
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr ""
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr ""
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1925
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 msgid "Preferences|GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr ""
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr ""
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr ""
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 msgid "Mixer Strip"
 msgstr ""
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 msgid "Use narrow strips in the mixer by default"
 msgstr ""
 
-#: rc_option_editor.cc:1898
-msgid "Meter hold time"
+#: rc_option_editor.cc:1906
+msgid "Peak hold time"
 msgstr ""
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 msgid "short"
 msgstr ""
 
-#: rc_option_editor.cc:1905 rc_option_editor.cc:1920
+#: rc_option_editor.cc:1913
 msgid "medium"
 msgstr ""
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr ""
 
-#: rc_option_editor.cc:1912
-msgid "Meter fall-off"
+#: rc_option_editor.cc:1920
+msgid "DPM fall-off"
+msgstr ""
+
+#: rc_option_editor.cc:1926
+msgid "slowest [6.6dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1927
+msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
+msgstr ""
+
+#: rc_option_editor.cc:1928
+msgid "slowish [12.0dB/sec] (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1929
+msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
+msgstr ""
+
+#: rc_option_editor.cc:1930
+msgid "medium [20dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1931
+msgid "fast [32dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1932
+msgid "faster [46dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1933
+msgid "fastest [70dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1939
+msgid "Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
+
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+msgid "-20dBFS (SMPTE RP.0155)"
 msgstr ""
 
-#: rc_option_editor.cc:1918
-msgid "slowest"
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+msgid "-18dBFS (EBU, BBC)"
 msgstr ""
 
-#: rc_option_editor.cc:1919
-msgid "slow"
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
 msgstr ""
 
-#: rc_option_editor.cc:1921
-msgid "fast"
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
+
+#: rc_option_editor.cc:1955
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
+msgstr ""
+
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
 msgstr ""
 
-#: rc_option_editor.cc:1922
-msgid "faster"
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
 msgstr ""
 
-#: rc_option_editor.cc:1923
-msgid "fastest"
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
+
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
+
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1985
+msgid "Peak threshold [dBFS]"
+msgstr ""
+
+#: rc_option_editor.cc:1993
+msgid ""
+"Specify the audio signal level in dbFS at and above which the meter-peak "
+"indicator will flash red."
+msgstr ""
+
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
 msgstr ""
 
 #: region_editor.cc:79
@@ -9067,11 +9272,11 @@ msgstr ""
 msgid "Position:"
 msgstr ""
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr ""
 
-#: region_editor.cc:92 sfdb_ui.cc:140
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr ""
 
@@ -9095,23 +9300,23 @@ msgstr ""
 msgid "Source:"
 msgstr ""
 
-#: region_editor.cc:167
+#: region_editor.cc:166
 msgid "Region '%1'"
 msgstr ""
 
-#: region_editor.cc:274
+#: region_editor.cc:273
 msgid "change region start position"
 msgstr ""
 
-#: region_editor.cc:290
+#: region_editor.cc:289
 msgid "change region end position"
 msgstr ""
 
-#: region_editor.cc:310
+#: region_editor.cc:309
 msgid "change region length"
 msgstr ""
 
-#: region_editor.cc:404 region_editor.cc:416
+#: region_editor.cc:403 region_editor.cc:415
 msgid "change region sync point"
 msgstr ""
 
@@ -9300,316 +9505,316 @@ msgid ""
 "A route group of this name already exists.  Please use a different name."
 msgstr ""
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 msgid "Tracks/Busses"
 msgstr ""
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr ""
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr ""
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr ""
 
-#: route_params_ui.cc:211
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr ""
 
-#: route_params_ui.cc:258 route_params_ui.cc:286
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr ""
 
-#: route_params_ui.cc:478
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr ""
 
-#: route_params_ui.cc:611 route_params_ui.cc:612
+#: route_params_ui.cc:613 route_params_ui.cc:614
 msgid "No Track or Bus Selected"
 msgstr ""
 
-#: route_time_axis.cc:96
+#: route_time_axis.cc:97
 msgid "g"
 msgstr ""
 
-#: route_time_axis.cc:97
+#: route_time_axis.cc:98
 msgid "p"
 msgstr ""
 
-#: route_time_axis.cc:98
+#: route_time_axis.cc:99
 msgid "a"
 msgstr ""
 
-#: route_time_axis.cc:168
+#: route_time_axis.cc:173
 msgid "Record (Right-click for Step Edit)"
 msgstr ""
 
-#: route_time_axis.cc:171
+#: route_time_axis.cc:176
 msgid "Record"
 msgstr ""
 
-#: route_time_axis.cc:201
+#: route_time_axis.cc:210
 msgid "Route Group"
 msgstr ""
 
-#: route_time_axis.cc:204
+#: route_time_axis.cc:213
 msgid "MIDI Controllers and Automation"
 msgstr ""
 
-#: route_time_axis.cc:381
+#: route_time_axis.cc:390
 msgid "Show All Automation"
 msgstr ""
 
-#: route_time_axis.cc:384
+#: route_time_axis.cc:393
 msgid "Show Existing Automation"
 msgstr ""
 
-#: route_time_axis.cc:387
+#: route_time_axis.cc:396
 msgid "Hide All Automation"
 msgstr ""
 
-#: route_time_axis.cc:396
+#: route_time_axis.cc:405
 msgid "Processor automation"
 msgstr ""
 
-#: route_time_axis.cc:415
+#: route_time_axis.cc:424
 msgid "Color..."
 msgstr "Colour..."
 
-#: route_time_axis.cc:472
+#: route_time_axis.cc:481
 msgid "Overlaid"
 msgstr ""
 
-#: route_time_axis.cc:478
+#: route_time_axis.cc:487
 msgid "Stacked"
 msgstr ""
 
-#: route_time_axis.cc:486
+#: route_time_axis.cc:495
 msgid "Layers"
 msgstr ""
 
-#: route_time_axis.cc:555
+#: route_time_axis.cc:564
 msgid "Automatic (based on I/O connections)"
 msgstr ""
 
-#: route_time_axis.cc:564
+#: route_time_axis.cc:573
 msgid "(Currently: Existing Material)"
 msgstr ""
 
-#: route_time_axis.cc:567
+#: route_time_axis.cc:576
 msgid "(Currently: Capture Time)"
 msgstr ""
 
-#: route_time_axis.cc:575
+#: route_time_axis.cc:584
 msgid "Align With Existing Material"
 msgstr ""
 
-#: route_time_axis.cc:580
+#: route_time_axis.cc:589
 msgid "Align With Capture Time"
 msgstr ""
 
-#: route_time_axis.cc:585
+#: route_time_axis.cc:594
 msgid "Alignment"
 msgstr ""
 
-#: route_time_axis.cc:620
+#: route_time_axis.cc:629
 msgid "Normal Mode"
 msgstr ""
 
-#: route_time_axis.cc:626
+#: route_time_axis.cc:635
 msgid "Tape Mode"
 msgstr ""
 
-#: route_time_axis.cc:632
+#: route_time_axis.cc:641
 msgid "Non-Layered Mode"
 msgstr ""
 
-#: route_time_axis.cc:645 route_time_axis.cc:1587
+#: route_time_axis.cc:654 route_time_axis.cc:1601
 msgid "Playlist"
 msgstr ""
 
-#: route_time_axis.cc:965
+#: route_time_axis.cc:979
 msgid "Rename Playlist"
 msgstr ""
 
-#: route_time_axis.cc:966
+#: route_time_axis.cc:980
 msgid "New name for playlist:"
 msgstr ""
 
-#: route_time_axis.cc:1051
+#: route_time_axis.cc:1065
 msgid "New Copy Playlist"
 msgstr ""
 
-#: route_time_axis.cc:1052 route_time_axis.cc:1105
+#: route_time_axis.cc:1066 route_time_axis.cc:1119
 msgid "Name for new playlist:"
 msgstr ""
 
-#: route_time_axis.cc:1104
+#: route_time_axis.cc:1118
 msgid "New Playlist"
 msgstr ""
 
-#: route_time_axis.cc:1295
+#: route_time_axis.cc:1309
 msgid "You cannot create a track with that name as it is reserved for %1"
 msgstr ""
 
-#: route_time_axis.cc:1476
+#: route_time_axis.cc:1490
 msgid "New Copy..."
 msgstr ""
 
-#: route_time_axis.cc:1480
+#: route_time_axis.cc:1494
 msgid "New Take"
 msgstr ""
 
-#: route_time_axis.cc:1481
+#: route_time_axis.cc:1495
 msgid "Copy Take"
 msgstr ""
 
-#: route_time_axis.cc:1486
+#: route_time_axis.cc:1500
 msgid "Clear Current"
 msgstr ""
 
-#: route_time_axis.cc:1489
+#: route_time_axis.cc:1503
 msgid "Select From All..."
 msgstr ""
 
-#: route_time_axis.cc:1577
+#: route_time_axis.cc:1591
 msgid "Take: %1.%2"
 msgstr ""
 
-#: route_time_axis.cc:2267
+#: route_time_axis.cc:2291
 msgid "Underlays"
 msgstr ""
 
-#: route_time_axis.cc:2270
+#: route_time_axis.cc:2294
 msgid "Remove \"%1\""
 msgstr ""
 
-#: route_time_axis.cc:2320 route_time_axis.cc:2357
+#: route_time_axis.cc:2344 route_time_axis.cc:2381
 msgid "programming error: underlay reference pointer pairs are inconsistent!"
 msgstr ""
 
-#: route_time_axis.cc:2388
+#: route_time_axis.cc:2408
 msgid "After-fade listen (AFL)"
 msgstr ""
 
-#: route_time_axis.cc:2392
+#: route_time_axis.cc:2412
 msgid "Pre-fade listen (PFL)"
 msgstr ""
 
-#: route_time_axis.cc:2396
+#: route_time_axis.cc:2416
 msgid "s"
 msgstr ""
 
-#: route_time_axis.cc:2400
+#: route_time_axis.cc:2419
 msgid "m"
 msgstr ""
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 msgid "Mute this track"
 msgstr ""
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr ""
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr ""
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr ""
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 msgid "Monitor input"
 msgstr ""
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 msgid "Monitor playback"
 msgstr ""
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 msgid "Not connected to JACK - cannot engage record"
 msgstr ""
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 msgid "Step Entry"
 msgstr ""
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr ""
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 msgid "Assign all tracks and buses (prefader)"
 msgstr ""
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr ""
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 msgid "Assign all tracks and buses (postfader)"
 msgstr ""
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 msgid "Assign selected tracks (prefader)"
 msgstr ""
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 msgid "Assign selected tracks and buses (prefader)"
 msgstr ""
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 msgid "Assign selected tracks (postfader)"
 msgstr ""
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 msgid "Assign selected tracks and buses (postfader)"
 msgstr ""
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 msgid "Copy track/bus gains to sends"
 msgstr ""
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr ""
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr ""
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 msgid "Solo Isolate"
 msgstr ""
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr ""
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr ""
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr ""
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr ""
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 msgid "Color Selection"
 msgstr "Colour Selection"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "\n"
@@ -9618,68 +9823,68 @@ msgid ""
 "(This action cannot be undone, and the session file will be overwritten)"
 msgstr ""
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
 "\n"
 "(This action cannot be undone, and the session file will be overwritten)"
 msgstr ""
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 msgid "Remove track"
 msgstr ""
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 msgid "Remove bus"
 msgstr ""
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
 msgstr ""
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 msgid "Use the new name"
 msgstr ""
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 msgid "Re-edit the name"
 msgstr ""
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 msgid "Rename Track"
 msgstr ""
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 msgid "Rename Bus"
 msgstr ""
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 msgid " latency"
 msgstr ""
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr ""
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 msgid "Save As Template"
 msgstr ""
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 msgid "Template name:"
 msgstr ""
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 msgid "Remote Control ID"
 msgstr ""
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 msgid "Remote control ID:"
 msgstr ""
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -9687,15 +9892,15 @@ msgid ""
 "The remote control ID of %3 cannot be changed."
 msgstr ""
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 msgid "the master bus"
 msgstr ""
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 msgid "the monitor bus"
 msgstr ""
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -9706,21 +9911,21 @@ msgid ""
 "change this%5"
 msgstr ""
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 msgid "the mixer"
 msgstr ""
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 msgid "the editor"
 msgstr ""
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
 msgstr ""
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr ""
 
@@ -9736,7 +9941,7 @@ msgstr ""
 msgid "the session folder"
 msgstr ""
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 msgid "Send "
 msgstr ""
 
@@ -10208,51 +10413,99 @@ msgstr ""
 msgid "Glue new regions to bars and beats"
 msgstr ""
 
-#: sfdb_ui.cc:87 sfdb_ui.cc:107 sfdb_ui.cc:116
+#: session_option_editor.cc:275 session_option_editor.cc:277
+#: session_option_editor.cc:284 session_option_editor.cc:291
+#: session_option_editor.cc:298 session_option_editor.cc:300
+#: session_option_editor.cc:307 session_option_editor.cc:314
+#: session_option_editor.cc:321 session_option_editor.cc:323
+msgid "Meterbridge"
+msgstr ""
+
+#: session_option_editor.cc:275
+msgid "Route Display"
+msgstr ""
+
+#: session_option_editor.cc:279
+msgid "Show Midi Tracks"
+msgstr ""
+
+#: session_option_editor.cc:286
+msgid "Show Busses"
+msgstr ""
+
+#: session_option_editor.cc:293
+msgid "Include Master Bus"
+msgstr ""
+
+#: session_option_editor.cc:298
+msgid "Button Area"
+msgstr ""
+
+#: session_option_editor.cc:302
+msgid "Rec-enable Button"
+msgstr ""
+
+#: session_option_editor.cc:309
+msgid "Mute Button"
+msgstr ""
+
+#: session_option_editor.cc:316
+msgid "Solo Button"
+msgstr ""
+
+#: session_option_editor.cc:321
+msgid "Name Labels"
+msgstr ""
+
+#: session_option_editor.cc:325
+msgid "Track Name"
+msgstr ""
+
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 msgid "as new tracks"
 msgstr ""
 
-#: sfdb_ui.cc:89 sfdb_ui.cc:109
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 msgid "to selected tracks"
 msgstr ""
 
-#: sfdb_ui.cc:91 sfdb_ui.cc:111
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 msgid "to region list"
 msgstr ""
 
-#: sfdb_ui.cc:93 sfdb_ui.cc:113
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 msgid "as new tape tracks"
 msgstr ""
 
-#: sfdb_ui.cc:97
+#: sfdb_ui.cc:96
 msgid "programming error: unknown import mode string %1"
 msgstr ""
 
-#: sfdb_ui.cc:124
+#: sfdb_ui.cc:123
 msgid "Auto-play"
 msgstr ""
 
-#: sfdb_ui.cc:130 sfdb_ui.cc:237
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 msgid "<b>Sound File Information</b>"
 msgstr ""
 
-#: sfdb_ui.cc:142
+#: sfdb_ui.cc:141
 msgid "Timestamp:"
 msgstr ""
 
-#: sfdb_ui.cc:144
+#: sfdb_ui.cc:143
 msgid "Format:"
 msgstr ""
 
-#: sfdb_ui.cc:183 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr ""
 
-#: sfdb_ui.cc:320
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr ""
 
-#: sfdb_ui.cc:327
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr ""
 
@@ -10280,11 +10533,11 @@ msgstr ""
 msgid "MIDI files"
 msgstr ""
 
-#: sfdb_ui.cc:458 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 msgid "All files"
 msgstr ""
 
-#: sfdb_ui.cc:477 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 msgid "Browse Files"
 msgstr ""
 
@@ -10292,223 +10545,211 @@ msgstr ""
 msgid "Paths"
 msgstr ""
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr ""
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 msgid "Sort:"
 msgstr ""
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 msgid "Longest"
 msgstr ""
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 msgid "Shortest"
 msgstr ""
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 msgid "Newest"
 msgstr ""
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr ""
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr ""
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 msgid "Least downloaded"
 msgstr ""
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr ""
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr ""
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr ""
 
-#: sfdb_ui.cc:572
+#: sfdb_ui.cc:555
+msgid "Similar"
+msgstr ""
+
+#: sfdb_ui.cc:567
 msgid "ID"
 msgstr ""
 
-#: sfdb_ui.cc:573 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 msgid "Filename"
 msgstr ""
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:570
 msgid "Duration"
 msgstr ""
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:571
 msgid "Size"
 msgstr ""
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:572
 msgid "Samplerate"
 msgstr ""
 
-#: sfdb_ui.cc:578
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr ""
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr ""
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr ""
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr ""
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr ""
 
-#: sfdb_ui.cc:846
-msgid "found %1 match"
-msgid_plural "found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:862
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr "SoundFileBrowser: Could not tokenise string: "
 
-#: sfdb_ui.cc:960
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sfdb_ui.cc:965
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr ""
 
-#: sfdb_ui.cc:1029
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr ""
 
-#: sfdb_ui.cc:1031
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr ""
 
-#: sfdb_ui.cc:1033 sfdb_ui.cc:1035
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr ""
 
-#: sfdb_ui.cc:1037
+#: sfdb_ui.cc:1086
 msgid "GB"
 msgstr ""
 
-#: sfdb_ui.cc:1070
-msgid "Search returned no results."
-msgstr ""
-
-#: sfdb_ui.cc:1072
-msgid "Found %1 match"
-msgid_plural "Found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:1277 sfdb_ui.cc:1585 sfdb_ui.cc:1635 sfdb_ui.cc:1653
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr ""
 
-#: sfdb_ui.cc:1280 sfdb_ui.cc:1636 sfdb_ui.cc:1654
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 msgid "one track per channel"
 msgstr ""
 
-#: sfdb_ui.cc:1288 sfdb_ui.cc:1638 sfdb_ui.cc:1655
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 msgid "sequence files"
 msgstr ""
 
-#: sfdb_ui.cc:1291 sfdb_ui.cc:1643
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 msgid "all files in one track"
 msgstr ""
 
-#: sfdb_ui.cc:1292 sfdb_ui.cc:1637
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 msgid "merge files"
 msgstr ""
 
-#: sfdb_ui.cc:1298 sfdb_ui.cc:1640
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 msgid "one region per file"
 msgstr ""
 
-#: sfdb_ui.cc:1301 sfdb_ui.cc:1641
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 msgid "one region per channel"
 msgstr ""
 
-#: sfdb_ui.cc:1306 sfdb_ui.cc:1642 sfdb_ui.cc:1656
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 msgid "all files in one region"
 msgstr ""
 
-#: sfdb_ui.cc:1373
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
 msgstr ""
 
-#: sfdb_ui.cc:1513
+#: sfdb_ui.cc:1534
 msgid "Copy files to session"
 msgstr ""
 
-#: sfdb_ui.cc:1530 sfdb_ui.cc:1693
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 msgid "file timestamp"
 msgstr ""
 
-#: sfdb_ui.cc:1531 sfdb_ui.cc:1695
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 msgid "edit point"
 msgstr ""
 
-#: sfdb_ui.cc:1532 sfdb_ui.cc:1697
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 msgid "playhead"
 msgstr ""
 
-#: sfdb_ui.cc:1533
+#: sfdb_ui.cc:1554
 msgid "session start"
 msgstr ""
 
-#: sfdb_ui.cc:1538
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1581
 msgid "<b>Insert at</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1573
+#: sfdb_ui.cc:1594
 msgid "<b>Mapping</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1591
+#: sfdb_ui.cc:1612
 msgid "<b>Conversion quality</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1603 sfdb_ui.cc:1709
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr ""
 
-#: sfdb_ui.cc:1604 sfdb_ui.cc:1711
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr ""
 
-#: sfdb_ui.cc:1605 sfdb_ui.cc:1713
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr ""
 
-#: sfdb_ui.cc:1607
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr ""
 
@@ -10594,21 +10835,21 @@ msgstr ""
 
 #: startup.cc:194
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -10715,10 +10956,6 @@ msgstr ""
 msgid "Click to open the program website in your web browser"
 msgstr ""
 
-#: startup.cc:594
-msgid "What would you like to do ?"
-msgstr ""
-
 #: startup.cc:729
 msgid "Open"
 msgstr ""
@@ -10731,83 +10968,83 @@ msgstr ""
 msgid "Create session folder in:"
 msgstr ""
 
-#: startup.cc:813
+#: startup.cc:821
 msgid "Select folder for session"
 msgstr ""
 
-#: startup.cc:845
+#: startup.cc:853
 msgid "Use this template"
 msgstr ""
 
-#: startup.cc:848
+#: startup.cc:856
 msgid "no template"
 msgstr ""
 
-#: startup.cc:876
+#: startup.cc:884
 msgid "Use an existing session as a template:"
 msgstr ""
 
-#: startup.cc:888
+#: startup.cc:896
 msgid "Select template"
 msgstr ""
 
-#: startup.cc:914
+#: startup.cc:922
 msgid "New Session"
 msgstr ""
 
-#: startup.cc:1068
+#: startup.cc:1077
 msgid "Select session file"
 msgstr ""
 
-#: startup.cc:1084
+#: startup.cc:1093
 msgid "Browse:"
 msgstr ""
 
-#: startup.cc:1093
+#: startup.cc:1102
 msgid "Select a session"
 msgstr ""
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 msgid "channels"
 msgstr ""
 
-#: startup.cc:1135
+#: startup.cc:1145
 msgid "<b>Busses</b>"
 msgstr ""
 
-#: startup.cc:1136
+#: startup.cc:1146
 msgid "<b>Inputs</b>"
 msgstr ""
 
-#: startup.cc:1137
+#: startup.cc:1147
 msgid "<b>Outputs</b>"
 msgstr ""
 
-#: startup.cc:1145
+#: startup.cc:1155
 msgid "Create master bus"
 msgstr ""
 
-#: startup.cc:1155
+#: startup.cc:1165
 msgid "Automatically connect to physical inputs"
 msgstr ""
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr ""
 
-#: startup.cc:1215
+#: startup.cc:1225
 msgid "Automatically connect outputs"
 msgstr ""
 
-#: startup.cc:1237
+#: startup.cc:1247
 msgid "... to master bus"
 msgstr ""
 
-#: startup.cc:1247
+#: startup.cc:1257
 msgid "... to physical outputs"
 msgstr ""
 
-#: startup.cc:1297
+#: startup.cc:1307
 msgid "Advanced Session Options"
 msgstr ""
 
@@ -11485,19 +11722,19 @@ msgstr ""
 msgid "bad XPM header %1"
 msgstr ""
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr ""
 
-#: utils.cc:544
+#: utils.cc:591
 msgid "cannot find XPM file for %1"
 msgstr ""
 
-#: utils.cc:570
+#: utils.cc:617
 msgid "cannot find icon image for %1 using %2"
 msgstr ""
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr ""
 
@@ -11505,78 +11742,80 @@ msgstr ""
 msgid "VerboseCanvasCursor"
 msgstr ""
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 msgid "Set Video Track"
 msgstr ""
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 msgid "Launch External Video Monitor"
 msgstr ""
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr ""
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr ""
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 msgid "Video files"
 msgstr ""
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 msgid "<b>Video Information</b>"
 msgstr ""
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 msgid "Start:"
 msgstr ""
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 msgid "Frame rate:"
 msgstr ""
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr ""
 
-#: editor_videotimeline.cc:138
+#: editor_videotimeline.cc:146
 msgid "Export Successful: %1"
 msgstr ""
 
-#: video_timeline.cc:467
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:501
-msgid "Failed to set session-framerate: "
-msgstr ""
-
-#: video_timeline.cc:501
-msgid " does not have a corresponding option setting in Ardour."
+#: video_timeline.cc:507
+msgid ""
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:507
+#: video_timeline.cc:515
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:508
-msgid " vs "
+#: video_timeline.cc:588
+msgid ""
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:690
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -11584,17 +11823,17 @@ msgid ""
 "xjadeo's remote-control interface 'xjremote')."
 msgstr ""
 
-#: video_monitor.cc:282
+#: video_monitor.cc:281
 msgid "Video Monitor: File Not Found."
 msgstr ""
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -11604,344 +11843,352 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 msgid "Transcode/Import Video File "
 msgstr ""
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 msgid "Output File:"
 msgstr ""
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr ""
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 #, fuzzy
 msgid "Height = "
 msgstr "quaver (8)"
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr ""
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 msgid "<b>File Information</b>"
 msgstr ""
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr ""
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 msgid "Duration:"
 msgstr ""
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr ""
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr ""
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 msgid "??"
 msgstr ""
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 msgid "<b>Import Settings</b>"
 msgstr ""
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr ""
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr ""
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 msgid "Import/Transcode Video to Session"
 msgstr ""
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr ""
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 msgid "Original Width"
 msgstr ""
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr ""
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 msgid "Extract Audio:"
 msgstr ""
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 msgid "Extracting Audio.."
 msgstr ""
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr ""
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 msgid "Transcoding Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 msgid "Save Transcoded Video File"
 msgstr ""
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr ""
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr ""
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 msgid "Server Docroot:"
 msgstr ""
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr ""
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 msgid "Listen Port:"
 msgstr ""
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 msgid "Cache Size:"
 msgstr ""
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr ""
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr ""
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 msgid "Confirm Overwrite"
 msgstr ""
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr ""
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr ""
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 msgid "Export Video File "
 msgstr ""
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 msgid "Video:"
 msgstr ""
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr ""
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr ""
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 #, fuzzy
 msgid "Normalize Audio"
 msgstr "Normalise to:"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr ""
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr ""
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 msgid "Deinterlace"
 msgstr ""
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr ""
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 msgid "Include Session Metadata"
 msgstr ""
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr ""
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 msgid "<b>Output:</b>"
 msgstr ""
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 msgid "<b>Input:</b>"
 msgstr ""
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 msgid "Audio:"
 msgstr ""
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 msgid "Master Bus"
 msgstr ""
 
-#: export_video_dialog.cc:166
+#: export_video_dialog.cc:145
+msgid "from the %1 session's start to the session's end"
+msgstr ""
+
+#: export_video_dialog.cc:149
+msgid "from 00:00:00:00 to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:151
+msgid "from the video's start to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:184
 msgid "<b>Settings:</b>"
 msgstr ""
 
-#: export_video_dialog.cc:174
+#: export_video_dialog.cc:192
 msgid "Range:"
 msgstr ""
 
-#: export_video_dialog.cc:177
+#: export_video_dialog.cc:195
 msgid "Preset:"
 msgstr ""
 
-#: export_video_dialog.cc:180
+#: export_video_dialog.cc:198
 msgid "Video Codec:"
 msgstr ""
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:201
 msgid "Video KBit/s:"
 msgstr ""
 
-#: export_video_dialog.cc:186
+#: export_video_dialog.cc:204
 msgid "Audio Codec:"
 msgstr ""
 
-#: export_video_dialog.cc:189
+#: export_video_dialog.cc:207
 msgid "Audio KBit/s:"
 msgstr ""
 
-#: export_video_dialog.cc:192
+#: export_video_dialog.cc:210
 msgid "Audio Samplerate:"
 msgstr ""
 
-#: export_video_dialog.cc:369
+#: export_video_dialog.cc:387
 #, fuzzy
 msgid "Normalizing audio"
 msgstr "Normalise values"
 
-#: export_video_dialog.cc:373
+#: export_video_dialog.cc:391
 msgid "Exporting audio"
 msgstr ""
 
-#: export_video_dialog.cc:419
-msgid "Exporting Audio.."
+#: export_video_dialog.cc:437
+msgid "Exporting Audio..."
 msgstr ""
 
-#: export_video_dialog.cc:476
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:505
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:544
-msgid "Encoding Video.."
+#: export_video_dialog.cc:562
+msgid "Encoding Video..."
 msgstr ""
 
-#: export_video_dialog.cc:563
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:661
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr ""
 
-#: export_video_dialog.cc:673
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr ""
 
-#: export_video_dialog.cc:761
+#: export_video_dialog.cc:779
 msgid "Transcoding failed."
 msgstr ""
 
-#: export_video_dialog.cc:930 export_video_dialog.cc:950
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 msgid "Save Exported Video File"
 msgstr ""
 
@@ -11957,31 +12204,13 @@ msgstr ""
 msgid "<b>Video Export Info</b>"
 msgstr ""
 
-#: export_video_infobox.cc:46
+#: export_video_infobox.cc:48
 msgid ""
-"Ardour video export is not recommended for mastering!\n"
-"While 'ffmpeg' (which is used by ardour) can produce high-quality files, "
-"this export lacks the possibility to tweak many settings. We recommend to "
-"use 'winff', 'devede' or 'dvdauthor' to mux & master. Nevertheless this "
-"video-export comes in handy to do quick snapshots, intermediates, dailies or "
-"online videos.\n"
-"\n"
-"The soundtrack is created from the master-bus of the current Ardour "
-"session.\n"
-"\n"
-"The video soure defaults to the file used in the video timeline, which may "
-"not the best quality to start with, you should the original video file.\n"
+"Video encoding is a non-trivial task with many details.\n"
 "\n"
-"If the export-range is longer than the original video, black video frames "
-"are prefixed and/or appended. This process may fail with non-standard pixel-"
-"aspect-ratios.\n"
+"Please see the manual at %1/video-timeline/operations/#export.\n"
 "\n"
-"The file-format is determined by the extension that you choose for the "
-"output file (.avi, .mov, .flv, .ogv,...)\n"
-"Note: not all combinations of format+codec+settings produce files which are "
-"according so spec. e.g. flv files require sample-rates of 22.1kHz or "
-"44.1kHz, mpeg containers can not be used with ac3 audio-codec, etc. If in "
-"doubt, use one of the built-in presets."
+"Open Manual in Browser? "
 msgstr ""
 
 #~ msgid "Quantize Type"
diff --git a/gtk2_ardour/po/es.po b/gtk2_ardour/po/es.po
index 58e3931a65..aa9a7b6ec8 100644
--- a/gtk2_ardour/po/es.po
+++ b/gtk2_ardour/po/es.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk2_ardour\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Pablo Fernández <pablo.fbus@gmail.com>\n"
 "Language-Team: Grupo de Traducción al Español <traductores@teklibre.com>\n"
@@ -404,7 +404,7 @@ msgstr "%1 archivo de definición de menú no encontrado"
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr "%1 no funcionará sin un archivo ardour.menus válido"
 
-#: add_route_dialog.cc:53 route_params_ui.cc:503
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 msgid "Add Track or Bus"
 msgstr "Añadir pista o bus"
 
@@ -441,8 +441,8 @@ msgstr "Buses"
 msgid "Add:"
 msgstr "Añadir:"
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 msgid "<b>Options</b>"
 msgstr "<b>Opciones</b>"
 
@@ -456,21 +456,21 @@ msgid "Group:"
 msgstr "Grupo:"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 msgid "Audio"
 msgstr "Audio"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -496,7 +496,7 @@ msgstr ""
 "Si no vas a usar un plugin de este tipo, usa una pista normal audio o MIDI."
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1301
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr "Normal"
 
@@ -540,7 +540,7 @@ msgstr "8 Canales"
 msgid "12 Channel"
 msgstr "12 Canales"
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2136
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -629,7 +629,7 @@ msgid "Track"
 msgstr "Pista"
 
 #: analysis_window.cc:68 editor_actions.cc:616 mixer_ui.cc:125
-#: mixer_ui.cc:1793
+#: mixer_ui.cc:1795
 msgid "Show"
 msgstr "Mostrar"
 
@@ -637,95 +637,91 @@ msgstr "Mostrar"
 msgid "Re-analyze data"
 msgstr "Re-analizar datos"
 
-#: ardour_button.cc:658
+#: ardour_button.cc:704
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr "el botón no puede observar el estado de un controlable no existente\n"
 
 # en realidad no existe este término en el español...
-#: ardour_ui.cc:179
+#: ardour_ui.cc:180
 msgid "audition"
 msgstr "escucha"
 
-#: ardour_ui.cc:180
+#: ardour_ui.cc:181
 msgid "solo"
 msgstr "solo"
 
-#: ardour_ui.cc:181
+#: ardour_ui.cc:182
 msgid "feedback"
 msgstr "feedback"
 
-#: ardour_ui.cc:183 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 msgid "Speaker Configuration"
 msgstr "Configuración de altavoces"
 
-#: ardour_ui.cc:184 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 msgid "Theme Manager"
 msgstr "Gestor de temas"
 
-#: ardour_ui.cc:185 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr "Combinaciones de teclas"
 
-#: ardour_ui.cc:186
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ardour_ui.cc:187 ardour_ui.cc:192
+#: ardour_ui.cc:191 ardour_ui.cc:196
 #, fuzzy
 msgid "Add Tracks/Busses"
 msgstr "Pistas/Buses"
 
-#: ardour_ui.cc:188
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "Acerca de"
 
-#: ardour_ui.cc:189 location_ui.cc:1134
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "Posiciones"
 
-#: ardour_ui.cc:190 route_params_ui.cc:57 route_params_ui.cc:604
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 msgid "Tracks and Busses"
 msgstr "Pistas y buses"
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ardour_ui.cc:193 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr "Gestor de conjuntos de conexiones"
 
-#: ardour_ui.cc:194 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "Reloj grande"
 
-#: ardour_ui.cc:195
+#: ardour_ui.cc:199
 #, fuzzy
 msgid "Audio Connections"
 msgstr "Gestor de conexiones de audio"
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:200
 #, fuzzy
 msgid "MIDI Connections"
 msgstr "Gestor de conexiones MIDI"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr "Errores"
 
-#: ardour_ui.cc:299
-msgid "could not initialize %1."
-msgstr "no se pudo inicializar %1."
-
-#: ardour_ui.cc:394
+#: ardour_ui.cc:388
 msgid "Starting audio engine"
 msgstr "Arrancando motor de audio"
 
-#: ardour_ui.cc:763 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 msgid "%1 is ready for use"
 msgstr "%1 está preparado para su uso"
 
-#: ardour_ui.cc:811
+#: ardour_ui.cc:806
 msgid ""
 "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"
@@ -738,23 +734,23 @@ msgstr ""
 "\n"
 "Puedes comprobar este límite con 'ulimit -l' y normalmente se establece en %2"
 
-#: ardour_ui.cc:828
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr "No volver a mostrar esta ventana"
 
-#: ardour_ui.cc:870
+#: ardour_ui.cc:865
 msgid "Don't quit"
 msgstr "No salir"
 
-#: ardour_ui.cc:871
+#: ardour_ui.cc:866
 msgid "Just quit"
 msgstr "Salir sin guardar"
 
-#: ardour_ui.cc:872
+#: ardour_ui.cc:867
 msgid "Save and quit"
 msgstr "Guardar y salir"
 
-#: ardour_ui.cc:882
+#: ardour_ui.cc:877
 msgid ""
 "%1 was unable to save your session.\n"
 "\n"
@@ -768,15 +764,15 @@ msgstr ""
 "\n"
 "\"Salir sin guardar\"."
 
-#: ardour_ui.cc:913
+#: ardour_ui.cc:908
 msgid "Please wait while %1 cleans up..."
 msgstr "Por favor, espera mientras %1 organiza todo..."
 
-#: ardour_ui.cc:930
+#: ardour_ui.cc:925
 msgid "Unsaved Session"
 msgstr "Sesión no guardada"
 
-#: ardour_ui.cc:951
+#: ardour_ui.cc:946
 msgid ""
 "The session \"%1\"\n"
 "has not been saved.\n"
@@ -794,7 +790,7 @@ msgstr ""
 "\n"
 "¿Qué deseas hacer?"
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:949
 msgid ""
 "The snapshot \"%1\"\n"
 "has not been saved.\n"
@@ -812,74 +808,74 @@ msgstr ""
 "\n"
 "¿Qué deseas hacer?"
 
-#: ardour_ui.cc:968
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr "Prompter"
 
-#: ardour_ui.cc:1045
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "desconectado"
 
-#: ardour_ui.cc:1052
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 
-#: ardour_ui.cc:1056
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 
-#: ardour_ui.cc:1074 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 msgid "File:"
 msgstr "Archivo:"
 
-#: ardour_ui.cc:1078
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr "BWF"
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr "WAV"
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr "WAV64"
 
-#: ardour_ui.cc:1087 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr "CAF"
 
-#: ardour_ui.cc:1090
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr "AIFF"
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr "iXML"
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr "RF64"
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr "32-float"
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr "24-int"
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr "16-int"
 
-#: ardour_ui.cc:1129
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 
-#: ardour_ui.cc:1148
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -890,33 +886,33 @@ msgstr ""
 "%<PRIu32>%%</span> <span foreground=\"green\">c:</span><span foreground=\"%s"
 "\">%<PRIu32>%%</span>"
 
-#: ardour_ui.cc:1184
+#: ardour_ui.cc:1188
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr "Disco: <span foreground=\"green\">Desconocido</span>"
 
-#: ardour_ui.cc:1186
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr "Disco: <span foreground=\"green\">24hrs+</span>"
 
-#: ardour_ui.cc:1204
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr "Disco: <span foreground=\"green\">&gt;24 hrs</span>"
 
-#: ardour_ui.cc:1215
+#: ardour_ui.cc:1219
 #, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr "Disco: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 
-#: ardour_ui.cc:1241
+#: ardour_ui.cc:1245
 #, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr "TC: <span foreground=\"%s\">%s</span>"
 
-#: ardour_ui.cc:1358 ardour_ui.cc:1367 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr "Sesiones recientes"
 
-#: ardour_ui.cc:1447
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
@@ -924,26 +920,26 @@ msgstr ""
 "%1 no está conectado a JACK.\n"
 "No se pueden abrir ni cerrar archivos en esta condición."
 
-#: ardour_ui.cc:1474
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr "Abrir sesión"
 
-#: ardour_ui.cc:1492 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 msgid "%1 sessions"
 msgstr "sesiones %1"
 
-#: ardour_ui.cc:1529
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr "No puedes añadir pistas ni buses sin una sesión cargada."
 
-#: ardour_ui.cc:1537
+#: ardour_ui.cc:1548
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] "no se pudo crear %1 nueva pista mezclada"
 msgstr[1] "no se pudieron crear %1 nuevas pistas mezcladas"
 
-#: ardour_ui.cc:1543 ardour_ui.cc:1604
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 msgid ""
 "There are insufficient JACK ports available\n"
 "to create a new track or bus.\n"
@@ -955,23 +951,23 @@ msgstr ""
 "Deberás guardar %1, salir y\n"
 "reiniciar JACK con más puertos."
 
-#: ardour_ui.cc:1578
+#: ardour_ui.cc:1589
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr "No puedes añadir pistas ni buses sin una sesión cargada."
 
-#: ardour_ui.cc:1587
+#: ardour_ui.cc:1598
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] "no se pudo crear %1 nueva pista de audio"
 msgstr[1] "no se pudieron crear %1 nuevas pistas de audio"
 
-#: ardour_ui.cc:1596
+#: ardour_ui.cc:1607
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] "no se pudo crear %1 nuevo bus de audio"
 msgstr[1] "no se pudieron crear %1 nuevos buses de audio"
 
-#: ardour_ui.cc:1713
+#: ardour_ui.cc:1724
 msgid ""
 "Please create one or more tracks before trying to record.\n"
 "You can do this with the \"Add Track or Bus\" option in the Session menu."
@@ -979,7 +975,7 @@ msgstr ""
 "Por favor, añade al menos 1 pista antes de intentar grabar\n"
 "Lo puedes hacer con la opción \"Añadir pista o bus\"  en el menú de Sesión."
 
-#: ardour_ui.cc:2103
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
@@ -989,7 +985,7 @@ msgstr ""
 "\n"
 "%1"
 
-#: ardour_ui.cc:2105
+#: ardour_ui.cc:2116
 msgid ""
 "JACK has either been shutdown or it\n"
 "disconnected %1 because %1\n"
@@ -1001,19 +997,19 @@ msgstr ""
 "no fue lo bastante rápido. Intenta reiniciar\n"
 "JACK, reconectar y guardar la sesión."
 
-#: ardour_ui.cc:2131
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "Incapaz de iniciar la sesión actual"
 
-#: ardour_ui.cc:2211
+#: ardour_ui.cc:2222
 msgid "Take Snapshot"
 msgstr "Guardar captura de sesión"
 
-#: ardour_ui.cc:2212
+#: ardour_ui.cc:2223
 msgid "Name of new snapshot"
 msgstr "Nombre de captura de sesión"
 
-#: ardour_ui.cc:2236
+#: ardour_ui.cc:2247
 msgid ""
 "To ensure compatibility with various systems\n"
 "snapshot names may not contain a '%1' character"
@@ -1021,27 +1017,27 @@ msgstr ""
 "Para asegurar la compatibilidad entre varios sistemas, los\n"
 "nombres de captura de sesión no pueden contener el carácter '%1'"
 
-#: ardour_ui.cc:2248
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr "Confirmar reescritura de captura de sesión"
 
-#: ardour_ui.cc:2249
+#: ardour_ui.cc:2260
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr "Ya existe una captura de sesión con ese nombre. ¿Quieres reescribirla?"
 
-#: ardour_ui.cc:2252 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 msgid "Overwrite"
 msgstr "Reescribir"
 
-#: ardour_ui.cc:2286
+#: ardour_ui.cc:2297
 msgid "Rename Session"
 msgstr "Renombrar sesión"
 
-#: ardour_ui.cc:2287
+#: ardour_ui.cc:2298
 msgid "New session name"
 msgstr "Nuevo nombre de sesión"
 
-#: ardour_ui.cc:2301 ardour_ui.cc:2681 ardour_ui.cc:2726
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 msgid ""
 "To ensure compatibility with various systems\n"
 "session names may not contain a '%1' character"
@@ -1049,14 +1045,14 @@ msgstr ""
 "Para asegurar la compatibilidad entre varios sistemas,\n"
 "los nombres de sesión no pueden contener el carácter '%1'"
 
-#: ardour_ui.cc:2309
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr ""
 "Ese nombre ya está en uso por otro directorio o carpeta. Por favor, "
 "inténtalo otra vez."
 
-#: ardour_ui.cc:2318
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
@@ -1064,20 +1060,20 @@ msgstr ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
 
-#: ardour_ui.cc:2429
+#: ardour_ui.cc:2440
 msgid "Save Template"
 msgstr "Guardar plantilla"
 
 # se refiere a la sesión, no al Mezclador
-#: ardour_ui.cc:2430
+#: ardour_ui.cc:2441
 msgid "Name for template:"
 msgstr "Nombre de plantilla:"
 
-#: ardour_ui.cc:2431
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-plantilla"
 
-#: ardour_ui.cc:2469
+#: ardour_ui.cc:2480
 msgid ""
 "This session\n"
 "%1\n"
@@ -1087,52 +1083,52 @@ msgstr ""
 "%1\n"
 "ya existe. ¿Quieres abrirla?"
 
-#: ardour_ui.cc:2479
+#: ardour_ui.cc:2490
 msgid "Open Existing Session"
 msgstr "Abrir sesión existente"
 
-#: ardour_ui.cc:2717
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr "No hay ninguna sesión existente en \"%1\""
 
-#: ardour_ui.cc:2804
+#: ardour_ui.cc:2815
 msgid "Please wait while %1 loads your session"
 msgstr "Por favor, espera a que %1 cargue tu sesión"
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr "Error de Registro de Puertos"
 
-#: ardour_ui.cc:2820
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr "Pulsa el botón Cerrar para volver a intentarlo"
 
-#: ardour_ui.cc:2841
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "No se pudo cargar la sesión \"%1 (captura %2)\" "
 
-#: ardour_ui.cc:2847
+#: ardour_ui.cc:2858
 msgid "Loading Error"
 msgstr "Error al cargar"
 
-#: ardour_ui.cc:2848
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr "Pulsa el botón Actualizar para volver a intentarlo"
 
-#: ardour_ui.cc:2930
+#: ardour_ui.cc:2941
 msgid "Could not create session in \"%1\""
 msgstr "No se pudo crear la sesión en \"%1\""
 
-#: ardour_ui.cc:3030
+#: ardour_ui.cc:3041
 msgid "No files were ready for clean-up"
 msgstr "No había ningún archivo preparado para purgar"
 
-#: ardour_ui.cc:3034 ardour_ui.cc:3044 ardour_ui.cc:3177 ardour_ui.cc:3184
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 msgid "Clean-up"
 msgstr "Purgar"
 
-#: ardour_ui.cc:3035
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1143,21 +1139,21 @@ msgstr ""
 "Éstas todavía pueden incluir regiones que hacen que algunos\n"
 "archivos no utilizados continúen existiendo."
 
-#: ardour_ui.cc:3094
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr "kilo"
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr "mega"
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr "giga"
 
 # debí adaptar para que al completarse con los parámetros el mensaje tuviera sentido en español
 # (quedaba mal por los plurales y la ambigüedad was=fue/estuvo)
-#: ardour_ui.cc:3105
+#: ardour_ui.cc:3116
 msgid ""
 "The following file was deleted from %2,\n"
 "releasing %3 %4bytes of disk space"
@@ -1173,7 +1169,7 @@ msgstr[1] ""
 
 # debí adaptar para que al completarse con los parámetros el mensaje tuviera sentido en español
 # (quedaba mal por los plurales y la ambigüedad was=fue/estuvo)
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3123
 msgid ""
 "The following file was not in use and \n"
 "has been moved to: %2\n"
@@ -1211,11 +1207,11 @@ msgstr[1] ""
 "\n"
 "liberará %3 %4bytes de espacio en disco.\n"
 
-#: ardour_ui.cc:3172
+#: ardour_ui.cc:3183
 msgid "Are you sure you want to clean-up?"
 msgstr "¿Estás seguro de que quieres purgar?"
 
-#: ardour_ui.cc:3179
+#: ardour_ui.cc:3190
 msgid ""
 "Clean-up is a destructive operation.\n"
 "ALL undo/redo information will be lost if you clean-up.\n"
@@ -1225,81 +1221,81 @@ msgstr ""
 "TODA la información del historial deshacer/rehacer se perderá.\n"
 "Purgar moverá todos los archivos no usados a la carpeta \"dead\"."
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr "Purgar"
 
-#: ardour_ui.cc:3217
+#: ardour_ui.cc:3228
 msgid "Cleaned Files"
 msgstr "Archivos purgados"
 
-#: ardour_ui.cc:3234
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr "archivo eliminado"
 
-#: ardour_ui.cc:3326
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 
-#: ardour_ui.cc:3330
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr ""
 
-#: ardour_ui.cc:3331
+#: ardour_ui.cc:3342
 msgid "Do you really want to stop the Video Server?"
 msgstr ""
 
-#: ardour_ui.cc:3334
+#: ardour_ui.cc:3345
 #, fuzzy
 msgid "Yes, Stop It"
 msgstr "Sí, eliminar"
 
-#: ardour_ui.cc:3360
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr ""
 
-#: ardour_ui.cc:3362
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
 msgstr ""
 
-#: ardour_ui.cc:3370 ardour_ui.cc:3455
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
 
-#: ardour_ui.cc:3394
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr ""
 
-#: ardour_ui.cc:3399
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr ""
 
-#: ardour_ui.cc:3432
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr ""
 
-#: ardour_ui.cc:3441
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3477 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "no se pudo abrir %1"
 
-#: ardour_ui.cc:3481
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
 msgstr ""
 
-#: ardour_ui.cc:3641
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr "Se detuvo la grabación porque el sistema se sobrecargó."
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3702
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1313,7 +1309,7 @@ msgstr ""
 "En concreto, la velocidad de escritura de datos en el disco\n"
 "no fue lo bastante alta como para permitir la grabación.\n"
 
-#: ardour_ui.cc:3689
+#: ardour_ui.cc:3721
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1327,11 +1323,11 @@ msgstr ""
 "En concreto, la velocidad de lectura de datos desde el disco\n"
 "no fue lo bastante alta como para permitir la reproducción.\n"
 
-#: ardour_ui.cc:3729
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr "Recuperación del crash"
 
-#: ardour_ui.cc:3730
+#: ardour_ui.cc:3762
 msgid ""
 "This session appears to have been in the\n"
 "middle of recording when %1 or\n"
@@ -1349,19 +1345,19 @@ msgstr ""
 "o puede ignorarlo. Por favor, decide qué\n"
 "deseas hacer.\n"
 
-#: ardour_ui.cc:3742
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr "Ignorar información del crash"
 
-#: ardour_ui.cc:3743
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr "Recuperar del crash"
 
-#: ardour_ui.cc:3763
+#: ardour_ui.cc:3795
 msgid "Sample Rate Mismatch"
 msgstr "Discrepancia de frecuencia de muestreo"
 
-#: ardour_ui.cc:3764
+#: ardour_ui.cc:3796
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
 "%2 is currently running at %3 Hz.  If you load this session,\n"
@@ -1371,23 +1367,23 @@ msgstr ""
 "pero %2 está ejecutándose actualmente a %3 Hz. Si cargas la sesión\n"
 "puede que el audio se reproduzca a una frecuencia de muestreo incorrecta.\n"
 
-#: ardour_ui.cc:3773
+#: ardour_ui.cc:3805
 msgid "Do not load session"
 msgstr "No cargar sesión"
 
-#: ardour_ui.cc:3774
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr "Cargar sesión de todas formas"
 
-#: ardour_ui.cc:3797
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "No se pudo desconectar de JACK"
 
-#: ardour_ui.cc:3810
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr "No se pudo reconectar a JACK"
 
-#: ardour_ui.cc:4084
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1410,35 +1406,40 @@ msgstr "interfaz de usuario: no se pudo configurar el editor"
 msgid "UI: cannot setup mixer"
 msgstr "interfaz de usuario: no se pudo configurar el mezclador"
 
-#: ardour_ui2.cc:125
+#: ardour_ui2.cc:82
+#, fuzzy
+msgid "UI: cannot setup meterbridge"
+msgstr "interfaz de usuario: no se pudo configurar el mezclador"
+
+#: ardour_ui2.cc:130
 msgid "Play from playhead"
 msgstr "Reproducir desde cursor"
 
-#: ardour_ui2.cc:126
+#: ardour_ui2.cc:131
 msgid "Stop playback"
 msgstr "Detener reproducción"
 
-#: ardour_ui2.cc:127
+#: ardour_ui2.cc:132
 msgid "Toggle record"
 msgstr "Activar/Desactivar grabación"
 
-#: ardour_ui2.cc:128
+#: ardour_ui2.cc:133
 msgid "Play range/selection"
 msgstr "Reproducir rango/selección"
 
-#: ardour_ui2.cc:129
+#: ardour_ui2.cc:134
 msgid "Go to start of session"
 msgstr "Ir a inicio de sesión"
 
-#: ardour_ui2.cc:130
+#: ardour_ui2.cc:135
 msgid "Go to end of session"
 msgstr "Ir a fin de sesión"
 
-#: ardour_ui2.cc:131
+#: ardour_ui2.cc:136
 msgid "Play loop range"
 msgstr "Reproducir rango de bucle"
 
-#: ardour_ui2.cc:132
+#: ardour_ui2.cc:137
 msgid ""
 "MIDI Panic\n"
 "Send note off and reset controller messages on all MIDI channels"
@@ -1446,23 +1447,23 @@ msgstr ""
 "Pánico MIDI\n"
 "Enviar nota off y resetear mensajes de control en todos los canales MIDI"
 
-#: ardour_ui2.cc:133
+#: ardour_ui2.cc:138
 msgid "Return to last playback start when stopped"
 msgstr "Al detenerse, volver al último inicio de reproducción"
 
-#: ardour_ui2.cc:134
+#: ardour_ui2.cc:139
 msgid "Playhead follows Range Selections and Edits"
 msgstr "El cursor sigue a las selecciones de rango y edición"
 
-#: ardour_ui2.cc:135
+#: ardour_ui2.cc:140
 msgid "Be sensible about input monitoring"
 msgstr "Monitorización sensible de entradas"
 
-#: ardour_ui2.cc:136
+#: ardour_ui2.cc:141
 msgid "Enable/Disable audio click"
 msgstr "Activar/Desactivar claqueta"
 
-#: ardour_ui2.cc:137 monitor_section.cc:101
+#: ardour_ui2.cc:142 monitor_section.cc:101
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
@@ -1470,7 +1471,7 @@ msgstr ""
 "Si está activado, algo está en solo.\n"
 "Pulsa para desactivar todos los solos"
 
-#: ardour_ui2.cc:138
+#: ardour_ui2.cc:143
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
@@ -1478,11 +1479,11 @@ msgstr ""
 "Si está activado, se está produciendo escucha\n"
 "Pulsa para detener la escucha"
 
-#: ardour_ui2.cc:139
+#: ardour_ui2.cc:144
 msgid "When active, there is a feedback loop."
 msgstr "Cuando está activo,  existe un bucle de realimentación."
 
-#: ardour_ui2.cc:140
+#: ardour_ui2.cc:145
 #, fuzzy
 msgid ""
 "<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
@@ -1497,7 +1498,7 @@ msgstr ""
 "para introducir diferencias. Ver <span color=\"blue\">http://ardour.org/"
 "a3_features_clocks</span> para detalles."
 
-#: ardour_ui2.cc:141
+#: ardour_ui2.cc:146
 #, fuzzy
 msgid ""
 "<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
@@ -1512,28 +1513,33 @@ msgstr ""
 "para introducir diferencias. Ver <span color=\"blue\">http://ardour.org/"
 "a3_features_clocks</span> para detalles."
 
-#: ardour_ui2.cc:173
+#: ardour_ui2.cc:147
+#, fuzzy
+msgid "Reset Level Meter"
+msgstr "Restablecer envolvente"
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr "[ERROR]: "
 
-#: ardour_ui2.cc:175
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr "[AVISO]: "
 
-#: ardour_ui2.cc:177
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr "[INFO]: "
 
 # he cambiado desde Auto Volver. Qudaba un poco raro y auto return se entiende mejor
-#: ardour_ui2.cc:241 ardour_ui_ed.cc:376
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 msgid "Auto Return"
 msgstr "Auto Return"
 
-#: ardour_ui2.cc:243 ardour_ui_ed.cc:379
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr "Seguir Edits"
 
-#: ardour_ui2.cc:621 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1553,23 +1559,23 @@ msgstr "Configurar Editor"
 msgid "Setup Mixer"
 msgstr "Configurar Mezclador"
 
-#: ardour_ui_dependents.cc:84
+#: ardour_ui_dependents.cc:85
 msgid "Reload Session History"
 msgstr "Recargar historial de sesión"
 
-#: ardour_ui_dialogs.cc:206
+#: ardour_ui_dialogs.cc:242
 msgid "Don't close"
 msgstr "No cerrar"
 
-#: ardour_ui_dialogs.cc:207
+#: ardour_ui_dialogs.cc:243
 msgid "Just close"
 msgstr "Cerrar"
 
-#: ardour_ui_dialogs.cc:208
+#: ardour_ui_dialogs.cc:244
 msgid "Save and close"
 msgstr "Guardar y cerrar"
 
-#: ardour_ui_dialogs.cc:293
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr ""
 "Esta pantalla no es lo bastante alta para mostrar la ventana del mezclador"
@@ -1583,7 +1589,7 @@ msgstr "Sesión"
 msgid "Sync"
 msgstr "Sinc"
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr "Opciones"
 
@@ -1611,15 +1617,15 @@ msgstr "Tipo de archivo"
 msgid "Sample Format"
 msgstr "Formato de muestra"
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr "Superficies de control"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr "Medidores"
 
@@ -1635,7 +1641,7 @@ msgstr "Tiempo de persistencia"
 msgid "Denormal Handling"
 msgstr "Manejo de denormals"
 
-#: ardour_ui_ed.cc:123 route_time_axis.cc:1475
+#: ardour_ui_ed.cc:123 route_time_axis.cc:1489
 msgid "New..."
 msgstr "Nueva..."
 
@@ -1678,8 +1684,8 @@ msgstr "Captura de sesión..."
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ardour_ui_ed.cc:153 editor_actions.cc:1710 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1464 route_time_axis.cc:1471
+#: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 msgid "Rename..."
 msgstr "Renombrar..."
 
@@ -1708,7 +1714,7 @@ msgid "Stem export..."
 msgstr "Stem export..."
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "Exportar"
 
@@ -1720,11 +1726,11 @@ msgstr "Purgar archivos no usados..."
 msgid "Flush Wastebasket"
 msgstr "Vaciar papelera"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr "JACK"
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr "Latencia"
 
@@ -1732,8 +1738,8 @@ msgstr "Latencia"
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ardour_ui_ed.cc:195 global_port_matrix.cc:198 io_selector.cc:210
-#: mixer_strip.cc:712 mixer_strip.cc:838
+#: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr "Desconectar"
 
@@ -1749,7 +1755,7 @@ msgstr "Maximizar Editor"
 msgid "Show Toolbars"
 msgstr "Mostrar barras de herramientas"
 
-#: ardour_ui_ed.cc:230 mixer_ui.cc:1863 mixer_ui.cc:1869
+#: ardour_ui_ed.cc:230 mixer_ui.cc:1865 mixer_ui.cc:1871
 msgid "Window|Mixer"
 msgstr "Mezclador"
 
@@ -1758,27 +1764,32 @@ msgstr "Mezclador"
 msgid "Toggle Editor+Mixer"
 msgstr "Cambiar modo de edición"
 
-#: ardour_ui_ed.cc:233 midi_tracer.cc:39
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
+#, fuzzy
+msgid "Window|Meterbridge"
+msgstr "Mezclador"
+
+#: ardour_ui_ed.cc:234 midi_tracer.cc:39
 msgid "MIDI Tracer"
 msgstr "Rastreador MIDI"
 
-#: ardour_ui_ed.cc:235
+#: ardour_ui_ed.cc:236
 msgid "Chat"
 msgstr "Chat"
 
-#: ardour_ui_ed.cc:237
+#: ardour_ui_ed.cc:238
 msgid "Help|Manual"
 msgstr "Manual"
 
-#: ardour_ui_ed.cc:238
+#: ardour_ui_ed.cc:239
 msgid "Reference"
 msgstr "Referencia"
 
-#: ardour_ui_ed.cc:240 plugin_ui.cc:419
+#: ardour_ui_ed.cc:241 plugin_ui.cc:418
 msgid "Save"
 msgstr "Guardar"
 
-#: ardour_ui_ed.cc:248 rc_option_editor.cc:1114 rc_option_editor.cc:1125
+#: ardour_ui_ed.cc:249 rc_option_editor.cc:1114 rc_option_editor.cc:1125
 #: rc_option_editor.cc:1134 rc_option_editor.cc:1147 rc_option_editor.cc:1160
 #: rc_option_editor.cc:1169 rc_option_editor.cc:1179 rc_option_editor.cc:1181
 #: rc_option_editor.cc:1191 rc_option_editor.cc:1207 rc_option_editor.cc:1220
@@ -1788,102 +1799,102 @@ msgstr "Guardar"
 msgid "Transport"
 msgstr "Transporte"
 
-#: ardour_ui_ed.cc:254 engine_dialog.cc:85 sfdb_ui.cc:559
+#: ardour_ui_ed.cc:255 engine_dialog.cc:85
 msgid "Stop"
 msgstr "Stop"
 
-#: ardour_ui_ed.cc:257
+#: ardour_ui_ed.cc:258
 msgid "Roll"
 msgstr "Roll"
 
-#: ardour_ui_ed.cc:261
+#: ardour_ui_ed.cc:262
 msgid "Start/Stop"
 msgstr "Comenzar/Detener"
 
-#: ardour_ui_ed.cc:264
+#: ardour_ui_ed.cc:265
 msgid "Start/Continue/Stop"
 msgstr "Comenzar/Continuar/Detener"
 
-#: ardour_ui_ed.cc:267
+#: ardour_ui_ed.cc:268
 msgid "Stop and Forget Capture"
 msgstr "Detener y destruir captura"
 
 # it's not literal, but it's what it does
 # translating to "rollo" or "rodar" doesn't make much sense in spanish
 # am I missing something?
-#: ardour_ui_ed.cc:277
+#: ardour_ui_ed.cc:278
 msgid "Transition To Roll"
 msgstr "Transición hacia delante"
 
-#: ardour_ui_ed.cc:281
+#: ardour_ui_ed.cc:282
 msgid "Transition To Reverse"
 msgstr "Transición hacia atrás"
 
-#: ardour_ui_ed.cc:285
+#: ardour_ui_ed.cc:286
 msgid "Play Loop Range"
 msgstr "Reproducir rango de bucle"
 
-#: ardour_ui_ed.cc:288
+#: ardour_ui_ed.cc:289
 msgid "Play Selected Range"
 msgstr "Reproducir rango seleccionado"
 
-#: ardour_ui_ed.cc:291
+#: ardour_ui_ed.cc:292
 msgid "Play Selection w/Preroll"
 msgstr "Reproducir selección con Preroll"
 
-#: ardour_ui_ed.cc:295
+#: ardour_ui_ed.cc:296
 msgid "Enable Record"
 msgstr "Activar grabación"
 
-#: ardour_ui_ed.cc:298
+#: ardour_ui_ed.cc:299
 msgid "Start Recording"
 msgstr "Iniciar grabación"
 
-#: ardour_ui_ed.cc:302
+#: ardour_ui_ed.cc:303
 msgid "Rewind"
 msgstr "Rebobinar"
 
-#: ardour_ui_ed.cc:305
+#: ardour_ui_ed.cc:306
 msgid "Rewind (Slow)"
 msgstr "Rebobinar (Lento)"
 
-#: ardour_ui_ed.cc:308
+#: ardour_ui_ed.cc:309
 msgid "Rewind (Fast)"
 msgstr "Rebobinar (Rápido)"
 
-#: ardour_ui_ed.cc:311 startup.cc:727
+#: ardour_ui_ed.cc:312 startup.cc:727
 msgid "Forward"
 msgstr "Adelante"
 
-#: ardour_ui_ed.cc:314
+#: ardour_ui_ed.cc:315
 msgid "Forward (Slow)"
 msgstr "Adelante (Lento)"
 
-#: ardour_ui_ed.cc:317
+#: ardour_ui_ed.cc:318
 msgid "Forward (Fast)"
 msgstr "Adelante (Rápido)"
 
-#: ardour_ui_ed.cc:320
+#: ardour_ui_ed.cc:321
 msgid "Goto Zero"
 msgstr "Ir a cero"
 
-#: ardour_ui_ed.cc:323
+#: ardour_ui_ed.cc:324
 msgid "Goto Start"
 msgstr "Ir a inicio"
 
-#: ardour_ui_ed.cc:326
+#: ardour_ui_ed.cc:327
 msgid "Goto End"
 msgstr "Ir a fin"
 
-#: ardour_ui_ed.cc:329
+#: ardour_ui_ed.cc:330
 msgid "Goto Wall Clock"
 msgstr "Ir a hora actual"
 
-#: ardour_ui_ed.cc:333
+#: ardour_ui_ed.cc:334
 msgid "Focus On Clock"
 msgstr "Enfocar en reloj"
 
-#: ardour_ui_ed.cc:337 ardour_ui_ed.cc:346 audio_clock.cc:2046 editor.cc:237
+#: ardour_ui_ed.cc:338 ardour_ui_ed.cc:347 audio_clock.cc:2046 editor.cc:237
 #: editor_actions.cc:544 editor_actions.cc:553 export_timespan_selector.cc:88
 #: session_option_editor.cc:41 session_option_editor.cc:61
 #: session_option_editor.cc:80 session_option_editor.cc:96
@@ -1892,126 +1903,126 @@ msgstr "Enfocar en reloj"
 msgid "Timecode"
 msgstr "Timecode"
 
-#: ardour_ui_ed.cc:339 ardour_ui_ed.cc:348 editor_actions.cc:542
+#: ardour_ui_ed.cc:340 ardour_ui_ed.cc:349 editor_actions.cc:542
 msgid "Bars & Beats"
 msgstr "Compases y pulsos"
 
-#: ardour_ui_ed.cc:341 ardour_ui_ed.cc:350
+#: ardour_ui_ed.cc:342 ardour_ui_ed.cc:351
 msgid "Minutes & Seconds"
 msgstr "Minutos y segundos"
 
-#: ardour_ui_ed.cc:343 ardour_ui_ed.cc:352 audio_clock.cc:2050 editor.cc:238
+#: ardour_ui_ed.cc:344 ardour_ui_ed.cc:353 audio_clock.cc:2050 editor.cc:238
 #: editor_actions.cc:543
 msgid "Samples"
 msgstr "Muestras"
 
-#: ardour_ui_ed.cc:355
+#: ardour_ui_ed.cc:356
 msgid "Punch In"
 msgstr "Pinchar"
 
-#: ardour_ui_ed.cc:356 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr "Entrada"
 
-#: ardour_ui_ed.cc:359
+#: ardour_ui_ed.cc:360
 msgid "Punch Out"
 msgstr "Despinchar"
 
-#: ardour_ui_ed.cc:360 time_info_box.cc:114
+#: ardour_ui_ed.cc:361 time_info_box.cc:114
 msgid "Out"
 msgstr "Salida"
 
-#: ardour_ui_ed.cc:363
+#: ardour_ui_ed.cc:364
 msgid "Punch In/Out"
 msgstr "Pinchazo"
 
-#: ardour_ui_ed.cc:364
+#: ardour_ui_ed.cc:365
 msgid "In/Out"
 msgstr "In/Out"
 
-#: ardour_ui_ed.cc:367 rc_option_editor.cc:1071
+#: ardour_ui_ed.cc:368 rc_option_editor.cc:1071
 msgid "Click"
 msgstr "Claqueta"
 
-#: ardour_ui_ed.cc:370
+#: ardour_ui_ed.cc:371
 msgid "Auto Input"
 msgstr "Auto Entrada"
 
 # Reproducir Auto is too big
-#: ardour_ui_ed.cc:373
+#: ardour_ui_ed.cc:374
 msgid "Auto Play"
 msgstr "Auto Play"
 
-#: ardour_ui_ed.cc:384
+#: ardour_ui_ed.cc:385
 msgid "Sync Startup to Video"
 msgstr "Sincronizar inicio a video"
 
-#: ardour_ui_ed.cc:386
+#: ardour_ui_ed.cc:387
 msgid "Time Master"
 msgstr "Maestro"
 
-#: ardour_ui_ed.cc:393
+#: ardour_ui_ed.cc:394
 msgid "Toggle Record Enable Track %1"
 msgstr "Activar/Desactivar grabación en pista %1"
 
-#: ardour_ui_ed.cc:400
+#: ardour_ui_ed.cc:401
 msgid "Percentage"
 msgstr "Porcentaje"
 
-#: ardour_ui_ed.cc:401 shuttle_control.cc:169
+#: ardour_ui_ed.cc:402 shuttle_control.cc:169
 msgid "Semitones"
 msgstr "Semitonos"
 
-#: ardour_ui_ed.cc:405
+#: ardour_ui_ed.cc:406
 msgid "Send MTC"
 msgstr "Enviar MTC"
 
-#: ardour_ui_ed.cc:407
+#: ardour_ui_ed.cc:408
 msgid "Send MMC"
 msgstr "Enviar MMC"
 
-#: ardour_ui_ed.cc:409
+#: ardour_ui_ed.cc:410
 msgid "Use MMC"
 msgstr "Usar MMC"
 
-#: ardour_ui_ed.cc:411 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 msgid "Send MIDI Clock"
 msgstr "Enviar MIDI Clock"
 
-#: ardour_ui_ed.cc:413
+#: ardour_ui_ed.cc:414
 msgid "Send MIDI Feedback"
 msgstr "Enviar MIDI feedback"
 
-#: ardour_ui_ed.cc:419
+#: ardour_ui_ed.cc:420
 msgid "Panic"
 msgstr "Pánico"
 
-#: ardour_ui_ed.cc:559
+#: ardour_ui_ed.cc:560
 msgid "Wall Clock"
 msgstr "Hora actual"
 
-#: ardour_ui_ed.cc:560
+#: ardour_ui_ed.cc:561
 msgid "Disk Space"
 msgstr "Espacio en disco"
 
-#: ardour_ui_ed.cc:561
+#: ardour_ui_ed.cc:562
 msgid "DSP"
 msgstr "DSP"
 
-#: ardour_ui_ed.cc:562
+#: ardour_ui_ed.cc:563
 msgid "Buffers"
 msgstr "Buffers"
 
-#: ardour_ui_ed.cc:563
+#: ardour_ui_ed.cc:564
 msgid "JACK Sampling Rate and Latency"
 msgstr "Frecuencia de muestreo y latencia de JACK"
 
-#: ardour_ui_ed.cc:564
+#: ardour_ui_ed.cc:565
 msgid "Timecode Format"
 msgstr "Formato de timecode"
 
-#: ardour_ui_ed.cc:565
+#: ardour_ui_ed.cc:566
 msgid "File Format"
 msgstr "Formato archivo"
 
@@ -2027,11 +2038,11 @@ msgstr ""
 msgid "Internal"
 msgstr "Interno"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 msgid "Enable/Disable external positional sync"
 msgstr "Activar/Desactivar sincronización de posición externa"
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr "No es posible sincronizar a JACK: video pull up/down está establecido"
 
@@ -2061,7 +2072,7 @@ msgstr "Tempo"
 msgid "Meter"
 msgstr "Métrica"
 
-#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1030
+#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1039
 #: midi_region_view.cc:2991 session_metadata_dialog.cc:331
 #: session_metadata_dialog.cc:379 session_metadata_dialog.cc:435
 #: session_metadata_dialog.cc:716
@@ -2152,32 +2163,32 @@ msgid "hide track"
 msgstr "ocultar pista"
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:196 generic_pluginui.cc:456
-#: generic_pluginui.cc:733 panner_ui.cc:150
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
+#: generic_pluginui.cc:746 panner_ui.cc:150
 msgid "Automation|Manual"
 msgstr "Manual"
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1856 gain_meter.cc:199
-#: generic_pluginui.cc:459 generic_pluginui.cc:735 midi_time_axis.cc:1488
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
+#: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr "Reproducir"
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:202 generic_pluginui.cc:462
-#: generic_pluginui.cc:737 panner_ui.cc:156
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
+#: generic_pluginui.cc:750 panner_ui.cc:156
 msgid "Write"
 msgstr "Escribir"
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:205 generic_pluginui.cc:465
-#: generic_pluginui.cc:739 panner_ui.cc:159
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
+#: generic_pluginui.cc:752 panner_ui.cc:159
 msgid "Touch"
 msgstr "Tocar"
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr "???"
 
@@ -2186,7 +2197,7 @@ msgid "clear automation"
 msgstr "limpiar automatización"
 
 #: automation_time_axis.cc:485 editor_actions.cc:613 editor_markers.cc:857
-#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:699
+#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:708
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -2207,7 +2218,7 @@ msgstr "Discreto"
 msgid "Linear"
 msgstr "Lineal"
 
-#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:638
+#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:647
 #: shuttle_control.cc:188
 msgid "Mode"
 msgstr "Modo"
@@ -2224,13 +2235,13 @@ msgstr "Editar conjunto"
 msgid "Direction:"
 msgstr "Dirección:"
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:156
-#: mixer_strip.cc:2132
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 msgid "Input"
 msgstr "Entrada"
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:161 mixer_strip.cc:2135
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 msgid "Output"
 msgstr "Salida"
 
@@ -2240,8 +2251,8 @@ msgid "Edit"
 msgstr "Editar"
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:420 processor_box.cc:2227
-#: route_time_axis.cc:704
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
+#: route_time_axis.cc:713
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -2409,7 +2420,7 @@ msgstr "Tiempo"
 
 #: edit_note_dialog.cc:98 editor_regions.cc:114
 #: export_timespan_selector.cc:359 export_timespan_selector.cc:421
-#: location_ui.cc:313 midi_list_editor.cc:114 time_info_box.cc:105
+#: location_ui.cc:317 midi_list_editor.cc:114 time_info_box.cc:105
 msgid "Length"
 msgstr "Duración"
 
@@ -2656,17 +2667,17 @@ msgid "Ranges & Marks"
 msgstr "Rangos y marcas"
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 msgid "Editor"
 msgstr "Editor"
 
 #: editor.cc:1215 editor.cc:1225 editor.cc:4440 editor_actions.cc:130
-#: editor_actions.cc:1804
+#: editor_actions.cc:1813
 msgid "Loop"
 msgstr "Bucle"
 
@@ -2691,8 +2702,8 @@ msgstr "Symmetric"
 msgid "Slow"
 msgstr "Lenta"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1606
-#: sfdb_ui.cc:1715
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "Rápida"
 
@@ -2712,7 +2723,7 @@ msgstr "Activar"
 msgid "Slowest"
 msgstr "Lentísima"
 
-#: editor.cc:1572 route_time_axis.cc:1863 selection.cc:1009 selection.cc:1064
+#: editor.cc:1572 route_time_axis.cc:1877 selection.cc:1009 selection.cc:1064
 msgid "programming error: "
 msgstr "programming error: "
 
@@ -2829,7 +2840,7 @@ msgid "Select All in Track"
 msgstr "Seleccionar todo en la pista"
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2235
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr "Seleccionar todo"
 
@@ -2884,15 +2895,15 @@ msgstr "Seleccionar rango entre cursor y punto de edición"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2220
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr "Cortar"
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2223
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr "Copiar"
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2231
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr "Pegar"
 
@@ -3049,7 +3060,7 @@ msgstr "Rehacer"
 msgid "Redo (%1)"
 msgstr "Rehacer (%1)"
 
-#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1785
+#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1794
 msgid "Duplicate"
 msgstr "Duplicar"
 
@@ -3079,8 +3090,8 @@ msgstr "Eliminar lista de reproducción"
 msgid "Keep Playlist"
 msgstr "Conservar lista de reproducción"
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -3100,7 +3111,7 @@ msgstr "limpiar listas de reproducción"
 msgid "Please wait while %1 loads visual data."
 msgstr "Por favor, espera a que %1 cargue datos visuales."
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2251
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 msgid "Edit..."
 msgstr "Editar..."
 
@@ -3152,7 +3163,7 @@ msgstr "Superposición"
 msgid "Position"
 msgstr "Posición"
 
-#: editor_actions.cc:101 gain_meter.cc:124 gain_meter.cc:755 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr "Recortar"
@@ -3165,7 +3176,7 @@ msgstr "Ganancia"
 msgid "Ranges"
 msgstr "Rangos"
 
-#: editor_actions.cc:104 editor_actions.cc:1781 session_option_editor.cc:145
+#: editor_actions.cc:104 editor_actions.cc:1790 session_option_editor.cc:145
 #: session_option_editor.cc:147 session_option_editor.cc:156
 #: session_option_editor.cc:163
 msgid "Fades"
@@ -3204,7 +3215,7 @@ msgstr "Opciones MIDI"
 msgid "Misc Options"
 msgstr "Opciones misceláneas"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr "Monitorización"
@@ -3246,8 +3257,8 @@ msgstr "Reloj secundario"
 msgid "Separate"
 msgstr "Separar"
 
-#: editor_actions.cc:132 mixer_strip.cc:1916 route_time_axis.cc:199
-#: route_time_axis.cc:2397
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
+#: route_time_axis.cc:2417
 msgid "Solo"
 msgstr "Solo"
 
@@ -3259,7 +3270,7 @@ msgstr "Subcuadros"
 msgid "Timecode fps"
 msgstr "Timecode fps"
 
-#: editor_actions.cc:137 route_time_axis.cc:421
+#: editor_actions.cc:137 route_time_axis.cc:430
 msgid "Height"
 msgstr "Altura"
 
@@ -3383,7 +3394,7 @@ msgstr "Cursor a inicio de rango"
 msgid "Playhead to Range End"
 msgstr "Cursor a final de rango"
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2237
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 msgid "Deselect All"
 msgstr "Deseleccionar todo"
 
@@ -3653,9 +3664,9 @@ msgstr "Insertar tiempo"
 msgid "Toggle Active"
 msgstr "Activar/Desactivar pista"
 
-#: editor_actions.cc:370 editor_actions.cc:1707 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1488
-#: route_time_axis.cc:701
+#: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
+#: route_time_axis.cc:710
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -3663,20 +3674,20 @@ msgstr "Eliminar"
 msgid "Fit Selected Tracks"
 msgstr "Encajar las pistas seleccionadas en la ventana"
 
-#: editor_actions.cc:376 time_axis_view.cc:1298
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr "Máxima"
 
-#: editor_actions.cc:379 time_axis_view.cc:1299
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr "Muy grande"
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1300
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr "Grande"
 
 # aquí creo que el original debería decir "smallest" por coherencia (son las alturas de pista). me tomo la libertad de corregir
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr "Mínima"
 
@@ -3773,7 +3784,7 @@ msgstr "Reunir"
 msgid "Slide"
 msgstr "Deslizar"
 
-#: editor_actions.cc:478 editor_actions.cc:1728 editor_markers.cc:860
+#: editor_actions.cc:478 editor_actions.cc:1737 editor_markers.cc:860
 #: editor_rulers.cc:386 location_ui.cc:56
 msgid "Lock"
 msgstr "Bloquear"
@@ -3947,7 +3958,7 @@ msgstr "Mins:Segs"
 msgid "Video Monitor"
 msgstr "Monitorizar"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr ""
 
@@ -3958,7 +3969,7 @@ msgstr "Levantar a capa superior"
 
 #: editor_actions.cc:554
 #, fuzzy
-msgid "Framenumber"
+msgid "Frame number"
 msgstr "Número de pista"
 
 #: editor_actions.cc:555
@@ -4049,7 +4060,7 @@ msgstr "Eliminar no usados"
 
 #: editor_actions.cc:652 editor_audio_import.cc:279
 #: session_import_dialog.cc:74 session_import_dialog.cc:94
-#: session_metadata_dialog.cc:297 editor_videotimeline.cc:107
+#: session_metadata_dialog.cc:297 editor_videotimeline.cc:108
 msgid "Import"
 msgstr "Importar"
 
@@ -4091,289 +4102,289 @@ msgstr "Cargando editor de combinaciones de teclas desde %1"
 msgid "Could not find editor.bindings in search path %1"
 msgstr "Could not find editor.bindings in search path %1"
 
-#: editor_actions.cc:1019 editor_actions.cc:1415 editor_actions.cc:1426
-#: editor_actions.cc:1479 editor_actions.cc:1490 editor_actions.cc:1537
-#: editor_actions.cc:1547 editor_regions.cc:1561
+#: editor_actions.cc:1028 editor_actions.cc:1424 editor_actions.cc:1435
+#: editor_actions.cc:1488 editor_actions.cc:1499 editor_actions.cc:1546
+#: editor_actions.cc:1556 editor_regions.cc:1561
 msgid "programming error: %1: %2"
 msgstr "programming error: %1: %2"
 
-#: editor_actions.cc:1713
+#: editor_actions.cc:1722
 msgid "Raise"
 msgstr "Levantar"
 
-#: editor_actions.cc:1716
+#: editor_actions.cc:1725
 msgid "Raise to Top"
 msgstr "Levantar a capa superior"
 
-#: editor_actions.cc:1719 gtk-custom-ruler.c:132
+#: editor_actions.cc:1728 gtk-custom-ruler.c:132
 msgid "Lower"
 msgstr "Bajar"
 
-#: editor_actions.cc:1722
+#: editor_actions.cc:1731
 msgid "Lower to Bottom"
 msgstr "Bajar a capa inferior"
 
-#: editor_actions.cc:1725
+#: editor_actions.cc:1734
 msgid "Move to Original Position"
 msgstr "Mover a posición original"
 
-#: editor_actions.cc:1730
+#: editor_actions.cc:1739
 msgid "Lock to Video"
 msgstr ""
 
-#: editor_actions.cc:1735 editor_markers.cc:867
+#: editor_actions.cc:1744 editor_markers.cc:867
 msgid "Glue to Bars and Beats"
 msgstr "Adherir a compases y pulsos"
 
-#: editor_actions.cc:1740
+#: editor_actions.cc:1749
 msgid "Remove Sync"
 msgstr "Eliminar sincronía"
 
-#: editor_actions.cc:1743 mixer_strip.cc:1903 route_time_axis.cc:200
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr "Mudo"
 
-#: editor_actions.cc:1746
+#: editor_actions.cc:1755
 msgid "Normalize..."
 msgstr "Normalizar..."
 
-#: editor_actions.cc:1749
+#: editor_actions.cc:1758
 msgid "Reverse"
 msgstr "Al revés"
 
-#: editor_actions.cc:1752
+#: editor_actions.cc:1761
 msgid "Make Mono Regions"
 msgstr "Crear regiones mono"
 
-#: editor_actions.cc:1755
+#: editor_actions.cc:1764
 msgid "Boost Gain"
 msgstr "Amplificar ganancia"
 
-#: editor_actions.cc:1758
+#: editor_actions.cc:1767
 msgid "Cut Gain"
 msgstr "Reducir ganancia"
 
-#: editor_actions.cc:1761
+#: editor_actions.cc:1770
 msgid "Pitch Shift..."
 msgstr "Cambiar tono..."
 
-#: editor_actions.cc:1764
+#: editor_actions.cc:1773
 msgid "Transpose..."
 msgstr "Transponer..."
 
-#: editor_actions.cc:1767
+#: editor_actions.cc:1776
 msgid "Opaque"
 msgstr "Opaca"
 
-#: editor_actions.cc:1771 editor_regions.cc:116
+#: editor_actions.cc:1780 editor_regions.cc:116
 msgid "Fade In"
 msgstr "Fundido de entrada"
 
-#: editor_actions.cc:1776 editor_regions.cc:117
+#: editor_actions.cc:1785 editor_regions.cc:117
 msgid "Fade Out"
 msgstr "Fundido de salida"
 
-#: editor_actions.cc:1791
+#: editor_actions.cc:1800
 msgid "Multi-Duplicate..."
 msgstr "Duplicado múltiple..."
 
-#: editor_actions.cc:1796
+#: editor_actions.cc:1805
 msgid "Fill Track"
 msgstr "Llenar pista"
 
-#: editor_actions.cc:1800 editor_markers.cc:955
+#: editor_actions.cc:1809 editor_markers.cc:955
 msgid "Set Loop Range"
 msgstr "Crear rango de bucle"
 
-#: editor_actions.cc:1807
+#: editor_actions.cc:1816
 msgid "Set Punch"
 msgstr "Establecer pinchazo"
 
-#: editor_actions.cc:1811
+#: editor_actions.cc:1820
 msgid "Add Single Range Marker"
 msgstr "Añadir marca de rango simple"
 
-#: editor_actions.cc:1816
+#: editor_actions.cc:1825
 msgid "Add Range Marker Per Region"
 msgstr "Añadir marca de rango por región"
 
-#: editor_actions.cc:1820
+#: editor_actions.cc:1829
 msgid "Snap Position To Grid"
 msgstr "Ajustar posición a rejilla"
 
-#: editor_actions.cc:1823
+#: editor_actions.cc:1832
 msgid "Close Gaps"
 msgstr "Cerrar huecos"
 
-#: editor_actions.cc:1826
+#: editor_actions.cc:1835
 msgid "Rhythm Ferret..."
 msgstr "Rhythm Ferret..."
 
-#: editor_actions.cc:1829
+#: editor_actions.cc:1838
 msgid "Export..."
 msgstr "Exportar..."
 
-#: editor_actions.cc:1835
+#: editor_actions.cc:1844
 msgid "Separate Under"
 msgstr "Separar debajo"
 
-#: editor_actions.cc:1839
+#: editor_actions.cc:1848
 msgid "Set Fade In Length"
 msgstr "Definir duración de fundido de entrada"
 
-#: editor_actions.cc:1840
+#: editor_actions.cc:1849
 msgid "Set Fade Out Length"
 msgstr "Definir duración de fundido de salida"
 
-#: editor_actions.cc:1841
+#: editor_actions.cc:1850
 msgid "Set Tempo from Region = Bar"
 msgstr "Definir tempo según \"región = compás\""
 
-#: editor_actions.cc:1846
+#: editor_actions.cc:1855
 msgid "Split at Percussion Onsets"
 msgstr "Separar en inicios de percusión"
 
-#: editor_actions.cc:1851
+#: editor_actions.cc:1860
 msgid "List Editor..."
 msgstr "Editor de lista de eventos..."
 
-#: editor_actions.cc:1854
+#: editor_actions.cc:1863
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: editor_actions.cc:1858
+#: editor_actions.cc:1867
 msgid "Bounce (with processing)"
 msgstr "Rebotar (con procesado)"
 
-#: editor_actions.cc:1859
+#: editor_actions.cc:1868
 msgid "Bounce (without processing)"
 msgstr "Rebotar (sin procesado)"
 
-#: editor_actions.cc:1860
+#: editor_actions.cc:1869
 msgid "Combine"
 msgstr "Combinar"
 
-#: editor_actions.cc:1861
+#: editor_actions.cc:1870
 msgid "Uncombine"
 msgstr "Descombinar"
 
-#: editor_actions.cc:1863
+#: editor_actions.cc:1872
 msgid "Spectral Analysis..."
 msgstr "Análisis espectral..."
 
-#: editor_actions.cc:1865
+#: editor_actions.cc:1874
 msgid "Reset Envelope"
 msgstr "Restablecer envolvente"
 
-#: editor_actions.cc:1867
+#: editor_actions.cc:1876
 msgid "Reset Gain"
 msgstr "Restablecer ganancia"
 
-#: editor_actions.cc:1872
+#: editor_actions.cc:1881
 msgid "Envelope Active"
 msgstr "Envolvente activa"
 
-#: editor_actions.cc:1876
+#: editor_actions.cc:1885
 msgid "Quantize..."
 msgstr "Cuantificar..."
 
-#: editor_actions.cc:1877 editor_actions.cc:1878
+#: editor_actions.cc:1886 editor_actions.cc:1887
 msgid "Insert Patch Change..."
 msgstr "Insertar cambio de patch..."
 
-#: editor_actions.cc:1879
+#: editor_actions.cc:1888
 msgid "Unlink from other copies"
 msgstr "Desligar de otras copias"
 
-#: editor_actions.cc:1880
+#: editor_actions.cc:1889
 msgid "Strip Silence..."
 msgstr "Quitar silencio..."
 
-#: editor_actions.cc:1881
+#: editor_actions.cc:1890
 msgid "Set Range Selection"
 msgstr "Establecer selección de rango"
 
-#: editor_actions.cc:1883
+#: editor_actions.cc:1892
 msgid "Nudge Later"
 msgstr "Atrasar"
 
-#: editor_actions.cc:1884
+#: editor_actions.cc:1893
 msgid "Nudge Earlier"
 msgstr "Adelantar"
 
-#: editor_actions.cc:1889
+#: editor_actions.cc:1898
 msgid "Nudge Later by Capture Offset"
 msgstr "Atrasar por compensación de captura"
 
-#: editor_actions.cc:1896
+#: editor_actions.cc:1905
 msgid "Nudge Earlier by Capture Offset"
 msgstr "Adelantar por compensación de captura"
 
-#: editor_actions.cc:1900
+#: editor_actions.cc:1909
 msgid "Trim to Loop"
 msgstr "Recortar a bucle"
 
-#: editor_actions.cc:1901
+#: editor_actions.cc:1910
 msgid "Trim to Punch"
 msgstr "Recortar a pinchazo"
 
-#: editor_actions.cc:1903
+#: editor_actions.cc:1912
 msgid "Trim to Previous"
 msgstr "Recortar a anterior"
 
-#: editor_actions.cc:1904
+#: editor_actions.cc:1913
 msgid "Trim to Next"
 msgstr "Recortar a siguiente"
 
-#: editor_actions.cc:1911
+#: editor_actions.cc:1920
 msgid "Insert Region From Region List"
 msgstr "Insertar región desde lista de regiones"
 
-#: editor_actions.cc:1917
+#: editor_actions.cc:1926
 msgid "Set Sync Position"
 msgstr "Establecer posición de sincronía"
 
-#: editor_actions.cc:1918
+#: editor_actions.cc:1927
 msgid "Place Transient"
 msgstr "Colocar transitorio"
 
-#: editor_actions.cc:1919
+#: editor_actions.cc:1928
 msgid "Split"
 msgstr "Separar"
 
-#: editor_actions.cc:1920
+#: editor_actions.cc:1929
 msgid "Trim Start at Edit Point"
 msgstr "Recortar inicio en punto de edición"
 
-#: editor_actions.cc:1921
+#: editor_actions.cc:1930
 msgid "Trim End at Edit Point"
 msgstr "Recortar final en punto de edición"
 
-#: editor_actions.cc:1926
+#: editor_actions.cc:1935
 msgid "Align Start"
 msgstr "Alinear inicio"
 
-#: editor_actions.cc:1933
+#: editor_actions.cc:1942
 msgid "Align Start Relative"
 msgstr "Alinear inicio relativo"
 
-#: editor_actions.cc:1937
+#: editor_actions.cc:1946
 msgid "Align End"
 msgstr "Alinear final"
 
-#: editor_actions.cc:1942
+#: editor_actions.cc:1951
 msgid "Align End Relative"
 msgstr "Alinear final relativo"
 
-#: editor_actions.cc:1949
+#: editor_actions.cc:1958
 msgid "Align Sync"
 msgstr "Alinear sincronía"
 
-#: editor_actions.cc:1956
+#: editor_actions.cc:1965
 msgid "Align Sync Relative"
 msgstr "Alinear sincronía relativo"
 
-#: editor_actions.cc:1960 editor_actions.cc:1963
+#: editor_actions.cc:1969 editor_actions.cc:1972
 msgid "Choose Top..."
 msgstr "Elegir superior..."
 
@@ -4402,32 +4413,32 @@ msgstr ""
 "La sesión ya contiene un archivo llamado %1. ¿Deseas importar %2 como un "
 "nuevo archivo u omitirlo?"
 
-#: editor_audio_import.cc:279 editor_videotimeline.cc:107
+#: editor_audio_import.cc:279 editor_videotimeline.cc:108
 msgid "Cancel Import"
 msgstr "Cancelar Importación"
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr "Editor: no se pudo abrir el archivo \"%1\", (%2)"
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 msgid "Cancel entire import"
 msgstr "Cancelar importación completa"
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 msgid "Don't embed it"
 msgstr "No embeber"
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr "Embeber todos sin preguntas"
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 msgid "Sample rate"
 msgstr "Frec. de muestreo"
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
@@ -4435,7 +4446,7 @@ msgstr ""
 "%1\n"
 "¡La frecuencia de muestreo de este archivo es diferente a la de la sesión!"
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 msgid "Embed it anyway"
 msgstr "Embeber de todas formas"
 
@@ -4473,31 +4484,31 @@ msgstr "copiar marca de tempo"
 msgid "move tempo mark"
 msgstr "mover marca de tempo"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr "cambiar duración del fundido de entrada"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr "cambiar duración del fundido de salida"
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr "mover marca"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr "Ocurrió un error al ejecutar la operación de cambio de tempo"
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 msgid "programming_error: %1"
 msgstr "programming_error: %1"
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr "nueva marca de rango"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 msgid "rubberband selection"
 msgstr "selección elástica"
 
@@ -4566,7 +4577,7 @@ msgid "Sharing Solo?"
 msgstr "Comparte solo?"
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 msgid "Rec"
 msgstr "Grb"
 
@@ -4639,7 +4650,7 @@ msgid "end"
 msgstr "fin"
 
 #: editor_markers.cc:646 editor_ops.cc:1744 editor_ops.cc:1764
-#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1005
+#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1017
 msgid "add marker"
 msgstr "añadir marca"
 
@@ -4647,7 +4658,7 @@ msgstr "añadir marca"
 msgid "range"
 msgstr "rango"
 
-#: editor_markers.cc:713 location_ui.cc:840
+#: editor_markers.cc:713 location_ui.cc:852
 msgid "remove marker"
 msgstr "eliminar marca"
 
@@ -4726,8 +4737,8 @@ msgstr "Renombrar marca"
 msgid "Rename Range"
 msgstr "Renombrar rango"
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2233 route_time_axis.cc:968 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -4865,7 +4876,7 @@ msgstr "bajar regiones a capa inferior"
 msgid "Rename Region"
 msgstr "Renombrar región"
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 msgid "New name:"
 msgstr "Nuevo nombre: "
 
@@ -5046,7 +5057,7 @@ msgstr ""
 "(Es una acción destructiva que no podrás deshacer)"
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr "No, no hagas nada"
 
@@ -5237,11 +5248,11 @@ msgstr "Ok"
 msgid "close region gaps"
 msgstr "cerrar huecos de regiones"
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr "That would be bad news ...."
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5261,7 +5272,7 @@ msgstr ""
 msgid "tracks"
 msgstr "pistas"
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 msgid "track"
 msgstr "pista"
 
@@ -5270,7 +5281,7 @@ msgstr "pista"
 msgid "busses"
 msgstr "buses"
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 msgid "bus"
 msgstr "bus"
 
@@ -5313,7 +5324,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr "Sí, elimínalas."
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr "Sí, elimínala"
 
@@ -5382,7 +5393,7 @@ msgstr "Length of region fade-in (units: secondary clock), () if disabled"
 msgid "Length of region fade-out (units: secondary clock), () if dsisabled"
 msgstr "Length of region fade-out (units: secondary clock), () if dsisabled"
 
-#: editor_regions.cc:118 mixer_strip.cc:1960 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr "L"
@@ -5399,8 +5410,9 @@ msgstr "G"
 msgid "Region position glued to Bars|Beats time?"
 msgstr "Region position glued to Bars|Beats time?"
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:723
-#: mixer_strip.cc:1934 panner_ui.cc:554 stereo_panner.cc:237
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
+#: stereo_panner.cc:237
 msgid "M"
 msgstr "M"
 
@@ -5469,7 +5481,8 @@ msgstr "Nombre de Pista/Bus"
 msgid "Track/Bus visible ?"
 msgstr "¿Pista/Bus visible?"
 
-#: editor_routes.cc:204 mixer_strip.cc:1951 route_time_axis.cc:2387
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
+#: route_time_axis.cc:2407
 msgid "A"
 msgstr "A"
 
@@ -5477,7 +5490,7 @@ msgstr "A"
 msgid "Track/Bus active ?"
 msgstr "¿Pista/Bus activa/o?"
 
-#: editor_routes.cc:205 mixer_strip.cc:1935
+#: editor_routes.cc:205 mixer_strip.cc:1932
 msgid "I"
 msgstr "I"
 
@@ -5485,7 +5498,7 @@ msgstr "I"
 msgid "MIDI input enabled"
 msgstr "Entrada MIDI habilitada"
 
-#: editor_routes.cc:206 mixer_strip.cc:1933 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr "R"
@@ -5498,7 +5511,7 @@ msgstr "Grabación habilitada"
 msgid "Muted"
 msgstr "En mudo"
 
-#: editor_routes.cc:208 mixer_strip.cc:1947
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr "S"
 
@@ -5510,7 +5523,7 @@ msgstr "En solo"
 msgid "SI"
 msgstr "SI"
 
-#: editor_routes.cc:209 mixer_strip.cc:351 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 msgid "Solo Isolated"
 msgstr "Solo aislado"
 
@@ -5793,143 +5806,147 @@ msgid "192000Hz"
 msgstr "192000Hz"
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr "Ninguno"
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr "Triangular"
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr "Rectangular"
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 msgid "Shaped"
 msgstr "Shaped"
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr "Reproducción/grabación en 1 dispositivo"
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr "Reproducción/grabación en 2 dispositivos"
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr "Sólo reproducción"
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 msgid "Recording only"
 msgstr "Sólo grabación"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr "seq"
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 msgid "raw"
 msgstr "raw"
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr "Driver:"
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 msgid "Audio Interface:"
 msgstr "Interfaz de audio:"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:148 sfdb_ui.cc:261 sfdb_ui.cc:266
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 msgid "Sample rate:"
 msgstr "Frec. de muestreo:"
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr "Tamaño del buffer:"
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr "Cantidad de buffers:"
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr "Latencia aproximada:"
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 msgid "Audio mode:"
 msgstr "Modo de audio:"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr "Timeout de clientes"
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr "Cantidad de puertos:"
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr "Driver MIDI:"
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 msgid "Dither:"
 msgstr "Dither:"
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr ""
 "No se encuentra el servidor JACK en el sistema. Por favor, instala JACK y "
 "reinicia"
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr "Servidor:"
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr "Dispositivo de entrada:"
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 msgid "Output device:"
 msgstr "Dispositivo de salida:"
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 msgid "Hardware input latency:"
 msgstr "Latencia de entrada del hardware:"
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 msgid "samples"
 msgstr "muestras"
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 msgid "Hardware output latency:"
 msgstr "Latencia de salida del hardware:"
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr "Dispositivo"
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr ""
 "no se pudo leer el archivo de inicialización de JACK %1 para almacenar "
 "parámetros"
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 msgid ""
 "You do not have any audio devices capable of\n"
 "simultaneous playback and recording.\n"
@@ -5958,33 +5975,33 @@ msgstr ""
 "o sólo capturar, pero no ambas cosas a la vez, arranca\n"
 "JACK antes de ejecutar %1 y elige el dispositivo adecuado."
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr "No hay dispositivos de audio adecuados"
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr "JACK appears to be missing from the %1 bundle"
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr "Es necesario que antes elijas un dispositivo de audio."
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr "Dispositivo de audio \"%1\" desconocido en este ordenador."
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr "AudioSetup value for %1 is missing data"
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 "los archivos de configuración contienen una ruta al servidor JACK que no "
 "existe (%1)"
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:146
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 msgid "Channels:"
 msgstr "Canales:"
 
@@ -6139,9 +6156,9 @@ msgid "Folder:"
 msgstr "Carpeta:"
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "Explorar"
 
@@ -6267,6 +6284,13 @@ msgstr "Opciones FLAC"
 msgid "Broadcast Wave options"
 msgstr "Opciones de Broadcast Wave"
 
+#: export_format_selector.cc:136
+#, fuzzy
+msgid "Do you really want to remove the format?"
+msgstr ""
+"¿De verdad deseas eliminar la captura \"%1\" ?\n"
+"(no podrás deshacer esta acción)"
+
 #: export_preset_selector.cc:28
 msgid "Preset"
 msgstr "Preset"
@@ -6279,6 +6303,13 @@ msgstr ""
 "¡El preset seleccionado no se cargó correctamente!\n"
 "¿Quizás se refiere a un formato que ha sido eliminado?"
 
+#: export_preset_selector.cc:156
+#, fuzzy
+msgid "Do you really want to remove this preset?"
+msgstr ""
+"¿De verdad deseas eliminar la captura \"%1\" ?\n"
+"(no podrás deshacer esta acción)"
+
 #: export_timespan_selector.cc:46
 msgid "Show Times as:"
 msgstr "Mostrar los tiempos como:"
@@ -6291,36 +6322,49 @@ msgstr " a "
 msgid "Range"
 msgstr "Rango"
 
-#: gain_meter.cc:109 gain_meter.cc:431 gain_meter.cc:820
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+#, fuzzy
+msgid "curl error %1 (%2)"
+msgstr "programming error: %1 (%2)"
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+msgid "%1"
+msgstr ""
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr "-inf"
 
-#: gain_meter.cc:115 gain_meter.cc:869
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr "Modo de automatización de fader"
 
-#: gain_meter.cc:116 gain_meter.cc:870
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr "Tipo de automatización de fader"
 
-#: gain_meter.cc:125 gain_meter.cc:759 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr "Abs"
 
-#: gain_meter.cc:334
-msgid "-Inf"
-msgstr "-Inf"
-
-#: gain_meter.cc:726 mixer_strip.cc:1954 panner_ui.cc:557
-#: route_time_axis.cc:2391
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
+#: route_time_axis.cc:2411
 msgid "P"
 msgstr "P"
 
-#: gain_meter.cc:729 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr "T"
 
-#: gain_meter.cc:732 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr "W"
 
@@ -6332,7 +6376,7 @@ msgstr "<span size=\"large\">Presets</span>"
 msgid "Switches"
 msgstr "Conmutadores"
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2210
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 msgid "Controls"
 msgstr "Controles"
 
@@ -6361,63 +6405,63 @@ msgstr "Gestor de conexiones de audio"
 msgid "MIDI Connection Manager"
 msgstr "Gestor de conexiones MIDI"
 
-#: global_port_matrix.cc:204 io_selector.cc:216
+#: global_port_matrix.cc:213 io_selector.cc:216
 msgid "port"
 msgstr "puerto"
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 msgid "Selection..."
 msgstr "Selección..."
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr "Habilitado para grabación..."
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 msgid "Soloed..."
 msgstr "En solo..."
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 msgid "Create New Group ..."
 msgstr "Crear nuevo grupo..."
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr ""
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 msgid "Edit Group..."
 msgstr "Editar grupo..."
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 msgid "Collect Group"
 msgstr ""
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 msgid "Remove Group"
 msgstr "Eiminar grupo"
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 msgid "Remove Subgroup Bus"
 msgstr "Eliminar bus de subgrupo"
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 msgid "Add New Subgroup Bus"
 msgstr "Añadir nuebo bus de subgrupo"
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr "Añadir nuevo bus auxiliar (pre-fader)"
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 msgid "Add New Aux Bus (post-fader)"
 msgstr "Añadir nuevo bus auxiliar (post-fader)"
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 msgid "Enable All Groups"
 msgstr ""
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 msgid "Disable All Groups"
 msgstr "Desactivar todos los grupos"
 
@@ -6513,11 +6557,11 @@ msgstr "Importando fichero: %1 de %2"
 msgid "I/O selector"
 msgstr "Selector de E/S"
 
-#: io_selector.cc:266
+#: io_selector.cc:265
 msgid "%1 input"
 msgstr "%1 entrada"
 
-#: io_selector.cc:268
+#: io_selector.cc:267
 msgid "%1 output"
 msgstr "%1 salida"
 
@@ -6595,7 +6639,7 @@ msgstr[1] "%1 muestras"
 msgid "Reset"
 msgstr "Restablecer"
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1734
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 msgid "programming error: %1 (%2)"
 msgstr "programming error: %1 (%2)"
 
@@ -6623,63 +6667,63 @@ msgstr "Compositor:"
 msgid "Pre-Emphasis"
 msgstr "Pre-énfasis"
 
-#: location_ui.cc:310
+#: location_ui.cc:314
 msgid "Remove this range"
 msgstr "Eliminar este rango"
 
-#: location_ui.cc:311
+#: location_ui.cc:315
 msgid "Start time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:312
+#: location_ui.cc:316
 msgid "End time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:315
+#: location_ui.cc:319
 msgid "Set range start from playhead location"
 msgstr "Establecer inicio de rango en posición de cursor"
 
-#: location_ui.cc:316
+#: location_ui.cc:320
 msgid "Set range end from playhead location"
 msgstr "Establecer fin de rango en posición de cursor"
 
-#: location_ui.cc:320
+#: location_ui.cc:324
 msgid "Remove this marker"
 msgstr "Eliminar esta marca"
 
-#: location_ui.cc:321
+#: location_ui.cc:325
 msgid "Position - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:323
+#: location_ui.cc:327
 msgid "Set marker time from playhead location"
 msgstr "Establecer tiempo de marca en posición de cursor"
 
-#: location_ui.cc:462
+#: location_ui.cc:494
 msgid "You cannot put a CD marker at the start of the session"
 msgstr "No puedes colocar una marca de CD al inicio de la sesión"
 
-#: location_ui.cc:708
+#: location_ui.cc:720
 msgid "New Marker"
 msgstr "Nueva marca"
 
-#: location_ui.cc:709
+#: location_ui.cc:721
 msgid "New Range"
 msgstr "Nuevo rango"
 
-#: location_ui.cc:722
+#: location_ui.cc:734
 msgid "<b>Loop/Punch Ranges</b>"
 msgstr "<b>Rangos de bucle/pinchazo</b>"
 
-#: location_ui.cc:747
+#: location_ui.cc:759
 msgid "<b>Markers (Including CD Index)</b>"
 msgstr "<b>Marcas (incluyendo índice de CD)</b>"
 
-#: location_ui.cc:782
+#: location_ui.cc:794
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
 msgstr "<b>Rangos (incluyendo rangos de pistas de CD)</b>"
 
-#: location_ui.cc:1024
+#: location_ui.cc:1036
 msgid "add range marker"
 msgstr "añadir marca de rango"
 
@@ -6764,19 +6808,19 @@ msgstr ""
 "guardar tu sesión en este momento pues perderíamos la información\n"
 "de las conexiones.\n"
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr " (compilado usando "
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr " y versión de GCC "
 
-#: main.cc:504
+#: main.cc:500
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr "Copyright (C) 1999-2012 Paul Davis"
 
-#: main.cc:505
+#: main.cc:501
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
@@ -6784,30 +6828,34 @@ msgstr ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
 
-#: main.cc:507
+#: main.cc:503
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr "%1 viene SIN GARANT�A DE NINGUNA CLASE"
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 "incluidas de comerciabilidad o adecuación para un propósito determinado"
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "Esto es software libre. Puedes distribuirlo "
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr ""
 "bajo ciertas condiciones; lee el código para conocer las condiciones de "
 "copia."
 
-#: main.cc:519
+#: main.cc:513
+msgid "could not initialize %1."
+msgstr "no se pudo inicializar %1."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr "Cannot xinstall SIGPIPE error handler"
 
-#: main.cc:525
+#: main.cc:528
 msgid "could not create %1 GUI"
 msgstr "could not create %1 GUI"
 
@@ -6815,7 +6863,7 @@ msgstr "could not create %1 GUI"
 msgid "Display delta to edit cursor"
 msgstr "Mostrar diferencia al punto de edición"
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 msgid "MarkerText"
 msgstr "MarkerText"
 
@@ -7308,7 +7356,7 @@ msgstr "Pulsa para elegir una carpeta adicional"
 msgid "Missing Plugins"
 msgstr "Plugins ausentes"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr "OK"
 
@@ -7382,20 +7430,20 @@ msgstr ""
 msgid "Could not find mixer.bindings in search path %1"
 msgstr ""
 
-#: mixer_strip.cc:91 mixer_strip.cc:119 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr "pre"
 
-#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:352 mixer_strip.cc:1293
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 msgid "Comments"
 msgstr "Comentarios"
 
-#: mixer_strip.cc:145
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr "Conmutar anchura de este canal de mezcla."
 
-#: mixer_strip.cc:147
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
@@ -7403,60 +7451,60 @@ msgstr ""
 "\n"
 "%1-%2-clic para conmutar la anchura de todos los canales."
 
-#: mixer_strip.cc:154
+#: mixer_strip.cc:156
 msgid "Hide this mixer strip"
 msgstr "Ocultar este canal del mezclador"
 
-#: mixer_strip.cc:165
+#: mixer_strip.cc:167
 msgid "Click to select metering point"
 msgstr "Selección de punto de medición"
 
 # it's just a meaningless string
-#: mixer_strip.cc:171
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr "tupni"
 
-#: mixer_strip.cc:190
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr "Solo aislado"
 
-#: mixer_strip.cc:199
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr "Bloquear estado de solo"
 
-#: mixer_strip.cc:201 mixer_strip.cc:1929
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 msgid "lock"
 msgstr "bloquear"
 
-#: mixer_strip.cc:202 mixer_strip.cc:1928
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 msgid "iso"
 msgstr "iso"
 
-#: mixer_strip.cc:256
+#: mixer_strip.cc:258
 msgid "Mix group"
 msgstr "Grupo de mezcla"
 
-#: mixer_strip.cc:349 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 msgid "Phase Invert"
 msgstr "Inversión de fase"
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 msgid "Solo Safe"
 msgstr "Solo seguro"
 
-#: mixer_strip.cc:353 mixer_ui.cc:124 route_time_axis.cc:664
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 msgid "Group"
 msgstr "Grupo"
 
-#: mixer_strip.cc:354 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 msgid "Meter Point"
 msgstr "Punto de medición"
 
-#: mixer_strip.cc:466
+#: mixer_strip.cc:470
 msgid "Enable/Disable MIDI input"
 msgstr "Activar/Desactivar entrada MIDI"
 
-#: mixer_strip.cc:616
+#: mixer_strip.cc:622
 msgid ""
 "Aux\n"
 "Sends"
@@ -7464,138 +7512,151 @@ msgstr ""
 "Aux\n"
 "Envíos"
 
-#: mixer_strip.cc:640
+#: mixer_strip.cc:646
 msgid "Snd"
 msgstr "Snd"
 
-#: mixer_strip.cc:694 mixer_strip.cc:822 processor_box.cc:2152
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr "No está conectado a JACK - No es posible realizar cambios de E/S"
 
-#: mixer_strip.cc:1089
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr "<b>ENTRADA</b> a %1"
 
-#: mixer_strip.cc:1092
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr "<b>SALIDA</b> desde %1"
 
-#: mixer_strip.cc:1167
+#: mixer_strip.cc:1174
 msgid "Disconnected"
 msgstr "Desconectado"
 
-#: mixer_strip.cc:1296
+#: mixer_strip.cc:1303
 msgid "*Comments*"
 msgstr "*Comentarios*"
 
-#: mixer_strip.cc:1303
+#: mixer_strip.cc:1310
 msgid "Cmt"
 msgstr "Cmt"
 
-#: mixer_strip.cc:1306
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr ""
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr "Clicar para añadir o editar comentarios"
 
-#: mixer_strip.cc:1351
+#: mixer_strip.cc:1358
 msgid ": comment editor"
 msgstr ": editor de notas"
 
-#: mixer_strip.cc:1428
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr "Grp"
 
-#: mixer_strip.cc:1431
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr "~G"
 
-#: mixer_strip.cc:1460
+#: mixer_strip.cc:1467
 msgid "Comments..."
 msgstr "Notas..."
 
-#: mixer_strip.cc:1462
+#: mixer_strip.cc:1469
 msgid "Save As Template..."
 msgstr "Guardar como plantilla..."
 
-#: mixer_strip.cc:1468 route_group_dialog.cc:39 route_time_axis.cc:687
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr "Activo"
 
-#: mixer_strip.cc:1475
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr "Ajustar latencia..."
 
-#: mixer_strip.cc:1478
+#: mixer_strip.cc:1485
 msgid "Protect Against Denormals"
 msgstr "Proteger contra denormals"
 
-#: mixer_strip.cc:1484 route_time_axis.cc:426
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 msgid "Remote Control ID..."
 msgstr "ID de control remoto..."
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 msgid "in"
 msgstr "in"
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 msgid "post"
 msgstr "post"
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 msgid "out"
 msgstr "out"
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr "custom"
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 msgid "pr"
 msgstr "pr"
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 msgid "po"
 msgstr "po"
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 msgid "o"
 msgstr "o"
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr ""
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr "Disco"
 
-#: mixer_strip.cc:1920 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr "AFL"
 
-#: mixer_strip.cc:1923 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr "PFL"
 
-#: mixer_strip.cc:1936
+#: mixer_strip.cc:1933
 msgid "D"
 msgstr "D"
 
-#: mixer_strip.cc:1959
+#: mixer_strip.cc:1953
 msgid "i"
 msgstr "i"
 
-#: mixer_strip.cc:2133
+#: mixer_strip.cc:2128
 msgid "Pre-fader"
 msgstr "Pre-fader"
 
-#: mixer_strip.cc:2134
+#: mixer_strip.cc:2129
 msgid "Post-fader"
 msgstr "Post-fader"
 
+#: mixer_strip.cc:2166 meter_strip.cc:728
+msgid "Change all in Group to %1"
+msgstr ""
+
+#: mixer_strip.cc:2168 meter_strip.cc:730
+#, fuzzy
+msgid "Change all to %1"
+msgstr "Canal %1"
+
+#: mixer_strip.cc:2170 meter_strip.cc:732
+msgid "Change same track-type to %1"
+msgstr ""
+
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr ""
@@ -7604,10 +7665,68 @@ msgstr ""
 msgid "-all-"
 msgstr "-todos-"
 
-#: mixer_ui.cc:1792
+#: mixer_ui.cc:1794
 msgid "Strips"
 msgstr "Canales"
 
+#: meter_strip.cc:764
+msgid "Variable height"
+msgstr ""
+
+#: meter_strip.cc:765
+#, fuzzy
+msgid "Short"
+msgstr "corto"
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr ""
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr ""
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+#, fuzzy
+msgid "VU"
+msgstr "V"
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr "SiP"
@@ -7994,7 +8113,7 @@ msgstr ""
 msgid "Panner (2D)"
 msgstr "Paner (2D)"
 
-#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:452
+#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:451
 msgid "Bypass"
 msgstr "Puentear"
 
@@ -8171,7 +8290,7 @@ msgstr "Por categoría"
 msgid "Eh? LADSPA plugins don't have editors!"
 msgstr "¿Cómo? ¡Los plugins LADSPA no tienen editores!"
 
-#: plugin_ui.cc:125 plugin_ui.cc:228
+#: plugin_ui.cc:125 plugin_ui.cc:227
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
 "version of %1)"
@@ -8183,7 +8302,7 @@ msgstr ""
 msgid "unknown type of editor-supplying plugin"
 msgstr "Tipo desconocido de plugin con editor propio "
 
-#: plugin_ui.cc:258
+#: plugin_ui.cc:257
 msgid ""
 "unknown type of editor-supplying plugin (note: no linuxVST support in this "
 "version of %1)"
@@ -8191,45 +8310,45 @@ msgstr ""
 "Tipo desconocido de plugin con editor propio (nota: no hay soporte linuxVST "
 "en esta versión de %1)"
 
-#: plugin_ui.cc:330
+#: plugin_ui.cc:329
 msgid "create_lv2_editor called on non-LV2 plugin"
 msgstr ""
 
-#: plugin_ui.cc:418
+#: plugin_ui.cc:417
 msgid "Add"
 msgstr "Añadir"
 
-#: plugin_ui.cc:422
+#: plugin_ui.cc:421
 msgid "Description"
 msgstr "Descripción"
 
-#: plugin_ui.cc:423
+#: plugin_ui.cc:422
 msgid "Plugin analysis"
 msgstr "Análisis de plugin"
 
-#: plugin_ui.cc:430
+#: plugin_ui.cc:429
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
 msgstr ""
 
-#: plugin_ui.cc:431
+#: plugin_ui.cc:430
 msgid "Save a new preset"
 msgstr "Guadar un preset nuevo"
 
-#: plugin_ui.cc:432
+#: plugin_ui.cc:431
 msgid "Save the current preset"
 msgstr ""
 
-#: plugin_ui.cc:433
+#: plugin_ui.cc:432
 msgid "Delete the current preset"
 msgstr ""
 
-#: plugin_ui.cc:434
+#: plugin_ui.cc:433
 msgid "Disable signal processing by the plugin"
 msgstr ""
 
-#: plugin_ui.cc:467 plugin_ui.cc:632
+#: plugin_ui.cc:466 plugin_ui.cc:662
 msgid ""
 "Click to allow the plugin to receive keyboard events that %1 would normally "
 "use as a shortcut"
@@ -8237,29 +8356,41 @@ msgstr ""
 "Pulsa para permitir que el plugin reciba eventos de teclado que %1 usaría "
 "normalmente como atajos de teclado"
 
-#: plugin_ui.cc:468
+#: plugin_ui.cc:467
 msgid "Click to enable/disable this plugin"
 msgstr "Pulsa para activar/desactivar este plugin"
 
-#: plugin_ui.cc:507
+#: plugin_ui.cc:506
 msgid "latency (%1 sample)"
 msgid_plural "latency (%1 samples)"
 msgstr[0] "latencia (%1 muestra)"
 msgstr[1] "latencia (%1 muestras)"
 
-#: plugin_ui.cc:509
+#: plugin_ui.cc:508
 msgid "latency (%1 ms)"
 msgstr "latencia (%1 ms)"
 
-#: plugin_ui.cc:520
+#: plugin_ui.cc:519
 msgid "Edit Latency"
 msgstr "Editar latencia"
 
-#: plugin_ui.cc:559
+#: plugin_ui.cc:558
 msgid "Plugin preset %1 not found"
 msgstr "No se encontró el preset %1"
 
-#: plugin_ui.cc:639
+#: plugin_ui.cc:595
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin_ui.cc:615 plugin_ui.cc:630
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"newer version"
+msgstr ""
+
+#: plugin_ui.cc:669
 msgid "Click to allow normal use of %1 keyboard shortcuts"
 msgstr "Pulsa para permitir el uso normal de los atajos de teclado de %1"
 
@@ -8363,46 +8494,46 @@ msgstr "Detectando..."
 msgid "Port Insert "
 msgstr "Inserción puerto"
 
-#: port_matrix.cc:323 port_matrix.cc:342
+#: port_matrix.cc:331 port_matrix.cc:357
 msgid "<b>Sources</b>"
 msgstr "<b>Orígenes</b>"
 
-#: port_matrix.cc:324 port_matrix.cc:343
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr "<b>Destinos</b>"
 
-#: port_matrix.cc:419 port_matrix.cc:427
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr "Añadir %s %s"
 
-#: port_matrix.cc:435
+#: port_matrix.cc:456
 #, c-format
 msgid "Rename '%s'..."
 msgstr "Renombrar '%s'..."
 
-#: port_matrix.cc:451
+#: port_matrix.cc:472
 msgid "Remove all"
 msgstr "Eliminar todo"
 
-#: port_matrix.cc:471 port_matrix.cc:483
+#: port_matrix.cc:492 port_matrix.cc:504
 #, c-format
 msgid "%s all"
 msgstr "%s todos"
 
-#: port_matrix.cc:506
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr "Buscar otra vez"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr "Mostrar puertos individuales"
 
-#: port_matrix.cc:514
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr ""
 
-#: port_matrix.cc:702
+#: port_matrix.cc:723
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
 "or buss cannot support the new configuration."
@@ -8410,33 +8541,35 @@ msgstr ""
 "No es posible añadir un puerto aquí, pues el primer procesador de la pista o "
 "bus no puede soportar la nueva configuración."
 
-#: port_matrix.cc:705
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr ""
 
-#: port_matrix.cc:727
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr "Eliminación de puertos no permitida"
 
-#: port_matrix.cc:728
+#: port_matrix.cc:749
+#, fuzzy
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
 "Este puerto no se puede eliminar, pues el primer plugin de la pista o bus no "
 "puede admitir el nuevo número de entradas."
 
-#: port_matrix.cc:945
+#: port_matrix.cc:966
 #, c-format
 msgid "Remove '%s'"
 msgstr "Eliminar '%s'"
 
-#: port_matrix.cc:960
+#: port_matrix.cc:981
 #, c-format
 msgid "%s all from '%s'"
 msgstr "%s todo desde '%s'"
 
-#: port_matrix.cc:1026
+#: port_matrix.cc:1047
 msgid "channel"
 msgstr "canal"
 
@@ -8448,36 +8581,36 @@ msgstr "No hay puertos para conectar."
 msgid "There are no %1 ports to connect."
 msgstr "No hay %1 puertos para conectar."
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
 "Alt+double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 msgid "Show All Controls"
 msgstr "Mostrar todos los controles"
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 msgid "Hide All Controls"
 msgstr "Ocultar todos los controles"
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 msgid "on"
 msgstr "on"
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr "apagado"
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
@@ -8485,15 +8618,15 @@ msgstr ""
 "Botón derecho para añadir/eliminar/editar\n"
 "plugins, inserciones, envíos y más"
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 msgid "Plugin Incompatibility"
 msgstr "Incompatiblidad de plugin"
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr "Intentaste añadir el plugin \"%1\" en el slot %2.\n"
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
@@ -8501,19 +8634,19 @@ msgstr ""
 "\n"
 "Este plugin tiene:\n"
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
 msgstr[0] "\t%1 entrada MIDI\n"
 msgstr[1] "\t%1 entradas MIDI\n"
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
 msgstr[0] "\t%1 entrada audio\n"
 msgstr[1] "\t%1 entradas audio\n"
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
@@ -8521,19 +8654,19 @@ msgstr ""
 "\n"
 "Pero en el punto de inserción hay:\n"
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
 msgstr[0] "\t%1 canal MIDI\n"
 msgstr[1] "\t%1 canales MIDI\n"
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
 msgstr[0] "\t%1 canal audio\n"
 msgstr[1] "\t%1 canales audio\n"
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
@@ -8541,11 +8674,11 @@ msgstr ""
 "\n"
 "%1 es incapaz de insertar este plugin aquí.\n"
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 msgid "Cannot set up new send: %1"
 msgstr "No se pudo configurar el nuevo envío: %1"
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
 "in that way because the inputs and\n"
@@ -8555,19 +8688,19 @@ msgstr ""
 "de ese modo porque las entradas y salidas no\n"
 "funcionarán correctamente."
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 msgid "Rename Processor"
 msgstr "Renombrar procesador"
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr ""
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr ""
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
@@ -8578,7 +8711,7 @@ msgstr ""
 "configuración de E/S de los plugins no concuerda\n"
 "con la configuración de esta pista."
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 msgid ""
 "Do you really want to remove all processors from %1?\n"
 "(this cannot be undone)"
@@ -8586,15 +8719,15 @@ msgstr ""
 "¿De verdad deseas eliminar todos los procesadores de %1? \n"
 "(esto no se puede deshacer)"
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 msgid "Yes, remove them all"
 msgstr "Sí, eliminar todos"
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 msgid "Remove processors"
 msgstr "Eliminar procesadores"
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
 "(this cannot be undone)"
@@ -8602,7 +8735,7 @@ msgstr ""
 "¿De verdad deseas eliminar todos los procesadores pre-fader de %1?\n"
 "(esto no se puede deshacer)"
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
 "(this cannot be undone)"
@@ -8610,54 +8743,54 @@ msgstr ""
 "¿De verdad deseas eliminar todos los procesadores post-fader de %1?\n"
 "(esto no se puede deshacer)"
 
-#: processor_box.cc:2198
+#: processor_box.cc:2200
 msgid "New Plugin"
 msgstr "Nuevo plugin"
 
-#: processor_box.cc:2201
+#: processor_box.cc:2203
 msgid "New Insert"
 msgstr "Nueva inserción"
 
-#: processor_box.cc:2204
+#: processor_box.cc:2206
 msgid "New External Send ..."
 msgstr "Nuevo envío externo..."
 
-#: processor_box.cc:2208
+#: processor_box.cc:2210
 msgid "New Aux Send ..."
 msgstr "Nuevo envío auxiliar..."
 
-#: processor_box.cc:2212
+#: processor_box.cc:2214
 msgid "Clear (all)"
 msgstr "Limpiar (todos)"
 
 # es correcto el término 'resetear'?
 # He cambiado tipo de compás y compás, cuando tiene este significado, por métrica
-#: processor_box.cc:2214
+#: processor_box.cc:2216
 msgid "Clear (pre-fader)"
 msgstr "Limpiar (pre-fader)"
 
-#: processor_box.cc:2216
+#: processor_box.cc:2218
 msgid "Clear (post-fader)"
 msgstr "Limpiar (post-fader)"
 
-#: processor_box.cc:2242
+#: processor_box.cc:2244
 msgid "Activate All"
 msgstr "Activar todos"
 
-#: processor_box.cc:2244
+#: processor_box.cc:2246
 msgid "Deactivate All"
 msgstr "Desactivar todos"
 
-#: processor_box.cc:2246
+#: processor_box.cc:2248
 msgid "A/B Plugins"
 msgstr "Plugins A/B"
 
-#: processor_box.cc:2255
+#: processor_box.cc:2257
 #, fuzzy
 msgid "Edit with generic controls..."
 msgstr "Editar con controles básicos..."
 
-#: processor_box.cc:2531
+#: processor_box.cc:2557
 msgid "%1: %2 (by %3)"
 msgstr "%1: %2 (a %3)"
 
@@ -8819,7 +8952,7 @@ msgstr ""
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
 
 #: rc_option_editor.cc:836
@@ -8908,7 +9041,7 @@ msgstr "Número máximo de sesiones recientes"
 msgid "Click gain level"
 msgstr "Nivel de ganancia de claqueta"
 
-#: rc_option_editor.cc:1083 route_time_axis.cc:206 route_time_axis.cc:667
+#: rc_option_editor.cc:1083 route_time_axis.cc:215 route_time_axis.cc:676
 msgid "Automation"
 msgstr "Automatización"
 
@@ -9104,92 +9237,96 @@ msgstr "Mover automatización relevante al desplazar regiones de audio"
 msgid "Show meters on tracks in the editor"
 msgstr "Mostrar medidores en pistas en Editor"
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr ""
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr "Las regiones en los grupos de edición activos se editan juntas"
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 msgid "whenever they overlap in time"
 msgstr "cuando se solapan en el tiempo"
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr "sólo si tienen la misma duración, posición y origen"
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr "Hacer que el rectángulo de selección elástica se ajuste a rejilla"
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 msgid "Show waveforms in regions"
 msgstr "Mostrar formas de onda en regiones"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 msgid "Show gain envelopes in audio regions"
 msgstr "Mostrar envolventes de ganancia en regiones de audio"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr "en todos los modos"
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr "sólo en el modo de ganancia de región"
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 msgid "Waveform scale"
 msgstr "Escala de forma de onda"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "lineal"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr "logarítmica"
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 msgid "Waveform shape"
 msgstr "Forma de onda"
 
 # en realidad no existe este término en el español...
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 msgid "traditional"
 msgstr "tradicional"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 msgid "rectified"
 msgstr "rectificada"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr "Mostrar formas de onda al grabar audio"
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr "Mostrar barra de herramientas de zoom"
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr "Colorear regiones con el color de su pista"
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr "Actualizar la ventana del editor durante arrastres del resumen"
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 msgid "Synchronise editor and mixer track order"
 msgstr "Sincronizar orden de pistas en Editor y Mezclador"
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 msgid "Synchronise editor and mixer selection"
 msgstr "Sincronizar selección en Editor y Mezclador"
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 msgid "Name new markers"
 msgstr "Nombrar marcas nuevas"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9202,339 +9339,424 @@ msgstr ""
 "(Las marcas se pueden renombrar en cualquier momento, por medio del clic "
 "derecho)"
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr ""
 "Auto-scroll en la ventana del editor cuando se arrastra hacia cerca de sus "
 "bordes"
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr "Buffering"
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 msgid "Record monitoring handled by"
 msgstr "Monitorización de la grabación manejado por"
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 msgid "ardour"
 msgstr "ardour"
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 msgid "audio hardware"
 msgstr "hardware de audio"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 msgid "Tape machine mode"
 msgstr "Modo magnetófono"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr "Conexión de pistas y buses"
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr "Autoconectar buses master/monitor"
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 msgid "Connect track inputs"
 msgstr "Conectar a entradas de pista"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 msgid "automatically to physical inputs"
 msgstr "automáticamente a entradas físicas"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr "manualmente"
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 msgid "Connect track and bus outputs"
 msgstr "Conectar salidas de pista y bus"
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 msgid "automatically to physical outputs"
 msgstr "automáticamente a salidas físicas"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 msgid "automatically to master bus"
 msgstr "automáticamente al bus master"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 msgid "Denormals"
 msgstr "Denormals"
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 msgid "Use DC bias to protect against denormals"
 msgstr "Usar DC bias para proteger contra denormals"
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr "Manejo de procesador"
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr "ningún manejo de procesador"
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 msgid "use FlushToZero"
 msgstr "usar FlushToZero"
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr "usar DenormalsAreZero"
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr "usar FlushToZero y DenormalsAreZero"
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 msgid "Silence plugins when the transport is stopped"
 msgstr "Silenciar plugins cuando el transporte esté parado"
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr "Nuevos plugins inician activados"
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr "Activar análisis automático de audio"
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 msgid "Replicate missing region channels"
 msgstr "Duplicar canales de región ausentes"
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 msgid "Solo / mute"
 msgstr "Solo / mudo"
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 msgid "Solo-in-place mute cut (dB)"
 msgstr "Corte de solo / mudo (dB)"
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr "Los controles de solo son controles de escucha"
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 msgid "Listen Position"
 msgstr "Posición de escucha"
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 msgid "after-fader (AFL)"
 msgstr "Post-fader (AFL) "
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 msgid "pre-fader (PFL)"
 msgstr "pre-fader (PFL)"
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr "Las señales PFL vienen desde"
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 msgid "before pre-fader processors"
 msgstr "antes de procesadores pre-fader"
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr "pre-fader pero después de procesadores pre-fader"
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr "Las señales AFL vienen desde"
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 msgid "immediately post-fader"
 msgstr "inmediatamente post-fader"
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 msgid "after post-fader processors (before pan)"
 msgstr "después de procesadores post-fader (antes de pan)"
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr "Solo exclusivo"
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 msgid "Show solo muting"
 msgstr "Mostrar mudos de solo"
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr "Solo invalida mudo"
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 msgid "Default track / bus muting options"
 msgstr "Opciones por defecto para mudo de pista / bus"
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr "Mudo afecta envíos pre-fader"
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr "Mudo afecta envíos post-fader"
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 msgid "Mute affects control outputs"
 msgstr "Mudo afecta a salidas de control"
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr "Mudo afecta a salidas principales"
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 msgid "Send MIDI Time Code"
 msgstr "Enviar MIDI Time Code"
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 "Pocentaje a cada lado de la velocidad normal de transporte para transmitir "
 "MTC"
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr "Obedecer comandos de MIDI Machine Control"
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr "Enviar comandos de MIDI Machine Control"
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 msgid "Send MIDI control feedback"
 msgstr "Enviar feedback de control MIDI"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr "ID del dispositivo MMC de entrada"
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr "ID del dispositivo MMC de salida"
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr "Cambio de programa inicial"
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr "Mostrar el primer banco o programa MIDi como 0"
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr "No mostrar mensajes MIDI periódicos (MTC, MIDI Clock)"
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 msgid "Sound MIDI notes as they are selected"
 msgstr "Las notas MIDI suenan al ser seleccionadas"
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 msgid "User interaction"
 msgstr "Interacción con el usuario"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
 "   <i>(if available for your language preferences)</i>"
 msgstr ""
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 msgid "Control surface remote ID"
 msgstr "ID remota de superficies de control"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 msgid "assigned by user"
 msgstr "asignado por usuario"
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr "según orden de Mezclador"
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr "según orden del Editor"
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1925
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 #, fuzzy
 msgid "Preferences|GUI"
 msgstr "Preferencias"
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr "Resaltar controles al pasar sobre éstos el puntero del ratón"
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr "Mostrar descripciones emergentes al colocar el ratón sobre un control"
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr ""
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 msgid "Mixer Strip"
 msgstr "Canal de Mezclador"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 msgid "Use narrow strips in the mixer by default"
 msgstr "Usar canales de mezcla estrechos por defecto"
 
-#: rc_option_editor.cc:1898
-msgid "Meter hold time"
+#: rc_option_editor.cc:1906
+#, fuzzy
+msgid "Peak hold time"
 msgstr "Tiempo de retención del medidor"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 msgid "short"
 msgstr "corto"
 
-#: rc_option_editor.cc:1905 rc_option_editor.cc:1920
+#: rc_option_editor.cc:1913
 msgid "medium"
 msgstr "medio"
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr "largo"
 
-#: rc_option_editor.cc:1912
-msgid "Meter fall-off"
+#: rc_option_editor.cc:1920
+#, fuzzy
+msgid "DPM fall-off"
 msgstr "Decaimiento del medidor"
 
-#: rc_option_editor.cc:1918
-msgid "slowest"
-msgstr "lentísimo"
+#: rc_option_editor.cc:1926
+msgid "slowest [6.6dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1927
+msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
+msgstr ""
+
+#: rc_option_editor.cc:1928
+msgid "slowish [12.0dB/sec] (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1929
+msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
+msgstr ""
+
+#: rc_option_editor.cc:1930
+msgid "medium [20dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1931
+msgid "fast [32dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1932
+msgid "faster [46dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1933
+msgid "fastest [70dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1939
+msgid "Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
+
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+msgid "-20dBFS (SMPTE RP.0155)"
+msgstr ""
+
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+msgid "-18dBFS (EBU, BBC)"
+msgstr ""
+
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
+
+#: rc_option_editor.cc:1955
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
+msgstr ""
+
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
+msgstr ""
+
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
+msgstr ""
+
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
+
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
 
-#: rc_option_editor.cc:1919
-msgid "slow"
-msgstr "lento"
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
 
-#: rc_option_editor.cc:1921
-msgid "fast"
-msgstr "rápido"
+#: rc_option_editor.cc:1985
+#, fuzzy
+msgid "Peak threshold [dBFS]"
+msgstr "Umbral de pico"
 
-#: rc_option_editor.cc:1922
-msgid "faster"
-msgstr "más rápido"
+#: rc_option_editor.cc:1993
+msgid ""
+"Specify the audio signal level in dbFS at and above which the meter-peak "
+"indicator will flash red."
+msgstr ""
 
-#: rc_option_editor.cc:1923
-msgid "fastest"
-msgstr "rapidísimo"
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
+msgstr ""
 
 #: region_editor.cc:79
 msgid "audition this region"
@@ -9544,11 +9766,11 @@ msgstr "Escuchar esta región"
 msgid "Position:"
 msgstr "Posición:"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr "Fin:"
 
-#: region_editor.cc:92 sfdb_ui.cc:140
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr "Duración:"
 
@@ -9572,23 +9794,23 @@ msgstr "Orígenes:"
 msgid "Source:"
 msgstr "Origen:"
 
-#: region_editor.cc:167
+#: region_editor.cc:166
 msgid "Region '%1'"
 msgstr "Región '%1'"
 
-#: region_editor.cc:274
+#: region_editor.cc:273
 msgid "change region start position"
 msgstr "cambiar posición del inicio de región"
 
-#: region_editor.cc:290
+#: region_editor.cc:289
 msgid "change region end position"
 msgstr "cambiar posición del final de región"
 
-#: region_editor.cc:310
+#: region_editor.cc:309
 msgid "change region length"
 msgstr "cambiar duración de región "
 
-#: region_editor.cc:404 region_editor.cc:416
+#: region_editor.cc:403 region_editor.cc:415
 msgid "change region sync point"
 msgstr "cambiar punto de sincronía de región"
 
@@ -9780,317 +10002,317 @@ msgid ""
 msgstr ""
 "Ya existe un grupo de ruteado con este nombre. Por favor, elige otro nombre."
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 msgid "Tracks/Busses"
 msgstr "Pistas/Buses"
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr "Entradas"
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr "Salidas"
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr "Plugins, inserciones y envíos"
 
-#: route_params_ui.cc:211
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr ""
 
-#: route_params_ui.cc:258 route_params_ui.cc:286
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr "Retardo de reproducción: %<PRId64> muestras"
 
-#: route_params_ui.cc:478
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr "NINGUNA PISTA"
 
-#: route_params_ui.cc:611 route_params_ui.cc:612
+#: route_params_ui.cc:613 route_params_ui.cc:614
 msgid "No Track or Bus Selected"
 msgstr "No hay pista o bus seleccionado"
 
-#: route_time_axis.cc:96
+#: route_time_axis.cc:97
 msgid "g"
 msgstr "g"
 
-#: route_time_axis.cc:97
+#: route_time_axis.cc:98
 msgid "p"
 msgstr "p"
 
-#: route_time_axis.cc:98
+#: route_time_axis.cc:99
 msgid "a"
 msgstr "a"
 
-#: route_time_axis.cc:168
+#: route_time_axis.cc:173
 msgid "Record (Right-click for Step Edit)"
 msgstr ""
 
-#: route_time_axis.cc:171
+#: route_time_axis.cc:176
 msgid "Record"
 msgstr "Grabar"
 
-#: route_time_axis.cc:201
+#: route_time_axis.cc:210
 msgid "Route Group"
 msgstr "Grupo de ruteado"
 
-#: route_time_axis.cc:204
+#: route_time_axis.cc:213
 msgid "MIDI Controllers and Automation"
 msgstr "Controladores y automatización MIDI"
 
-#: route_time_axis.cc:381
+#: route_time_axis.cc:390
 msgid "Show All Automation"
 msgstr "Mostrar toda automatización"
 
-#: route_time_axis.cc:384
+#: route_time_axis.cc:393
 msgid "Show Existing Automation"
 msgstr "Mostrar automatización existente"
 
-#: route_time_axis.cc:387
+#: route_time_axis.cc:396
 msgid "Hide All Automation"
 msgstr "Ocultar toda automatización"
 
-#: route_time_axis.cc:396
+#: route_time_axis.cc:405
 #, fuzzy
 msgid "Processor automation"
 msgstr "limpiar automatización"
 
-#: route_time_axis.cc:415
+#: route_time_axis.cc:424
 msgid "Color..."
 msgstr "Color..."
 
-#: route_time_axis.cc:472
+#: route_time_axis.cc:481
 msgid "Overlaid"
 msgstr "Superpuestas"
 
-#: route_time_axis.cc:478
+#: route_time_axis.cc:487
 msgid "Stacked"
 msgstr "Apiladas"
 
-#: route_time_axis.cc:486
+#: route_time_axis.cc:495
 msgid "Layers"
 msgstr "Capas"
 
-#: route_time_axis.cc:555
+#: route_time_axis.cc:564
 msgid "Automatic (based on I/O connections)"
 msgstr "Automática (basada en conexiones de E/S)"
 
-#: route_time_axis.cc:564
+#: route_time_axis.cc:573
 msgid "(Currently: Existing Material)"
 msgstr "(Actualmente: Material existente)"
 
-#: route_time_axis.cc:567
+#: route_time_axis.cc:576
 msgid "(Currently: Capture Time)"
 msgstr "(Actualmente: Tiempo de captura)"
 
-#: route_time_axis.cc:575
+#: route_time_axis.cc:584
 msgid "Align With Existing Material"
 msgstr "Alinear con material existente"
 
-#: route_time_axis.cc:580
+#: route_time_axis.cc:589
 msgid "Align With Capture Time"
 msgstr "Alinear con tiempo de captura"
 
-#: route_time_axis.cc:585
+#: route_time_axis.cc:594
 msgid "Alignment"
 msgstr "Alineación"
 
-#: route_time_axis.cc:620
+#: route_time_axis.cc:629
 msgid "Normal Mode"
 msgstr "Modo normal"
 
-#: route_time_axis.cc:626
+#: route_time_axis.cc:635
 msgid "Tape Mode"
 msgstr "Modo cinta"
 
-#: route_time_axis.cc:632
+#: route_time_axis.cc:641
 msgid "Non-Layered Mode"
 msgstr "Modo sin capas"
 
-#: route_time_axis.cc:645 route_time_axis.cc:1587
+#: route_time_axis.cc:654 route_time_axis.cc:1601
 msgid "Playlist"
 msgstr "Lista de Reproducción"
 
-#: route_time_axis.cc:965
+#: route_time_axis.cc:979
 msgid "Rename Playlist"
 msgstr "Renombrar lista de reproducción"
 
-#: route_time_axis.cc:966
+#: route_time_axis.cc:980
 msgid "New name for playlist:"
 msgstr "Nuevo nombre para lista de reproducción"
 
-#: route_time_axis.cc:1051
+#: route_time_axis.cc:1065
 msgid "New Copy Playlist"
 msgstr "Nueva copia de lista de reproducción"
 
-#: route_time_axis.cc:1052 route_time_axis.cc:1105
+#: route_time_axis.cc:1066 route_time_axis.cc:1119
 msgid "Name for new playlist:"
 msgstr "Nombre para nueva lista de reproducción:"
 
-#: route_time_axis.cc:1104
+#: route_time_axis.cc:1118
 msgid "New Playlist"
 msgstr "Nueva lista de reproducción"
 
-#: route_time_axis.cc:1295
+#: route_time_axis.cc:1309
 msgid "You cannot create a track with that name as it is reserved for %1"
 msgstr "No puedes crear una pista con ese nombre pues está reservado para %1"
 
-#: route_time_axis.cc:1476
+#: route_time_axis.cc:1490
 msgid "New Copy..."
 msgstr "Nueva copia..."
 
-#: route_time_axis.cc:1480
+#: route_time_axis.cc:1494
 msgid "New Take"
 msgstr "Nueva toma"
 
-#: route_time_axis.cc:1481
+#: route_time_axis.cc:1495
 msgid "Copy Take"
 msgstr "Copiar toma"
 
-#: route_time_axis.cc:1486
+#: route_time_axis.cc:1500
 msgid "Clear Current"
 msgstr "Borrar actual"
 
-#: route_time_axis.cc:1489
+#: route_time_axis.cc:1503
 msgid "Select From All..."
 msgstr "Selecciona de todos...."
 
-#: route_time_axis.cc:1577
+#: route_time_axis.cc:1591
 msgid "Take: %1.%2"
 msgstr ""
 
-#: route_time_axis.cc:2267
+#: route_time_axis.cc:2291
 msgid "Underlays"
 msgstr "Underlays"
 
-#: route_time_axis.cc:2270
+#: route_time_axis.cc:2294
 msgid "Remove \"%1\""
 msgstr "Eliminar \"%1\""
 
-#: route_time_axis.cc:2320 route_time_axis.cc:2357
+#: route_time_axis.cc:2344 route_time_axis.cc:2381
 msgid "programming error: underlay reference pointer pairs are inconsistent!"
 msgstr "programming error: underlay reference pointer pairs are inconsistent!"
 
-#: route_time_axis.cc:2388
+#: route_time_axis.cc:2408
 msgid "After-fade listen (AFL)"
 msgstr "Escucha Post-fader (AFL) "
 
-#: route_time_axis.cc:2392
+#: route_time_axis.cc:2412
 msgid "Pre-fade listen (PFL)"
 msgstr "Escucha pre-fader (PFL)"
 
-#: route_time_axis.cc:2396
+#: route_time_axis.cc:2416
 msgid "s"
 msgstr "s"
 
-#: route_time_axis.cc:2400
+#: route_time_axis.cc:2419
 msgid "m"
 msgstr "m"
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 msgid "Mute this track"
 msgstr "Enmudecer esta pista"
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr "Enmudecer resto de pistas (que no estén en solo)"
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr "Activar la grabación en esta pista"
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr "hacer que los canales del mezclador muestren envíos a este bus"
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 msgid "Monitor input"
 msgstr "Monitorizar entrada"
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 msgid "Monitor playback"
 msgstr "Monitorizar reproducción"
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 msgid "Not connected to JACK - cannot engage record"
 msgstr "No está conectado a JACK - no se puede activar la grabación"
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 msgid "Step Entry"
 msgstr ""
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr "Asignar todas las pistas (prefader)"
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 msgid "Assign all tracks and buses (prefader)"
 msgstr "Asignar todas las pistas y buses (prefader)"
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr "Asignar todas las pistas (postfader)"
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 msgid "Assign all tracks and buses (postfader)"
 msgstr "Asignar todas las pistas y buses (postfader)"
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 msgid "Assign selected tracks (prefader)"
 msgstr "Assignar pistas seleccionadas (prefader)"
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 msgid "Assign selected tracks and buses (prefader)"
 msgstr "Assignar pistas y buses seleccionados (prefader)"
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 msgid "Assign selected tracks (postfader)"
 msgstr "Assignar pistas seleccionadas (postfader)"
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 msgid "Assign selected tracks and buses (postfader)"
 msgstr "Assignar pistas y buses seleccionados (postfader)"
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 msgid "Copy track/bus gains to sends"
 msgstr "Copiar ganancias de pista/bus a envíos"
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr "Establecer ganancia de envíos a -inf"
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr "Establecer ganancia de envíos a 0dB"
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 msgid "Solo Isolate"
 msgstr "Aislar solo"
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr "Pre-Fader"
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr "Post-Fader"
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr "Salidas de control"
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr "Salidas principales"
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 msgid "Color Selection"
 msgstr "Selección de color"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "\n"
@@ -10104,7 +10326,7 @@ msgstr ""
 "\n"
 "(Esta acción no se puede deshacer y sobrescribirá el archivo de sesión)"
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
 "\n"
@@ -10113,15 +10335,15 @@ msgstr ""
 "¿De verdad deseas eliminar el bus \"%1\" ?\n"
 "(Esta acción no se puede deshacer y el archivo de sesión se reescribirá)"
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 msgid "Remove track"
 msgstr "Eliminar pista"
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 msgid "Remove bus"
 msgstr "Eliminar bus"
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
@@ -10130,47 +10352,47 @@ msgstr ""
 "buses.\n"
 "¿Quieres usar este nombre?"
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 msgid "Use the new name"
 msgstr "Usar el nuevo nombre"
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 msgid "Re-edit the name"
 msgstr ""
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 msgid "Rename Track"
 msgstr "Renombrar pista"
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 msgid "Rename Bus"
 msgstr "Renombrar bus"
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 msgid " latency"
 msgstr "latencia"
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr "Cannot create route template directory %1"
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 msgid "Save As Template"
 msgstr "Guardar como plantilla"
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 msgid "Template name:"
 msgstr "Nombre de plantilla :"
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 msgid "Remote Control ID"
 msgstr "ID de control remoto"
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 msgid "Remote control ID:"
 msgstr "ID de control remoto:"
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -10178,15 +10400,15 @@ msgid ""
 "The remote control ID of %3 cannot be changed."
 msgstr ""
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 msgid "the master bus"
 msgstr "el bus master"
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 msgid "the monitor bus"
 msgstr "el bus de monitorización"
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -10197,15 +10419,15 @@ msgid ""
 "change this%5"
 msgstr ""
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 msgid "the mixer"
 msgstr "el mezclador"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 msgid "the editor"
 msgstr "el editor"
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
@@ -10213,7 +10435,7 @@ msgstr ""
 "Clic izquierdo para invertir (inversión de fase) canal %1 de esta pista.  "
 "Clic derecho para mostrar menú."
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr ""
 
@@ -10229,7 +10451,7 @@ msgstr "Clicar para añadir nueva localización"
 msgid "the session folder"
 msgstr "el archivo de sesión"
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 msgid "Send "
 msgstr "Enviar "
 
@@ -10709,51 +10931,108 @@ msgstr "Adherir marcadores nuevos a compases y pulsos"
 msgid "Glue new regions to bars and beats"
 msgstr "Adherir regiones nuevas a compases y pulsos"
 
-#: sfdb_ui.cc:87 sfdb_ui.cc:107 sfdb_ui.cc:116
+#: session_option_editor.cc:275 session_option_editor.cc:277
+#: session_option_editor.cc:284 session_option_editor.cc:291
+#: session_option_editor.cc:298 session_option_editor.cc:300
+#: session_option_editor.cc:307 session_option_editor.cc:314
+#: session_option_editor.cc:321 session_option_editor.cc:323
+#, fuzzy
+msgid "Meterbridge"
+msgstr "Medidores"
+
+#: session_option_editor.cc:275
+msgid "Route Display"
+msgstr ""
+
+#: session_option_editor.cc:279
+#, fuzzy
+msgid "Show Midi Tracks"
+msgstr "Mostrar todas las pistas MIDI"
+
+# es correcto utilizar 'buses' en español? -> al parecer sí, desde hace poc. Chequear: http://buscon.rae.es/draeI/SrvltObtenerHtml?IDLEMA=12558&NEDIC=Si
+#: session_option_editor.cc:286
+#, fuzzy
+msgid "Show Busses"
+msgstr "Buses"
+
+#: session_option_editor.cc:293
+#, fuzzy
+msgid "Include Master Bus"
+msgstr "el bus master"
+
+#: session_option_editor.cc:298
+msgid "Button Area"
+msgstr ""
+
+#: session_option_editor.cc:302
+#, fuzzy
+msgid "Rec-enable Button"
+msgstr "Activar grabación"
+
+#: session_option_editor.cc:309
+#, fuzzy
+msgid "Mute Button"
+msgstr "+ botón"
+
+#: session_option_editor.cc:316
+#, fuzzy
+msgid "Solo Button"
+msgstr "Solo / mudo"
+
+#: session_option_editor.cc:321
+msgid "Name Labels"
+msgstr ""
+
+#: session_option_editor.cc:325
+#, fuzzy
+msgid "Track Name"
+msgstr "Nombre de Pista/Bus"
+
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 msgid "as new tracks"
 msgstr "como nuevas pistas"
 
-#: sfdb_ui.cc:89 sfdb_ui.cc:109
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 msgid "to selected tracks"
 msgstr "a pistas seleccionadas"
 
-#: sfdb_ui.cc:91 sfdb_ui.cc:111
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 msgid "to region list"
 msgstr "a lista de regiones"
 
-#: sfdb_ui.cc:93 sfdb_ui.cc:113
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 msgid "as new tape tracks"
 msgstr "como pistas de cinta"
 
-#: sfdb_ui.cc:97
+#: sfdb_ui.cc:96
 msgid "programming error: unknown import mode string %1"
 msgstr "programming error: unknown import mode string %1"
 
-#: sfdb_ui.cc:124
+#: sfdb_ui.cc:123
 msgid "Auto-play"
 msgstr "Auto-play"
 
-#: sfdb_ui.cc:130 sfdb_ui.cc:237
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 msgid "<b>Sound File Information</b>"
 msgstr "<b>Información del archivo de sonido</b>"
 
-#: sfdb_ui.cc:142
+#: sfdb_ui.cc:141
 msgid "Timestamp:"
 msgstr "Timestamp:"
 
-#: sfdb_ui.cc:144
+#: sfdb_ui.cc:143
 msgid "Format:"
 msgstr "Formato:"
 
-#: sfdb_ui.cc:183 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: sfdb_ui.cc:320
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr "La escucha de archovos MID aún no está soportada"
 
-#: sfdb_ui.cc:327
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "No se pudo leer el archivo %1 (%2)."
 
@@ -10781,11 +11060,11 @@ msgstr "Archivos de audio"
 msgid "MIDI files"
 msgstr "Archivos MIDI"
 
-#: sfdb_ui.cc:458 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: sfdb_ui.cc:477 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 msgid "Browse Files"
 msgstr "Explorar archivos"
 
@@ -10793,169 +11072,157 @@ msgstr "Explorar archivos"
 msgid "Paths"
 msgstr "Rutas"
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr "Buscar etiquetas"
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 msgid "Sort:"
 msgstr "Corto:"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 msgid "Longest"
 msgstr "El más largo"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 msgid "Shortest"
 msgstr "El más corto"
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 msgid "Newest"
 msgstr "El más nuevo"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr "El más antiguo"
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr "El más descargado"
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 msgid "Least downloaded"
 msgstr "El menos descargado"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr "El puntuado más alto"
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr "El puntuado más bajo"
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr ""
 
-#: sfdb_ui.cc:572
+#: sfdb_ui.cc:555
+msgid "Similar"
+msgstr ""
+
+#: sfdb_ui.cc:567
 msgid "ID"
 msgstr "ID"
 
-#: sfdb_ui.cc:573 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:570
 msgid "Duration"
 msgstr "Duración"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:571
 msgid "Size"
 msgstr "Tamaño"
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:572
 msgid "Samplerate"
 msgstr "Frec. de muestreo"
 
-#: sfdb_ui.cc:578
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr "Licencia"
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr "Buscar en Freesound"
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr ""
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr ""
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr ""
 
-#: sfdb_ui.cc:846
-msgid "found %1 match"
-msgid_plural "found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:862
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr "SoundFileBrowser: Could not tokenize string: "
 
-#: sfdb_ui.cc:960
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sfdb_ui.cc:965
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr ""
 
-#: sfdb_ui.cc:1029
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr "B"
 
-#: sfdb_ui.cc:1031
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr "kB"
 
-#: sfdb_ui.cc:1033 sfdb_ui.cc:1035
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr "MB"
 
-#: sfdb_ui.cc:1037
+#: sfdb_ui.cc:1086
 msgid "GB"
 msgstr "GB"
 
-#: sfdb_ui.cc:1070
-msgid "Search returned no results."
-msgstr ""
-
-#: sfdb_ui.cc:1072
-msgid "Found %1 match"
-msgid_plural "Found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:1277 sfdb_ui.cc:1585 sfdb_ui.cc:1635 sfdb_ui.cc:1653
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr "1 pista por archivo"
 
-#: sfdb_ui.cc:1280 sfdb_ui.cc:1636 sfdb_ui.cc:1654
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 msgid "one track per channel"
 msgstr "1 pista por canal"
 
-#: sfdb_ui.cc:1288 sfdb_ui.cc:1638 sfdb_ui.cc:1655
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 msgid "sequence files"
 msgstr "secuenciar archivos"
 
-#: sfdb_ui.cc:1291 sfdb_ui.cc:1643
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 msgid "all files in one track"
 msgstr "todos los archivos en una pista"
 
-#: sfdb_ui.cc:1292 sfdb_ui.cc:1637
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 msgid "merge files"
 msgstr "fusionar archivos"
 
-#: sfdb_ui.cc:1298 sfdb_ui.cc:1640
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 msgid "one region per file"
 msgstr "una región por archivo"
 
-#: sfdb_ui.cc:1301 sfdb_ui.cc:1641
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 msgid "one region per channel"
 msgstr "una región por canal"
 
-#: sfdb_ui.cc:1306 sfdb_ui.cc:1642 sfdb_ui.cc:1656
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 msgid "all files in one region"
 msgstr "todos los archivos en una región"
 
-#: sfdb_ui.cc:1373
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
@@ -10963,60 +11230,60 @@ msgstr ""
 "Uno o más de los archivos seleccionados\n"
 "no puede ser usado por %1"
 
-#: sfdb_ui.cc:1513
+#: sfdb_ui.cc:1534
 msgid "Copy files to session"
 msgstr ""
 "Copiar archivos\n"
 "a la sesión"
 
-#: sfdb_ui.cc:1530 sfdb_ui.cc:1693
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 msgid "file timestamp"
 msgstr "timestamp de archivo"
 
-#: sfdb_ui.cc:1531 sfdb_ui.cc:1695
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 msgid "edit point"
 msgstr "punto de edición"
 
-#: sfdb_ui.cc:1532 sfdb_ui.cc:1697
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 msgid "playhead"
 msgstr "cursor"
 
-#: sfdb_ui.cc:1533
+#: sfdb_ui.cc:1554
 msgid "session start"
 msgstr "inicio de sesión"
 
-#: sfdb_ui.cc:1538
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr "<b>Añadir archivos como...</b>"
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1581
 msgid "<b>Insert at</b>"
 msgstr "<b>Insertar en</b>"
 
-#: sfdb_ui.cc:1573
+#: sfdb_ui.cc:1594
 msgid "<b>Mapping</b>"
 msgstr "<b>Mapeado</b>"
 
-#: sfdb_ui.cc:1591
+#: sfdb_ui.cc:1612
 msgid "<b>Conversion quality</b>"
 msgstr "<b>Calidad de conversión</b>"
 
-#: sfdb_ui.cc:1603 sfdb_ui.cc:1709
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr "La mejor"
 
-#: sfdb_ui.cc:1604 sfdb_ui.cc:1711
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr "Buena"
 
 # Quick=Veloz
 # Fast=Rápida
 # if not, you get two "rápida" entries in the combo
-#: sfdb_ui.cc:1605 sfdb_ui.cc:1713
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr "Veloz"
 
-#: sfdb_ui.cc:1607
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "Rapidísima"
 
@@ -11103,22 +11370,23 @@ msgid "I'd like more options for this session"
 msgstr "Quiero más opciones para esta sesión"
 
 #: startup.cc:194
+#, fuzzy
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -11284,10 +11552,6 @@ msgstr ""
 msgid "Click to open the program website in your web browser"
 msgstr ""
 
-#: startup.cc:594
-msgid "What would you like to do ?"
-msgstr "¿Qué te gustaría hacer?"
-
 #: startup.cc:729
 msgid "Open"
 msgstr "Abrir"
@@ -11300,83 +11564,83 @@ msgstr "Nombre de sesión:"
 msgid "Create session folder in:"
 msgstr "Crear carpeta de sesión en :"
 
-#: startup.cc:813
+#: startup.cc:821
 msgid "Select folder for session"
 msgstr "Seleccionar carpeta para sesión"
 
-#: startup.cc:845
+#: startup.cc:853
 msgid "Use this template"
 msgstr "Usar esta plantilla"
 
-#: startup.cc:848
+#: startup.cc:856
 msgid "no template"
 msgstr "sin plantilla"
 
-#: startup.cc:876
+#: startup.cc:884
 msgid "Use an existing session as a template:"
 msgstr "Usar una sesión existente como plantilla: "
 
-#: startup.cc:888
+#: startup.cc:896
 msgid "Select template"
 msgstr "Seleccionar plantilla"
 
-#: startup.cc:914
+#: startup.cc:922
 msgid "New Session"
 msgstr "Nueva sesión"
 
-#: startup.cc:1068
+#: startup.cc:1077
 msgid "Select session file"
 msgstr "Seleccionar archivo de sesión"
 
-#: startup.cc:1084
+#: startup.cc:1093
 msgid "Browse:"
 msgstr "Explorar:"
 
-#: startup.cc:1093
+#: startup.cc:1102
 msgid "Select a session"
 msgstr "Seleccionar una sesión"
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 msgid "channels"
 msgstr "canales"
 
-#: startup.cc:1135
+#: startup.cc:1145
 msgid "<b>Busses</b>"
 msgstr "<b>Buses</b>"
 
-#: startup.cc:1136
+#: startup.cc:1146
 msgid "<b>Inputs</b>"
 msgstr "<b>Entradas</b>"
 
-#: startup.cc:1137
+#: startup.cc:1147
 msgid "<b>Outputs</b>"
 msgstr "<b>Salidas</b>"
 
-#: startup.cc:1145
+#: startup.cc:1155
 msgid "Create master bus"
 msgstr "Crear bus master"
 
-#: startup.cc:1155
+#: startup.cc:1165
 msgid "Automatically connect to physical inputs"
 msgstr "Conectar a entradas físicas automáticamente"
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr "Usar sólo"
 
-#: startup.cc:1215
+#: startup.cc:1225
 msgid "Automatically connect outputs"
 msgstr "Conectar salidas automáticamente"
 
-#: startup.cc:1237
+#: startup.cc:1247
 msgid "... to master bus"
 msgstr "...al bus master"
 
-#: startup.cc:1247
+#: startup.cc:1257
 msgid "... to physical outputs"
 msgstr "...a salidas físicas"
 
-#: startup.cc:1297
+#: startup.cc:1307
 msgid "Advanced Session Options"
 msgstr "Opciones avanzadas de sesión"
 
@@ -12061,19 +12325,19 @@ msgstr "No se guardó el archivo de configuración %1."
 msgid "bad XPM header %1"
 msgstr "Encabezado XPM erróneo %1."
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr "No se encuentra el estilo RGBA para \"%1\"."
 
-#: utils.cc:544
+#: utils.cc:591
 msgid "cannot find XPM file for %1"
 msgstr "No se pudo encontrar el archivo XPM para %1."
 
-#: utils.cc:570
+#: utils.cc:617
 msgid "cannot find icon image for %1 using %2"
 msgstr "No se pudo encontrar la imagen del icono para %1 usando %2"
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr "Caught exception while loading icon named %1"
 
@@ -12081,84 +12345,86 @@ msgstr "Caught exception while loading icon named %1"
 msgid "VerboseCanvasCursor"
 msgstr "VerboseCanvasCursor"
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 #, fuzzy
 msgid "Set Video Track"
 msgstr "Añadir pista de audio"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 #, fuzzy
 msgid "Launch External Video Monitor"
 msgstr "Monitorizar"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr ""
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr ""
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 #, fuzzy
 msgid "Video files"
 msgstr "Archivos de audio"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 #, fuzzy
 msgid "<b>Video Information</b>"
 msgstr "<b>Información del archivo de sonido</b>"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 #, fuzzy
 msgid "Start:"
 msgstr "Inicio"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 #, fuzzy
 msgid "Frame rate:"
 msgstr "Frec. de muestreo:"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr ""
 
-#: editor_videotimeline.cc:138
+#: editor_videotimeline.cc:146
 msgid "Export Successful: %1"
 msgstr ""
 
-#: video_timeline.cc:467
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:501
-msgid "Failed to set session-framerate: "
-msgstr ""
-
-#: video_timeline.cc:501
-msgid " does not have a corresponding option setting in Ardour."
+#: video_timeline.cc:507
+msgid ""
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:507
+#: video_timeline.cc:515
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:508
-msgid " vs "
+#: video_timeline.cc:588
+msgid ""
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:690
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12166,18 +12432,18 @@ msgid ""
 "xjadeo's remote-control interface 'xjremote')."
 msgstr ""
 
-#: video_monitor.cc:282
+#: video_monitor.cc:281
 #, fuzzy
 msgid "Video Monitor: File Not Found."
 msgstr "Monitorizar"
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -12187,380 +12453,389 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 #, fuzzy
 msgid "Transcode/Import Video File "
 msgstr "Exportar a archivo(s) de audio..."
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 #, fuzzy
 msgid "Output File:"
 msgstr "Dispositivo de salida:"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr ""
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 #, fuzzy
 msgid "Height = "
 msgstr "Altura"
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr ""
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 #, fuzzy
 msgid "<b>File Information</b>"
 msgstr "<b>Información del archivo de sonido</b>"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr ""
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 #, fuzzy
 msgid "Duration:"
 msgstr "Duración"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr ""
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr ""
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 #, fuzzy
 msgid "??"
 msgstr "???"
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 #, fuzzy
 msgid "<b>Import Settings</b>"
 msgstr "<b>Opciones</b>"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr ""
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr ""
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 #, fuzzy
 msgid "Import/Transcode Video to Session"
 msgstr "Exportar desde sesión"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr ""
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 msgid "Original Width"
 msgstr ""
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr ""
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 #, fuzzy
 msgid "Extract Audio:"
 msgstr "Exportar audio"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 #, fuzzy
 msgid "Extracting Audio.."
 msgstr "Exportar audio"
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr ""
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 #, fuzzy
 msgid "Transcoding Failed."
 msgstr "Traducciones deshabilitadas"
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 #, fuzzy
 msgid "Save Transcoded Video File"
 msgstr "Exportar a archivo(s) de audio..."
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr ""
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr ""
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 #, fuzzy
 msgid "Server Docroot:"
 msgstr "Servidor:"
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr ""
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 #, fuzzy
 msgid "Listen Port:"
 msgstr "Posición de escucha"
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 #, fuzzy
 msgid "Cache Size:"
 msgstr "Tamaño máx."
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr ""
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr ""
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 #, fuzzy
 msgid "Confirm Overwrite"
 msgstr "Confirmar reescritura de captura de sesión"
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 #, fuzzy
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr "Ya existe una captura de sesión con ese nombre. ¿Quieres reescribirla?"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 #, fuzzy
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr "No se pudo leer el archivo %1 (%2)."
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 #, fuzzy
 msgid "Export Video File "
 msgstr "Exportar a archivo(s) de audio..."
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 #, fuzzy
 msgid "Video:"
 msgstr "Mike Start"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr ""
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr ""
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 #, fuzzy
 msgid "Normalize Audio"
 msgstr "Normalizar a:"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr ""
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr ""
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 #, fuzzy
 msgid "Deinterlace"
 msgstr "Centrar cursor"
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr ""
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 #, fuzzy
 msgid "Include Session Metadata"
 msgstr "Editar metadatos de sesión"
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr ""
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 #, fuzzy
 msgid "<b>Output:</b>"
 msgstr "<b>Salidas</b>"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 #, fuzzy
 msgid "<b>Input:</b>"
 msgstr "<b>Entradas</b>"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 #, fuzzy
 msgid "Audio:"
 msgstr "Audio"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 #, fuzzy
 msgid "Master Bus"
 msgstr "el bus master"
 
-#: export_video_dialog.cc:166
+#: export_video_dialog.cc:145
+msgid "from the %1 session's start to the session's end"
+msgstr ""
+
+#: export_video_dialog.cc:149
+msgid "from 00:00:00:00 to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:151
+msgid "from the video's start to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:184
 #, fuzzy
 msgid "<b>Settings:</b>"
 msgstr "<b>Destinos</b>"
 
-#: export_video_dialog.cc:174
+#: export_video_dialog.cc:192
 #, fuzzy
 msgid "Range:"
 msgstr "Rango"
 
-#: export_video_dialog.cc:177
+#: export_video_dialog.cc:195
 #, fuzzy
 msgid "Preset:"
 msgstr "Preset"
 
-#: export_video_dialog.cc:180
+#: export_video_dialog.cc:198
 #, fuzzy
 msgid "Video Codec:"
 msgstr "Carpeta:"
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:201
 #, fuzzy
 msgid "Video KBit/s:"
 msgstr "Mike Start"
 
-#: export_video_dialog.cc:186
+#: export_video_dialog.cc:204
 #, fuzzy
 msgid "Audio Codec:"
 msgstr "Modo de audio:"
 
-#: export_video_dialog.cc:189
+#: export_video_dialog.cc:207
 #, fuzzy
 msgid "Audio KBit/s:"
 msgstr "Archivos de audio"
 
-#: export_video_dialog.cc:192
+#: export_video_dialog.cc:210
 #, fuzzy
 msgid "Audio Samplerate:"
 msgstr "Frec. de muestreo:"
 
-#: export_video_dialog.cc:369
+#: export_video_dialog.cc:387
 #, fuzzy
 msgid "Normalizing audio"
 msgstr "Normalizar valores"
 
-#: export_video_dialog.cc:373
+#: export_video_dialog.cc:391
 #, fuzzy
 msgid "Exporting audio"
 msgstr "Exportar audio"
 
-#: export_video_dialog.cc:419
+#: export_video_dialog.cc:437
 #, fuzzy
-msgid "Exporting Audio.."
+msgid "Exporting Audio..."
 msgstr "Exportar audio"
 
-#: export_video_dialog.cc:476
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:505
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:544
-msgid "Encoding Video.."
-msgstr ""
+#: export_video_dialog.cc:562
+#, fuzzy
+msgid "Encoding Video..."
+msgstr "Traducciones deshabilitadas"
 
-#: export_video_dialog.cc:563
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:661
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr ""
 
-#: export_video_dialog.cc:673
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr ""
 
-#: export_video_dialog.cc:761
+#: export_video_dialog.cc:779
 #, fuzzy
 msgid "Transcoding failed."
 msgstr "Traducciones deshabilitadas"
 
-#: export_video_dialog.cc:930 export_video_dialog.cc:950
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 #, fuzzy
 msgid "Save Exported Video File"
 msgstr "Exportar a archivo(s) de audio..."
@@ -12578,33 +12853,36 @@ msgstr ""
 msgid "<b>Video Export Info</b>"
 msgstr ""
 
-#: export_video_infobox.cc:46
+#: export_video_infobox.cc:48
 msgid ""
-"Ardour video export is not recommended for mastering!\n"
-"While 'ffmpeg' (which is used by ardour) can produce high-quality files, "
-"this export lacks the possibility to tweak many settings. We recommend to "
-"use 'winff', 'devede' or 'dvdauthor' to mux & master. Nevertheless this "
-"video-export comes in handy to do quick snapshots, intermediates, dailies or "
-"online videos.\n"
-"\n"
-"The soundtrack is created from the master-bus of the current Ardour "
-"session.\n"
-"\n"
-"The video soure defaults to the file used in the video timeline, which may "
-"not the best quality to start with, you should the original video file.\n"
+"Video encoding is a non-trivial task with many details.\n"
 "\n"
-"If the export-range is longer than the original video, black video frames "
-"are prefixed and/or appended. This process may fail with non-standard pixel-"
-"aspect-ratios.\n"
+"Please see the manual at %1/video-timeline/operations/#export.\n"
 "\n"
-"The file-format is determined by the extension that you choose for the "
-"output file (.avi, .mov, .flv, .ogv,...)\n"
-"Note: not all combinations of format+codec+settings produce files which are "
-"according so spec. e.g. flv files require sample-rates of 22.1kHz or "
-"44.1kHz, mpeg containers can not be used with ac3 audio-codec, etc. If in "
-"doubt, use one of the built-in presets."
+"Open Manual in Browser? "
 msgstr ""
 
+#~ msgid "-Inf"
+#~ msgstr "-Inf"
+
+#~ msgid "slowest"
+#~ msgstr "lentísimo"
+
+#~ msgid "slow"
+#~ msgstr "lento"
+
+#~ msgid "fast"
+#~ msgstr "rápido"
+
+#~ msgid "faster"
+#~ msgstr "más rápido"
+
+#~ msgid "fastest"
+#~ msgstr "rapidísimo"
+
+#~ msgid "What would you like to do ?"
+#~ msgstr "¿Qué te gustaría hacer?"
+
 #~ msgid "Connect"
 #~ msgstr "Conectar"
 
diff --git a/gtk2_ardour/po/fr.po b/gtk2_ardour/po/fr.po
index 052ded798d..60560cfa0b 100644
--- a/gtk2_ardour/po/fr.po
+++ b/gtk2_ardour/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ardour 2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2013-05-20 01:04+0200\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -411,7 +411,7 @@ msgstr "fichier de définition de menu introuvable: %1"
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr "%1 ne fonctionnera pas sans un fichier ardour.menus valide"
 
-#: add_route_dialog.cc:53 route_params_ui.cc:503
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 msgid "Add Track or Bus"
 msgstr "Ajouter une piste ou un bus"
 
@@ -447,8 +447,8 @@ msgstr "Bus"
 msgid "Add:"
 msgstr "Ajouter:"
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 msgid "<b>Options</b>"
 msgstr "<b>Options</b>"
 
@@ -462,21 +462,21 @@ msgid "Group:"
 msgstr "Groupe:"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 msgid "Audio"
 msgstr "Audio"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -501,7 +501,7 @@ msgstr ""
 "Si le plugin n'utilise qu'un type d'entrée, utilisez une piste audio ou MIDI."
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1301
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr "Normal"
 
@@ -545,7 +545,7 @@ msgstr "8 canaux"
 msgid "12 Channel"
 msgstr "12 canaux"
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2136
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr "Personalisée"
 
@@ -638,7 +638,7 @@ msgid "Track"
 msgstr "Piste"
 
 #: analysis_window.cc:68 editor_actions.cc:616 mixer_ui.cc:125
-#: mixer_ui.cc:1793
+#: mixer_ui.cc:1795
 msgid "Show"
 msgstr "Afficher"
 
@@ -647,94 +647,90 @@ msgstr "Afficher"
 msgid "Re-analyze data"
 msgstr "Analyser les données"
 
-#: ardour_button.cc:658
+#: ardour_button.cc:704
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr "Le bouton ne peut pas surveiller un élement Controllable inexistant\n"
 
-#: ardour_ui.cc:179
+#: ardour_ui.cc:180
 msgid "audition"
 msgstr "écoute"
 
-#: ardour_ui.cc:180
+#: ardour_ui.cc:181
 msgid "solo"
 msgstr "solo"
 
-#: ardour_ui.cc:181
+#: ardour_ui.cc:182
 msgid "feedback"
 msgstr "larsen"
 
-#: ardour_ui.cc:183 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 msgid "Speaker Configuration"
 msgstr "Positionnement des haut-parleurs"
 
-#: ardour_ui.cc:184 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 msgid "Theme Manager"
 msgstr "Apparence..."
 
-#: ardour_ui.cc:185 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr "Raccourcis clavier"
 
-#: ardour_ui.cc:186
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ardour_ui.cc:187 ardour_ui.cc:192
+#: ardour_ui.cc:191 ardour_ui.cc:196
 #, fuzzy
 msgid "Add Tracks/Busses"
 msgstr "Pistes / Bus"
 
-#: ardour_ui.cc:188
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "À propos..."
 
-#: ardour_ui.cc:189 location_ui.cc:1134
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "Repères et intervalles..."
 
-#: ardour_ui.cc:190 route_params_ui.cc:57 route_params_ui.cc:604
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 msgid "Tracks and Busses"
 msgstr "Pistes/Bus"
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr "Propriétés"
 
-#: ardour_ui.cc:193 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr "Gestionnaire de paquets"
 
-#: ardour_ui.cc:194 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "Grande horloge"
 
-#: ardour_ui.cc:195
+#: ardour_ui.cc:199
 #, fuzzy
 msgid "Audio Connections"
 msgstr "Gestionnaire de connexion audio"
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:200
 #, fuzzy
 msgid "MIDI Connections"
 msgstr "Connexions en entrée"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr "Erreurs"
 
-#: ardour_ui.cc:299
-msgid "could not initialize %1."
-msgstr "impossible d'initialiser %1."
-
-#: ardour_ui.cc:394
+#: ardour_ui.cc:388
 msgid "Starting audio engine"
 msgstr "Démarrage du moteur audio"
 
-#: ardour_ui.cc:763 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 msgid "%1 is ready for use"
 msgstr "%1 est prêt à être utilisé."
 
-#: ardour_ui.cc:811
+#: ardour_ui.cc:806
 #, fuzzy
 msgid ""
 "WARNING: Your system has a limit for maximum amount of locked memory. This "
@@ -750,23 +746,23 @@ msgstr ""
 "Vous pouvez connaître la limite actuelle avec la commande \"ulimit -l\". "
 "Celle-ci est habituellement contrôlée par le fichier %2."
 
-#: ardour_ui.cc:828
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr "Ne plus afficher cette fenêtre"
 
-#: ardour_ui.cc:870
+#: ardour_ui.cc:865
 msgid "Don't quit"
 msgstr "Ne pas quitter"
 
-#: ardour_ui.cc:871
+#: ardour_ui.cc:866
 msgid "Just quit"
 msgstr "Quitter sans enregistrer"
 
-#: ardour_ui.cc:872
+#: ardour_ui.cc:867
 msgid "Save and quit"
 msgstr "Enregistrer et quitter"
 
-#: ardour_ui.cc:882
+#: ardour_ui.cc:877
 msgid ""
 "%1 was unable to save your session.\n"
 "\n"
@@ -780,15 +776,15 @@ msgstr ""
 "\n"
 "cliquez sur le bouton « Quitter sans enregistrer »."
 
-#: ardour_ui.cc:913
+#: ardour_ui.cc:908
 msgid "Please wait while %1 cleans up..."
 msgstr "Veuillez patienter pendant que %1 nettoie ses données..."
 
-#: ardour_ui.cc:930
+#: ardour_ui.cc:925
 msgid "Unsaved Session"
 msgstr "Session non sauvegardée"
 
-#: ardour_ui.cc:951
+#: ardour_ui.cc:946
 msgid ""
 "The session \"%1\"\n"
 "has not been saved.\n"
@@ -806,7 +802,7 @@ msgstr ""
 "\n"
 "Que voulez-vous faire ?"
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:949
 msgid ""
 "The snapshot \"%1\"\n"
 "has not been saved.\n"
@@ -823,74 +819,74 @@ msgstr ""
 "\n"
 "Que voulez-vous faire ?"
 
-#: ardour_ui.cc:968
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr "Question"
 
-#: ardour_ui.cc:1045
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "déconnecté"
 
-#: ardour_ui.cc:1052
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 
-#: ardour_ui.cc:1056
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 
-#: ardour_ui.cc:1074 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 msgid "File:"
 msgstr "Fichiers:"
 
-#: ardour_ui.cc:1078
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr "BWF"
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr "WAV"
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr "WAV64"
 
-#: ardour_ui.cc:1087 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr "CAF"
 
-#: ardour_ui.cc:1090
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr "AIFF"
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr "iXML"
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr "RF64"
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr "32-float"
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr "24-int"
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr "16-int"
 
-#: ardour_ui.cc:1129
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 
-#: ardour_ui.cc:1148
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -901,33 +897,33 @@ msgstr ""
 "%<PRIu32>%%</span> <span foreground=\"green\">c:</span><span foreground=\"%s"
 "\">%<PRIu32>%%</span>"
 
-#: ardour_ui.cc:1184
+#: ardour_ui.cc:1188
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr "Disque: <span foreground=\"green\">Unknown</span>"
 
-#: ardour_ui.cc:1186
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr "Disque: <span foreground=\"green\">24hrs+</span>"
 
-#: ardour_ui.cc:1204
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr "Disque: <span foreground=\"green\">&gt;24 hrs</span>"
 
-#: ardour_ui.cc:1215
+#: ardour_ui.cc:1219
 #, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr "Disque: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 
-#: ardour_ui.cc:1241
+#: ardour_ui.cc:1245
 #, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr "TC: <span foreground=\"%s\">%s</span>"
 
-#: ardour_ui.cc:1358 ardour_ui.cc:1367 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr "Sessions récentes"
 
-#: ardour_ui.cc:1447
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
@@ -935,27 +931,27 @@ msgstr ""
 "%1 n'est pas connecté à JACK\n"
 "Aucune session ne peut être ouverte ou fermée"
 
-#: ardour_ui.cc:1474
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr "Ouvrir une session"
 
-#: ardour_ui.cc:1492 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 msgid "%1 sessions"
 msgstr "Sessions %1"
 
-#: ardour_ui.cc:1529
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr "Vous ne pouvez pas ajouter une piste sans avoir ouvert une session."
 
-#: ardour_ui.cc:1537
+#: ardour_ui.cc:1548
 #, fuzzy
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] "ne peut créer %1 nouvelle piste mixée (mixte)"
 msgstr[1] "ne peut créer %1 nouvelles pistes mixées"
 
-#: ardour_ui.cc:1543 ardour_ui.cc:1604
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 msgid ""
 "There are insufficient JACK ports available\n"
 "to create a new track or bus.\n"
@@ -967,24 +963,24 @@ msgstr ""
 "Vous devriez enregistrer %1, quitter, puis\n"
 "redémarrer JACK avec plus de ports."
 
-#: ardour_ui.cc:1578
+#: ardour_ui.cc:1589
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr ""
 "Vous ne pouvez pas ajouter une piste ou un bus sans avoir ouvert une session."
 
-#: ardour_ui.cc:1587
+#: ardour_ui.cc:1598
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] "impossible de créer %1 nouvelle piste audio"
 msgstr[1] "impossible de créer %1 nouvelles pistes audios"
 
-#: ardour_ui.cc:1596
+#: ardour_ui.cc:1607
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] "impossible de créer %1 nouveau bus"
 msgstr[1] "impossible de créer %1 nouveaux bus"
 
-#: ardour_ui.cc:1713
+#: ardour_ui.cc:1724
 msgid ""
 "Please create one or more tracks before trying to record.\n"
 "You can do this with the \"Add Track or Bus\" option in the Session menu."
@@ -992,7 +988,7 @@ msgstr ""
 "Créez au moins une piste avant d'enregistrer.\n"
 "Allez dans le menu de Session, et choisissez \"Ajouter une piste ou un bus\"."
 
-#: ardour_ui.cc:2103
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
@@ -1002,7 +998,7 @@ msgstr ""
 "\n"
 "%1"
 
-#: ardour_ui.cc:2105
+#: ardour_ui.cc:2116
 msgid ""
 "JACK has either been shutdown or it\n"
 "disconnected %1 because %1\n"
@@ -1014,19 +1010,19 @@ msgstr ""
 "Essayer de redémarrer JACK, de reconnecter\n"
 "%1 à JACK, et d'enregistrer la session."
 
-#: ardour_ui.cc:2131
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "Impossible de lancer la session"
 
-#: ardour_ui.cc:2211
+#: ardour_ui.cc:2222
 msgid "Take Snapshot"
 msgstr "Prendre un cliché..."
 
-#: ardour_ui.cc:2212
+#: ardour_ui.cc:2223
 msgid "Name of new snapshot"
 msgstr "Nom du nouveau cliché"
 
-#: ardour_ui.cc:2236
+#: ardour_ui.cc:2247
 msgid ""
 "To ensure compatibility with various systems\n"
 "snapshot names may not contain a '%1' character"
@@ -1035,27 +1031,27 @@ msgstr ""
 "systèmes, les noms de cliché ne peuvent pas\n"
 "utiliser le caractère '%1' "
 
-#: ardour_ui.cc:2248
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr "Confirmer l'écrasement du cliché"
 
-#: ardour_ui.cc:2249
+#: ardour_ui.cc:2260
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr "Un cliché de ce nom existe déjà. Voulez-vous l'écraser ?"
 
-#: ardour_ui.cc:2252 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: ardour_ui.cc:2286
+#: ardour_ui.cc:2297
 msgid "Rename Session"
 msgstr "Renommer la session"
 
-#: ardour_ui.cc:2287
+#: ardour_ui.cc:2298
 msgid "New session name"
 msgstr "Nouveau nom de la session:"
 
-#: ardour_ui.cc:2301 ardour_ui.cc:2681 ardour_ui.cc:2726
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 msgid ""
 "To ensure compatibility with various systems\n"
 "session names may not contain a '%1' character"
@@ -1063,12 +1059,12 @@ msgstr ""
 "Afin d'assurer la compatibilité sur différents systèmes\n"
 "les noms de sessions ne peuvent pas comporter le caractère '%1'"
 
-#: ardour_ui.cc:2309
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr "Un fichier ou un répertoire utilise déjà ce nom. Essayez autre chose."
 
-#: ardour_ui.cc:2318
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
@@ -1076,19 +1072,19 @@ msgstr ""
 "Le renommage de la session a échoué.\n"
 "Il est possible que les données soient à présent corrompues."
 
-#: ardour_ui.cc:2429
+#: ardour_ui.cc:2440
 msgid "Save Template"
 msgstr "Enregistrer comme modèle"
 
-#: ardour_ui.cc:2430
+#: ardour_ui.cc:2441
 msgid "Name for template:"
 msgstr "Nom du modèle:"
 
-#: ardour_ui.cc:2431
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-modèle"
 
-#: ardour_ui.cc:2469
+#: ardour_ui.cc:2480
 msgid ""
 "This session\n"
 "%1\n"
@@ -1098,52 +1094,52 @@ msgstr ""
 "%1\n"
 "existe déjà. Voulez-vous l'ouvrir ?"
 
-#: ardour_ui.cc:2479
+#: ardour_ui.cc:2490
 msgid "Open Existing Session"
 msgstr "Ouvrir une session"
 
-#: ardour_ui.cc:2717
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr "Aucune session n'existe dans \"%1\""
 
-#: ardour_ui.cc:2804
+#: ardour_ui.cc:2815
 msgid "Please wait while %1 loads your session"
 msgstr "Veuillez patienter pendant que %1 ouvre la session"
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr "Erreur d'enregistrement du port"
 
-#: ardour_ui.cc:2820
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr "Cliquez sur le bouton \"Fermer\" pour réessayer."
 
-#: ardour_ui.cc:2841
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "La session \"%1 (cliché %2)\" ne s'est pas chargée correctement"
 
-#: ardour_ui.cc:2847
+#: ardour_ui.cc:2858
 msgid "Loading Error"
 msgstr "Erreur de chargement"
 
-#: ardour_ui.cc:2848
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr "Cliquez sur le bouton \"Rafraîchir\" pour réessayer."
 
-#: ardour_ui.cc:2930
+#: ardour_ui.cc:2941
 msgid "Could not create session in \"%1\""
 msgstr "Impossible de créer une session dans \"%1\""
 
-#: ardour_ui.cc:3030
+#: ardour_ui.cc:3041
 msgid "No files were ready for clean-up"
 msgstr "Aucun fichier à nettoyer"
 
-#: ardour_ui.cc:3034 ardour_ui.cc:3044 ardour_ui.cc:3177 ardour_ui.cc:3184
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 msgid "Clean-up"
 msgstr "Nettoyer"
 
-#: ardour_ui.cc:3035
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1154,19 +1150,19 @@ msgstr ""
 "Ceux-ci peuvent contenir des régions ayant besoin de certains\n"
 "fichiers audio inutilisés pour exister."
 
-#: ardour_ui.cc:3094
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr "kilo"
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr "mega"
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr "giga"
 
-#: ardour_ui.cc:3105
+#: ardour_ui.cc:3116
 msgid ""
 "The following file was deleted from %2,\n"
 "releasing %3 %4bytes of disk space"
@@ -1180,7 +1176,7 @@ msgstr[1] ""
 "Les %1 fichiers suivants ont été éffacés de %2,\n"
 "libérant %3 %4octets d'espace disque."
 
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3123
 msgid ""
 "The following file was not in use and \n"
 "has been moved to: %2\n"
@@ -1216,11 +1212,11 @@ msgstr[1] ""
 "<span face=\"mono\">Session -> Nettoyer -> Vider la corbeille</span>\n"
 "libérera %3 %4octets supplémentaires sur le disque.\n"
 
-#: ardour_ui.cc:3172
+#: ardour_ui.cc:3183
 msgid "Are you sure you want to clean-up?"
 msgstr "Voulez-vous vraiment lancer le nettoyage ?"
 
-#: ardour_ui.cc:3179
+#: ardour_ui.cc:3190
 msgid ""
 "Clean-up is a destructive operation.\n"
 "ALL undo/redo information will be lost if you clean-up.\n"
@@ -1230,43 +1226,43 @@ msgstr ""
 "TOUTES les opérations d'annulation seront perdues.\n"
 "Les fichiers audio inutilisés seront déplacés dans un dossier \"dead\"."
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr "Fenêtre de nettoyage"
 
-#: ardour_ui.cc:3217
+#: ardour_ui.cc:3228
 msgid "Cleaned Files"
 msgstr "Fichiers nettoyés"
 
-#: ardour_ui.cc:3234
+#: ardour_ui.cc:3245
 #, fuzzy
 msgid "deleted file"
 msgstr "Fichier effacé"
 
-#: ardour_ui.cc:3326
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 "Le Seveur-Video n'a pas été lancé par Ardour. La demande d'arrêt est ignorée."
 
-#: ardour_ui.cc:3330
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr "Arrêter le Serveur-Vidéo"
 
-#: ardour_ui.cc:3331
+#: ardour_ui.cc:3342
 msgid "Do you really want to stop the Video Server?"
 msgstr "Voulez-vous vraiment arreter le Serveur-Vidéo?"
 
-#: ardour_ui.cc:3334
+#: ardour_ui.cc:3345
 #, fuzzy
 msgid "Yes, Stop It"
 msgstr "Oui, la détruire"
 
-#: ardour_ui.cc:3360
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr "Le Serveur-Vidéo est déjà démarré"
 
-#: ardour_ui.cc:3362
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
@@ -1274,42 +1270,42 @@ msgstr ""
 "Un Serveur-Vidéo est configuré et peut être accessible. Une nouvelle "
 "instance ne sera pas démarrée."
 
-#: ardour_ui.cc:3370 ardour_ui.cc:3455
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
 
-#: ardour_ui.cc:3394
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr ""
 
-#: ardour_ui.cc:3399
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr ""
 
-#: ardour_ui.cc:3432
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr ""
 
-#: ardour_ui.cc:3441
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3477 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "impossible d'ouvrir %1"
 
-#: ardour_ui.cc:3481
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
 msgstr ""
 
-#: ardour_ui.cc:3641
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr ""
 "L'enregistrement s'est arrêté car votre système n'était pas assez rapide."
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3702
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1323,7 +1319,7 @@ msgstr ""
 "L'enregistrement a généré un débit de\n"
 "données trop important pour le disque.\n"
 
-#: ardour_ui.cc:3689
+#: ardour_ui.cc:3721
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1337,11 +1333,11 @@ msgstr ""
 "La lecture a généré un débit de données\n"
 "trop important pour le disque.\n"
 
-#: ardour_ui.cc:3729
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr "Récupération après un crash"
 
-#: ardour_ui.cc:3730
+#: ardour_ui.cc:3762
 msgid ""
 "This session appears to have been in the\n"
 "middle of recording when %1 or\n"
@@ -1358,19 +1354,19 @@ msgstr ""
 "%1 peut récupérer ou ignorer les données\n"
 "de l'enregistrement. Que voulez-vous faire?\n"
 
-#: ardour_ui.cc:3742
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr "Ignorer les données"
 
-#: ardour_ui.cc:3743
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr "Récupérer les données"
 
-#: ardour_ui.cc:3763
+#: ardour_ui.cc:3795
 msgid "Sample Rate Mismatch"
 msgstr "Mauvais taux d'échantillonnage"
 
-#: ardour_ui.cc:3764
+#: ardour_ui.cc:3796
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
 "%2 is currently running at %3 Hz.  If you load this session,\n"
@@ -1380,23 +1376,23 @@ msgstr ""
 "mais %2 tourne actuellement à %3 Hz. Si vous chargez cette session,\n"
 "l'audio pourra être joué avec un mauvais taux d'echantillonnage.\n"
 
-#: ardour_ui.cc:3773
+#: ardour_ui.cc:3805
 msgid "Do not load session"
 msgstr "Ne pas charger la session"
 
-#: ardour_ui.cc:3774
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr "Charger quand-même la session"
 
-#: ardour_ui.cc:3797
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "Impossible de se déconnecter de JACK"
 
-#: ardour_ui.cc:3810
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr "Impossible de se reconnecter à JACK"
 
-#: ardour_ui.cc:4084
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1421,39 +1417,44 @@ msgstr "IHM: impossible d'initialiser l'éditeur"
 msgid "UI: cannot setup mixer"
 msgstr "IHM: impossible d'initialiser la console de mixage"
 
-#: ardour_ui2.cc:125
+#: ardour_ui2.cc:82
+#, fuzzy
+msgid "UI: cannot setup meterbridge"
+msgstr "IHM: impossible d'initialiser la console de mixage"
+
+#: ardour_ui2.cc:130
 #, fuzzy
 msgid "Play from playhead"
 msgstr "Démarrer la lecture"
 
-#: ardour_ui2.cc:126
+#: ardour_ui2.cc:131
 msgid "Stop playback"
 msgstr "Stopper la lecture"
 
-#: ardour_ui2.cc:127
+#: ardour_ui2.cc:132
 msgid "Toggle record"
 msgstr "Activer/désactiver l'enregistrement"
 
-#: ardour_ui2.cc:128
+#: ardour_ui2.cc:133
 #, fuzzy
 msgid "Play range/selection"
 msgstr "Lire la sélection"
 
-#: ardour_ui2.cc:129
+#: ardour_ui2.cc:134
 #, fuzzy
 msgid "Go to start of session"
 msgstr "Début de la session"
 
-#: ardour_ui2.cc:130
+#: ardour_ui2.cc:135
 #, fuzzy
 msgid "Go to end of session"
 msgstr "Fin de la session"
 
-#: ardour_ui2.cc:131
+#: ardour_ui2.cc:136
 msgid "Play loop range"
 msgstr "Lire la boucle"
 
-#: ardour_ui2.cc:132
+#: ardour_ui2.cc:137
 #, fuzzy
 msgid ""
 "MIDI Panic\n"
@@ -1463,25 +1464,25 @@ msgstr ""
 "Envoyer la commande \"fin de toutes les notes\" et réinitialiser les "
 "messages de contrôle sur tous les canaux MIDI"
 
-#: ardour_ui2.cc:133
+#: ardour_ui2.cc:138
 msgid "Return to last playback start when stopped"
 msgstr "Revenir en début de lecture lors de l'arrêt"
 
-#: ardour_ui2.cc:134
+#: ardour_ui2.cc:139
 msgid "Playhead follows Range Selections and Edits"
 msgstr ""
 "La tête de lecture suit les selections d'intervalles et les modifications "
 "effectuées"
 
-#: ardour_ui2.cc:135
+#: ardour_ui2.cc:140
 msgid "Be sensible about input monitoring"
 msgstr "Monitoring d'entrée automatique"
 
-#: ardour_ui2.cc:136
+#: ardour_ui2.cc:141
 msgid "Enable/Disable audio click"
 msgstr "Activer/désactiver le métronome"
 
-#: ardour_ui2.cc:137 monitor_section.cc:101
+#: ardour_ui2.cc:142 monitor_section.cc:101
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
@@ -1489,7 +1490,7 @@ msgstr ""
 "Actif lorsque quelque chose est en solo\n"
 "Cliquez pour désactiver tous les solos."
 
-#: ardour_ui2.cc:138
+#: ardour_ui2.cc:143
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
@@ -1497,11 +1498,11 @@ msgstr ""
 "Actif lorsqu'une écoute est en cours\n"
 "Cliquez pour stopper l'écoute."
 
-#: ardour_ui2.cc:139
+#: ardour_ui2.cc:144
 msgid "When active, there is a feedback loop."
 msgstr "Actif lorsqu'une boucle de larsen est détécté"
 
-#: ardour_ui2.cc:140
+#: ardour_ui2.cc:145
 msgid ""
 "<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1514,7 +1515,7 @@ msgstr ""
 "<tt>Esc</tt> annule; <tt>Entrée</tt>: confirme; Ajouter '+' ou '-' pourque "
 "la valeur s'ajoute (ou s'enlève) de la valeur originelle.\n"
 
-#: ardour_ui2.cc:141
+#: ardour_ui2.cc:146
 msgid ""
 "<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1527,27 +1528,32 @@ msgstr ""
 "<tt>Esc</tt> annule; <tt>Entrée</tt>: confirme; Ajouter '+' ou '-' pourque "
 "la valeur s'ajoute (ou s'enlève) de la valeur originelle.\n"
 
-#: ardour_ui2.cc:173
+#: ardour_ui2.cc:147
+#, fuzzy
+msgid "Reset Level Meter"
+msgstr "Réinitialiser l'enveloppe"
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr "[ERREUR]: "
 
-#: ardour_ui2.cc:175
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr "[AVERTISSEMENT]: "
 
-#: ardour_ui2.cc:177
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr "[INFO]: "
 
-#: ardour_ui2.cc:241 ardour_ui_ed.cc:376
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 msgid "Auto Return"
 msgstr "Retour auto"
 
-#: ardour_ui2.cc:243 ardour_ui_ed.cc:379
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr "Suivre modif."
 
-#: ardour_ui2.cc:621 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1567,23 +1573,23 @@ msgstr "Éditeur de configuration"
 msgid "Setup Mixer"
 msgstr "Console de mixage"
 
-#: ardour_ui_dependents.cc:84
+#: ardour_ui_dependents.cc:85
 msgid "Reload Session History"
 msgstr "Recharger l'historique de la session"
 
-#: ardour_ui_dialogs.cc:206
+#: ardour_ui_dialogs.cc:242
 msgid "Don't close"
 msgstr "Ne pas fermer"
 
-#: ardour_ui_dialogs.cc:207
+#: ardour_ui_dialogs.cc:243
 msgid "Just close"
 msgstr "Fermer"
 
-#: ardour_ui_dialogs.cc:208
+#: ardour_ui_dialogs.cc:244
 msgid "Save and close"
 msgstr "Enregistrer et fermer"
 
-#: ardour_ui_dialogs.cc:293
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr ""
 
@@ -1596,7 +1602,7 @@ msgstr "Session"
 msgid "Sync"
 msgstr "Synchro"
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr "Options"
 
@@ -1624,15 +1630,15 @@ msgstr "fichier"
 msgid "Sample Format"
 msgstr "Échantillon"
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr "Surfaces de contrôle"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr "VU-mètre"
 
@@ -1649,7 +1655,7 @@ msgstr "Temps de maintien"
 msgid "Denormal Handling"
 msgstr "échantillons dénormalisés"
 
-#: ardour_ui_ed.cc:123 route_time_axis.cc:1475
+#: ardour_ui_ed.cc:123 route_time_axis.cc:1489
 msgid "New..."
 msgstr "Nouvelle session..."
 
@@ -1691,8 +1697,8 @@ msgstr "Prendre un cliché..."
 msgid "Save As..."
 msgstr "Enregistrer sous..."
 
-#: ardour_ui_ed.cc:153 editor_actions.cc:1710 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1464 route_time_axis.cc:1471
+#: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 msgid "Rename..."
 msgstr "Renommer.."
 
@@ -1722,7 +1728,7 @@ msgid "Stem export..."
 msgstr "Exporter"
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "Exporter"
 
@@ -1734,11 +1740,11 @@ msgstr "Nettoyer les fichiers audio inutilisés..."
 msgid "Flush Wastebasket"
 msgstr "Vider la corbeille"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr "JACK"
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr "Latence (trames/période)"
 
@@ -1746,8 +1752,8 @@ msgstr "Latence (trames/période)"
 msgid "Reconnect"
 msgstr "Reconnecter"
 
-#: ardour_ui_ed.cc:195 global_port_matrix.cc:198 io_selector.cc:210
-#: mixer_strip.cc:712 mixer_strip.cc:838
+#: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr "Déconnecter"
 
@@ -1763,7 +1769,7 @@ msgstr "Plein écran"
 msgid "Show Toolbars"
 msgstr "Afficher les barres d'outils"
 
-#: ardour_ui_ed.cc:230 mixer_ui.cc:1863 mixer_ui.cc:1869
+#: ardour_ui_ed.cc:230 mixer_ui.cc:1865 mixer_ui.cc:1871
 msgid "Window|Mixer"
 msgstr "Console de mixage"
 
@@ -1772,27 +1778,32 @@ msgstr "Console de mixage"
 msgid "Toggle Editor+Mixer"
 msgstr "Commuter le mode d'édition"
 
-#: ardour_ui_ed.cc:233 midi_tracer.cc:39
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
+#, fuzzy
+msgid "Window|Meterbridge"
+msgstr "Console de mixage"
+
+#: ardour_ui_ed.cc:234 midi_tracer.cc:39
 msgid "MIDI Tracer"
 msgstr "Activité MIDI"
 
-#: ardour_ui_ed.cc:235
+#: ardour_ui_ed.cc:236
 msgid "Chat"
 msgstr "Salon de discussion (anglais)"
 
-#: ardour_ui_ed.cc:237
+#: ardour_ui_ed.cc:238
 msgid "Help|Manual"
 msgstr "Manuel"
 
-#: ardour_ui_ed.cc:238
+#: ardour_ui_ed.cc:239
 msgid "Reference"
 msgstr "Référence"
 
-#: ardour_ui_ed.cc:240 plugin_ui.cc:419
+#: ardour_ui_ed.cc:241 plugin_ui.cc:418
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ardour_ui_ed.cc:248 rc_option_editor.cc:1114 rc_option_editor.cc:1125
+#: ardour_ui_ed.cc:249 rc_option_editor.cc:1114 rc_option_editor.cc:1125
 #: rc_option_editor.cc:1134 rc_option_editor.cc:1147 rc_option_editor.cc:1160
 #: rc_option_editor.cc:1169 rc_option_editor.cc:1179 rc_option_editor.cc:1181
 #: rc_option_editor.cc:1191 rc_option_editor.cc:1207 rc_option_editor.cc:1220
@@ -1802,99 +1813,99 @@ msgstr "Enregistrer"
 msgid "Transport"
 msgstr "Commandes"
 
-#: ardour_ui_ed.cc:254 engine_dialog.cc:85 sfdb_ui.cc:559
+#: ardour_ui_ed.cc:255 engine_dialog.cc:85
 msgid "Stop"
 msgstr "Arrêter"
 
-#: ardour_ui_ed.cc:257
+#: ardour_ui_ed.cc:258
 msgid "Roll"
 msgstr "Roll"
 
-#: ardour_ui_ed.cc:261
+#: ardour_ui_ed.cc:262
 msgid "Start/Stop"
 msgstr "Lecture/Arrêt"
 
-#: ardour_ui_ed.cc:264
+#: ardour_ui_ed.cc:265
 msgid "Start/Continue/Stop"
 msgstr "Lecture/Arrêt"
 
-#: ardour_ui_ed.cc:267
+#: ardour_ui_ed.cc:268
 msgid "Stop and Forget Capture"
 msgstr "Arrêt avec destruction"
 
-#: ardour_ui_ed.cc:277
+#: ardour_ui_ed.cc:278
 msgid "Transition To Roll"
 msgstr "Lecture avant"
 
-#: ardour_ui_ed.cc:281
+#: ardour_ui_ed.cc:282
 msgid "Transition To Reverse"
 msgstr "Lecture arrière"
 
-#: ardour_ui_ed.cc:285
+#: ardour_ui_ed.cc:286
 msgid "Play Loop Range"
 msgstr "Lire la boucle"
 
-#: ardour_ui_ed.cc:288
+#: ardour_ui_ed.cc:289
 msgid "Play Selected Range"
 msgstr "Lecture de l'intervalle"
 
-#: ardour_ui_ed.cc:291
+#: ardour_ui_ed.cc:292
 msgid "Play Selection w/Preroll"
 msgstr "Lire la zone de sélection avec compte à rebours"
 
-#: ardour_ui_ed.cc:295
+#: ardour_ui_ed.cc:296
 msgid "Enable Record"
 msgstr "Activer l'enregistrement"
 
-#: ardour_ui_ed.cc:298
+#: ardour_ui_ed.cc:299
 msgid "Start Recording"
 msgstr "Démarrer l'enregistrement"
 
-#: ardour_ui_ed.cc:302
+#: ardour_ui_ed.cc:303
 msgid "Rewind"
 msgstr "Rembobiner"
 
-#: ardour_ui_ed.cc:305
+#: ardour_ui_ed.cc:306
 msgid "Rewind (Slow)"
 msgstr "Rembobiner (lent)"
 
-#: ardour_ui_ed.cc:308
+#: ardour_ui_ed.cc:309
 msgid "Rewind (Fast)"
 msgstr "Rembobiner (rapide)"
 
-#: ardour_ui_ed.cc:311 startup.cc:727
+#: ardour_ui_ed.cc:312 startup.cc:727
 msgid "Forward"
 msgstr "Avance rapide"
 
-#: ardour_ui_ed.cc:314
+#: ardour_ui_ed.cc:315
 msgid "Forward (Slow)"
 msgstr "Avancer (lent)"
 
-#: ardour_ui_ed.cc:317
+#: ardour_ui_ed.cc:318
 msgid "Forward (Fast)"
 msgstr "Avancer (rapide)"
 
-#: ardour_ui_ed.cc:320
+#: ardour_ui_ed.cc:321
 msgid "Goto Zero"
 msgstr "Premier temps"
 
-#: ardour_ui_ed.cc:323
+#: ardour_ui_ed.cc:324
 msgid "Goto Start"
 msgstr "début"
 
-#: ardour_ui_ed.cc:326
+#: ardour_ui_ed.cc:327
 msgid "Goto End"
 msgstr "fin"
 
-#: ardour_ui_ed.cc:329
+#: ardour_ui_ed.cc:330
 msgid "Goto Wall Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:333
+#: ardour_ui_ed.cc:334
 msgid "Focus On Clock"
 msgstr "Mettre le focus sur l'horloge"
 
-#: ardour_ui_ed.cc:337 ardour_ui_ed.cc:346 audio_clock.cc:2046 editor.cc:237
+#: ardour_ui_ed.cc:338 ardour_ui_ed.cc:347 audio_clock.cc:2046 editor.cc:237
 #: editor_actions.cc:544 editor_actions.cc:553 export_timespan_selector.cc:88
 #: session_option_editor.cc:41 session_option_editor.cc:61
 #: session_option_editor.cc:80 session_option_editor.cc:96
@@ -1903,127 +1914,127 @@ msgstr "Mettre le focus sur l'horloge"
 msgid "Timecode"
 msgstr "Timecode"
 
-#: ardour_ui_ed.cc:339 ardour_ui_ed.cc:348 editor_actions.cc:542
+#: ardour_ui_ed.cc:340 ardour_ui_ed.cc:349 editor_actions.cc:542
 msgid "Bars & Beats"
 msgstr "Mesures:Temps"
 
-#: ardour_ui_ed.cc:341 ardour_ui_ed.cc:350
+#: ardour_ui_ed.cc:342 ardour_ui_ed.cc:351
 msgid "Minutes & Seconds"
 msgstr "Minutes:Secondes"
 
-#: ardour_ui_ed.cc:343 ardour_ui_ed.cc:352 audio_clock.cc:2050 editor.cc:238
+#: ardour_ui_ed.cc:344 ardour_ui_ed.cc:353 audio_clock.cc:2050 editor.cc:238
 #: editor_actions.cc:543
 msgid "Samples"
 msgstr "Échantillons"
 
-#: ardour_ui_ed.cc:355
+#: ardour_ui_ed.cc:356
 msgid "Punch In"
 msgstr "Punch In"
 
-#: ardour_ui_ed.cc:356 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr "Entrée"
 
-#: ardour_ui_ed.cc:359
+#: ardour_ui_ed.cc:360
 msgid "Punch Out"
 msgstr "Punch Out"
 
-#: ardour_ui_ed.cc:360 time_info_box.cc:114
+#: ardour_ui_ed.cc:361 time_info_box.cc:114
 msgid "Out"
 msgstr "descente"
 
-#: ardour_ui_ed.cc:363
+#: ardour_ui_ed.cc:364
 msgid "Punch In/Out"
 msgstr "Punch in/out"
 
-#: ardour_ui_ed.cc:364
+#: ardour_ui_ed.cc:365
 msgid "In/Out"
 msgstr "In/Out"
 
-#: ardour_ui_ed.cc:367 rc_option_editor.cc:1071
+#: ardour_ui_ed.cc:368 rc_option_editor.cc:1071
 msgid "Click"
 msgstr "Métronome"
 
-#: ardour_ui_ed.cc:370
+#: ardour_ui_ed.cc:371
 msgid "Auto Input"
 msgstr "Monitoring automatique"
 
-#: ardour_ui_ed.cc:373
+#: ardour_ui_ed.cc:374
 msgid "Auto Play"
 msgstr "Lecture auto"
 
-#: ardour_ui_ed.cc:384
+#: ardour_ui_ed.cc:385
 msgid "Sync Startup to Video"
 msgstr "Sync début avec vidéo"
 
-#: ardour_ui_ed.cc:386
+#: ardour_ui_ed.cc:387
 msgid "Time Master"
 msgstr "Horloge maître"
 
-#: ardour_ui_ed.cc:393
+#: ardour_ui_ed.cc:394
 msgid "Toggle Record Enable Track %1"
 msgstr "Armer la piste %1"
 
-#: ardour_ui_ed.cc:400
+#: ardour_ui_ed.cc:401
 msgid "Percentage"
 msgstr "pourcentage"
 
-#: ardour_ui_ed.cc:401 shuttle_control.cc:169
+#: ardour_ui_ed.cc:402 shuttle_control.cc:169
 msgid "Semitones"
 msgstr "Demi-tons"
 
-#: ardour_ui_ed.cc:405
+#: ardour_ui_ed.cc:406
 msgid "Send MTC"
 msgstr "Envoi MTC (Midi Time Code)"
 
-#: ardour_ui_ed.cc:407
+#: ardour_ui_ed.cc:408
 msgid "Send MMC"
 msgstr "Envoi MMC (Midi Machine Control)"
 
-#: ardour_ui_ed.cc:409
+#: ardour_ui_ed.cc:410
 msgid "Use MMC"
 msgstr "Réception MMC (Midi Machine Control)"
 
-#: ardour_ui_ed.cc:411 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 msgid "Send MIDI Clock"
 msgstr "Envoyer l'horloge MIDI"
 
-#: ardour_ui_ed.cc:413
+#: ardour_ui_ed.cc:414
 msgid "Send MIDI Feedback"
 msgstr "Envoyer les réponses MIDI"
 
-#: ardour_ui_ed.cc:419
+#: ardour_ui_ed.cc:420
 msgid "Panic"
 msgstr "Panique"
 
-#: ardour_ui_ed.cc:559
+#: ardour_ui_ed.cc:560
 msgid "Wall Clock"
 msgstr "Grande horloge"
 
-#: ardour_ui_ed.cc:560
+#: ardour_ui_ed.cc:561
 msgid "Disk Space"
 msgstr "Espace disque"
 
-#: ardour_ui_ed.cc:561
+#: ardour_ui_ed.cc:562
 msgid "DSP"
 msgstr "DSP"
 
-#: ardour_ui_ed.cc:562
+#: ardour_ui_ed.cc:563
 #, fuzzy
 msgid "Buffers"
 msgstr "taille du tampon"
 
-#: ardour_ui_ed.cc:563
+#: ardour_ui_ed.cc:564
 msgid "JACK Sampling Rate and Latency"
 msgstr "Taux d'échantillonnage et latence de JACK"
 
-#: ardour_ui_ed.cc:564
+#: ardour_ui_ed.cc:565
 #, fuzzy
 msgid "Timecode Format"
 msgstr "Trames Timecode"
 
-#: ardour_ui_ed.cc:565
+#: ardour_ui_ed.cc:566
 #, fuzzy
 msgid "File Format"
 msgstr "Format de fichier"
@@ -2040,11 +2051,11 @@ msgstr ""
 msgid "Internal"
 msgstr "Interne"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 msgid "Enable/Disable external positional sync"
 msgstr "Activer/désactiver la synchronisation positionnelle externe"
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr "Impossible de synchroniser avec JACK: le pullup / pulldown est réglé"
 
@@ -2074,7 +2085,7 @@ msgstr "Tempo"
 msgid "Meter"
 msgstr "Signature rythmique"
 
-#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1030
+#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1039
 #: midi_region_view.cc:2991 session_metadata_dialog.cc:331
 #: session_metadata_dialog.cc:379 session_metadata_dialog.cc:435
 #: session_metadata_dialog.cc:716
@@ -2164,32 +2175,32 @@ msgid "hide track"
 msgstr "cacher la piste"
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:196 generic_pluginui.cc:456
-#: generic_pluginui.cc:733 panner_ui.cc:150
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
+#: generic_pluginui.cc:746 panner_ui.cc:150
 msgid "Automation|Manual"
 msgstr "Manuel"
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1856 gain_meter.cc:199
-#: generic_pluginui.cc:459 generic_pluginui.cc:735 midi_time_axis.cc:1488
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
+#: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr "Lire"
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:202 generic_pluginui.cc:462
-#: generic_pluginui.cc:737 panner_ui.cc:156
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
+#: generic_pluginui.cc:750 panner_ui.cc:156
 msgid "Write"
 msgstr "Écrire"
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:205 generic_pluginui.cc:465
-#: generic_pluginui.cc:739 panner_ui.cc:159
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
+#: generic_pluginui.cc:752 panner_ui.cc:159
 msgid "Touch"
 msgstr "Reprise"
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr "???"
 
@@ -2198,7 +2209,7 @@ msgid "clear automation"
 msgstr "effacer l'automation"
 
 #: automation_time_axis.cc:485 editor_actions.cc:613 editor_markers.cc:857
-#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:699
+#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:708
 msgid "Hide"
 msgstr "Cacher"
 
@@ -2220,7 +2231,7 @@ msgstr "Déconnecter"
 msgid "Linear"
 msgstr "Linéaire"
 
-#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:638
+#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:647
 #: shuttle_control.cc:188
 msgid "Mode"
 msgstr "Mode"
@@ -2238,13 +2249,13 @@ msgstr "Raccourci pour l'édition: utiliser la touche"
 msgid "Direction:"
 msgstr "Sélection"
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:156
-#: mixer_strip.cc:2132
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 msgid "Input"
 msgstr "Entrée"
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:161 mixer_strip.cc:2135
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 msgid "Output"
 msgstr "Sortie"
 
@@ -2254,8 +2265,8 @@ msgid "Edit"
 msgstr "Édition"
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:420 processor_box.cc:2227
-#: route_time_axis.cc:704
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
+#: route_time_axis.cc:713
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -2428,7 +2439,7 @@ msgstr "Timecode"
 
 #: edit_note_dialog.cc:98 editor_regions.cc:114
 #: export_timespan_selector.cc:359 export_timespan_selector.cc:421
-#: location_ui.cc:313 midi_list_editor.cc:114 time_info_box.cc:105
+#: location_ui.cc:317 midi_list_editor.cc:114 time_info_box.cc:105
 msgid "Length"
 msgstr "Durée:"
 
@@ -2675,17 +2686,17 @@ msgid "Ranges & Marks"
 msgstr "Intervalles et repères"
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 msgid "Editor"
 msgstr "Éditeur"
 
 #: editor.cc:1215 editor.cc:1225 editor.cc:4440 editor_actions.cc:130
-#: editor_actions.cc:1804
+#: editor_actions.cc:1813
 msgid "Loop"
 msgstr "Boucle"
 
@@ -2710,8 +2721,8 @@ msgstr ""
 msgid "Slow"
 msgstr "Lent"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1606
-#: sfdb_ui.cc:1715
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "Rapide"
 
@@ -2731,7 +2742,7 @@ msgstr "Activer"
 msgid "Slowest"
 msgstr "Très lent"
 
-#: editor.cc:1572 route_time_axis.cc:1863 selection.cc:1009 selection.cc:1064
+#: editor.cc:1572 route_time_axis.cc:1877 selection.cc:1009 selection.cc:1064
 msgid "programming error: "
 msgstr "programming error: "
 
@@ -2851,7 +2862,7 @@ msgid "Select All in Track"
 msgstr "Sélectionner tout dans la piste"
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2235
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr "Sélectionner tout"
 
@@ -2906,15 +2917,15 @@ msgstr "Selectionner de la tête de lecture jusqu'au point d'édition"
 msgid "Select"
 msgstr "Sélectionner"
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2220
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr "Couper"
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2223
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr "Copier"
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2231
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr "Coller"
 
@@ -3072,7 +3083,7 @@ msgstr "Refaire"
 msgid "Redo (%1)"
 msgstr "Refaire (%1)"
 
-#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1785
+#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1794
 msgid "Duplicate"
 msgstr "Dupliquer"
 
@@ -3102,8 +3113,8 @@ msgstr "Supprimer la liste de lecture"
 msgid "Keep Playlist"
 msgstr "Garder la liste de lecture"
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -3123,7 +3134,7 @@ msgstr "effacer les listes de lecture"
 msgid "Please wait while %1 loads visual data."
 msgstr "Veuillez patienter pendant que %1 charge les données graphiques."
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2251
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 msgid "Edit..."
 msgstr "Éditer..."
 
@@ -3172,7 +3183,7 @@ msgstr "Empilement des régions"
 msgid "Position"
 msgstr "Position"
 
-#: editor_actions.cc:101 gain_meter.cc:124 gain_meter.cc:755 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr "Rogner"
@@ -3185,7 +3196,7 @@ msgstr "Gain"
 msgid "Ranges"
 msgstr "Intervalles"
 
-#: editor_actions.cc:104 editor_actions.cc:1781 session_option_editor.cc:145
+#: editor_actions.cc:104 editor_actions.cc:1790 session_option_editor.cc:145
 #: session_option_editor.cc:147 session_option_editor.cc:156
 #: session_option_editor.cc:163
 msgid "Fades"
@@ -3223,7 +3234,7 @@ msgstr "Options MIDI"
 msgid "Misc Options"
 msgstr "Autres options"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr "Monitoring"
@@ -3264,8 +3275,8 @@ msgstr "Horloge secondaire"
 msgid "Separate"
 msgstr "Séparer"
 
-#: editor_actions.cc:132 mixer_strip.cc:1916 route_time_axis.cc:199
-#: route_time_axis.cc:2397
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
+#: route_time_axis.cc:2417
 msgid "Solo"
 msgstr "Solo"
 
@@ -3277,7 +3288,7 @@ msgstr "Sous-trames"
 msgid "Timecode fps"
 msgstr "Timecode (trames/s)"
 
-#: editor_actions.cc:137 route_time_axis.cc:421
+#: editor_actions.cc:137 route_time_axis.cc:430
 msgid "Height"
 msgstr "Hauteur"
 
@@ -3417,7 +3428,7 @@ msgstr "début de la région"
 msgid "Playhead to Range End"
 msgstr "fin de la région"
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2237
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 msgid "Deselect All"
 msgstr "Désélectionner tout"
 
@@ -3700,9 +3711,9 @@ msgstr "Insérer une région"
 msgid "Toggle Active"
 msgstr "Activer/Désactiver"
 
-#: editor_actions.cc:370 editor_actions.cc:1707 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1488
-#: route_time_axis.cc:701
+#: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
+#: route_time_axis.cc:710
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -3710,19 +3721,19 @@ msgstr "Supprimer"
 msgid "Fit Selected Tracks"
 msgstr "Ajuster à la fenêtre"
 
-#: editor_actions.cc:376 time_axis_view.cc:1298
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr "Énorme"
 
-#: editor_actions.cc:379 time_axis_view.cc:1299
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr "Grand"
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1300
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr "Très grand"
 
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr "Très petit"
 
@@ -3823,7 +3834,7 @@ msgstr "Collant"
 msgid "Slide"
 msgstr "Glissant"
 
-#: editor_actions.cc:478 editor_actions.cc:1728 editor_markers.cc:860
+#: editor_actions.cc:478 editor_actions.cc:1737 editor_markers.cc:860
 #: editor_rulers.cc:386 location_ui.cc:56
 msgid "Lock"
 msgstr "Verrouillé"
@@ -3999,7 +4010,7 @@ msgstr "Minutes:Secondes"
 msgid "Video Monitor"
 msgstr "Afficher le monitoring vidéo"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr ""
 
@@ -4010,7 +4021,7 @@ msgstr "Envoyer à l'avant"
 
 #: editor_actions.cc:554
 #, fuzzy
-msgid "Framenumber"
+msgid "Frame number"
 msgstr "Numéro de la piste"
 
 #: editor_actions.cc:555
@@ -4101,7 +4112,7 @@ msgstr "Supprimer les régions inutilisées"
 
 #: editor_actions.cc:652 editor_audio_import.cc:279
 #: session_import_dialog.cc:74 session_import_dialog.cc:94
-#: session_metadata_dialog.cc:297 editor_videotimeline.cc:107
+#: session_metadata_dialog.cc:297 editor_videotimeline.cc:108
 msgid "Import"
 msgstr "Importer"
 
@@ -4142,311 +4153,311 @@ msgstr "Chargement des menus depuis %1"
 msgid "Could not find editor.bindings in search path %1"
 msgstr ""
 
-#: editor_actions.cc:1019 editor_actions.cc:1415 editor_actions.cc:1426
-#: editor_actions.cc:1479 editor_actions.cc:1490 editor_actions.cc:1537
-#: editor_actions.cc:1547 editor_regions.cc:1561
+#: editor_actions.cc:1028 editor_actions.cc:1424 editor_actions.cc:1435
+#: editor_actions.cc:1488 editor_actions.cc:1499 editor_actions.cc:1546
+#: editor_actions.cc:1556 editor_regions.cc:1561
 msgid "programming error: %1: %2"
 msgstr "programming error: %1: %2"
 
-#: editor_actions.cc:1713
+#: editor_actions.cc:1722
 msgid "Raise"
 msgstr "Envoyer vers l'avant"
 
-#: editor_actions.cc:1716
+#: editor_actions.cc:1725
 msgid "Raise to Top"
 msgstr "Envoyer à l'avant"
 
-#: editor_actions.cc:1719 gtk-custom-ruler.c:132
+#: editor_actions.cc:1728 gtk-custom-ruler.c:132
 msgid "Lower"
 msgstr "Envoyer vers l'arrière"
 
-#: editor_actions.cc:1722
+#: editor_actions.cc:1731
 msgid "Lower to Bottom"
 msgstr "Envoyer à l'arrière"
 
-#: editor_actions.cc:1725
+#: editor_actions.cc:1734
 msgid "Move to Original Position"
 msgstr "Remettre à sa position d'origine"
 
-#: editor_actions.cc:1730
+#: editor_actions.cc:1739
 msgid "Lock to Video"
 msgstr ""
 
-#: editor_actions.cc:1735 editor_markers.cc:867
+#: editor_actions.cc:1744 editor_markers.cc:867
 msgid "Glue to Bars and Beats"
 msgstr "Coller aux mesures/temps"
 
-#: editor_actions.cc:1740
+#: editor_actions.cc:1749
 msgid "Remove Sync"
 msgstr "Supprimer le point de synchro"
 
-#: editor_actions.cc:1743 mixer_strip.cc:1903 route_time_axis.cc:200
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr "Muet"
 
-#: editor_actions.cc:1746
+#: editor_actions.cc:1755
 msgid "Normalize..."
 msgstr "Normaliser..."
 
-#: editor_actions.cc:1749
+#: editor_actions.cc:1758
 msgid "Reverse"
 msgstr "Inverser"
 
-#: editor_actions.cc:1752
+#: editor_actions.cc:1761
 msgid "Make Mono Regions"
 msgstr "Créer des régions mono"
 
-#: editor_actions.cc:1755
+#: editor_actions.cc:1764
 msgid "Boost Gain"
 msgstr "Augmenter le gain"
 
-#: editor_actions.cc:1758
+#: editor_actions.cc:1767
 msgid "Cut Gain"
 msgstr "Couper le gain"
 
-#: editor_actions.cc:1761
+#: editor_actions.cc:1770
 msgid "Pitch Shift..."
 msgstr "Pitch shift..."
 
-#: editor_actions.cc:1764
+#: editor_actions.cc:1773
 msgid "Transpose..."
 msgstr "Transposer..."
 
-#: editor_actions.cc:1767
+#: editor_actions.cc:1776
 msgid "Opaque"
 msgstr "Opaque"
 
-#: editor_actions.cc:1771 editor_regions.cc:116
+#: editor_actions.cc:1780 editor_regions.cc:116
 msgid "Fade In"
 msgstr "Type de montée"
 
-#: editor_actions.cc:1776 editor_regions.cc:117
+#: editor_actions.cc:1785 editor_regions.cc:117
 msgid "Fade Out"
 msgstr "Type de descente"
 
-#: editor_actions.cc:1791
+#: editor_actions.cc:1800
 msgid "Multi-Duplicate..."
 msgstr "Multi-dupliquer..."
 
-#: editor_actions.cc:1796
+#: editor_actions.cc:1805
 msgid "Fill Track"
 msgstr "Remplir la piste"
 
-#: editor_actions.cc:1800 editor_markers.cc:955
+#: editor_actions.cc:1809 editor_markers.cc:955
 msgid "Set Loop Range"
 msgstr "Boucle"
 
-#: editor_actions.cc:1807
+#: editor_actions.cc:1816
 #, fuzzy
 msgid "Set Punch"
 msgstr "Punch in→out"
 
-#: editor_actions.cc:1811
+#: editor_actions.cc:1820
 #, fuzzy
 msgid "Add Single Range Marker"
 msgstr "Ajoute 1 repère d'intervalle"
 
-#: editor_actions.cc:1816
+#: editor_actions.cc:1825
 #, fuzzy
 msgid "Add Range Marker Per Region"
 msgstr "Ajoute des repères d'intervalle par région"
 
-#: editor_actions.cc:1820
+#: editor_actions.cc:1829
 #, fuzzy
 msgid "Snap Position To Grid"
 msgstr "Aligner sur la grille"
 
-#: editor_actions.cc:1823
+#: editor_actions.cc:1832
 #, fuzzy
 msgid "Close Gaps"
 msgstr "Fermer"
 
-#: editor_actions.cc:1826
+#: editor_actions.cc:1835
 msgid "Rhythm Ferret..."
 msgstr "Fureteur de rythme..."
 
-#: editor_actions.cc:1829
+#: editor_actions.cc:1838
 msgid "Export..."
 msgstr "Exporter..."
 
-#: editor_actions.cc:1835
+#: editor_actions.cc:1844
 msgid "Separate Under"
 msgstr "Séparer dessous"
 
-#: editor_actions.cc:1839
+#: editor_actions.cc:1848
 msgid "Set Fade In Length"
 msgstr "Définir la durée de montée"
 
-#: editor_actions.cc:1840
+#: editor_actions.cc:1849
 msgid "Set Fade Out Length"
 msgstr "Définir la durée de descente"
 
-#: editor_actions.cc:1841
+#: editor_actions.cc:1850
 #, fuzzy
 msgid "Set Tempo from Region = Bar"
 msgstr "Définir le tempo = région"
 
-#: editor_actions.cc:1846
+#: editor_actions.cc:1855
 #, fuzzy
 msgid "Split at Percussion Onsets"
 msgstr "Découper les régions au début des percussions"
 
-#: editor_actions.cc:1851
+#: editor_actions.cc:1860
 #, fuzzy
 msgid "List Editor..."
 msgstr "Options..."
 
-#: editor_actions.cc:1854
+#: editor_actions.cc:1863
 msgid "Properties..."
 msgstr "Propriétés..."
 
-#: editor_actions.cc:1858
+#: editor_actions.cc:1867
 msgid "Bounce (with processing)"
 msgstr ""
 
-#: editor_actions.cc:1859
+#: editor_actions.cc:1868
 msgid "Bounce (without processing)"
 msgstr ""
 
-#: editor_actions.cc:1860
+#: editor_actions.cc:1869
 msgid "Combine"
 msgstr "Joindre les régions"
 
-#: editor_actions.cc:1861
+#: editor_actions.cc:1870
 msgid "Uncombine"
 msgstr "Défaire jointure des régions"
 
-#: editor_actions.cc:1863
+#: editor_actions.cc:1872
 msgid "Spectral Analysis..."
 msgstr "Analyze du spectre..."
 
-#: editor_actions.cc:1865
+#: editor_actions.cc:1874
 msgid "Reset Envelope"
 msgstr "Réinitialiser l'enveloppe"
 
-#: editor_actions.cc:1867
+#: editor_actions.cc:1876
 msgid "Reset Gain"
 msgstr "Réinitialiser le gain"
 
-#: editor_actions.cc:1872
+#: editor_actions.cc:1881
 msgid "Envelope Active"
 msgstr "Enveloppe Active"
 
-#: editor_actions.cc:1876
+#: editor_actions.cc:1885
 #, fuzzy
 msgid "Quantize..."
 msgstr "Quantiser"
 
-#: editor_actions.cc:1877 editor_actions.cc:1878
+#: editor_actions.cc:1886 editor_actions.cc:1887
 msgid "Insert Patch Change..."
 msgstr ""
 
-#: editor_actions.cc:1879
+#: editor_actions.cc:1888
 msgid "Unlink from other copies"
 msgstr ""
 
-#: editor_actions.cc:1880
+#: editor_actions.cc:1889
 msgid "Strip Silence..."
 msgstr "Supprimer le silence..."
 
-#: editor_actions.cc:1881
+#: editor_actions.cc:1890
 msgid "Set Range Selection"
 msgstr "Choisir intervalle depuis la région"
 
-#: editor_actions.cc:1883
+#: editor_actions.cc:1892
 #, fuzzy
 msgid "Nudge Later"
 msgstr "Décaler vers la droite"
 
-#: editor_actions.cc:1884
+#: editor_actions.cc:1893
 msgid "Nudge Earlier"
 msgstr "Décaler vers la gauche"
 
-#: editor_actions.cc:1889
+#: editor_actions.cc:1898
 #, fuzzy
 msgid "Nudge Later by Capture Offset"
 msgstr "Décaler de l'offset de capture vers la droite"
 
-#: editor_actions.cc:1896
+#: editor_actions.cc:1905
 msgid "Nudge Earlier by Capture Offset"
 msgstr "Décaler de l'offset de capture vers la gauche"
 
-#: editor_actions.cc:1900
+#: editor_actions.cc:1909
 msgid "Trim to Loop"
 msgstr "Rogner aux repères de boucle"
 
-#: editor_actions.cc:1901
+#: editor_actions.cc:1910
 msgid "Trim to Punch"
 msgstr "Rogner aux points de punch-in/out"
 
-#: editor_actions.cc:1903
+#: editor_actions.cc:1912
 msgid "Trim to Previous"
 msgstr "Rogner aux précédent"
 
-#: editor_actions.cc:1904
+#: editor_actions.cc:1913
 #, fuzzy
 msgid "Trim to Next"
 msgstr "Rogner à la région suivante"
 
-#: editor_actions.cc:1911
+#: editor_actions.cc:1920
 #, fuzzy
 msgid "Insert Region From Region List"
 msgstr "Convertir en région (vers la liste des régions)"
 
-#: editor_actions.cc:1917
+#: editor_actions.cc:1926
 #, fuzzy
 msgid "Set Sync Position"
 msgstr "Placer la synchro de région"
 
-#: editor_actions.cc:1918
+#: editor_actions.cc:1927
 msgid "Place Transient"
 msgstr ""
 
-#: editor_actions.cc:1919
+#: editor_actions.cc:1928
 msgid "Split"
 msgstr "Scinder"
 
-#: editor_actions.cc:1920
+#: editor_actions.cc:1929
 #, fuzzy
 msgid "Trim Start at Edit Point"
 msgstr "Rogner le début jusqu'au point d'édition"
 
-#: editor_actions.cc:1921
+#: editor_actions.cc:1930
 #, fuzzy
 msgid "Trim End at Edit Point"
 msgstr "Rogner la fin jusqu'au point d'édition"
 
-#: editor_actions.cc:1926
+#: editor_actions.cc:1935
 #, fuzzy
 msgid "Align Start"
 msgstr "aligner le début des régions"
 
-#: editor_actions.cc:1933
+#: editor_actions.cc:1942
 #, fuzzy
 msgid "Align Start Relative"
 msgstr "aligner relativement le début des régions"
 
-#: editor_actions.cc:1937
+#: editor_actions.cc:1946
 #, fuzzy
 msgid "Align End"
 msgstr "Aligner"
 
-#: editor_actions.cc:1942
+#: editor_actions.cc:1951
 #, fuzzy
 msgid "Align End Relative"
 msgstr "Aligner relativement"
 
-#: editor_actions.cc:1949
+#: editor_actions.cc:1958
 #, fuzzy
 msgid "Align Sync"
 msgstr "aligner les synchro des régions"
 
-#: editor_actions.cc:1956
+#: editor_actions.cc:1965
 #, fuzzy
 msgid "Align Sync Relative"
 msgstr "Aligner relativement"
 
-#: editor_actions.cc:1960 editor_actions.cc:1963
+#: editor_actions.cc:1969 editor_actions.cc:1972
 msgid "Choose Top..."
 msgstr ""
 
@@ -4476,32 +4487,32 @@ msgstr ""
 "La session contient déjà le fichier source %1. Voulez-vous importer %2 comme "
 "un nouveau fichier source, ou l'ignorer?"
 
-#: editor_audio_import.cc:279 editor_videotimeline.cc:107
+#: editor_audio_import.cc:279 editor_videotimeline.cc:108
 msgid "Cancel Import"
 msgstr "Annuler l'importation"
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr "Éditeur: impossible d'ouvrir le fichier « %1 » (%2)"
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 msgid "Cancel entire import"
 msgstr "Annuler toute l'importation"
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 msgid "Don't embed it"
 msgstr "Ne pas le lier"
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr "Lier tout sans poser de question"
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 msgid "Sample rate"
 msgstr "Échantillonnage"
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
@@ -4510,7 +4521,7 @@ msgstr ""
 "La fréquence d'échantillonnage de ce fichier audio ne correspond pas à celle "
 "de la session !"
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 msgid "Embed it anyway"
 msgstr "Lier quand même"
 
@@ -4547,32 +4558,32 @@ msgstr "copier le changement tempo"
 msgid "move tempo mark"
 msgstr "déplacer le changement tempo"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr "modifier la durée de montée"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr "modifier la durée de descente"
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr "déplacer le repère"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr ""
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 #, fuzzy
 msgid "programming_error: %1"
 msgstr "programming error: %1"
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr "nouvel intervalle"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 msgid "rubberband selection"
 msgstr "sélection élastique"
 
@@ -4648,7 +4659,7 @@ msgid "Sharing Solo?"
 msgstr "Partager solo?"
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 msgid "Rec"
 msgstr "Enreg."
 
@@ -4722,7 +4733,7 @@ msgid "end"
 msgstr "fin"
 
 #: editor_markers.cc:646 editor_ops.cc:1744 editor_ops.cc:1764
-#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1005
+#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1017
 msgid "add marker"
 msgstr "ajouter un repère"
 
@@ -4731,7 +4742,7 @@ msgstr "ajouter un repère"
 msgid "range"
 msgstr " intervalle"
 
-#: editor_markers.cc:713 location_ui.cc:840
+#: editor_markers.cc:713 location_ui.cc:852
 msgid "remove marker"
 msgstr "Supprimer le repère"
 
@@ -4811,8 +4822,8 @@ msgstr "renommer le repère"
 msgid "Rename Range"
 msgstr "renommer"
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2233 route_time_axis.cc:968 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr "Renommer"
 
@@ -4956,7 +4967,7 @@ msgstr "Envoyer à l'arrière"
 msgid "Rename Region"
 msgstr "renommer la région"
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 msgid "New name:"
 msgstr "Nouveau nom:"
 
@@ -5131,7 +5142,7 @@ msgstr ""
 "(cette opération est destructive et ne pourra pas être annulée)"
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr "Non, ne rien faire"
 
@@ -5326,11 +5337,11 @@ msgstr "Ok"
 msgid "close region gaps"
 msgstr "réinitialiser le gain"
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr "Mauvaise nouvelle..."
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5349,7 +5360,7 @@ msgstr ""
 msgid "tracks"
 msgstr "pistes"
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 msgid "track"
 msgstr "piste"
 
@@ -5357,7 +5368,7 @@ msgstr "piste"
 msgid "busses"
 msgstr "bus"
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 msgid "bus"
 msgstr "bus"
 
@@ -5399,7 +5410,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr "Oui, supprimer"
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr "Oui, supprimer"
 
@@ -5472,7 +5483,7 @@ msgstr ""
 msgid "Length of region fade-out (units: secondary clock), () if dsisabled"
 msgstr ""
 
-#: editor_regions.cc:118 mixer_strip.cc:1960 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr "L"
@@ -5490,8 +5501,9 @@ msgstr "G"
 msgid "Region position glued to Bars|Beats time?"
 msgstr ""
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:723
-#: mixer_strip.cc:1934 panner_ui.cc:554 stereo_panner.cc:237
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
+#: stereo_panner.cc:237
 msgid "M"
 msgstr "M"
 
@@ -5561,7 +5573,8 @@ msgstr "Nom de piste/bus"
 msgid "Track/Bus visible ?"
 msgstr "Piste/bus visible?"
 
-#: editor_routes.cc:204 mixer_strip.cc:1951 route_time_axis.cc:2387
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
+#: route_time_axis.cc:2407
 msgid "A"
 msgstr "A"
 
@@ -5569,7 +5582,7 @@ msgstr "A"
 msgid "Track/Bus active ?"
 msgstr "Piste/bus actif?"
 
-#: editor_routes.cc:205 mixer_strip.cc:1935
+#: editor_routes.cc:205 mixer_strip.cc:1932
 msgid "I"
 msgstr "I"
 
@@ -5577,7 +5590,7 @@ msgstr "I"
 msgid "MIDI input enabled"
 msgstr "Entrée MIDI activée"
 
-#: editor_routes.cc:206 mixer_strip.cc:1933 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr "R"
@@ -5592,7 +5605,7 @@ msgstr "Armement"
 msgid "Muted"
 msgstr "Muet"
 
-#: editor_routes.cc:208 mixer_strip.cc:1947
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr "S"
 
@@ -5604,7 +5617,7 @@ msgstr "Solo"
 msgid "SI"
 msgstr "SI"
 
-#: editor_routes.cc:209 mixer_strip.cc:351 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 msgid "Solo Isolated"
 msgstr "Solo isolé"
 
@@ -5889,143 +5902,147 @@ msgid "192000Hz"
 msgstr "192000Hz"
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr "(aucun)"
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr "Triangulaire"
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr "Rectangulaire"
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 msgid "Shaped"
 msgstr "Remodelé"
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr "Lecture/Enregistrement sur 1 appareil"
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr "Lecture/Enregistrement sur 2 appareils"
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr "Lecture seulement"
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 msgid "Recording only"
 msgstr "Enregistrement seulement"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr ""
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 msgid "raw"
 msgstr "brut"
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr "Pilote:"
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 msgid "Audio Interface:"
 msgstr "Interface audio:"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:148 sfdb_ui.cc:261 sfdb_ui.cc:266
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 msgid "Sample rate:"
 msgstr "Échantillonnage:"
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr "Taille du tampon:"
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr "Nombre de tampons:"
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr "Latence approximative:"
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 msgid "Audio mode:"
 msgstr "Mode audio:"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr "Délai d'expiration client"
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr "Nombre de ports:"
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr "Pilote MIDI:"
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 msgid "Dither:"
 msgstr "Interpolation:"
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr ""
 "Aucun serveur JACK n'a été trouvé sur le système. Veuillez installer JACK et "
 "recommencez"
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr "Serveur:"
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr "Interface d'entrée:"
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 msgid "Output device:"
 msgstr "Interface de sortie:"
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 msgid "Hardware input latency:"
 msgstr "Latence matérielle en entrée:"
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 msgid "samples"
 msgstr "échantillons"
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 msgid "Hardware output latency:"
 msgstr "Latence matérielle en sortie:"
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr "Interface audio"
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 msgid "Advanced"
 msgstr "Avancé"
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr ""
 "Impossible d'ouvrir le fichier de configuration de JACK %1 pour y "
 "enregistrer les paramètres"
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 msgid ""
 "You do not have any audio devices capable of\n"
 "simultaneous playback and recording.\n"
@@ -6055,33 +6072,33 @@ msgstr ""
 "les deux à la fois, démarrez JACK avant %1 et sélectionnez le\n"
 "périphérique correspondant."
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr "Aucun périphérique audio approprié"
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr "Il semble que JACK soit absent du pack %1"
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr "Vous devez d'abord choisir un périphérique audio."
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr "Le périphérique audio \"%1\" est inconnu."
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr "La valeur « %1 » de la Config Audio est incomplète"
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 "Les fichiers de configuration contiennent un chemin vers JACK qui n'existe "
 "pas (%1)"
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:146
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 msgid "Channels:"
 msgstr "Canaux:"
 
@@ -6242,9 +6259,9 @@ msgid "Folder:"
 msgstr "Dossier:"
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "Parcourir"
 
@@ -6369,6 +6386,11 @@ msgstr "Options FLAC"
 msgid "Broadcast Wave options"
 msgstr "Option Broadcast Wave"
 
+#: export_format_selector.cc:136
+#, fuzzy
+msgid "Do you really want to remove the format?"
+msgstr "Voulez-vous vraiment arreter le Serveur-Vidéo?"
+
 #: export_preset_selector.cc:28
 msgid "Preset"
 msgstr "Préréglage"
@@ -6381,6 +6403,11 @@ msgstr ""
 "Le préréglage n'a pas pu être chargé!\n"
 "Peut-être qu'il référence un format qui a été supprimé?"
 
+#: export_preset_selector.cc:156
+#, fuzzy
+msgid "Do you really want to remove this preset?"
+msgstr "Voulez-vous vraiment arreter le Serveur-Vidéo?"
+
 #: export_timespan_selector.cc:46
 msgid "Show Times as:"
 msgstr "Temps exprimé en:"
@@ -6393,36 +6420,50 @@ msgstr " à "
 msgid "Range"
 msgstr "Intervalle"
 
-#: gain_meter.cc:109 gain_meter.cc:431 gain_meter.cc:820
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+#, fuzzy
+msgid "curl error %1 (%2)"
+msgstr "programming error: %1 (%2)"
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+#, fuzzy
+msgid "%1"
+msgstr "%"
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr "-inf"
 
-#: gain_meter.cc:115 gain_meter.cc:869
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr "Mode d'automation du gain"
 
-#: gain_meter.cc:116 gain_meter.cc:870
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr "Type d'automation du gain"
 
-#: gain_meter.cc:125 gain_meter.cc:759 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr "abs"
 
-#: gain_meter.cc:334
-msgid "-Inf"
-msgstr "-inf"
-
-#: gain_meter.cc:726 mixer_strip.cc:1954 panner_ui.cc:557
-#: route_time_axis.cc:2391
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
+#: route_time_axis.cc:2411
 msgid "P"
 msgstr "P"
 
-#: gain_meter.cc:729 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr "T"
 
-#: gain_meter.cc:732 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr "W"
 
@@ -6435,7 +6476,7 @@ msgstr "<span size=\"large\">réglages préféfinis</span>"
 msgid "Switches"
 msgstr "Pitch shift"
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2210
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 msgid "Controls"
 msgstr "Contrôles"
 
@@ -6466,68 +6507,68 @@ msgstr "Gestionnaire de connexion audio"
 msgid "MIDI Connection Manager"
 msgstr "Gestion des connexions MIDI"
 
-#: global_port_matrix.cc:204 io_selector.cc:216
+#: global_port_matrix.cc:213 io_selector.cc:216
 msgid "port"
 msgstr "port"
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 msgid "Selection..."
 msgstr "Sélectionnées..."
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr "Armées..."
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 msgid "Soloed..."
 msgstr "Solo..."
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 #, fuzzy
 msgid "Create New Group ..."
 msgstr "Nouveau groupe..."
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr ""
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 #, fuzzy
 msgid "Edit Group..."
 msgstr "Nouveau groupe..."
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 #, fuzzy
 msgid "Collect Group"
 msgstr "Sélectionner"
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 #, fuzzy
 msgid "Remove Group"
 msgstr "Groupe"
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 #, fuzzy
 msgid "Remove Subgroup Bus"
 msgstr "Ajouter un sous-groupe de bus"
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 msgid "Add New Subgroup Bus"
 msgstr "Ajouter un sous-groupe de bus"
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr "Ajouter un nouveau bus auxiliaire (pre-fader)"
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 msgid "Add New Aux Bus (post-fader)"
 msgstr "Ajouter un nouveau bus auxiliaire (post-fader)"
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 msgid "Enable All Groups"
 msgstr ""
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 #, fuzzy
 msgid "Disable All Groups"
 msgstr "Désactiver tous les groupes"
@@ -6626,11 +6667,11 @@ msgstr "Import du fichier: %1 sur %2"
 msgid "I/O selector"
 msgstr "Sélecteur I/O"
 
-#: io_selector.cc:266
+#: io_selector.cc:265
 msgid "%1 input"
 msgstr "Entrée %1"
 
-#: io_selector.cc:268
+#: io_selector.cc:267
 msgid "%1 output"
 msgstr "sortie %1"
 
@@ -6712,7 +6753,7 @@ msgstr[1] "%1 échantillons"
 msgid "Reset"
 msgstr "Réinitialiser"
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1734
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 msgid "programming error: %1 (%2)"
 msgstr "programming error: %1 (%2)"
 
@@ -6741,68 +6782,68 @@ msgstr "Compositeur:"
 msgid "Pre-Emphasis"
 msgstr "Pré-accentuation"
 
-#: location_ui.cc:310
+#: location_ui.cc:314
 #, fuzzy
 msgid "Remove this range"
 msgstr "définir l'intervalle de punch in/out"
 
-#: location_ui.cc:311
+#: location_ui.cc:315
 msgid "Start time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:312
+#: location_ui.cc:316
 msgid "End time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:315
+#: location_ui.cc:319
 #, fuzzy
 msgid "Set range start from playhead location"
 msgstr "placer sur la tête de lecture"
 
-#: location_ui.cc:316
+#: location_ui.cc:320
 #, fuzzy
 msgid "Set range end from playhead location"
 msgstr "aligner sur la zone de sélection"
 
-#: location_ui.cc:320
+#: location_ui.cc:324
 #, fuzzy
 msgid "Remove this marker"
 msgstr "déplacer le repère"
 
-#: location_ui.cc:321
+#: location_ui.cc:325
 msgid "Position - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:323
+#: location_ui.cc:327
 #, fuzzy
 msgid "Set marker time from playhead location"
 msgstr "aligner sur la zone de sélection"
 
-#: location_ui.cc:462
+#: location_ui.cc:494
 msgid "You cannot put a CD marker at the start of the session"
 msgstr "Vous ne pouvez pas poser un marqueur de CD au début de la session"
 
-#: location_ui.cc:708
+#: location_ui.cc:720
 msgid "New Marker"
 msgstr "Nouveau repère"
 
-#: location_ui.cc:709
+#: location_ui.cc:721
 msgid "New Range"
 msgstr "Nouvel intervalle"
 
-#: location_ui.cc:722
+#: location_ui.cc:734
 msgid "<b>Loop/Punch Ranges</b>"
 msgstr "<b>boucle et punch-in/out</b>"
 
-#: location_ui.cc:747
+#: location_ui.cc:759
 msgid "<b>Markers (Including CD Index)</b>"
 msgstr "<b>Repères (Indexes de CD inclus)</b>"
 
-#: location_ui.cc:782
+#: location_ui.cc:794
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
 msgstr "<b>Intervalles (intervalles de piste CD inclus)</b>"
 
-#: location_ui.cc:1024
+#: location_ui.cc:1036
 msgid "add range marker"
 msgstr "ajouter un repère d'intervalle"
 
@@ -6890,19 +6931,19 @@ msgstr ""
 "Il n'est pas possible de sauvegarder la session\n"
 "car les informations de connection seraient perdues.\n"
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr " (construit avec "
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr " et GCC version "
 
-#: main.cc:504
+#: main.cc:500
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr "Copyright © 1999-2012 Paul Davis"
 
-#: main.cc:505
+#: main.cc:501
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
@@ -6910,29 +6951,33 @@ msgstr ""
 "Pour certaines parties, Copyright © Steve Harris, Ari Johnson, Brett Viren, "
 "Joel Baker, Robin Gareus"
 
-#: main.cc:507
+#: main.cc:503
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr "%1 est distribué sans AUCUNE GARANTIE"
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr "pas même de COMMERCIALISATION ou d'ADÉQUATION À UN BUT PARTICULIER."
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "Ceci est un logiciel libre, et vous êtes encouragé à le distribuer "
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr ""
 "sous certaines conditions ; voir le fichier source pour les conditions de "
 "distribution."
 
-#: main.cc:519
+#: main.cc:513
+msgid "could not initialize %1."
+msgstr "impossible d'initialiser %1."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr ""
 
-#: main.cc:525
+#: main.cc:528
 #, fuzzy
 msgid "could not create %1 GUI"
 msgstr "impossible de créer l'interface utilisateur d'Ardour"
@@ -6942,7 +6987,7 @@ msgstr "impossible de créer l'interface utilisateur d'Ardour"
 msgid "Display delta to edit cursor"
 msgstr "delta d'Horloge Primaire au point d'édition"
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 msgid "MarkerText"
 msgstr "MarkerText"
 
@@ -7457,7 +7502,7 @@ msgstr "Cliquez pour choisir un dossier supplémentaire"
 msgid "Missing Plugins"
 msgstr "Plugins manquants"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr "OK"
 
@@ -7537,83 +7582,83 @@ msgstr "Chargement des menus depuis %1"
 msgid "Could not find mixer.bindings in search path %1"
 msgstr ""
 
-#: mixer_strip.cc:91 mixer_strip.cc:119 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr "pré"
 
-#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:352 mixer_strip.cc:1293
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 #, fuzzy
 msgid "Comments"
 msgstr "Commentaire"
 
-#: mixer_strip.cc:145
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr ""
 
-#: mixer_strip.cc:147
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
 msgstr ""
 
-#: mixer_strip.cc:154
+#: mixer_strip.cc:156
 msgid "Hide this mixer strip"
 msgstr "Cacher ce tranche de mixage"
 
-#: mixer_strip.cc:165
+#: mixer_strip.cc:167
 #, fuzzy
 msgid "Click to select metering point"
 msgstr "Sélectionner tout après le point d'édition"
 
-#: mixer_strip.cc:171
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr "tupni"
 
-#: mixer_strip.cc:190
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr "Isoler le Solo"
 
-#: mixer_strip.cc:199
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr "Verrouiller le status Solo"
 
-#: mixer_strip.cc:201 mixer_strip.cc:1929
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 msgid "lock"
 msgstr "verrou"
 
-#: mixer_strip.cc:202 mixer_strip.cc:1928
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 msgid "iso"
 msgstr "iso"
 
-#: mixer_strip.cc:256
+#: mixer_strip.cc:258
 #, fuzzy
 msgid "Mix group"
 msgstr "Aucun groupe"
 
-#: mixer_strip.cc:349 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 #, fuzzy
 msgid "Phase Invert"
 msgstr "Inverser"
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 msgid "Solo Safe"
 msgstr "Bloquer le solo"
 
-#: mixer_strip.cc:353 mixer_ui.cc:124 route_time_axis.cc:664
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 msgid "Group"
 msgstr "Groupe"
 
-#: mixer_strip.cc:354 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 #, fuzzy
 msgid "Meter Point"
 msgstr "VU-mètre"
 
-#: mixer_strip.cc:466
+#: mixer_strip.cc:470
 msgid "Enable/Disable MIDI input"
 msgstr "Activer/désactiver l'entrée du MIDI"
 
-#: mixer_strip.cc:616
+#: mixer_strip.cc:622
 msgid ""
 "Aux\n"
 "Sends"
@@ -7621,147 +7666,160 @@ msgstr ""
 "Arrivées\n"
 "Aux"
 
-#: mixer_strip.cc:640
+#: mixer_strip.cc:646
 #, fuzzy
 msgid "Snd"
 msgstr "secondes"
 
-#: mixer_strip.cc:694 mixer_strip.cc:822 processor_box.cc:2152
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr "Non connecté à JACK – aucun changement d'entrée/sortie n'est possible"
 
-#: mixer_strip.cc:1089
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr "<b>ENTRÉE</b> vers %1"
 
-#: mixer_strip.cc:1092
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr "<b>SORTIE</b> depuis %1"
 
-#: mixer_strip.cc:1167
+#: mixer_strip.cc:1174
 msgid "Disconnected"
 msgstr "Déconnecté"
 
-#: mixer_strip.cc:1296
+#: mixer_strip.cc:1303
 msgid "*Comments*"
 msgstr "*commentaires*"
 
-#: mixer_strip.cc:1303
+#: mixer_strip.cc:1310
 msgid "Cmt"
 msgstr "Cmt"
 
-#: mixer_strip.cc:1306
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr "*Cmt*"
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr "ajouter ou modifier des commentaires"
 
-#: mixer_strip.cc:1351
+#: mixer_strip.cc:1358
 msgid ": comment editor"
 msgstr ": éditeur de commentaires"
 
-#: mixer_strip.cc:1428
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr "Grp"
 
-#: mixer_strip.cc:1431
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr "~G"
 
-#: mixer_strip.cc:1460
+#: mixer_strip.cc:1467
 msgid "Comments..."
 msgstr "Commentaires..."
 
-#: mixer_strip.cc:1462
+#: mixer_strip.cc:1469
 msgid "Save As Template..."
 msgstr "Enregistrer comme modèle..."
 
-#: mixer_strip.cc:1468 route_group_dialog.cc:39 route_time_axis.cc:687
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr "Activé"
 
-#: mixer_strip.cc:1475
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr "Régler la latence..."
 
-#: mixer_strip.cc:1478
+#: mixer_strip.cc:1485
 msgid "Protect Against Denormals"
 msgstr "Protèger contre les dénormalisations"
 
-#: mixer_strip.cc:1484 route_time_axis.cc:426
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 #, fuzzy
 msgid "Remote Control ID..."
 msgstr "Identifiant de contrôleur"
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 msgid "in"
 msgstr "entrée"
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 msgid "post"
 msgstr "post"
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 msgid "out"
 msgstr "sortie"
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr ""
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 #, fuzzy
 msgid "pr"
 msgstr "pré"
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 #, fuzzy
 msgid "po"
 msgstr "p"
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 #, fuzzy
 msgid "o"
 msgstr "Mono"
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr ""
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr "Disque"
 
-#: mixer_strip.cc:1920 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr "AFL"
 
-#: mixer_strip.cc:1923 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr "PFL"
 
-#: mixer_strip.cc:1936
+#: mixer_strip.cc:1933
 #, fuzzy
 msgid "D"
 msgstr "CD"
 
-#: mixer_strip.cc:1959
+#: mixer_strip.cc:1953
 #, fuzzy
 msgid "i"
 msgstr "entrée"
 
-#: mixer_strip.cc:2133
+#: mixer_strip.cc:2128
 #, fuzzy
 msgid "Pre-fader"
 msgstr "Pré-atténuation"
 
-#: mixer_strip.cc:2134
+#: mixer_strip.cc:2129
 #, fuzzy
 msgid "Post-fader"
 msgstr "Post-atténuation"
 
+#: mixer_strip.cc:2166 meter_strip.cc:728
+msgid "Change all in Group to %1"
+msgstr ""
+
+#: mixer_strip.cc:2168 meter_strip.cc:730
+#, fuzzy
+msgid "Change all to %1"
+msgstr "Canal %1"
+
+#: mixer_strip.cc:2170 meter_strip.cc:732
+msgid "Change same track-type to %1"
+msgstr ""
+
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr ""
@@ -7771,10 +7829,69 @@ msgstr ""
 msgid "-all-"
 msgstr "-(tout)-"
 
-#: mixer_ui.cc:1792
+#: mixer_ui.cc:1794
 msgid "Strips"
 msgstr "Tranches"
 
+#: meter_strip.cc:764
+#, fuzzy
+msgid "Variable height"
+msgstr "la hauteur"
+
+#: meter_strip.cc:765
+#, fuzzy
+msgid "Short"
+msgstr "Court"
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr ""
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr ""
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+#, fuzzy
+msgid "VU"
+msgstr "V"
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr "SiP"
@@ -8186,7 +8303,7 @@ msgstr ""
 msgid "Panner (2D)"
 msgstr ""
 
-#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:452
+#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:451
 msgid "Bypass"
 msgstr "Court-circuiter"
 
@@ -8364,7 +8481,7 @@ msgstr "Par catégorie"
 msgid "Eh? LADSPA plugins don't have editors!"
 msgstr "Hein ? Les plugins LADSPA n'ont pas d'éditeur !"
 
-#: plugin_ui.cc:125 plugin_ui.cc:228
+#: plugin_ui.cc:125 plugin_ui.cc:227
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
@@ -8377,7 +8494,7 @@ msgstr ""
 msgid "unknown type of editor-supplying plugin"
 msgstr "type inconnu pour le plugin fournissant un éditeur"
 
-#: plugin_ui.cc:258
+#: plugin_ui.cc:257
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no linuxVST support in this "
@@ -8386,48 +8503,48 @@ msgstr ""
 "type de plugin à éditeur inconnu (note: VST n'est pas pris en charge dans "
 "cette version d'ardour)"
 
-#: plugin_ui.cc:330
+#: plugin_ui.cc:329
 msgid "create_lv2_editor called on non-LV2 plugin"
 msgstr "create_lv2_editor est appelé sur un plugin non LV2"
 
-#: plugin_ui.cc:418
+#: plugin_ui.cc:417
 msgid "Add"
 msgstr "Ajouter"
 
-#: plugin_ui.cc:422
+#: plugin_ui.cc:421
 #, fuzzy
 msgid "Description"
 msgstr "Sélection"
 
-#: plugin_ui.cc:423
+#: plugin_ui.cc:422
 #, fuzzy
 msgid "Plugin analysis"
 msgstr "Plugins"
 
-#: plugin_ui.cc:430
+#: plugin_ui.cc:429
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
 msgstr ""
 
-#: plugin_ui.cc:431
+#: plugin_ui.cc:430
 #, fuzzy
 msgid "Save a new preset"
 msgstr "Nom du nouveau préréglage :"
 
-#: plugin_ui.cc:432
+#: plugin_ui.cc:431
 msgid "Save the current preset"
 msgstr ""
 
-#: plugin_ui.cc:433
+#: plugin_ui.cc:432
 msgid "Delete the current preset"
 msgstr ""
 
-#: plugin_ui.cc:434
+#: plugin_ui.cc:433
 msgid "Disable signal processing by the plugin"
 msgstr ""
 
-#: plugin_ui.cc:467 plugin_ui.cc:632
+#: plugin_ui.cc:466 plugin_ui.cc:662
 msgid ""
 "Click to allow the plugin to receive keyboard events that %1 would normally "
 "use as a shortcut"
@@ -8435,30 +8552,42 @@ msgstr ""
 "Cliquez pour authoriser le plugin à recevoir des évenements que %1 considère "
 "habituellement comme des raccourcis"
 
-#: plugin_ui.cc:468
+#: plugin_ui.cc:467
 msgid "Click to enable/disable this plugin"
 msgstr "Cliquez pour activer/désactiver ce plugin"
 
-#: plugin_ui.cc:507
+#: plugin_ui.cc:506
 #, fuzzy
 msgid "latency (%1 sample)"
 msgid_plural "latency (%1 samples)"
 msgstr[0] "latence (%1 échantillons)"
 msgstr[1] "latence (%1 échantillons)"
 
-#: plugin_ui.cc:509
+#: plugin_ui.cc:508
 msgid "latency (%1 ms)"
 msgstr "Latence (%1 ms)"
 
-#: plugin_ui.cc:520
+#: plugin_ui.cc:519
 msgid "Edit Latency"
 msgstr "Editer la latence"
 
-#: plugin_ui.cc:559
+#: plugin_ui.cc:558
 msgid "Plugin preset %1 not found"
 msgstr "Réglage de plugin « %1 » non trouvé"
 
-#: plugin_ui.cc:639
+#: plugin_ui.cc:595
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin_ui.cc:615 plugin_ui.cc:630
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"newer version"
+msgstr ""
+
+#: plugin_ui.cc:669
 msgid "Click to allow normal use of %1 keyboard shortcuts"
 msgstr "Cliquez pour utiliser les raccourcis claviers de %1"
 
@@ -8564,46 +8693,46 @@ msgstr "Recherche..."
 msgid "Port Insert "
 msgstr "Nom du port"
 
-#: port_matrix.cc:323 port_matrix.cc:342
+#: port_matrix.cc:331 port_matrix.cc:357
 msgid "<b>Sources</b>"
 msgstr "<b>Sources :</b>"
 
-#: port_matrix.cc:324 port_matrix.cc:343
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr "<b>Destinations</b>"
 
-#: port_matrix.cc:419 port_matrix.cc:427
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr "Ajouter %s %s"
 
-#: port_matrix.cc:435
+#: port_matrix.cc:456
 #, c-format
 msgid "Rename '%s'..."
 msgstr "Renommer '%s'..."
 
-#: port_matrix.cc:451
+#: port_matrix.cc:472
 msgid "Remove all"
 msgstr "Tout supprimer"
 
-#: port_matrix.cc:471 port_matrix.cc:483
+#: port_matrix.cc:492 port_matrix.cc:504
 #, c-format
 msgid "%s all"
 msgstr "%s tout"
 
-#: port_matrix.cc:506
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr "Rafraîchir"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr ""
 
-#: port_matrix.cc:514
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr ""
 
-#: port_matrix.cc:702
+#: port_matrix.cc:723
 #, fuzzy
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
@@ -8612,33 +8741,35 @@ msgstr ""
 "Ce port ne peut pas être supprimé, car le premier plugin n'accepte pas le "
 "nouveau nombre d'entrées."
 
-#: port_matrix.cc:705
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr ""
 
-#: port_matrix.cc:727
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr "Suppression de ports non authorisée"
 
-#: port_matrix.cc:728
+#: port_matrix.cc:749
+#, fuzzy
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
 "Ce port ne peut pas être supprimé, car le premier plugin n'accepte pas le "
 "nouveau nombre d'entrées."
 
-#: port_matrix.cc:945
+#: port_matrix.cc:966
 #, c-format
 msgid "Remove '%s'"
 msgstr "Supprimer '%s'"
 
-#: port_matrix.cc:960
+#: port_matrix.cc:981
 #, c-format
 msgid "%s all from '%s'"
 msgstr "%s tout depuis '%s'"
 
-#: port_matrix.cc:1026
+#: port_matrix.cc:1047
 msgid "channel"
 msgstr "canal"
 
@@ -8650,37 +8781,37 @@ msgstr "Il n'y a pas de port à connecter."
 msgid "There are no %1 ports to connect."
 msgstr "Il n'y a pas de port %1 à connecter."
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
 "Alt+double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 msgid "Show All Controls"
 msgstr "Afficher les contrôles"
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 msgid "Hide All Controls"
 msgstr "Cacher tous les contrôles"
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 #, fuzzy
 msgid "on"
 msgstr "Mono"
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr "Off"
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
@@ -8688,15 +8819,15 @@ msgstr ""
 "Clic-droit pour ajouter/enlever/modifier\n"
 "plugins/départs/insertions etc."
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 msgid "Plugin Incompatibility"
 msgstr "Incompatibilité du plugin"
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr "Vous avez essayé d'ajouter le plugin \"%1\" dans la case %2.\n"
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
@@ -8704,19 +8835,19 @@ msgstr ""
 "\n"
 "Ce plugin possède:\n"
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
 msgstr[0] "\t%1 entrée MIDI\n"
 msgstr[1] "\t%1 entrées MIDI\n"
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
 msgstr[0] "\t%1 entrée audio\n"
 msgstr[1] "\t%1 entrées audio\n"
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
@@ -8724,19 +8855,19 @@ msgstr ""
 "\n"
 "mais au point d'insertion, il y a:\n"
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
 msgstr[0] "\t%1 canal MIDI\n"
 msgstr[1] "\t%1 canaux MIDI\n"
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
 msgstr[0] "\t%1 canal audio\n"
 msgstr[1] "\t%1 canaux audio\n"
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
@@ -8744,11 +8875,11 @@ msgstr ""
 "\n"
 "%1 est incapable d'insérer ce plugin ici.\n"
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 msgid "Cannot set up new send: %1"
 msgstr "Impossible e configuer le nouveau départ: %1"
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
 "in that way because the inputs and\n"
@@ -8758,19 +8889,19 @@ msgstr ""
 "de cette façon car les entrées et les sorties\n"
 "ne fonctionneront pas correctement."
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 msgid "Rename Processor"
 msgstr "Renommer le traitement"
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr "Au moins 100 objects IO avec un nom du style %1 - Le nom est inchangé"
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr ""
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
@@ -8780,7 +8911,7 @@ msgstr ""
 "probablement car la configuration d'entrées/sorties des plugins\n"
 "ne correspond pas à la configuration de cette piste."
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 msgid ""
 "Do you really want to remove all processors from %1?\n"
 "(this cannot be undone)"
@@ -8788,15 +8919,15 @@ msgstr ""
 "Voulez-vous vraiment supprimer toutes les redirections de %1 ?\n"
 "Cette action ne pourra pas être annulé!"
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 msgid "Yes, remove them all"
 msgstr "Oui, les supprimer"
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 msgid "Remove processors"
 msgstr "Supprimer les traitements"
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
 "(this cannot be undone)"
@@ -8804,7 +8935,7 @@ msgstr ""
 "Voulez-vous vraiment supprimer toutes les pré-redirections de %1 ?\n"
 "Cette action ne pourra pas être annulé!"
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 #, fuzzy
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
@@ -8813,52 +8944,52 @@ msgstr ""
 "Voulez-vous vraiment supprimer toutes les post-redirections de %1 ?\n"
 "Cette action ne pourra pas être annulé!"
 
-#: processor_box.cc:2198
+#: processor_box.cc:2200
 msgid "New Plugin"
 msgstr "Nouveau plugin"
 
-#: processor_box.cc:2201
+#: processor_box.cc:2203
 msgid "New Insert"
 msgstr "Nouvelle insertion"
 
-#: processor_box.cc:2204
+#: processor_box.cc:2206
 msgid "New External Send ..."
 msgstr "Nouveau départ externe..."
 
-#: processor_box.cc:2208
+#: processor_box.cc:2210
 msgid "New Aux Send ..."
 msgstr "Nouveau départ auxilliaire..."
 
-#: processor_box.cc:2212
+#: processor_box.cc:2214
 msgid "Clear (all)"
 msgstr "Supprimer tout"
 
-#: processor_box.cc:2214
+#: processor_box.cc:2216
 msgid "Clear (pre-fader)"
 msgstr "Supprimer (pré-fader)"
 
-#: processor_box.cc:2216
+#: processor_box.cc:2218
 msgid "Clear (post-fader)"
 msgstr "Supprimer (post-fader)"
 
-#: processor_box.cc:2242
+#: processor_box.cc:2244
 msgid "Activate All"
 msgstr "Activer tous les groupes"
 
-#: processor_box.cc:2244
+#: processor_box.cc:2246
 #, fuzzy
 msgid "Deactivate All"
 msgstr "Désactiver tout"
 
-#: processor_box.cc:2246
+#: processor_box.cc:2248
 msgid "A/B Plugins"
 msgstr "A/B Plugins"
 
-#: processor_box.cc:2255
+#: processor_box.cc:2257
 msgid "Edit with generic controls..."
 msgstr ""
 
-#: processor_box.cc:2531
+#: processor_box.cc:2557
 msgid "%1: %2 (by %3)"
 msgstr "%1: %2 (par %3)"
 
@@ -9022,7 +9153,7 @@ msgstr ""
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
 
 #: rc_option_editor.cc:836
@@ -9115,7 +9246,7 @@ msgstr "Nombre maximum de sessions récentes"
 msgid "Click gain level"
 msgstr "Son du clic:"
 
-#: rc_option_editor.cc:1083 route_time_axis.cc:206 route_time_axis.cc:667
+#: rc_option_editor.cc:1083 route_time_axis.cc:215 route_time_axis.cc:676
 msgid "Automation"
 msgstr "Automation"
 
@@ -9302,96 +9433,100 @@ msgstr ""
 msgid "Show meters on tracks in the editor"
 msgstr "Afficher les VU-mètres sur les pistes"
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr ""
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr "Les régions en groupes d'édition actives sont modifiées ensembles"
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 msgid "whenever they overlap in time"
 msgstr "si elles se chevauchent dans le temps"
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr "seulement si elles partagent longueur, position et origine"
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 #, fuzzy
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr "La sélection élastique colle à la grille"
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 msgid "Show waveforms in regions"
 msgstr "Afficher le signal dans les régions"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 #, fuzzy
 msgid "Show gain envelopes in audio regions"
 msgstr "Afficher le signal dans les régions"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr "dans toutes les modes"
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr "seulement en mode d'édition du gain des régions"
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 msgid "Waveform scale"
 msgstr "Échelle du signal"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "linéaire"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr "logarithmique"
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 msgid "Waveform shape"
 msgstr "Forme du signal"
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 msgid "traditional"
 msgstr "Traditionnel"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 msgid "rectified"
 msgstr "Redressé"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr "Afficher le signal audio pendant l'enregistrement"
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr "Afficher la barre d'outils du zoom"
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr "Appliquer la couleur de la piste aux régions"
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 #, fuzzy
 msgid "Update editor window during drags of the summary"
 msgstr ""
 "Mettre à jour la fenêtre de l'éditeur quand la sommaire subit un cliquer-"
 "glisser"
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 msgid "Synchronise editor and mixer track order"
 msgstr "Ordre des pistes identique entre éditeur et mixage"
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 msgid "Synchronise editor and mixer selection"
 msgstr "Sélection des pistes identique entre éditeur et mixage"
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 msgid "Name new markers"
 msgstr "Nommer les nouveaux repères"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9401,350 +9536,435 @@ msgstr ""
 "Si actif, demander un nom à la création de toute repère nouvelle.\n"
 "Vous pouvez toujours renommer les repères par clic-droit"
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr ""
 "Défilement automatique de l'éditeur pendant un cliquer-glisser près de ses "
 "bords"
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr "Taille du tampon"
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 msgid "Record monitoring handled by"
 msgstr "Monitoring de l'enregistrement géré par"
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 msgid "ardour"
 msgstr "Ardour"
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 msgid "audio hardware"
 msgstr "le matériel audio"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 msgid "Tape machine mode"
 msgstr "Mode bande"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr "Connection des pistes et des bus"
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr "Connection automatique du bus général et des bus de monitoring"
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 msgid "Connect track inputs"
 msgstr "Connecter les entrées des pistes"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 msgid "automatically to physical inputs"
 msgstr "automatiquement aux entrées matérielles"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr "Manuellement"
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 msgid "Connect track and bus outputs"
 msgstr "Connecter les sorties des pistes et des bus"
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 msgid "automatically to physical outputs"
 msgstr "automatiquement aux sorties matérielles"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 msgid "automatically to master bus"
 msgstr "Automatiquement au bus géneral"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 #, fuzzy
 msgid "Denormals"
 msgstr "Dénormaliser"
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 #, fuzzy
 msgid "Use DC bias to protect against denormals"
 msgstr "Protège contre les dénormalisations"
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr "Gestion du traitement"
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr "Aucune gestion"
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 #, fuzzy
 msgid "use FlushToZero"
 msgstr "Utiliser FlushToZero"
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr "Utiliser DenormalsAreZero"
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 #, fuzzy
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr "Utiliser FlushToZero et DenormalsAreZero"
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 #, fuzzy
 msgid "Silence plugins when the transport is stopped"
 msgstr "Arrêt des plugins lors des déplacements"
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr "Activer les nouveaux plugins"
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr "Activer l'analyse automatique de l'audio"
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 msgid "Replicate missing region channels"
 msgstr "Dupliquer les canaux manquants dans la région"
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 msgid "Solo / mute"
 msgstr "Solo/muet"
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 #, fuzzy
 msgid "Solo-in-place mute cut (dB)"
 msgstr "Diminution du volume en mode solo (dB)"
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr ""
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 #, fuzzy
 msgid "Listen Position"
 msgstr "position"
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 #, fuzzy
 msgid "after-fader (AFL)"
 msgstr "Écoute post-fader"
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 #, fuzzy
 msgid "pre-fader (PFL)"
 msgstr "Écoute pré-fader"
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr "Les signaux PFL sont récupérés"
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 msgid "before pre-fader processors"
 msgstr "avant les traitements pré-fader"
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr "après les traitements pré-fader"
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr "Les signaux AFL sont récupérés"
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 msgid "immediately post-fader"
 msgstr "immédiatement post-fader"
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 msgid "after post-fader processors (before pan)"
 msgstr "après les traitements post-fader (avant panoramique)"
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr "Solo exclusif"
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 msgid "Show solo muting"
 msgstr "Le solo montre les sourdines"
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr "\"Solo\" annule \"Muet\""
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 msgid "Default track / bus muting options"
 msgstr "Options de mutisation par défaut des pistes/bus"
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr "\"Muet\" agit sur les départs pré-fader"
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr "\"Muet\" agit sur les départs post-fader"
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 msgid "Mute affects control outputs"
 msgstr "\"Muet\" agit sur les sorties de contrôle"
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr "\"Muet\" agit sur les sorties principales"
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 msgid "Send MIDI Time Code"
 msgstr "Envoyer MTC (Midi Time Code)"
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr "Obeir aux MMC MIDI (MIDI Machine Controls)"
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr "Envoyer les MMC MIDI"
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 #, fuzzy
 msgid "Send MIDI control feedback"
 msgstr "Envoi des réponses MIDI"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr "identifiant de l'appareil MMC en entrée"
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr "identifiant de l'appareil MMC en sortie"
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr ""
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr "Afficher le premier programme/banque MIDI comme 0."
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr "Ne jamais afficher des messages MIDI périodiques (MTC, MIDI Clock)"
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 msgid "Sound MIDI notes as they are selected"
 msgstr ""
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 msgid "User interaction"
 msgstr "Intération utilisateur"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
 "   <i>(if available for your language preferences)</i>"
 msgstr ""
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr "Clavier"
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 msgid "Control surface remote ID"
 msgstr "Identifiant distant de la surface de contrôle"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 msgid "assigned by user"
 msgstr "assigné manuellement"
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr "suivre l'ordre de la console de mixage"
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr "suivre l'ordre de l'Éditeur"
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1925
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 #, fuzzy
 msgid "Preferences|GUI"
 msgstr "Préférences"
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr ""
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr "Montrer des infobulles quand la souris survole une contrôle"
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr "IHM"
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr ""
 "Mettre à jour l'horloge du transport tous les 40ms au lieu de tous les 100ms"
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 #, fuzzy
 msgid "Mixer Strip"
 msgstr "Mixage"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 msgid "Use narrow strips in the mixer by default"
 msgstr "Utiliser des tranches de mixage étroites par défaut"
 
-#: rc_option_editor.cc:1898
-msgid "Meter hold time"
+#: rc_option_editor.cc:1906
+#, fuzzy
+msgid "Peak hold time"
 msgstr "Maintien de la crête de VU-mètre"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 msgid "short"
 msgstr "Court"
 
-#: rc_option_editor.cc:1905 rc_option_editor.cc:1920
+#: rc_option_editor.cc:1913
 #, fuzzy
 msgid "medium"
 msgstr "Moyen"
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr "Long"
 
-#: rc_option_editor.cc:1912
-msgid "Meter fall-off"
+#: rc_option_editor.cc:1920
+#, fuzzy
+msgid "DPM fall-off"
 msgstr "Taux de chute du VU-mètre"
 
-#: rc_option_editor.cc:1918
-msgid "slowest"
-msgstr "Très lent"
+#: rc_option_editor.cc:1926
+msgid "slowest [6.6dB/sec]"
+msgstr ""
 
-#: rc_option_editor.cc:1919
-msgid "slow"
-msgstr "Lent"
+#: rc_option_editor.cc:1927
+msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
+msgstr ""
 
-#: rc_option_editor.cc:1921
-msgid "fast"
-msgstr "Rapide"
+#: rc_option_editor.cc:1928
+msgid "slowish [12.0dB/sec] (DIN)"
+msgstr ""
 
-#: rc_option_editor.cc:1922
-msgid "faster"
-msgstr "Très rapide"
+#: rc_option_editor.cc:1929
+msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
+msgstr ""
 
-#: rc_option_editor.cc:1923
-msgid "fastest"
-msgstr "Ultra rapide"
+#: rc_option_editor.cc:1930
+msgid "medium [20dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1931
+msgid "fast [32dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1932
+msgid "faster [46dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1933
+msgid "fastest [70dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1939
+msgid "Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
+
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+msgid "-20dBFS (SMPTE RP.0155)"
+msgstr ""
+
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+msgid "-18dBFS (EBU, BBC)"
+msgstr ""
+
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
+
+#: rc_option_editor.cc:1955
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
+msgstr ""
+
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
+msgstr ""
+
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
+msgstr ""
+
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
+
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
+
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1985
+#, fuzzy
+msgid "Peak threshold [dBFS]"
+msgstr "Seuil de pic"
+
+#: rc_option_editor.cc:1993
+msgid ""
+"Specify the audio signal level in dbFS at and above which the meter-peak "
+"indicator will flash red."
+msgstr ""
+
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
+msgstr ""
 
 #: region_editor.cc:79
 msgid "audition this region"
@@ -9754,11 +9974,11 @@ msgstr "écouter cette région"
 msgid "Position:"
 msgstr "Position:"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr "Fin:"
 
-#: region_editor.cc:92 sfdb_ui.cc:140
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr "Longueur:"
 
@@ -9783,23 +10003,23 @@ msgstr "Sources:"
 msgid "Source:"
 msgstr "Source:"
 
-#: region_editor.cc:167
+#: region_editor.cc:166
 msgid "Region '%1'"
 msgstr "Région '%1'"
 
-#: region_editor.cc:274
+#: region_editor.cc:273
 msgid "change region start position"
 msgstr "changer le début de la région"
 
-#: region_editor.cc:290
+#: region_editor.cc:289
 msgid "change region end position"
 msgstr "changer la fin de la région"
 
-#: region_editor.cc:310
+#: region_editor.cc:309
 msgid "change region length"
 msgstr "changer la longueur de la région"
 
-#: region_editor.cc:404 region_editor.cc:416
+#: region_editor.cc:403 region_editor.cc:415
 #, fuzzy
 msgid "change region sync point"
 msgstr "changer la fin de la région"
@@ -9993,332 +10213,332 @@ msgid ""
 "A route group of this name already exists.  Please use a different name."
 msgstr "Ce nom a déjà été donné à un groupe. Choisissez-en un nouveau."
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 msgid "Tracks/Busses"
 msgstr "Pistes / Bus"
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr "Entrées"
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr "Sorties"
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr "Plugins, inserts et retours"
 
-#: route_params_ui.cc:211
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr ""
 "élément de liste d'affichage de route pour la route renommée introuvable !"
 
-#: route_params_ui.cc:258 route_params_ui.cc:286
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr "Délai de lecture: %<PRId64> échantillons"
 
-#: route_params_ui.cc:478
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr "PAS DE PISTE"
 
-#: route_params_ui.cc:611 route_params_ui.cc:612
+#: route_params_ui.cc:613 route_params_ui.cc:614
 msgid "No Track or Bus Selected"
 msgstr "Aucune piste ou bus sélectionné"
 
-#: route_time_axis.cc:96
+#: route_time_axis.cc:97
 msgid "g"
 msgstr "g"
 
-#: route_time_axis.cc:97
+#: route_time_axis.cc:98
 msgid "p"
 msgstr "p"
 
-#: route_time_axis.cc:98
+#: route_time_axis.cc:99
 msgid "a"
 msgstr "a"
 
-#: route_time_axis.cc:168
+#: route_time_axis.cc:173
 msgid "Record (Right-click for Step Edit)"
 msgstr ""
 
-#: route_time_axis.cc:171
+#: route_time_axis.cc:176
 msgid "Record"
 msgstr "Enregistrement"
 
-#: route_time_axis.cc:201
+#: route_time_axis.cc:210
 msgid "Route Group"
 msgstr "Groupe"
 
-#: route_time_axis.cc:204
+#: route_time_axis.cc:213
 #, fuzzy
 msgid "MIDI Controllers and Automation"
 msgstr "pour dessiner la courbe de gain"
 
-#: route_time_axis.cc:381
+#: route_time_axis.cc:390
 msgid "Show All Automation"
 msgstr "Afficher toute l'automation"
 
-#: route_time_axis.cc:384
+#: route_time_axis.cc:393
 msgid "Show Existing Automation"
 msgstr "Afficher l'automation existante"
 
-#: route_time_axis.cc:387
+#: route_time_axis.cc:396
 msgid "Hide All Automation"
 msgstr "Cacher toute l'automation"
 
-#: route_time_axis.cc:396
+#: route_time_axis.cc:405
 msgid "Processor automation"
 msgstr "Afficher automation du ..."
 
-#: route_time_axis.cc:415
+#: route_time_axis.cc:424
 msgid "Color..."
 msgstr "Couleur..."
 
-#: route_time_axis.cc:472
+#: route_time_axis.cc:481
 msgid "Overlaid"
 msgstr ""
 
-#: route_time_axis.cc:478
+#: route_time_axis.cc:487
 msgid "Stacked"
 msgstr "Empilés"
 
-#: route_time_axis.cc:486
+#: route_time_axis.cc:495
 #, fuzzy
 msgid "Layers"
 msgstr "Couche n°"
 
-#: route_time_axis.cc:555
+#: route_time_axis.cc:564
 msgid "Automatic (based on I/O connections)"
 msgstr "Automatique (à partir des connections I/O)"
 
-#: route_time_axis.cc:564
+#: route_time_axis.cc:573
 msgid "(Currently: Existing Material)"
 msgstr ""
 
-#: route_time_axis.cc:567
+#: route_time_axis.cc:576
 msgid "(Currently: Capture Time)"
 msgstr ""
 
-#: route_time_axis.cc:575
+#: route_time_axis.cc:584
 #, fuzzy
 msgid "Align With Existing Material"
 msgstr "aligner avec le contenu actuel"
 
-#: route_time_axis.cc:580
+#: route_time_axis.cc:589
 #, fuzzy
 msgid "Align With Capture Time"
 msgstr "aligner avec l'enregistrement"
 
-#: route_time_axis.cc:585
+#: route_time_axis.cc:594
 msgid "Alignment"
 msgstr "Alignement"
 
-#: route_time_axis.cc:620
+#: route_time_axis.cc:629
 msgid "Normal Mode"
 msgstr "Mode normal"
 
-#: route_time_axis.cc:626
+#: route_time_axis.cc:635
 msgid "Tape Mode"
 msgstr "Mode bande"
 
-#: route_time_axis.cc:632
+#: route_time_axis.cc:641
 msgid "Non-Layered Mode"
 msgstr "Mode sans chevauchement"
 
-#: route_time_axis.cc:645 route_time_axis.cc:1587
+#: route_time_axis.cc:654 route_time_axis.cc:1601
 msgid "Playlist"
 msgstr "Liste de lecture"
 
-#: route_time_axis.cc:965
+#: route_time_axis.cc:979
 msgid "Rename Playlist"
 msgstr "Renommer la liste de lecture"
 
-#: route_time_axis.cc:966
+#: route_time_axis.cc:980
 msgid "New name for playlist:"
 msgstr "Nouveau nom de la liste de lecture:"
 
-#: route_time_axis.cc:1051
+#: route_time_axis.cc:1065
 msgid "New Copy Playlist"
 msgstr "Nouvelle copie de la liste de lecture"
 
-#: route_time_axis.cc:1052 route_time_axis.cc:1105
+#: route_time_axis.cc:1066 route_time_axis.cc:1119
 msgid "Name for new playlist:"
 msgstr "Nom de la nouvelle liste de lecture:"
 
-#: route_time_axis.cc:1104
+#: route_time_axis.cc:1118
 msgid "New Playlist"
 msgstr "Nouvelle liste de lecture"
 
-#: route_time_axis.cc:1295
+#: route_time_axis.cc:1309
 msgid "You cannot create a track with that name as it is reserved for %1"
 msgstr "Vous ne pouvez pas créer une piste avec ce nom, il est réservé pour %1"
 
-#: route_time_axis.cc:1476
+#: route_time_axis.cc:1490
 msgid "New Copy..."
 msgstr "Nouvelle copie..."
 
-#: route_time_axis.cc:1480
+#: route_time_axis.cc:1494
 msgid "New Take"
 msgstr "Nouvelle prise"
 
-#: route_time_axis.cc:1481
+#: route_time_axis.cc:1495
 msgid "Copy Take"
 msgstr "Copier la prise"
 
-#: route_time_axis.cc:1486
+#: route_time_axis.cc:1500
 msgid "Clear Current"
 msgstr "Effacer actuelle"
 
-#: route_time_axis.cc:1489
+#: route_time_axis.cc:1503
 #, fuzzy
 msgid "Select From All..."
 msgstr "Choisir..."
 
-#: route_time_axis.cc:1577
+#: route_time_axis.cc:1591
 msgid "Take: %1.%2"
 msgstr "Prise: %1.%2"
 
-#: route_time_axis.cc:2267
+#: route_time_axis.cc:2291
 msgid "Underlays"
 msgstr ""
 
-#: route_time_axis.cc:2270
+#: route_time_axis.cc:2294
 msgid "Remove \"%1\""
 msgstr "Supprimer \"%1\""
 
-#: route_time_axis.cc:2320 route_time_axis.cc:2357
+#: route_time_axis.cc:2344 route_time_axis.cc:2381
 msgid "programming error: underlay reference pointer pairs are inconsistent!"
 msgstr "programming error: underlay reference pointer pairs are inconsistent!"
 
-#: route_time_axis.cc:2388
+#: route_time_axis.cc:2408
 #, fuzzy
 msgid "After-fade listen (AFL)"
 msgstr "Écoute post-fader"
 
-#: route_time_axis.cc:2392
+#: route_time_axis.cc:2412
 #, fuzzy
 msgid "Pre-fade listen (PFL)"
 msgstr "Écoute pré-fader"
 
-#: route_time_axis.cc:2396
+#: route_time_axis.cc:2416
 msgid "s"
 msgstr "s"
 
-#: route_time_axis.cc:2400
+#: route_time_axis.cc:2419
 msgid "m"
 msgstr "m"
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 msgid "Mute this track"
 msgstr "Rendre la piste muette"
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr "Rendre les autres pistes (non-solo) muettes"
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr "Activer l'enregistrement sur cette piste"
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr ""
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 msgid "Monitor input"
 msgstr "Monitoring du son qui entre"
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 msgid "Monitor playback"
 msgstr "Monitoring du son enregistré"
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 msgid "Not connected to JACK - cannot engage record"
 msgstr "Non connecté à JACK – impossible d'enclencher l'enregistrement"
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 #, fuzzy
 msgid "Step Entry"
 msgstr "vers le point d'édition"
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr ""
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 #, fuzzy
 msgid "Assign all tracks and buses (prefader)"
 msgstr "ajouter aux pistes sélectionnées (pré-fader)"
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr ""
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 #, fuzzy
 msgid "Assign all tracks and buses (postfader)"
 msgstr "ajouter aux pistes sélectionnées (post-fader)"
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 #, fuzzy
 msgid "Assign selected tracks (prefader)"
 msgstr "ajouter aux pistes sélectionnées (pré-fader)"
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 #, fuzzy
 msgid "Assign selected tracks and buses (prefader)"
 msgstr "ajouter aux pistes sélectionnées (pré-fader)"
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 #, fuzzy
 msgid "Assign selected tracks (postfader)"
 msgstr "ajouter aux pistes sélectionnées (post-fader)"
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 #, fuzzy
 msgid "Assign selected tracks and buses (postfader)"
 msgstr "ajouter aux pistes sélectionnées (post-fader)"
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 #, fuzzy
 msgid "Copy track/bus gains to sends"
 msgstr "Copier gains de piste/bus vers les départs"
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr "Régler gain des départs à -inf"
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr "Régler gain des départs à 0dB"
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 msgid "Solo Isolate"
 msgstr "Isoler le solo"
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr "Pré-atténuation"
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr "Post-atténuation"
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr "Sorties de contrôle"
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr "Sorties principales"
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 msgid "Color Selection"
 msgstr "Couleur de la sélection"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "\n"
@@ -10333,7 +10553,7 @@ msgstr ""
 "(Cette action ne pourra pas être annulée, et le fichier de session sera "
 "écrasé)"
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
 "\n"
@@ -10343,15 +10563,15 @@ msgstr ""
 "\n"
 "(Cette action ne pourra pas être annulé!)"
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 msgid "Remove track"
 msgstr "Supprimer la piste"
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 msgid "Remove bus"
 msgstr "Supprimer le bus"
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
@@ -10359,48 +10579,48 @@ msgstr ""
 "Il est déconseillé d'utiliser le caractère ':' pour les pistes et les bus.\n"
 "Voulez-vous tout de même utiliser ce nom?"
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 #, fuzzy
 msgid "Use the new name"
 msgstr "nouveau nom :"
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 msgid "Re-edit the name"
 msgstr ""
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 msgid "Rename Track"
 msgstr "Renommer la piste"
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 msgid "Rename Bus"
 msgstr "Renommer le bus"
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 msgid " latency"
 msgstr " latence"
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr ""
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 msgid "Save As Template"
 msgstr "Enregistrer comme modèle"
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 msgid "Template name:"
 msgstr "Nom du modèle de session :"
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 msgid "Remote Control ID"
 msgstr "Identifiant de contrôleur"
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 msgid "Remote control ID:"
 msgstr "Identifiant de contrôleur"
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -10408,17 +10628,17 @@ msgid ""
 "The remote control ID of %3 cannot be changed."
 msgstr ""
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the master bus"
 msgstr "Bus de sortie à"
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the monitor bus"
 msgstr "Bus de sortie à"
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -10429,17 +10649,17 @@ msgid ""
 "change this%5"
 msgstr ""
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the mixer"
 msgstr "Remixeur"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the editor"
 msgstr "éditeur"
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
@@ -10447,7 +10667,7 @@ msgstr ""
 "Clic gauche pour inverser la phase du canal %1 de cette piste. Clic droit "
 "pour afficher le menu."
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr ""
 
@@ -10463,7 +10683,7 @@ msgstr "Cliquez pour ajouter un nouveau dossier"
 msgid "the session folder"
 msgstr "dossier de la session"
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 msgid "Send "
 msgstr "Départ "
 
@@ -10951,51 +11171,107 @@ msgstr "Coller les nouveaux marqueurs aux mesures/temps"
 msgid "Glue new regions to bars and beats"
 msgstr "Coller les nouvelles régions aux mesures/temps"
 
-#: sfdb_ui.cc:87 sfdb_ui.cc:107 sfdb_ui.cc:116
+#: session_option_editor.cc:275 session_option_editor.cc:277
+#: session_option_editor.cc:284 session_option_editor.cc:291
+#: session_option_editor.cc:298 session_option_editor.cc:300
+#: session_option_editor.cc:307 session_option_editor.cc:314
+#: session_option_editor.cc:321 session_option_editor.cc:323
+#, fuzzy
+msgid "Meterbridge"
+msgstr "VU-mètre"
+
+#: session_option_editor.cc:275
+msgid "Route Display"
+msgstr ""
+
+#: session_option_editor.cc:279
+#, fuzzy
+msgid "Show Midi Tracks"
+msgstr "Afficher toutes les pistes MIDI"
+
+#: session_option_editor.cc:286
+#, fuzzy
+msgid "Show Busses"
+msgstr "Bus"
+
+#: session_option_editor.cc:293
+#, fuzzy
+msgid "Include Master Bus"
+msgstr "Bus de sortie à"
+
+#: session_option_editor.cc:298
+msgid "Button Area"
+msgstr ""
+
+#: session_option_editor.cc:302
+#, fuzzy
+msgid "Rec-enable Button"
+msgstr "(dés)activation d'enregistrement"
+
+#: session_option_editor.cc:309
+#, fuzzy
+msgid "Mute Button"
+msgstr "avec le bouton de la souris n°"
+
+#: session_option_editor.cc:316
+#, fuzzy
+msgid "Solo Button"
+msgstr "Gain Solo"
+
+#: session_option_editor.cc:321
+msgid "Name Labels"
+msgstr ""
+
+#: session_option_editor.cc:325
+#, fuzzy
+msgid "Track Name"
+msgstr "Nom de piste/bus"
+
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 msgid "as new tracks"
 msgstr "comme nouvelles pistes"
 
-#: sfdb_ui.cc:89 sfdb_ui.cc:109
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 msgid "to selected tracks"
 msgstr "aux pistes sélectionnées"
 
-#: sfdb_ui.cc:91 sfdb_ui.cc:111
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 msgid "to region list"
 msgstr "à la liste des régions"
 
-#: sfdb_ui.cc:93 sfdb_ui.cc:113
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 msgid "as new tape tracks"
 msgstr "comme nouvelles pistes bandes"
 
-#: sfdb_ui.cc:97
+#: sfdb_ui.cc:96
 msgid "programming error: unknown import mode string %1"
 msgstr "programming error: unknown import mode string %1"
 
-#: sfdb_ui.cc:124
+#: sfdb_ui.cc:123
 msgid "Auto-play"
 msgstr "Lecture auto"
 
-#: sfdb_ui.cc:130 sfdb_ui.cc:237
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 msgid "<b>Sound File Information</b>"
 msgstr "<b>Informations sur le fichier audio</b>"
 
-#: sfdb_ui.cc:142
+#: sfdb_ui.cc:141
 msgid "Timestamp:"
 msgstr "Horodatage:"
 
-#: sfdb_ui.cc:144
+#: sfdb_ui.cc:143
 msgid "Format:"
 msgstr "Format:"
 
-#: sfdb_ui.cc:183 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr "Tags:"
 
-#: sfdb_ui.cc:320
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr "L'écoute des fichiers MIDI n'est pas encore disponible"
 
-#: sfdb_ui.cc:327
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "Impossible de lire le fichier « %1 » (%2)."
 
@@ -11023,11 +11299,11 @@ msgstr "Audio"
 msgid "MIDI files"
 msgstr "Fichiers MIDI"
 
-#: sfdb_ui.cc:458 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 msgid "All files"
 msgstr "Tout"
 
-#: sfdb_ui.cc:477 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 msgid "Browse Files"
 msgstr "Parcours des fichiers"
 
@@ -11035,171 +11311,159 @@ msgstr "Parcours des fichiers"
 msgid "Paths"
 msgstr "Chemins"
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr "Recherche de tags"
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 msgid "Sort:"
 msgstr "Trier:"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 msgid "Longest"
 msgstr "Les plus longs"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 msgid "Shortest"
 msgstr "Les plus cours"
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 msgid "Newest"
 msgstr "Les plus récents"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr "Les plus vieux"
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr "Les plus téléchargés"
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 msgid "Least downloaded"
 msgstr "Les moins téléchargés"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr "Les mieux notés"
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr "Les moins bien notés"
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr ""
 
-#: sfdb_ui.cc:572
+#: sfdb_ui.cc:555
+msgid "Similar"
+msgstr ""
+
+#: sfdb_ui.cc:567
 msgid "ID"
 msgstr "ID"
 
-#: sfdb_ui.cc:573 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 msgid "Filename"
 msgstr "Nom du fichier "
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:570
 #, fuzzy
 msgid "Duration"
 msgstr "durée (s)"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:571
 #, fuzzy
 msgid "Size"
 msgstr "taille max"
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:572
 msgid "Samplerate"
 msgstr "Taux d'échantillonnage"
 
-#: sfdb_ui.cc:578
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr ""
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr "Rechercher sur Freesound"
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr ""
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr ""
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr "Cliquez pour fermer cette fenêtre sans importer de fichiers"
 
-#: sfdb_ui.cc:846
-msgid "found %1 match"
-msgid_plural "found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:862
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr "SoundFileBrowser: Could not tokenize string: "
 
-#: sfdb_ui.cc:960
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sfdb_ui.cc:965
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr ""
 
-#: sfdb_ui.cc:1029
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr "B"
 
-#: sfdb_ui.cc:1031
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr "kB"
 
-#: sfdb_ui.cc:1033 sfdb_ui.cc:1035
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr "MB"
 
-#: sfdb_ui.cc:1037
+#: sfdb_ui.cc:1086
 msgid "GB"
 msgstr "GB"
 
-#: sfdb_ui.cc:1070
-msgid "Search returned no results."
-msgstr "La recherche n'a pas retourné de résultats."
-
-#: sfdb_ui.cc:1072
-msgid "Found %1 match"
-msgid_plural "Found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:1277 sfdb_ui.cc:1585 sfdb_ui.cc:1635 sfdb_ui.cc:1653
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr "une piste par fichier"
 
-#: sfdb_ui.cc:1280 sfdb_ui.cc:1636 sfdb_ui.cc:1654
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 msgid "one track per channel"
 msgstr "une piste par canal"
 
-#: sfdb_ui.cc:1288 sfdb_ui.cc:1638 sfdb_ui.cc:1655
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 msgid "sequence files"
 msgstr "régions alignées"
 
-#: sfdb_ui.cc:1291 sfdb_ui.cc:1643
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 msgid "all files in one track"
 msgstr "tous les fichiers dans une piste"
 
-#: sfdb_ui.cc:1292 sfdb_ui.cc:1637
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 msgid "merge files"
 msgstr "fusionner les fichiers"
 
-#: sfdb_ui.cc:1298 sfdb_ui.cc:1640
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 msgid "one region per file"
 msgstr "une région par fichier"
 
-#: sfdb_ui.cc:1301 sfdb_ui.cc:1641
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 msgid "one region per channel"
 msgstr "une région par voie"
 
-#: sfdb_ui.cc:1306 sfdb_ui.cc:1642 sfdb_ui.cc:1656
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 msgid "all files in one region"
 msgstr "tout dans une région"
 
-#: sfdb_ui.cc:1373
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
@@ -11207,56 +11471,56 @@ msgstr ""
 "Un des fichiers sélectionnés\n"
 "ne peut pas être utilisé par %1"
 
-#: sfdb_ui.cc:1513
+#: sfdb_ui.cc:1534
 msgid "Copy files to session"
 msgstr "Copier les fichiers vers le dossier de session"
 
-#: sfdb_ui.cc:1530 sfdb_ui.cc:1693
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 msgid "file timestamp"
 msgstr "utiliser l'horodatage du fichier"
 
-#: sfdb_ui.cc:1531 sfdb_ui.cc:1695
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 msgid "edit point"
 msgstr "Point d'édition"
 
-#: sfdb_ui.cc:1532 sfdb_ui.cc:1697
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 msgid "playhead"
 msgstr "tête de lecture"
 
-#: sfdb_ui.cc:1533
+#: sfdb_ui.cc:1554
 #, fuzzy
 msgid "session start"
 msgstr "sur le début de la session"
 
-#: sfdb_ui.cc:1538
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1581
 msgid "<b>Insert at</b>"
 msgstr "<b>Insérer</b>"
 
-#: sfdb_ui.cc:1573
+#: sfdb_ui.cc:1594
 msgid "<b>Mapping</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1591
+#: sfdb_ui.cc:1612
 msgid "<b>Conversion quality</b>"
 msgstr "<b>Qualité de la conversion</b>"
 
-#: sfdb_ui.cc:1603 sfdb_ui.cc:1709
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr "Excellente"
 
-#: sfdb_ui.cc:1604 sfdb_ui.cc:1711
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr "Bonne"
 
-#: sfdb_ui.cc:1605 sfdb_ui.cc:1713
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr "Rapide"
 
-#: sfdb_ui.cc:1607
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "Très rapide"
 
@@ -11344,22 +11608,23 @@ msgid "I'd like more options for this session"
 msgstr "Je souhaite avoir accès à plus d'options"
 
 #: startup.cc:194
+#, fuzzy
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -11517,10 +11782,6 @@ msgstr ""
 msgid "Click to open the program website in your web browser"
 msgstr ""
 
-#: startup.cc:594
-msgid "What would you like to do ?"
-msgstr "Que voulez-vous faire?"
-
 #: startup.cc:729
 msgid "Open"
 msgstr "Ouvrir"
@@ -11533,83 +11794,83 @@ msgstr "Nom de la session:"
 msgid "Create session folder in:"
 msgstr "Créer le dossier dans:"
 
-#: startup.cc:813
+#: startup.cc:821
 msgid "Select folder for session"
 msgstr "Choisir le dossier de session"
 
-#: startup.cc:845
+#: startup.cc:853
 msgid "Use this template"
 msgstr "Choix du modèle"
 
-#: startup.cc:848
+#: startup.cc:856
 msgid "no template"
 msgstr "Pas de modèle"
 
-#: startup.cc:876
+#: startup.cc:884
 msgid "Use an existing session as a template:"
 msgstr "Utiliser une session existante comme modèle"
 
-#: startup.cc:888
+#: startup.cc:896
 msgid "Select template"
 msgstr "Choisir le modèle"
 
-#: startup.cc:914
+#: startup.cc:922
 msgid "New Session"
 msgstr "Créer une session"
 
-#: startup.cc:1068
+#: startup.cc:1077
 msgid "Select session file"
 msgstr "Sélection de la session"
 
-#: startup.cc:1084
+#: startup.cc:1093
 msgid "Browse:"
 msgstr "Autre session:"
 
-#: startup.cc:1093
+#: startup.cc:1102
 msgid "Select a session"
 msgstr "Sélectionner une session"
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 msgid "channels"
 msgstr "canaux"
 
-#: startup.cc:1135
+#: startup.cc:1145
 msgid "<b>Busses</b>"
 msgstr "<b>Bus:</b>"
 
-#: startup.cc:1136
+#: startup.cc:1146
 msgid "<b>Inputs</b>"
 msgstr "<b>Entrées:</b>"
 
-#: startup.cc:1137
+#: startup.cc:1147
 msgid "<b>Outputs</b>"
 msgstr "<b>Sorties:</b>"
 
-#: startup.cc:1145
+#: startup.cc:1155
 msgid "Create master bus"
 msgstr "Bus de sortie à"
 
-#: startup.cc:1155
+#: startup.cc:1165
 msgid "Automatically connect to physical inputs"
 msgstr "Se connecter aux entrées matérielles automatiquement"
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr "Utiliser seulement"
 
-#: startup.cc:1215
+#: startup.cc:1225
 msgid "Automatically connect outputs"
 msgstr "Se connecter aux sorties automatiquement"
 
-#: startup.cc:1237
+#: startup.cc:1247
 msgid "... to master bus"
 msgstr "...au bus général"
 
-#: startup.cc:1247
+#: startup.cc:1257
 msgid "... to physical outputs"
 msgstr "... aux sorties matérielles"
 
-#: startup.cc:1297
+#: startup.cc:1307
 msgid "Advanced Session Options"
 msgstr "Options avancées de session"
 
@@ -12302,19 +12563,19 @@ msgstr "Fichier de configuration \"%1\" non enregistré"
 msgid "bad XPM header %1"
 msgstr "mauvais entête XPM %1"
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr "style RGBA manquant pour « %1 »"
 
-#: utils.cc:544
+#: utils.cc:591
 msgid "cannot find XPM file for %1"
 msgstr "impossible de trouver le fichier XMP pour %1"
 
-#: utils.cc:570
+#: utils.cc:617
 msgid "cannot find icon image for %1 using %2"
 msgstr "Impossible de trouver l'icône pour %1 avec %2"
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr ""
 
@@ -12322,85 +12583,87 @@ msgstr ""
 msgid "VerboseCanvasCursor"
 msgstr "VerboseCanvasCursor"
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 #, fuzzy
 msgid "Set Video Track"
 msgstr "Ajouter une piste audio"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 #, fuzzy
 msgid "Launch External Video Monitor"
 msgstr "Afficher le monitoring vidéo"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr ""
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr ""
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 #, fuzzy
 msgid "Video files"
 msgstr "Audio"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 #, fuzzy
 msgid "<b>Video Information</b>"
 msgstr "<b>Informations sur le fichier audio</b>"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 #, fuzzy
 msgid "Start:"
 msgstr "Démarrer"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 #, fuzzy
 msgid "Frame rate:"
 msgstr "Échantillonnage:"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr ""
 
-#: editor_videotimeline.cc:138
+#: editor_videotimeline.cc:146
 #, fuzzy
 msgid "Export Successful: %1"
 msgstr "Export MIDI: %1"
 
-#: video_timeline.cc:467
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:501
-msgid "Failed to set session-framerate: "
-msgstr ""
-
-#: video_timeline.cc:501
-msgid " does not have a corresponding option setting in Ardour."
+#: video_timeline.cc:507
+msgid ""
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:507
+#: video_timeline.cc:515
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:508
-msgid " vs "
+#: video_timeline.cc:588
+msgid ""
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:690
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12408,17 +12671,17 @@ msgid ""
 "xjadeo's remote-control interface 'xjremote')."
 msgstr ""
 
-#: video_monitor.cc:282
+#: video_monitor.cc:281
 msgid "Video Monitor: File Not Found."
 msgstr ""
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -12428,379 +12691,388 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 #, fuzzy
 msgid "Transcode/Import Video File "
 msgstr "Exporter vers un fichier video..."
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 #, fuzzy
 msgid "Output File:"
 msgstr "Interface de sortie:"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr ""
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 #, fuzzy
 msgid "Height = "
 msgstr "Hauteur"
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr ""
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 #, fuzzy
 msgid "<b>File Information</b>"
 msgstr "<b>Informations sur le fichier audio</b>"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr ""
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 #, fuzzy
 msgid "Duration:"
 msgstr "durée (s)"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr ""
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr ""
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 #, fuzzy
 msgid "??"
 msgstr "???"
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 #, fuzzy
 msgid "<b>Import Settings</b>"
 msgstr "<b>Options</b>"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr ""
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr ""
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 #, fuzzy
 msgid "Import/Transcode Video to Session"
 msgstr "Importer depuis une session"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr ""
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 msgid "Original Width"
 msgstr ""
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr ""
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 #, fuzzy
 msgid "Extract Audio:"
 msgstr "Exporter la région"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 #, fuzzy
 msgid "Extracting Audio.."
 msgstr "Exporter la région"
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr ""
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 #, fuzzy
 msgid "Transcoding Failed."
 msgstr "Traduction activés"
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 #, fuzzy
 msgid "Save Transcoded Video File"
 msgstr "Exporter vers un fichier video..."
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr ""
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr ""
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 #, fuzzy
 msgid "Server Docroot:"
 msgstr "Serveur:"
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr ""
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 #, fuzzy
 msgid "Listen Port:"
 msgstr "position"
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 #, fuzzy
 msgid "Cache Size:"
 msgstr "taille max"
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr ""
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr ""
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 #, fuzzy
 msgid "Confirm Overwrite"
 msgstr "Confirmer l'écrasement du cliché"
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 #, fuzzy
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr "Un cliché de ce nom existe déjà. Voulez-vous l'écraser ?"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 #, fuzzy
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr "impossible de créer le fichier ardour de l'utilisateur %1 (%2)"
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 #, fuzzy
 msgid "Export Video File "
 msgstr "Exporter vers un fichier video..."
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 #, fuzzy
 msgid "Video:"
 msgstr "Mike Start"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr ""
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr ""
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 #, fuzzy
 msgid "Normalize Audio"
 msgstr "Normaliser à:"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr ""
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr ""
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 #, fuzzy
 msgid "Deinterlace"
 msgstr "Centrer sur la tête de lecture"
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr ""
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 #, fuzzy
 msgid "Include Session Metadata"
 msgstr "Éditer les méta-données de la session"
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr ""
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 #, fuzzy
 msgid "<b>Output:</b>"
 msgstr "<b>Sorties:</b>"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 #, fuzzy
 msgid "<b>Input:</b>"
 msgstr "<b>Entrées:</b>"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 #, fuzzy
 msgid "Audio:"
 msgstr "Audio"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 #, fuzzy
 msgid "Master Bus"
 msgstr "Bus de sortie à"
 
-#: export_video_dialog.cc:166
+#: export_video_dialog.cc:145
+msgid "from the %1 session's start to the session's end"
+msgstr ""
+
+#: export_video_dialog.cc:149
+msgid "from 00:00:00:00 to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:151
+msgid "from the video's start to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:184
 #, fuzzy
 msgid "<b>Settings:</b>"
 msgstr "<b>Destinations</b>"
 
-#: export_video_dialog.cc:174
+#: export_video_dialog.cc:192
 #, fuzzy
 msgid "Range:"
 msgstr "Intervalle"
 
-#: export_video_dialog.cc:177
+#: export_video_dialog.cc:195
 #, fuzzy
 msgid "Preset:"
 msgstr "Préréglage"
 
-#: export_video_dialog.cc:180
+#: export_video_dialog.cc:198
 msgid "Video Codec:"
 msgstr ""
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:201
 #, fuzzy
 msgid "Video KBit/s:"
 msgstr "Mike Start"
 
-#: export_video_dialog.cc:186
+#: export_video_dialog.cc:204
 #, fuzzy
 msgid "Audio Codec:"
 msgstr "Mode audio:"
 
-#: export_video_dialog.cc:189
+#: export_video_dialog.cc:207
 #, fuzzy
 msgid "Audio KBit/s:"
 msgstr "Audio"
 
-#: export_video_dialog.cc:192
+#: export_video_dialog.cc:210
 #, fuzzy
 msgid "Audio Samplerate:"
 msgstr "Échantillonnage:"
 
-#: export_video_dialog.cc:369
+#: export_video_dialog.cc:387
 #, fuzzy
 msgid "Normalizing audio"
 msgstr "Normaliser"
 
-#: export_video_dialog.cc:373
+#: export_video_dialog.cc:391
 #, fuzzy
 msgid "Exporting audio"
 msgstr "Exporter la région"
 
-#: export_video_dialog.cc:419
+#: export_video_dialog.cc:437
 #, fuzzy
-msgid "Exporting Audio.."
+msgid "Exporting Audio..."
 msgstr "Exporter la région"
 
-#: export_video_dialog.cc:476
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:505
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:544
-msgid "Encoding Video.."
-msgstr ""
+#: export_video_dialog.cc:562
+#, fuzzy
+msgid "Encoding Video..."
+msgstr "Traduction activés"
 
-#: export_video_dialog.cc:563
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:661
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr ""
 
-#: export_video_dialog.cc:673
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr ""
 
-#: export_video_dialog.cc:761
+#: export_video_dialog.cc:779
 #, fuzzy
 msgid "Transcoding failed."
 msgstr "Traduction activés"
 
-#: export_video_dialog.cc:930 export_video_dialog.cc:950
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 #, fuzzy
 msgid "Save Exported Video File"
 msgstr "Exporter vers un fichier video..."
@@ -12817,33 +13089,39 @@ msgstr ""
 msgid "<b>Video Export Info</b>"
 msgstr ""
 
-#: export_video_infobox.cc:46
+#: export_video_infobox.cc:48
 msgid ""
-"Ardour video export is not recommended for mastering!\n"
-"While 'ffmpeg' (which is used by ardour) can produce high-quality files, "
-"this export lacks the possibility to tweak many settings. We recommend to "
-"use 'winff', 'devede' or 'dvdauthor' to mux & master. Nevertheless this "
-"video-export comes in handy to do quick snapshots, intermediates, dailies or "
-"online videos.\n"
+"Video encoding is a non-trivial task with many details.\n"
 "\n"
-"The soundtrack is created from the master-bus of the current Ardour "
-"session.\n"
+"Please see the manual at %1/video-timeline/operations/#export.\n"
 "\n"
-"The video soure defaults to the file used in the video timeline, which may "
-"not the best quality to start with, you should the original video file.\n"
-"\n"
-"If the export-range is longer than the original video, black video frames "
-"are prefixed and/or appended. This process may fail with non-standard pixel-"
-"aspect-ratios.\n"
-"\n"
-"The file-format is determined by the extension that you choose for the "
-"output file (.avi, .mov, .flv, .ogv,...)\n"
-"Note: not all combinations of format+codec+settings produce files which are "
-"according so spec. e.g. flv files require sample-rates of 22.1kHz or "
-"44.1kHz, mpeg containers can not be used with ac3 audio-codec, etc. If in "
-"doubt, use one of the built-in presets."
+"Open Manual in Browser? "
 msgstr ""
 
+#~ msgid "-Inf"
+#~ msgstr "-inf"
+
+#~ msgid "slowest"
+#~ msgstr "Très lent"
+
+#~ msgid "slow"
+#~ msgstr "Lent"
+
+#~ msgid "fast"
+#~ msgstr "Rapide"
+
+#~ msgid "faster"
+#~ msgstr "Très rapide"
+
+#~ msgid "fastest"
+#~ msgstr "Ultra rapide"
+
+#~ msgid "Search returned no results."
+#~ msgstr "La recherche n'a pas retourné de résultats."
+
+#~ msgid "What would you like to do ?"
+#~ msgstr "Que voulez-vous faire?"
+
 #~ msgid "Control surfaces"
 #~ msgstr "Surfaces de contrôle"
 
@@ -14575,9 +14853,6 @@ msgstr ""
 #~ msgid "solo change"
 #~ msgstr "modification du solo"
 
-#~ msgid "rec-enable change"
-#~ msgstr "(dés)activation d'enregistrement"
-
 #~ msgid "mix group solo  change"
 #~ msgstr "changt solo de groupe"
 
diff --git a/gtk2_ardour/po/it.po b/gtk2_ardour/po/it.po
index d728e7b210..673dfbe159 100644
--- a/gtk2_ardour/po/it.po
+++ b/gtk2_ardour/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ardour 0.354.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2011-11-05 12:43+0100\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -369,7 +369,7 @@ msgstr "%1 file di definizione del menù mancante"
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr "%1 non può essere avviato senza un file ardour.menù valido"
 
-#: add_route_dialog.cc:53 route_params_ui.cc:503
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 msgid "Add Track or Bus"
 msgstr "Aggiungi Traccia/Bus"
 
@@ -409,8 +409,8 @@ msgstr "Bus"
 msgid "Add:"
 msgstr "Aggiungi:"
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 msgid "<b>Options</b>"
 msgstr "Opzioni"
 
@@ -424,21 +424,21 @@ msgid "Group:"
 msgstr "Gruppo:"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 msgid "Audio"
 msgstr "Audio"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -461,7 +461,7 @@ msgid ""
 msgstr ""
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1301
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr "Normale"
 
@@ -505,7 +505,7 @@ msgstr "8 canali"
 msgid "12 Channel"
 msgstr "12 canli"
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2136
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr "Personalizzato"
 
@@ -594,7 +594,7 @@ msgid "Track"
 msgstr "Traccia"
 
 #: analysis_window.cc:68 editor_actions.cc:616 mixer_ui.cc:125
-#: mixer_ui.cc:1793
+#: mixer_ui.cc:1795
 msgid "Show"
 msgstr "Mostra"
 
@@ -602,96 +602,92 @@ msgstr "Mostra"
 msgid "Re-analyze data"
 msgstr "Esegui di nuovo l'analisi"
 
-#: ardour_button.cc:658
+#: ardour_button.cc:704
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr ""
 
-#: ardour_ui.cc:179
+#: ardour_ui.cc:180
 #, fuzzy
 msgid "audition"
 msgstr "Ascolto"
 
-#: ardour_ui.cc:180
+#: ardour_ui.cc:181
 #, fuzzy
 msgid "solo"
 msgstr "Intervallo di loop"
 
-#: ardour_ui.cc:181
+#: ardour_ui.cc:182
 msgid "feedback"
 msgstr ""
 
-#: ardour_ui.cc:183 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 msgid "Speaker Configuration"
 msgstr "Configurazione altoparlanti"
 
-#: ardour_ui.cc:184 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 msgid "Theme Manager"
 msgstr "Gestore dei temi"
 
-#: ardour_ui.cc:185 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr "Scorciatoie da tastiera"
 
-#: ardour_ui.cc:186
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ardour_ui.cc:187 ardour_ui.cc:192
+#: ardour_ui.cc:191 ardour_ui.cc:196
 #, fuzzy
 msgid "Add Tracks/Busses"
 msgstr "Tracce/Bus"
 
-#: ardour_ui.cc:188
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "Circa"
 
-#: ardour_ui.cc:189 location_ui.cc:1134
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "Posizioni"
 
-#: ardour_ui.cc:190 route_params_ui.cc:57 route_params_ui.cc:604
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 msgid "Tracks and Busses"
 msgstr "Tracce e Bus"
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr "Proprietà"
 
-#: ardour_ui.cc:193 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr "Gestore dei raggruppamenti"
 
-#: ardour_ui.cc:194 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "Orologio grande"
 
-#: ardour_ui.cc:195
+#: ardour_ui.cc:199
 #, fuzzy
 msgid "Audio Connections"
 msgstr "Connessioni"
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:200
 #, fuzzy
 msgid "MIDI Connections"
 msgstr "Connessioni"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr "Errori"
 
-#: ardour_ui.cc:299
-msgid "could not initialize %1."
-msgstr "Impossibile inizializzare %1."
-
-#: ardour_ui.cc:394
+#: ardour_ui.cc:388
 msgid "Starting audio engine"
 msgstr "Avvio del motore audio"
 
-#: ardour_ui.cc:763 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 msgid "%1 is ready for use"
 msgstr "%1 è pronto."
 
-#: ardour_ui.cc:811
+#: ardour_ui.cc:806
 #, fuzzy
 msgid ""
 "WARNING: Your system has a limit for maximum amount of locked memory. This "
@@ -707,23 +703,23 @@ msgstr ""
 "Potete visualizzare questo limite massimo con il comando 'ulimit -l', di "
 "solito è controllato dal file /etc/security/limits.conf"
 
-#: ardour_ui.cc:828
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr "Non mostrare di nuovo"
 
-#: ardour_ui.cc:870
+#: ardour_ui.cc:865
 msgid "Don't quit"
 msgstr "Non uscire"
 
-#: ardour_ui.cc:871
+#: ardour_ui.cc:866
 msgid "Just quit"
 msgstr "Esci e basta"
 
-#: ardour_ui.cc:872
+#: ardour_ui.cc:867
 msgid "Save and quit"
 msgstr "Salva ed esci"
 
-#: ardour_ui.cc:882
+#: ardour_ui.cc:877
 #, fuzzy
 msgid ""
 "%1 was unable to save your session.\n"
@@ -736,16 +732,16 @@ msgstr ""
 "\n"
 "Se ancora vuoi chiudere usa la voce \"Esci e basta\"."
 
-#: ardour_ui.cc:913
+#: ardour_ui.cc:908
 #, fuzzy
 msgid "Please wait while %1 cleans up..."
 msgstr "Prego attendere mentre %1 carica i dati per la visualizzazione"
 
-#: ardour_ui.cc:930
+#: ardour_ui.cc:925
 msgid "Unsaved Session"
 msgstr "Sessione non salvata"
 
-#: ardour_ui.cc:951
+#: ardour_ui.cc:946
 msgid ""
 "The session \"%1\"\n"
 "has not been saved.\n"
@@ -763,7 +759,7 @@ msgstr ""
 "\n"
 "Cosa vuoi fare?"
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:949
 msgid ""
 "The snapshot \"%1\"\n"
 "has not been saved.\n"
@@ -781,75 +777,75 @@ msgstr ""
 "\n"
 "Cosa vuoi fare?"
 
-#: ardour_ui.cc:968
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr "Suggeritore"
 
-#: ardour_ui.cc:1045
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "Disconesso"
 
-#: ardour_ui.cc:1052
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1056
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1074 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 #, fuzzy
 msgid "File:"
 msgstr "Inizio file:"
 
-#: ardour_ui.cc:1078
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr ""
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr ""
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr ""
 
-#: ardour_ui.cc:1087 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr ""
 
-#: ardour_ui.cc:1090
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr ""
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr ""
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr ""
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr ""
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr ""
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr ""
 
-#: ardour_ui.cc:1129
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1148
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -857,34 +853,34 @@ msgid ""
 "\">%<PRIu32>%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1184
+#: ardour_ui.cc:1188
 #, fuzzy
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr "Spazio su disco: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1186
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr ""
 
-#: ardour_ui.cc:1204
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr ""
 
-#: ardour_ui.cc:1215
+#: ardour_ui.cc:1219
 #, fuzzy, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr "Spazio su disco: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1241
+#: ardour_ui.cc:1245
 #, fuzzy, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr "Spazio su disco: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1358 ardour_ui.cc:1367 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr "Sessioni recenti"
 
-#: ardour_ui.cc:1447
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
@@ -892,28 +888,28 @@ msgstr ""
 "%1 non è connesso a JACK\n"
 "Non si possono aprire o chiudere sessioni in questo stato."
 
-#: ardour_ui.cc:1474
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr "Apri sessione"
 
-#: ardour_ui.cc:1492 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 msgid "%1 sessions"
 msgstr "sessioni %1"
 
-#: ardour_ui.cc:1529
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr ""
 "Non si può aggiungere una traccia senza prima aver caricato una sessione."
 
-#: ardour_ui.cc:1537
+#: ardour_ui.cc:1548
 #, fuzzy
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] "Impossibile creare nuove tracce MIDI in %1"
 msgstr[1] "Impossibile creare nuove tracce MIDI in %1"
 
-#: ardour_ui.cc:1543 ardour_ui.cc:1604
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 msgid ""
 "There are insufficient JACK ports available\n"
 "to create a new track or bus.\n"
@@ -925,27 +921,27 @@ msgstr ""
 "Dovresti salvare %1, uscire e \n"
 "avviare di nuovo JACK con più porte."
 
-#: ardour_ui.cc:1578
+#: ardour_ui.cc:1589
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr ""
 "Non si può aggiungere una traccia o un bus senza prima aver caricato una "
 "sessione."
 
-#: ardour_ui.cc:1587
+#: ardour_ui.cc:1598
 #, fuzzy
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] "Impossibile creare una nuova traccia audio"
 msgstr[1] "Impossibile creare una nuova traccia audio"
 
-#: ardour_ui.cc:1596
+#: ardour_ui.cc:1607
 #, fuzzy
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] "Impossibile creare una nuova traccia audio %1"
 msgstr[1] "Impossibile creare una nuova traccia audio %1"
 
-#: ardour_ui.cc:1713
+#: ardour_ui.cc:1724
 #, fuzzy
 msgid ""
 "Please create one or more tracks before trying to record.\n"
@@ -955,7 +951,7 @@ msgstr ""
 "prima di avviare una registrazione.\n"
 "Controllare il menù di sessione."
 
-#: ardour_ui.cc:2103
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
@@ -965,7 +961,7 @@ msgstr ""
 "\n"
 "%1"
 
-#: ardour_ui.cc:2105
+#: ardour_ui.cc:2116
 msgid ""
 "JACK has either been shutdown or it\n"
 "disconnected %1 because %1\n"
@@ -977,19 +973,19 @@ msgstr ""
 "E' consigliato salvare la sessione e riavviare\n"
 "sia JACK che Ardour."
 
-#: ardour_ui.cc:2131
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "Impossibilitato ad avviare la sessione"
 
-#: ardour_ui.cc:2211
+#: ardour_ui.cc:2222
 msgid "Take Snapshot"
 msgstr "Crea istantanea"
 
-#: ardour_ui.cc:2212
+#: ardour_ui.cc:2223
 msgid "Name of new snapshot"
 msgstr "Nome della nuova istantanea"
 
-#: ardour_ui.cc:2236
+#: ardour_ui.cc:2247
 #, fuzzy
 msgid ""
 "To ensure compatibility with various systems\n"
@@ -999,29 +995,29 @@ msgstr ""
 "i nomi di instantanee non dovrebbero contenere\n"
 " il carattere '/'"
 
-#: ardour_ui.cc:2248
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr "Conferma sovrascrittura istantanea"
 
-#: ardour_ui.cc:2249
+#: ardour_ui.cc:2260
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr "Esiste già un'istantanea con questo nome. Vuoi sovrascriverla?"
 
-#: ardour_ui.cc:2252 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: ardour_ui.cc:2286
+#: ardour_ui.cc:2297
 #, fuzzy
 msgid "Rename Session"
 msgstr "Rinomina regione"
 
-#: ardour_ui.cc:2287
+#: ardour_ui.cc:2298
 #, fuzzy
 msgid "New session name"
 msgstr "Nome della sessione:"
 
-#: ardour_ui.cc:2301 ardour_ui.cc:2681 ardour_ui.cc:2726
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 #, fuzzy
 msgid ""
 "To ensure compatibility with various systems\n"
@@ -1031,30 +1027,30 @@ msgstr ""
 "i nomi di sessione non dovrebbero contenere\n"
 " il carattere '/'"
 
-#: ardour_ui.cc:2309
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr ""
 
-#: ardour_ui.cc:2318
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
 msgstr ""
 
-#: ardour_ui.cc:2429
+#: ardour_ui.cc:2440
 msgid "Save Template"
 msgstr "Salva Modello"
 
-#: ardour_ui.cc:2430
+#: ardour_ui.cc:2441
 msgid "Name for template:"
 msgstr "Nome per il modello:"
 
-#: ardour_ui.cc:2431
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-modello"
 
-#: ardour_ui.cc:2469
+#: ardour_ui.cc:2480
 msgid ""
 "This session\n"
 "%1\n"
@@ -1064,52 +1060,52 @@ msgstr ""
 "%1\n"
 "esiste già. Vuoi aprirla?"
 
-#: ardour_ui.cc:2479
+#: ardour_ui.cc:2490
 msgid "Open Existing Session"
 msgstr "Apri una sessione"
 
-#: ardour_ui.cc:2717
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr "Sessione inesistente in %1"
 
-#: ardour_ui.cc:2804
+#: ardour_ui.cc:2815
 msgid "Please wait while %1 loads your session"
 msgstr "Attendi mentre %1 carca la sessione"
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr "Errore nella registrazione di porta"
 
-#: ardour_ui.cc:2820
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr "Clicca su 'Chiudi' per provare di nuovo"
 
-#: ardour_ui.cc:2841
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "La sessione \"%1 (istantanea %2)\" non è stata caricata correttamente"
 
-#: ardour_ui.cc:2847
+#: ardour_ui.cc:2858
 msgid "Loading Error"
 msgstr "Errore di caricamento"
 
-#: ardour_ui.cc:2848
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr "Clicca su 'Aggiorna' per provare di nuovo."
 
-#: ardour_ui.cc:2930
+#: ardour_ui.cc:2941
 msgid "Could not create session in \"%1\""
 msgstr "Impossibile caricare la sessione \"%1\""
 
-#: ardour_ui.cc:3030
+#: ardour_ui.cc:3041
 msgid "No files were ready for clean-up"
 msgstr "Nessun file da pulire"
 
-#: ardour_ui.cc:3034 ardour_ui.cc:3044 ardour_ui.cc:3177 ardour_ui.cc:3184
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 msgid "Clean-up"
 msgstr "Pulisci"
 
-#: ardour_ui.cc:3035
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1121,19 +1117,19 @@ msgstr ""
 "Ci possono essere ancora istantanee con regioni\n"
 "che necessitano di questi file."
 
-#: ardour_ui.cc:3094
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr ""
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr ""
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr ""
 
-#: ardour_ui.cc:3105
+#: ardour_ui.cc:3116
 #, fuzzy
 msgid ""
 "The following file was deleted from %2,\n"
@@ -1150,7 +1146,7 @@ msgstr[1] ""
 "%2, \n"
 "verranno liberati %3 %4bytes di spazio su disco"
 
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3123
 #, fuzzy
 msgid ""
 "The following file was not in use and \n"
@@ -1191,11 +1187,11 @@ msgstr[1] ""
 "\n"
 "libererà %3 %4bytes di spazio su disco\n"
 
-#: ardour_ui.cc:3172
+#: ardour_ui.cc:3183
 msgid "Are you sure you want to clean-up?"
 msgstr "Siete sicuri di voler ripulire?"
 
-#: ardour_ui.cc:3179
+#: ardour_ui.cc:3190
 msgid ""
 "Clean-up is a destructive operation.\n"
 "ALL undo/redo information will be lost if you clean-up.\n"
@@ -1207,81 +1203,81 @@ msgstr ""
 "La pulizia sposterà tutti i file inutilizzati \n"
 "in una posizione \"morta\"."
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr "DialogoRipulitura"
 
-#: ardour_ui.cc:3217
+#: ardour_ui.cc:3228
 msgid "Cleaned Files"
 msgstr "File ripuliti"
 
-#: ardour_ui.cc:3234
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr "File eliminato"
 
-#: ardour_ui.cc:3326
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 
-#: ardour_ui.cc:3330
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr ""
 
-#: ardour_ui.cc:3331
+#: ardour_ui.cc:3342
 msgid "Do you really want to stop the Video Server?"
 msgstr ""
 
-#: ardour_ui.cc:3334
+#: ardour_ui.cc:3345
 #, fuzzy
 msgid "Yes, Stop It"
 msgstr "Si, rimuovi."
 
-#: ardour_ui.cc:3360
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr ""
 
-#: ardour_ui.cc:3362
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
 msgstr ""
 
-#: ardour_ui.cc:3370 ardour_ui.cc:3455
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
 
-#: ardour_ui.cc:3394
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr ""
 
-#: ardour_ui.cc:3399
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr ""
 
-#: ardour_ui.cc:3432
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr ""
 
-#: ardour_ui.cc:3441
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3477 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "impossibile aprire %1"
 
-#: ardour_ui.cc:3481
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
 msgstr ""
 
-#: ardour_ui.cc:3641
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr "La registazione è stata interrotta perche' il sistema non ha retto"
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3702
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1293,7 +1289,7 @@ msgstr ""
 "Nello specifico, non riesce a scrivere i dati \n"
 "con la velocità necessaria per le registrazioni.\n"
 
-#: ardour_ui.cc:3689
+#: ardour_ui.cc:3721
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1305,11 +1301,11 @@ msgstr ""
 "Nello specifico, non riesce a scrivere i dati \n"
 "con la velocità necessaria per le registrazioni.\n"
 
-#: ardour_ui.cc:3729
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr "Recupero dal crash"
 
-#: ardour_ui.cc:3730
+#: ardour_ui.cc:3762
 #, fuzzy
 msgid ""
 "This session appears to have been in the\n"
@@ -1327,19 +1323,19 @@ msgstr ""
 "oppure ignorarlo.\n"
 "Cosa preferite?\n"
 
-#: ardour_ui.cc:3742
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr "Ignora i dati del crash"
 
-#: ardour_ui.cc:3743
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr "Recupero dai dati di crash"
 
-#: ardour_ui.cc:3763
+#: ardour_ui.cc:3795
 msgid "Sample Rate Mismatch"
 msgstr "Frequenza di campionamento discrepante"
 
-#: ardour_ui.cc:3764
+#: ardour_ui.cc:3796
 #, fuzzy
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
@@ -1351,23 +1347,23 @@ msgstr ""
 "\n"
 "Il motore audio attualmente è avviato a %2 Hz\n"
 
-#: ardour_ui.cc:3773
+#: ardour_ui.cc:3805
 msgid "Do not load session"
 msgstr "Non caricare la sessione"
 
-#: ardour_ui.cc:3774
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr "Apri comunque la sessione"
 
-#: ardour_ui.cc:3797
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "Non posso disconnettermi da JACK"
 
-#: ardour_ui.cc:3810
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr "Non posso riconnettermi a JACK"
 
-#: ardour_ui.cc:4084
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1390,58 +1386,63 @@ msgstr "UI: impossibile avviare l'editor"
 msgid "UI: cannot setup mixer"
 msgstr "IU: impossibile avviare il mixer"
 
-#: ardour_ui2.cc:125
+#: ardour_ui2.cc:82
+#, fuzzy
+msgid "UI: cannot setup meterbridge"
+msgstr "IU: impossibile avviare il meter_bridge"
+
+#: ardour_ui2.cc:130
 msgid "Play from playhead"
 msgstr "Suona dalla testina"
 
-#: ardour_ui2.cc:126
+#: ardour_ui2.cc:131
 msgid "Stop playback"
 msgstr "Interrompi la riproduzione"
 
-#: ardour_ui2.cc:127
+#: ardour_ui2.cc:132
 msgid "Toggle record"
 msgstr "Registra"
 
-#: ardour_ui2.cc:128
+#: ardour_ui2.cc:133
 msgid "Play range/selection"
 msgstr "Suona intervallo/selezione"
 
-#: ardour_ui2.cc:129
+#: ardour_ui2.cc:134
 msgid "Go to start of session"
 msgstr "Vai all'inizio della sessione"
 
-#: ardour_ui2.cc:130
+#: ardour_ui2.cc:135
 msgid "Go to end of session"
 msgstr "Vai alla fine della sessione"
 
-#: ardour_ui2.cc:131
+#: ardour_ui2.cc:136
 msgid "Play loop range"
 msgstr "Suona l'intervallo di ciclo"
 
-#: ardour_ui2.cc:132
+#: ardour_ui2.cc:137
 msgid ""
 "MIDI Panic\n"
 "Send note off and reset controller messages on all MIDI channels"
 msgstr ""
 
-#: ardour_ui2.cc:133
+#: ardour_ui2.cc:138
 msgid "Return to last playback start when stopped"
 msgstr "Ritorna al punto d'inizio una volta fermato"
 
-#: ardour_ui2.cc:134
+#: ardour_ui2.cc:139
 #, fuzzy
 msgid "Playhead follows Range Selections and Edits"
 msgstr "Sposta la testina all'inizio dell'intervallo"
 
-#: ardour_ui2.cc:135
+#: ardour_ui2.cc:140
 msgid "Be sensible about input monitoring"
 msgstr "Controlla accuratamente le entrate"
 
-#: ardour_ui2.cc:136
+#: ardour_ui2.cc:141
 msgid "Enable/Disable audio click"
 msgstr "Abilita/Disabilita il click audio"
 
-#: ardour_ui2.cc:137 monitor_section.cc:101
+#: ardour_ui2.cc:142 monitor_section.cc:101
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
@@ -1449,7 +1450,7 @@ msgstr ""
 "Quando è attivo, qualcosa è in solo.\n"
 "Clicca per ripristinare tutto."
 
-#: ardour_ui2.cc:138
+#: ardour_ui2.cc:143
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
@@ -1457,11 +1458,11 @@ msgstr ""
 "Quando è attivo, qualcosa è in ascolto\n"
 "Clicca per ripristinare."
 
-#: ardour_ui2.cc:139
+#: ardour_ui2.cc:144
 msgid "When active, there is a feedback loop."
 msgstr ""
 
-#: ardour_ui2.cc:140
+#: ardour_ui2.cc:145
 msgid ""
 "<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1469,7 +1470,7 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:141
+#: ardour_ui2.cc:146
 msgid ""
 "<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1477,27 +1478,32 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:173
+#: ardour_ui2.cc:147
+#, fuzzy
+msgid "Reset Level Meter"
+msgstr "Azzera inviluppo"
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr "[ERRORE]:"
 
-#: ardour_ui2.cc:175
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr "[ATTENZIONE]:"
 
-#: ardour_ui2.cc:177
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr "[INFO]"
 
-#: ardour_ui2.cc:241 ardour_ui_ed.cc:376
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 msgid "Auto Return"
 msgstr ""
 
-#: ardour_ui2.cc:243 ardour_ui_ed.cc:379
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr ""
 
-#: ardour_ui2.cc:621 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1517,23 +1523,23 @@ msgstr "Prepara l'editor"
 msgid "Setup Mixer"
 msgstr "Prepara il mixer"
 
-#: ardour_ui_dependents.cc:84
+#: ardour_ui_dependents.cc:85
 msgid "Reload Session History"
 msgstr "Ricarica lo storico di sessione"
 
-#: ardour_ui_dialogs.cc:206
+#: ardour_ui_dialogs.cc:242
 msgid "Don't close"
 msgstr "Non uscire"
 
-#: ardour_ui_dialogs.cc:207
+#: ardour_ui_dialogs.cc:243
 msgid "Just close"
 msgstr "Chiudi e basta"
 
-#: ardour_ui_dialogs.cc:208
+#: ardour_ui_dialogs.cc:244
 msgid "Save and close"
 msgstr "Salva ed esci"
 
-#: ardour_ui_dialogs.cc:293
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr ""
 
@@ -1546,7 +1552,7 @@ msgstr "Sessione"
 msgid "Sync"
 msgstr "Sincronizza"
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr "Opzioni"
 
@@ -1574,15 +1580,15 @@ msgstr "Tipo file"
 msgid "Sample Format"
 msgstr "Formato di campionamento"
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr "Piattaforme di comando"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr "Misurazione"
 
@@ -1598,7 +1604,7 @@ msgstr "Tempo di tenuta"
 msgid "Denormal Handling"
 msgstr ""
 
-#: ardour_ui_ed.cc:123 route_time_axis.cc:1475
+#: ardour_ui_ed.cc:123 route_time_axis.cc:1489
 msgid "New..."
 msgstr "Nuovo..."
 
@@ -1641,8 +1647,8 @@ msgstr "Istantanea..."
 msgid "Save As..."
 msgstr "Salva con nome..."
 
-#: ardour_ui_ed.cc:153 editor_actions.cc:1710 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1464 route_time_axis.cc:1471
+#: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 msgid "Rename..."
 msgstr "Rinomina..."
 
@@ -1671,7 +1677,7 @@ msgid "Stem export..."
 msgstr "Esportazione Stem"
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "Esporta"
 
@@ -1683,11 +1689,11 @@ msgstr "Pulisci sorgenti inutilizzate..."
 msgid "Flush Wastebasket"
 msgstr "Svuota il cestino"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr "JACK"
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr "Latenza"
 
@@ -1695,8 +1701,8 @@ msgstr "Latenza"
 msgid "Reconnect"
 msgstr "Riconnetti"
 
-#: ardour_ui_ed.cc:195 global_port_matrix.cc:198 io_selector.cc:210
-#: mixer_strip.cc:712 mixer_strip.cc:838
+#: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr "Disconnetti"
 
@@ -1713,7 +1719,7 @@ msgstr "Massimizza l'area dell'editor"
 msgid "Show Toolbars"
 msgstr "Mostra la barra dello zoom"
 
-#: ardour_ui_ed.cc:230 mixer_ui.cc:1863 mixer_ui.cc:1869
+#: ardour_ui_ed.cc:230 mixer_ui.cc:1865 mixer_ui.cc:1871
 #, fuzzy
 msgid "Window|Mixer"
 msgstr "Finestra"
@@ -1723,28 +1729,33 @@ msgstr "Finestra"
 msgid "Toggle Editor+Mixer"
 msgstr "Modalità di modifica"
 
-#: ardour_ui_ed.cc:233 midi_tracer.cc:39
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
+#, fuzzy
+msgid "Window|Meterbridge"
+msgstr "Finestra"
+
+#: ardour_ui_ed.cc:234 midi_tracer.cc:39
 msgid "MIDI Tracer"
 msgstr ""
 
-#: ardour_ui_ed.cc:235
+#: ardour_ui_ed.cc:236
 msgid "Chat"
 msgstr ""
 
-#: ardour_ui_ed.cc:237
+#: ardour_ui_ed.cc:238
 #, fuzzy
 msgid "Help|Manual"
 msgstr "Manuale"
 
-#: ardour_ui_ed.cc:238
+#: ardour_ui_ed.cc:239
 msgid "Reference"
 msgstr "Riferimenti"
 
-#: ardour_ui_ed.cc:240 plugin_ui.cc:419
+#: ardour_ui_ed.cc:241 plugin_ui.cc:418
 msgid "Save"
 msgstr "Salva"
 
-#: ardour_ui_ed.cc:248 rc_option_editor.cc:1114 rc_option_editor.cc:1125
+#: ardour_ui_ed.cc:249 rc_option_editor.cc:1114 rc_option_editor.cc:1125
 #: rc_option_editor.cc:1134 rc_option_editor.cc:1147 rc_option_editor.cc:1160
 #: rc_option_editor.cc:1169 rc_option_editor.cc:1179 rc_option_editor.cc:1181
 #: rc_option_editor.cc:1191 rc_option_editor.cc:1207 rc_option_editor.cc:1220
@@ -1754,100 +1765,100 @@ msgstr "Salva"
 msgid "Transport"
 msgstr "Trasporto"
 
-#: ardour_ui_ed.cc:254 engine_dialog.cc:85 sfdb_ui.cc:559
+#: ardour_ui_ed.cc:255 engine_dialog.cc:85
 msgid "Stop"
 msgstr "Ferma"
 
-#: ardour_ui_ed.cc:257
+#: ardour_ui_ed.cc:258
 msgid "Roll"
 msgstr "Lancia"
 
-#: ardour_ui_ed.cc:261
+#: ardour_ui_ed.cc:262
 msgid "Start/Stop"
 msgstr "Avvia/Ferma"
 
-#: ardour_ui_ed.cc:264
+#: ardour_ui_ed.cc:265
 msgid "Start/Continue/Stop"
 msgstr "Avvia/Continua/Ferma"
 
-#: ardour_ui_ed.cc:267
+#: ardour_ui_ed.cc:268
 msgid "Stop and Forget Capture"
 msgstr "Ferma e interrompi la registrazione"
 
-#: ardour_ui_ed.cc:277
+#: ardour_ui_ed.cc:278
 msgid "Transition To Roll"
 msgstr ""
 
-#: ardour_ui_ed.cc:281
+#: ardour_ui_ed.cc:282
 msgid "Transition To Reverse"
 msgstr ""
 
-#: ardour_ui_ed.cc:285
+#: ardour_ui_ed.cc:286
 msgid "Play Loop Range"
 msgstr "Riproduci l'intervallo di ciclo"
 
-#: ardour_ui_ed.cc:288
+#: ardour_ui_ed.cc:289
 msgid "Play Selected Range"
 msgstr "Suona l'intervallo selezionato"
 
-#: ardour_ui_ed.cc:291
+#: ardour_ui_ed.cc:292
 #, fuzzy
 msgid "Play Selection w/Preroll"
 msgstr "Suona la regione selezionata"
 
-#: ardour_ui_ed.cc:295
+#: ardour_ui_ed.cc:296
 msgid "Enable Record"
 msgstr "Abilita la registrazione"
 
-#: ardour_ui_ed.cc:298
+#: ardour_ui_ed.cc:299
 msgid "Start Recording"
 msgstr "Inizia la registrazione"
 
-#: ardour_ui_ed.cc:302
+#: ardour_ui_ed.cc:303
 msgid "Rewind"
 msgstr "Indietro"
 
-#: ardour_ui_ed.cc:305
+#: ardour_ui_ed.cc:306
 msgid "Rewind (Slow)"
 msgstr "Indietro (lento)"
 
-#: ardour_ui_ed.cc:308
+#: ardour_ui_ed.cc:309
 msgid "Rewind (Fast)"
 msgstr "Indietro (veloce)"
 
-#: ardour_ui_ed.cc:311 startup.cc:727
+#: ardour_ui_ed.cc:312 startup.cc:727
 msgid "Forward"
 msgstr "Avanti"
 
-#: ardour_ui_ed.cc:314
+#: ardour_ui_ed.cc:315
 msgid "Forward (Slow)"
 msgstr "Avanti (lento)"
 
-#: ardour_ui_ed.cc:317
+#: ardour_ui_ed.cc:318
 msgid "Forward (Fast)"
 msgstr "Avanti (veloce)"
 
-#: ardour_ui_ed.cc:320
+#: ardour_ui_ed.cc:321
 msgid "Goto Zero"
 msgstr "Vai allo zero"
 
-#: ardour_ui_ed.cc:323
+#: ardour_ui_ed.cc:324
 msgid "Goto Start"
 msgstr "Vai all'inizio"
 
-#: ardour_ui_ed.cc:326
+#: ardour_ui_ed.cc:327
 msgid "Goto End"
 msgstr "Vai alla fine"
 
-#: ardour_ui_ed.cc:329
+#: ardour_ui_ed.cc:330
 msgid "Goto Wall Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:333
+#: ardour_ui_ed.cc:334
 msgid "Focus On Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:337 ardour_ui_ed.cc:346 audio_clock.cc:2046 editor.cc:237
+#: ardour_ui_ed.cc:338 ardour_ui_ed.cc:347 audio_clock.cc:2046 editor.cc:237
 #: editor_actions.cc:544 editor_actions.cc:553 export_timespan_selector.cc:88
 #: session_option_editor.cc:41 session_option_editor.cc:61
 #: session_option_editor.cc:80 session_option_editor.cc:96
@@ -1856,129 +1867,129 @@ msgstr ""
 msgid "Timecode"
 msgstr ""
 
-#: ardour_ui_ed.cc:339 ardour_ui_ed.cc:348 editor_actions.cc:542
+#: ardour_ui_ed.cc:340 ardour_ui_ed.cc:349 editor_actions.cc:542
 msgid "Bars & Beats"
 msgstr "Battute e battiti"
 
-#: ardour_ui_ed.cc:341 ardour_ui_ed.cc:350
+#: ardour_ui_ed.cc:342 ardour_ui_ed.cc:351
 msgid "Minutes & Seconds"
 msgstr "Minuti e secondi"
 
-#: ardour_ui_ed.cc:343 ardour_ui_ed.cc:352 audio_clock.cc:2050 editor.cc:238
+#: ardour_ui_ed.cc:344 ardour_ui_ed.cc:353 audio_clock.cc:2050 editor.cc:238
 #: editor_actions.cc:543
 msgid "Samples"
 msgstr "Campioni"
 
-#: ardour_ui_ed.cc:355
+#: ardour_ui_ed.cc:356
 msgid "Punch In"
 msgstr "Punch in"
 
-#: ardour_ui_ed.cc:356 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr "Ingresso"
 
-#: ardour_ui_ed.cc:359
+#: ardour_ui_ed.cc:360
 msgid "Punch Out"
 msgstr "Punch out"
 
-#: ardour_ui_ed.cc:360 time_info_box.cc:114
+#: ardour_ui_ed.cc:361 time_info_box.cc:114
 msgid "Out"
 msgstr "Uscita"
 
-#: ardour_ui_ed.cc:363
+#: ardour_ui_ed.cc:364
 msgid "Punch In/Out"
 msgstr ""
 
-#: ardour_ui_ed.cc:364
+#: ardour_ui_ed.cc:365
 msgid "In/Out"
 msgstr "Ingresso/Uscita"
 
-#: ardour_ui_ed.cc:367 rc_option_editor.cc:1071
+#: ardour_ui_ed.cc:368 rc_option_editor.cc:1071
 msgid "Click"
 msgstr "Metronomo"
 
-#: ardour_ui_ed.cc:370
+#: ardour_ui_ed.cc:371
 msgid "Auto Input"
 msgstr ""
 
-#: ardour_ui_ed.cc:373
+#: ardour_ui_ed.cc:374
 msgid "Auto Play"
 msgstr "Riproduci automaticamente"
 
-#: ardour_ui_ed.cc:384
+#: ardour_ui_ed.cc:385
 msgid "Sync Startup to Video"
 msgstr ""
 
-#: ardour_ui_ed.cc:386
+#: ardour_ui_ed.cc:387
 msgid "Time Master"
 msgstr ""
 
-#: ardour_ui_ed.cc:393
+#: ardour_ui_ed.cc:394
 msgid "Toggle Record Enable Track %1"
 msgstr "Abilita la registrazione sulla traccia %1"
 
-#: ardour_ui_ed.cc:400
+#: ardour_ui_ed.cc:401
 msgid "Percentage"
 msgstr "Percentuale"
 
-#: ardour_ui_ed.cc:401 shuttle_control.cc:169
+#: ardour_ui_ed.cc:402 shuttle_control.cc:169
 msgid "Semitones"
 msgstr "Semitoni"
 
-#: ardour_ui_ed.cc:405
+#: ardour_ui_ed.cc:406
 msgid "Send MTC"
 msgstr "Invia MTC"
 
-#: ardour_ui_ed.cc:407
+#: ardour_ui_ed.cc:408
 msgid "Send MMC"
 msgstr "Invia MMC"
 
-#: ardour_ui_ed.cc:409
+#: ardour_ui_ed.cc:410
 msgid "Use MMC"
 msgstr "Usa MMC"
 
-#: ardour_ui_ed.cc:411 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 msgid "Send MIDI Clock"
 msgstr "Invia il clock MIDI"
 
-#: ardour_ui_ed.cc:413
+#: ardour_ui_ed.cc:414
 msgid "Send MIDI Feedback"
 msgstr ""
 
-#: ardour_ui_ed.cc:419
+#: ardour_ui_ed.cc:420
 msgid "Panic"
 msgstr "Panico"
 
-#: ardour_ui_ed.cc:559
+#: ardour_ui_ed.cc:560
 #, fuzzy
 msgid "Wall Clock"
 msgstr "Orologio grande"
 
-#: ardour_ui_ed.cc:560
+#: ardour_ui_ed.cc:561
 msgid "Disk Space"
 msgstr ""
 
-#: ardour_ui_ed.cc:561
+#: ardour_ui_ed.cc:562
 #, fuzzy
 msgid "DSP"
 msgstr "SiP"
 
-#: ardour_ui_ed.cc:562
+#: ardour_ui_ed.cc:563
 #, fuzzy
 msgid "Buffers"
 msgstr "Dimenzione buffer:"
 
-#: ardour_ui_ed.cc:563
+#: ardour_ui_ed.cc:564
 msgid "JACK Sampling Rate and Latency"
 msgstr ""
 
-#: ardour_ui_ed.cc:564
+#: ardour_ui_ed.cc:565
 #, fuzzy
 msgid "Timecode Format"
 msgstr "Rimuovi Campo"
 
-#: ardour_ui_ed.cc:565
+#: ardour_ui_ed.cc:566
 #, fuzzy
 msgid "File Format"
 msgstr "Formato del file"
@@ -1995,11 +2006,11 @@ msgstr ""
 msgid "Internal"
 msgstr "Interno"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 msgid "Enable/Disable external positional sync"
 msgstr ""
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr ""
 "Impossibile sincronizzazione con JACK: è impostato video \"pull up/down\""
@@ -2031,7 +2042,7 @@ msgstr "Tempo"
 msgid "Meter"
 msgstr "Suddivisione"
 
-#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1030
+#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1039
 #: midi_region_view.cc:2991 session_metadata_dialog.cc:331
 #: session_metadata_dialog.cc:379 session_metadata_dialog.cc:435
 #: session_metadata_dialog.cc:716
@@ -2121,33 +2132,33 @@ msgid "hide track"
 msgstr "Nascondi traccia"
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:196 generic_pluginui.cc:456
-#: generic_pluginui.cc:733 panner_ui.cc:150
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
+#: generic_pluginui.cc:746 panner_ui.cc:150
 #, fuzzy
 msgid "Automation|Manual"
 msgstr "Automazione"
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1856 gain_meter.cc:199
-#: generic_pluginui.cc:459 generic_pluginui.cc:735 midi_time_axis.cc:1488
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
+#: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr "Suona"
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:202 generic_pluginui.cc:462
-#: generic_pluginui.cc:737 panner_ui.cc:156
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
+#: generic_pluginui.cc:750 panner_ui.cc:156
 msgid "Write"
 msgstr "Scrivi"
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:205 generic_pluginui.cc:465
-#: generic_pluginui.cc:739 panner_ui.cc:159
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
+#: generic_pluginui.cc:752 panner_ui.cc:159
 msgid "Touch"
 msgstr "Tocco"
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr "???"
 
@@ -2156,7 +2167,7 @@ msgid "clear automation"
 msgstr "pulisci l'automazione"
 
 #: automation_time_axis.cc:485 editor_actions.cc:613 editor_markers.cc:857
-#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:699
+#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:708
 msgid "Hide"
 msgstr "Nascondi"
 
@@ -2177,7 +2188,7 @@ msgstr "Discreto"
 msgid "Linear"
 msgstr "Lineare"
 
-#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:638
+#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:647
 #: shuttle_control.cc:188
 msgid "Mode"
 msgstr "Modo"
@@ -2194,13 +2205,13 @@ msgstr "Modifica il raggruppamento"
 msgid "Direction:"
 msgstr "Direzione:"
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:156
-#: mixer_strip.cc:2132
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 msgid "Input"
 msgstr "Ingresso"
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:161 mixer_strip.cc:2135
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 msgid "Output"
 msgstr "Uscita"
 
@@ -2210,8 +2221,8 @@ msgid "Edit"
 msgstr "Modifica"
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:420 processor_box.cc:2227
-#: route_time_axis.cc:704
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
+#: route_time_axis.cc:713
 msgid "Delete"
 msgstr "Elimina"
 
@@ -2384,7 +2395,7 @@ msgstr "Tempo"
 
 #: edit_note_dialog.cc:98 editor_regions.cc:114
 #: export_timespan_selector.cc:359 export_timespan_selector.cc:421
-#: location_ui.cc:313 midi_list_editor.cc:114 time_info_box.cc:105
+#: location_ui.cc:317 midi_list_editor.cc:114 time_info_box.cc:105
 msgid "Length"
 msgstr "Durata"
 
@@ -2631,17 +2642,17 @@ msgid "Ranges & Marks"
 msgstr "Intervalli & marcatori"
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 msgid "Editor"
 msgstr "Editor"
 
 #: editor.cc:1215 editor.cc:1225 editor.cc:4440 editor_actions.cc:130
-#: editor_actions.cc:1804
+#: editor_actions.cc:1813
 msgid "Loop"
 msgstr "Ciclo"
 
@@ -2666,8 +2677,8 @@ msgstr ""
 msgid "Slow"
 msgstr "Lento"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1606
-#: sfdb_ui.cc:1715
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "Veloce"
 
@@ -2687,7 +2698,7 @@ msgstr "Attiva"
 msgid "Slowest"
 msgstr "Piu' Lento"
 
-#: editor.cc:1572 route_time_axis.cc:1863 selection.cc:1009 selection.cc:1064
+#: editor.cc:1572 route_time_axis.cc:1877 selection.cc:1009 selection.cc:1064
 msgid "programming error: "
 msgstr "errore di programmazione: "
 
@@ -2806,7 +2817,7 @@ msgid "Select All in Track"
 msgstr "Seleziona tutto nella traccia"
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2235
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr "Seleziona tutto"
 
@@ -2858,15 +2869,15 @@ msgstr "Seleziona l'intervallo tra la testina ed il punto di modifica"
 msgid "Select"
 msgstr "Seleziona"
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2220
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr "Taglia"
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2223
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr "Copia"
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2231
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr "Incolla"
 
@@ -3030,7 +3041,7 @@ msgstr "Ripristina"
 msgid "Redo (%1)"
 msgstr "Ripristina (%1)"
 
-#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1785
+#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1794
 msgid "Duplicate"
 msgstr "Duplica"
 
@@ -3060,8 +3071,8 @@ msgstr "Elimina la playlist"
 msgid "Keep Playlist"
 msgstr "Mantieni la playlist"
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "Cancella"
 
@@ -3082,7 +3093,7 @@ msgstr "cancella le playlist"
 msgid "Please wait while %1 loads visual data."
 msgstr "Prego attendere mentre %1 carica i dati per la visualizzazione"
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2251
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 msgid "Edit..."
 msgstr "Modifica..."
 
@@ -3131,7 +3142,7 @@ msgstr "Strato"
 msgid "Position"
 msgstr "Posizione"
 
-#: editor_actions.cc:101 gain_meter.cc:124 gain_meter.cc:755 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr "Spunta"
@@ -3144,7 +3155,7 @@ msgstr "Guadagno"
 msgid "Ranges"
 msgstr "Intervalli"
 
-#: editor_actions.cc:104 editor_actions.cc:1781 session_option_editor.cc:145
+#: editor_actions.cc:104 editor_actions.cc:1790 session_option_editor.cc:145
 #: session_option_editor.cc:147 session_option_editor.cc:156
 #: session_option_editor.cc:163
 msgid "Fades"
@@ -3184,7 +3195,7 @@ msgstr "Opzioni varie"
 msgid "Misc Options"
 msgstr "Opzioni varie"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr "Controllo"
@@ -3225,8 +3236,8 @@ msgstr "Orologio secondario"
 msgid "Separate"
 msgstr "Separa"
 
-#: editor_actions.cc:132 mixer_strip.cc:1916 route_time_axis.cc:199
-#: route_time_axis.cc:2397
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
+#: route_time_axis.cc:2417
 msgid "Solo"
 msgstr "Solo"
 
@@ -3238,7 +3249,7 @@ msgstr ""
 msgid "Timecode fps"
 msgstr ""
 
-#: editor_actions.cc:137 route_time_axis.cc:421
+#: editor_actions.cc:137 route_time_axis.cc:430
 msgid "Height"
 msgstr "Altezza"
 
@@ -3369,7 +3380,7 @@ msgstr "Sposta la testina all'inizio dell'intervallo"
 msgid "Playhead to Range End"
 msgstr "Sposta la testina alla fine dell'intervallo"
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2237
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 msgid "Deselect All"
 msgstr "Deseleziona tutto"
 
@@ -3646,9 +3657,9 @@ msgstr "Inserisci tempo"
 msgid "Toggle Active"
 msgstr "Attiva"
 
-#: editor_actions.cc:370 editor_actions.cc:1707 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1488
-#: route_time_axis.cc:701
+#: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
+#: route_time_axis.cc:710
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -3656,19 +3667,19 @@ msgstr "Rimuovi"
 msgid "Fit Selected Tracks"
 msgstr "Adatta le tracce selezionate"
 
-#: editor_actions.cc:376 time_axis_view.cc:1298
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr "Ampissimo"
 
-#: editor_actions.cc:379 time_axis_view.cc:1299
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr "Ampio"
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1300
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr "Più ampio"
 
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr "Piccolo"
 
@@ -3768,7 +3779,7 @@ msgstr "Giuntura"
 msgid "Slide"
 msgstr ""
 
-#: editor_actions.cc:478 editor_actions.cc:1728 editor_markers.cc:860
+#: editor_actions.cc:478 editor_actions.cc:1737 editor_markers.cc:860
 #: editor_rulers.cc:386 location_ui.cc:56
 msgid "Lock"
 msgstr "Blocca"
@@ -3952,7 +3963,7 @@ msgstr "Min:Sec"
 msgid "Video Monitor"
 msgstr "Controllo"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr ""
 
@@ -3963,7 +3974,7 @@ msgstr "Porta in cima"
 
 #: editor_actions.cc:554
 #, fuzzy
-msgid "Framenumber"
+msgid "Frame number"
 msgstr "Numero traccia"
 
 #: editor_actions.cc:555
@@ -4055,7 +4066,7 @@ msgstr "Rimuovi bus"
 
 #: editor_actions.cc:652 editor_audio_import.cc:279
 #: session_import_dialog.cc:74 session_import_dialog.cc:94
-#: session_metadata_dialog.cc:297 editor_videotimeline.cc:107
+#: session_metadata_dialog.cc:297 editor_videotimeline.cc:108
 msgid "Import"
 msgstr "Importa"
 
@@ -4096,311 +4107,311 @@ msgstr "Inizializzazione menù da %1"
 msgid "Could not find editor.bindings in search path %1"
 msgstr ""
 
-#: editor_actions.cc:1019 editor_actions.cc:1415 editor_actions.cc:1426
-#: editor_actions.cc:1479 editor_actions.cc:1490 editor_actions.cc:1537
-#: editor_actions.cc:1547 editor_regions.cc:1561
+#: editor_actions.cc:1028 editor_actions.cc:1424 editor_actions.cc:1435
+#: editor_actions.cc:1488 editor_actions.cc:1499 editor_actions.cc:1546
+#: editor_actions.cc:1556 editor_regions.cc:1561
 msgid "programming error: %1: %2"
 msgstr "Errore di programmazione: %1: %2"
 
-#: editor_actions.cc:1713
+#: editor_actions.cc:1722
 msgid "Raise"
 msgstr ""
 
-#: editor_actions.cc:1716
+#: editor_actions.cc:1725
 msgid "Raise to Top"
 msgstr "Porta in cima"
 
-#: editor_actions.cc:1719 gtk-custom-ruler.c:132
+#: editor_actions.cc:1728 gtk-custom-ruler.c:132
 msgid "Lower"
 msgstr "Abbassa"
 
-#: editor_actions.cc:1722
+#: editor_actions.cc:1731
 msgid "Lower to Bottom"
 msgstr "Porta in fondo"
 
-#: editor_actions.cc:1725
+#: editor_actions.cc:1734
 msgid "Move to Original Position"
 msgstr "Spostati alla posizione iniziale"
 
-#: editor_actions.cc:1730
+#: editor_actions.cc:1739
 msgid "Lock to Video"
 msgstr ""
 
-#: editor_actions.cc:1735 editor_markers.cc:867
+#: editor_actions.cc:1744 editor_markers.cc:867
 msgid "Glue to Bars and Beats"
 msgstr "Aggancia a battute e battiti"
 
-#: editor_actions.cc:1740
+#: editor_actions.cc:1749
 #, fuzzy
 msgid "Remove Sync"
 msgstr "Rimuovi il punto di sincronizzazione"
 
-#: editor_actions.cc:1743 mixer_strip.cc:1903 route_time_axis.cc:200
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr "Muto"
 
-#: editor_actions.cc:1746
+#: editor_actions.cc:1755
 msgid "Normalize..."
 msgstr "Normalizza..."
 
-#: editor_actions.cc:1749
+#: editor_actions.cc:1758
 msgid "Reverse"
 msgstr ""
 
-#: editor_actions.cc:1752
+#: editor_actions.cc:1761
 #, fuzzy
 msgid "Make Mono Regions"
 msgstr "Crea regioni mono"
 
-#: editor_actions.cc:1755
+#: editor_actions.cc:1764
 msgid "Boost Gain"
 msgstr "Aumenta guadagno"
 
-#: editor_actions.cc:1758
+#: editor_actions.cc:1767
 msgid "Cut Gain"
 msgstr "Riduci guadagno"
 
-#: editor_actions.cc:1761
+#: editor_actions.cc:1770
 msgid "Pitch Shift..."
 msgstr "Cambia tono..."
 
-#: editor_actions.cc:1764
+#: editor_actions.cc:1773
 msgid "Transpose..."
 msgstr "Trasponi..."
 
-#: editor_actions.cc:1767
+#: editor_actions.cc:1776
 msgid "Opaque"
 msgstr "Opaco"
 
-#: editor_actions.cc:1771 editor_regions.cc:116
+#: editor_actions.cc:1780 editor_regions.cc:116
 msgid "Fade In"
 msgstr "Dissolvenza in entrata"
 
-#: editor_actions.cc:1776 editor_regions.cc:117
+#: editor_actions.cc:1785 editor_regions.cc:117
 msgid "Fade Out"
 msgstr "Dissolvenza in uscita"
 
-#: editor_actions.cc:1791
+#: editor_actions.cc:1800
 msgid "Multi-Duplicate..."
 msgstr "Multi-Duplica"
 
-#: editor_actions.cc:1796
+#: editor_actions.cc:1805
 msgid "Fill Track"
 msgstr "Riempi Traccia"
 
-#: editor_actions.cc:1800 editor_markers.cc:955
+#: editor_actions.cc:1809 editor_markers.cc:955
 msgid "Set Loop Range"
 msgstr "Imposta l'intervallo di loop"
 
-#: editor_actions.cc:1807
+#: editor_actions.cc:1816
 msgid "Set Punch"
 msgstr "Imposta Punch"
 
-#: editor_actions.cc:1811
+#: editor_actions.cc:1820
 #, fuzzy
 msgid "Add Single Range Marker"
 msgstr "Aggiungi 1 marcatore di intervallo"
 
-#: editor_actions.cc:1816
+#: editor_actions.cc:1825
 #, fuzzy
 msgid "Add Range Marker Per Region"
 msgstr "Aggiungi marcatori di intervallo"
 
-#: editor_actions.cc:1820
+#: editor_actions.cc:1829
 #, fuzzy
 msgid "Snap Position To Grid"
 msgstr "Allinea alla griglia"
 
-#: editor_actions.cc:1823
+#: editor_actions.cc:1832
 #, fuzzy
 msgid "Close Gaps"
 msgstr "Chiudi"
 
-#: editor_actions.cc:1826
+#: editor_actions.cc:1835
 msgid "Rhythm Ferret..."
 msgstr ""
 
-#: editor_actions.cc:1829
+#: editor_actions.cc:1838
 msgid "Export..."
 msgstr "Esporta..."
 
-#: editor_actions.cc:1835
+#: editor_actions.cc:1844
 msgid "Separate Under"
 msgstr "Separa sotto"
 
-#: editor_actions.cc:1839
+#: editor_actions.cc:1848
 msgid "Set Fade In Length"
 msgstr "Imposta la durata della dissolvenza in entrata"
 
-#: editor_actions.cc:1840
+#: editor_actions.cc:1849
 msgid "Set Fade Out Length"
 msgstr "Durata della dissolvenza in uscita"
 
-#: editor_actions.cc:1841
+#: editor_actions.cc:1850
 #, fuzzy
 msgid "Set Tempo from Region = Bar"
 msgstr "Nuova Regione dall'intervallo"
 
-#: editor_actions.cc:1846
+#: editor_actions.cc:1855
 #, fuzzy
 msgid "Split at Percussion Onsets"
 msgstr "Inizio al cursore di modifica"
 
-#: editor_actions.cc:1851
+#: editor_actions.cc:1860
 #, fuzzy
 msgid "List Editor..."
 msgstr "Editor delle Opzioni"
 
-#: editor_actions.cc:1854
+#: editor_actions.cc:1863
 msgid "Properties..."
 msgstr "Proprietà..."
 
-#: editor_actions.cc:1858
+#: editor_actions.cc:1867
 msgid "Bounce (with processing)"
 msgstr "Fissa (elaborando)"
 
-#: editor_actions.cc:1859
+#: editor_actions.cc:1868
 msgid "Bounce (without processing)"
 msgstr "Fissa (senza elaborare)"
 
-#: editor_actions.cc:1860
+#: editor_actions.cc:1869
 msgid "Combine"
 msgstr "Unisci"
 
-#: editor_actions.cc:1861
+#: editor_actions.cc:1870
 msgid "Uncombine"
 msgstr "Separa"
 
-#: editor_actions.cc:1863
+#: editor_actions.cc:1872
 msgid "Spectral Analysis..."
 msgstr "Analisi spettrale"
 
-#: editor_actions.cc:1865
+#: editor_actions.cc:1874
 msgid "Reset Envelope"
 msgstr "Azzera inviluppo"
 
-#: editor_actions.cc:1867
+#: editor_actions.cc:1876
 msgid "Reset Gain"
 msgstr "Azzera guadagno"
 
-#: editor_actions.cc:1872
+#: editor_actions.cc:1881
 msgid "Envelope Active"
 msgstr "Inviluppo attivo/passiv"
 
-#: editor_actions.cc:1876
+#: editor_actions.cc:1885
 #, fuzzy
 msgid "Quantize..."
 msgstr "Quantizza"
 
-#: editor_actions.cc:1877 editor_actions.cc:1878
+#: editor_actions.cc:1886 editor_actions.cc:1887
 msgid "Insert Patch Change..."
 msgstr ""
 
-#: editor_actions.cc:1879
+#: editor_actions.cc:1888
 msgid "Unlink from other copies"
 msgstr ""
 
-#: editor_actions.cc:1880
+#: editor_actions.cc:1889
 msgid "Strip Silence..."
 msgstr "Rimuovi silenzio"
 
-#: editor_actions.cc:1881
+#: editor_actions.cc:1890
 msgid "Set Range Selection"
 msgstr "Imposta intervallo di selezione"
 
-#: editor_actions.cc:1883
+#: editor_actions.cc:1892
 #, fuzzy
 msgid "Nudge Later"
 msgstr "Sposta avanti"
 
-#: editor_actions.cc:1884
+#: editor_actions.cc:1893
 #, fuzzy
 msgid "Nudge Earlier"
 msgstr "Sposta avanti"
 
-#: editor_actions.cc:1889
+#: editor_actions.cc:1898
 #, fuzzy
 msgid "Nudge Later by Capture Offset"
 msgstr "Sposta"
 
-#: editor_actions.cc:1896
+#: editor_actions.cc:1905
 #, fuzzy
 msgid "Nudge Earlier by Capture Offset"
 msgstr "Sposta"
 
-#: editor_actions.cc:1900
+#: editor_actions.cc:1909
 msgid "Trim to Loop"
 msgstr "Ritaglia in base al ciclo"
 
-#: editor_actions.cc:1901
+#: editor_actions.cc:1910
 msgid "Trim to Punch"
 msgstr "Ritaglia in base al punch"
 
-#: editor_actions.cc:1903
+#: editor_actions.cc:1912
 #, fuzzy
 msgid "Trim to Previous"
 msgstr "Inizio al cursore di modifica"
 
-#: editor_actions.cc:1904
+#: editor_actions.cc:1913
 #, fuzzy
 msgid "Trim to Next"
 msgstr "Inizio al cursore di modifica"
 
-#: editor_actions.cc:1911
+#: editor_actions.cc:1920
 #, fuzzy
 msgid "Insert Region From Region List"
 msgstr "Nuova Regione dall'intervallo"
 
-#: editor_actions.cc:1917
+#: editor_actions.cc:1926
 #, fuzzy
 msgid "Set Sync Position"
 msgstr "Per Posizione della Regione"
 
-#: editor_actions.cc:1918
+#: editor_actions.cc:1927
 msgid "Place Transient"
 msgstr ""
 
-#: editor_actions.cc:1919
+#: editor_actions.cc:1928
 msgid "Split"
 msgstr "Dividi"
 
-#: editor_actions.cc:1920
+#: editor_actions.cc:1929
 msgid "Trim Start at Edit Point"
 msgstr ""
 
-#: editor_actions.cc:1921
+#: editor_actions.cc:1930
 msgid "Trim End at Edit Point"
 msgstr ""
 
-#: editor_actions.cc:1926
+#: editor_actions.cc:1935
 msgid "Align Start"
 msgstr ""
 
-#: editor_actions.cc:1933
+#: editor_actions.cc:1942
 msgid "Align Start Relative"
 msgstr ""
 
-#: editor_actions.cc:1937
+#: editor_actions.cc:1946
 #, fuzzy
 msgid "Align End"
 msgstr "Allinea"
 
-#: editor_actions.cc:1942
+#: editor_actions.cc:1951
 #, fuzzy
 msgid "Align End Relative"
 msgstr "Allinea Realtivo"
 
-#: editor_actions.cc:1949
+#: editor_actions.cc:1958
 #, fuzzy
 msgid "Align Sync"
 msgstr "Sposta Regione/i"
 
-#: editor_actions.cc:1956
+#: editor_actions.cc:1965
 #, fuzzy
 msgid "Align Sync Relative"
 msgstr "Allinea Realtivo"
 
-#: editor_actions.cc:1960 editor_actions.cc:1963
+#: editor_actions.cc:1969 editor_actions.cc:1972
 msgid "Choose Top..."
 msgstr ""
 
@@ -4429,34 +4440,34 @@ msgstr ""
 "La sessione contiene già un file chiamato %1. Vuoi importare %2 come nuova "
 "sorgente o passare oltre?"
 
-#: editor_audio_import.cc:279 editor_videotimeline.cc:107
+#: editor_audio_import.cc:279 editor_videotimeline.cc:108
 msgid "Cancel Import"
 msgstr "Annullare l'importazione"
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 #, fuzzy
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr "Editor: impossibile aprire il file \"%1\" (%2)"
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 #, fuzzy
 msgid "Cancel entire import"
 msgstr "Annullare l'importazione"
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 msgid "Don't embed it"
 msgstr "Non inludere"
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr "Includi tutto senza domande"
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 msgid "Sample rate"
 msgstr "Frequenza di campionamento"
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
@@ -4464,7 +4475,7 @@ msgstr ""
 "%1\n"
 "Il sample rate del file audio non corrisponde a quello della sessione!"
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 msgid "Embed it anyway"
 msgstr "Includi comunque"
 
@@ -4501,32 +4512,32 @@ msgstr "Copia il marcatore di tempo"
 msgid "move tempo mark"
 msgstr "Muovi il marcatore di tempo"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr "cambia la durata della dissolvenza in entrata"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr "cambia la durata della dissolvenza in uscita"
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr "Muovi marcatore"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr "C'è stato un errore durante l'esecuzione di 'time stretch'"
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 #, fuzzy
 msgid "programming_error: %1"
 msgstr "Errore di programmazione: %1"
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr "nuovo marcatore di intervallo"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 #, fuzzy
 msgid "rubberband selection"
 msgstr "Suona intervallo/selezione"
@@ -4606,7 +4617,7 @@ msgid "Sharing Solo?"
 msgstr ""
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 msgid "Rec"
 msgstr "Reg"
 
@@ -4684,7 +4695,7 @@ msgid "end"
 msgstr "fine"
 
 #: editor_markers.cc:646 editor_ops.cc:1744 editor_ops.cc:1764
-#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1005
+#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1017
 msgid "add marker"
 msgstr "aggiungi marcatore"
 
@@ -4693,7 +4704,7 @@ msgstr "aggiungi marcatore"
 msgid "range"
 msgstr " intervallo"
 
-#: editor_markers.cc:713 location_ui.cc:840
+#: editor_markers.cc:713 location_ui.cc:852
 msgid "remove marker"
 msgstr "rimuovi marcatore"
 
@@ -4776,8 +4787,8 @@ msgstr "Rinomina marcatore"
 msgid "Rename Range"
 msgstr "Rinomina intervallo"
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2233 route_time_axis.cc:968 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr "Rinomina"
 
@@ -4922,7 +4933,7 @@ msgstr "Porta in fondo"
 msgid "Rename Region"
 msgstr "Rinomina regione"
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 msgid "New name:"
 msgstr "Nuovo nome: "
 
@@ -5095,7 +5106,7 @@ msgstr ""
 "(questa azione non potrà essere annullata)"
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr "No, non fare niente."
 
@@ -5294,11 +5305,11 @@ msgstr "Ok"
 msgid "close region gaps"
 msgstr "Riempi gli intervalli della regione"
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr "Ci sarebbero cattive notizie..."
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5318,7 +5329,7 @@ msgstr ""
 msgid "tracks"
 msgstr "Tracce"
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 msgid "track"
 msgstr "traccia"
 
@@ -5326,7 +5337,7 @@ msgstr "traccia"
 msgid "busses"
 msgstr "Bus"
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 msgid "bus"
 msgstr "bus"
 
@@ -5371,7 +5382,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr "Si, rimuovi."
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr "Si, rimuovi."
 
@@ -5444,7 +5455,7 @@ msgstr ""
 msgid "Length of region fade-out (units: secondary clock), () if dsisabled"
 msgstr ""
 
-#: editor_regions.cc:118 mixer_strip.cc:1960 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr ""
@@ -5462,8 +5473,9 @@ msgstr ""
 msgid "Region position glued to Bars|Beats time?"
 msgstr ""
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:723
-#: mixer_strip.cc:1934 panner_ui.cc:554 stereo_panner.cc:237
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
+#: stereo_panner.cc:237
 msgid "M"
 msgstr ""
 
@@ -5535,7 +5547,8 @@ msgstr "Tracce/Bus"
 msgid "Track/Bus visible ?"
 msgstr "Tracce/Bus"
 
-#: editor_routes.cc:204 mixer_strip.cc:1951 route_time_axis.cc:2387
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
+#: route_time_axis.cc:2407
 msgid "A"
 msgstr "A"
 
@@ -5544,7 +5557,7 @@ msgstr "A"
 msgid "Track/Bus active ?"
 msgstr "Tracce/Bus"
 
-#: editor_routes.cc:205 mixer_strip.cc:1935
+#: editor_routes.cc:205 mixer_strip.cc:1932
 #, fuzzy
 msgid "I"
 msgstr "Ingresso"
@@ -5554,7 +5567,7 @@ msgstr "Ingresso"
 msgid "MIDI input enabled"
 msgstr "Tieni traccia delle Entrate MIDI"
 
-#: editor_routes.cc:206 mixer_strip.cc:1933 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr ""
@@ -5569,7 +5582,7 @@ msgstr "Attiva registrazione"
 msgid "Muted"
 msgstr "Muto"
 
-#: editor_routes.cc:208 mixer_strip.cc:1947
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr ""
 
@@ -5583,7 +5596,7 @@ msgstr "In solo..."
 msgid "SI"
 msgstr "Ingresso"
 
-#: editor_routes.cc:209 mixer_strip.cc:351 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 #, fuzzy
 msgid "Solo Isolated"
 msgstr "isolato"
@@ -5872,140 +5885,144 @@ msgid "192000Hz"
 msgstr ""
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr "Nessuno"
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr "Triangolare"
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr "Rettangolare"
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 msgid "Shaped"
 msgstr ""
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr "Riproduzione/Registrazione su un dispositivo"
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr "Riproduzione/Registrazione su due dispositivi"
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr "Solo riproduzione"
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 msgid "Recording only"
 msgstr "Solo registrazione"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr ""
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 msgid "raw"
 msgstr ""
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr "Driver:"
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 #, fuzzy
 msgid "Audio Interface:"
 msgstr "Interfaccia:"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:148 sfdb_ui.cc:261 sfdb_ui.cc:266
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 msgid "Sample rate:"
 msgstr "Frequenza di campionamento"
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr "Dimenzione buffer:"
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr "Numero di buffer:"
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr "Latenza:"
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 msgid "Audio mode:"
 msgstr "Modalità audio:"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr "Ignora"
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr ""
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr "Numero di porte:"
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr "Driver MIDI:"
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 msgid "Dither:"
 msgstr "Dither:"
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr "Nessun server JACK trovato su questo sistema. Installa JACK e riavvia."
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr "Server:"
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr "Dispositivo di ingresso:"
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 msgid "Output device:"
 msgstr "Dispositivo di uscita"
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 msgid "Hardware input latency:"
 msgstr "Latenza in ingresso:"
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 msgid "samples"
 msgstr "campioni"
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 msgid "Hardware output latency:"
 msgstr "Latenza in uscita:"
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr "Dispositivo"
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr "Non posso aprire il file rc di JACK per memorizzare i parametri"
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 #, fuzzy
 msgid ""
 "You do not have any audio devices capable of\n"
@@ -6036,33 +6053,33 @@ msgstr ""
 "ma non in simultanea, avviate JACK prima di Ardour e scegliete\n"
 "il dispositivo appropriato."
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr "Non ci sono dispositivi audio adatti "
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr "Sembra che JACK sia assente dal raggruppamento %1"
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr "Devi prima scegliere un dispositivo audio."
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr "Impossibile riconoscere il dispositivo audio \"%1\" "
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr "Manca il valore di configurazione audio per %1"
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 "il file di configurazione contengono un percorso al server JACK inesistente "
 "(%1)"
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:146
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 msgid "Channels:"
 msgstr "Canali"
 
@@ -6224,9 +6241,9 @@ msgid "Folder:"
 msgstr "Cartella:"
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "Sfoglia"
 
@@ -6351,6 +6368,13 @@ msgstr "Opzioni FLAC"
 msgid "Broadcast Wave options"
 msgstr ""
 
+#: export_format_selector.cc:136
+#, fuzzy
+msgid "Do you really want to remove the format?"
+msgstr ""
+"Si vuole realmente rimuovere la traccia \"%1\" ?\n"
+"(questa azione non potrà essere annullata)"
+
 #: export_preset_selector.cc:28
 msgid "Preset"
 msgstr "Preimpostazione"
@@ -6363,6 +6387,13 @@ msgstr ""
 "Il preset selezionato non è stato caricato correttamente!\n"
 "Forse fa riferimento ad un formato che è stato rimosso?"
 
+#: export_preset_selector.cc:156
+#, fuzzy
+msgid "Do you really want to remove this preset?"
+msgstr ""
+"Si vuole realmente rimuovere la traccia \"%1\" ?\n"
+"(questa azione non potrà essere annullata)"
+
 #: export_timespan_selector.cc:46
 msgid "Show Times as:"
 msgstr "Mostra tempo come:"
@@ -6375,36 +6406,49 @@ msgstr "a"
 msgid "Range"
 msgstr "Intervallo"
 
-#: gain_meter.cc:109 gain_meter.cc:431 gain_meter.cc:820
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+#, fuzzy
+msgid "curl error %1 (%2)"
+msgstr "Errore di programmazione:  %1 (%2)"
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+msgid "%1"
+msgstr ""
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr "-inf"
 
-#: gain_meter.cc:115 gain_meter.cc:869
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr "Modalità di automazione fader"
 
-#: gain_meter.cc:116 gain_meter.cc:870
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr "Tipo di automazione fader"
 
-#: gain_meter.cc:125 gain_meter.cc:759 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr ""
 
-#: gain_meter.cc:334
-msgid "-Inf"
-msgstr ""
-
-#: gain_meter.cc:726 mixer_strip.cc:1954 panner_ui.cc:557
-#: route_time_axis.cc:2391
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
+#: route_time_axis.cc:2411
 msgid "P"
 msgstr ""
 
-#: gain_meter.cc:729 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr ""
 
-#: gain_meter.cc:732 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr ""
 
@@ -6417,7 +6461,7 @@ msgstr "<span size=\"large\">Presets</span>"
 msgid "Switches"
 msgstr "Intonazione"
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2210
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 msgid "Controls"
 msgstr "Controlli"
 
@@ -6447,68 +6491,68 @@ msgstr "Gestore delle connessioni audio"
 msgid "MIDI Connection Manager"
 msgstr "Gestore delle connessionio MIDI"
 
-#: global_port_matrix.cc:204 io_selector.cc:216
+#: global_port_matrix.cc:213 io_selector.cc:216
 msgid "port"
 msgstr "entrata"
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 msgid "Selection..."
 msgstr "Selezione..."
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr "Registrazione abilitata"
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 msgid "Soloed..."
 msgstr "In solo..."
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 #, fuzzy
 msgid "Create New Group ..."
 msgstr "Nuovo Gruppo"
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr ""
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 #, fuzzy
 msgid "Edit Group..."
 msgstr "Nuovo Gruppo"
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 #, fuzzy
 msgid "Collect Group"
 msgstr "Colleziona"
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 #, fuzzy
 msgid "Remove Group"
 msgstr "Modifica Gruppo"
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 #, fuzzy
 msgid "Remove Subgroup Bus"
 msgstr "Aggiungi un nuovo bus sottogruppo"
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 msgid "Add New Subgroup Bus"
 msgstr "Aggiungi un nuovo bus sottogruppo"
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr "Aggiungi un nuovo bus ausiliario (pre-fader)"
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 msgid "Add New Aux Bus (post-fader)"
 msgstr "Aggiungi un bus ausiliario (post-fader)"
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 msgid "Enable All Groups"
 msgstr ""
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 #, fuzzy
 msgid "Disable All Groups"
 msgstr "Disabilita tutto"
@@ -6607,11 +6651,11 @@ msgstr "Importazione file: %1 di %2"
 msgid "I/O selector"
 msgstr "Esegui la regione selezionata come loop"
 
-#: io_selector.cc:266
+#: io_selector.cc:265
 msgid "%1 input"
 msgstr "entrata %1"
 
-#: io_selector.cc:268
+#: io_selector.cc:267
 msgid "%1 output"
 msgstr "uscita %1"
 
@@ -6695,7 +6739,7 @@ msgstr[1] "campione"
 msgid "Reset"
 msgstr "Azzera"
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1734
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 msgid "programming error: %1 (%2)"
 msgstr "Errore di programmazione:  %1 (%2)"
 
@@ -6725,68 +6769,68 @@ msgstr "Compositore"
 msgid "Pre-Emphasis"
 msgstr ""
 
-#: location_ui.cc:310
+#: location_ui.cc:314
 #, fuzzy
 msgid "Remove this range"
 msgstr "Dimentica questo intervallo"
 
-#: location_ui.cc:311
+#: location_ui.cc:315
 msgid "Start time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:312
+#: location_ui.cc:316
 msgid "End time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:315
+#: location_ui.cc:319
 #, fuzzy
 msgid "Set range start from playhead location"
 msgstr "Imposta dall'inizio"
 
-#: location_ui.cc:316
+#: location_ui.cc:320
 #, fuzzy
 msgid "Set range end from playhead location"
 msgstr "Imposta intervallo dalla selezione intervallo"
 
-#: location_ui.cc:320
+#: location_ui.cc:324
 #, fuzzy
 msgid "Remove this marker"
 msgstr "Dimentica questo marcatore"
 
-#: location_ui.cc:321
+#: location_ui.cc:325
 msgid "Position - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:323
+#: location_ui.cc:327
 #, fuzzy
 msgid "Set marker time from playhead location"
 msgstr "Imposta intervallo dalla selezione intervallo"
 
-#: location_ui.cc:462
+#: location_ui.cc:494
 msgid "You cannot put a CD marker at the start of the session"
 msgstr "Impossibile inserire un marcatore CD all'inizio della sessione"
 
-#: location_ui.cc:708
+#: location_ui.cc:720
 msgid "New Marker"
 msgstr "Nuovo marcatore"
 
-#: location_ui.cc:709
+#: location_ui.cc:721
 msgid "New Range"
 msgstr "Nuovo Intervallo"
 
-#: location_ui.cc:722
+#: location_ui.cc:734
 msgid "<b>Loop/Punch Ranges</b>"
 msgstr "Intervalli di Ciclo/Punch"
 
-#: location_ui.cc:747
+#: location_ui.cc:759
 msgid "<b>Markers (Including CD Index)</b>"
 msgstr "<b>Marcatori (inclusi gli indici CD)</b>"
 
-#: location_ui.cc:782
+#: location_ui.cc:794
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
 msgstr "<b>Intervalli (inclusi gli intervalli traccia CD)</b>"
 
-#: location_ui.cc:1024
+#: location_ui.cc:1036
 msgid "add range marker"
 msgstr "agggiungi marcatore di intervallo"
 
@@ -6871,20 +6915,20 @@ msgstr ""
 "e riconnettere %1, oppure uscire da %1 adesso. Non è possibile salvare\n"
 "la sessione adesso perché perderemmo le tue impostazioni di connessione.\n"
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr ""
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr ""
 
-#: main.cc:504
+#: main.cc:500
 #, fuzzy
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr "Diritti (C) 1999-2011 Paul Davis"
 
-#: main.cc:505
+#: main.cc:501
 #, fuzzy
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
@@ -6893,29 +6937,33 @@ msgstr ""
 "Per alcune parti Diritti (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker"
 
-#: main.cc:507
+#: main.cc:503
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr "%1 è fornito SENZA ALCUNA GARANZIA"
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr "neanche per la COMMERCIALIZZAZIONE o PER SCOPI PARTICOLARI."
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "Questo è software libero e siete i benvenuti se volete redistribuirlo "
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr ""
 "sotto determinate condizioni; leggere i sorgenti per le condizioni relative "
 "alla copia."
 
-#: main.cc:519
+#: main.cc:513
+msgid "could not initialize %1."
+msgstr "Impossibile inizializzare %1."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr ""
 
-#: main.cc:525
+#: main.cc:528
 #, fuzzy
 msgid "could not create %1 GUI"
 msgstr "Impossibile creare l'interfaccia di Ardour"
@@ -6925,7 +6973,7 @@ msgstr "Impossibile creare l'interfaccia di Ardour"
 msgid "Display delta to edit cursor"
 msgstr "Inizio al cursore di modifica"
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 #, fuzzy
 msgid "MarkerText"
 msgstr "Marcatori"
@@ -7461,7 +7509,7 @@ msgstr "Clicca per scegliere un'altra cartella"
 msgid "Missing Plugins"
 msgstr "Plugin mancanti"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr "Ok"
 
@@ -7541,239 +7589,252 @@ msgstr "Inizializzazione menù da %1"
 msgid "Could not find mixer.bindings in search path %1"
 msgstr ""
 
-#: mixer_strip.cc:91 mixer_strip.cc:119 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr ""
 
-#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:352 mixer_strip.cc:1293
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 #, fuzzy
 msgid "Comments"
 msgstr "Commento"
 
-#: mixer_strip.cc:145
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr ""
 
-#: mixer_strip.cc:147
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
 msgstr ""
 
-#: mixer_strip.cc:154
+#: mixer_strip.cc:156
 #, fuzzy
 msgid "Hide this mixer strip"
 msgstr "Nascondi tutti i Bus del Mixer"
 
-#: mixer_strip.cc:165
+#: mixer_strip.cc:167
 #, fuzzy
 msgid "Click to select metering point"
 msgstr "Esegui la regione selezionata come loop"
 
-#: mixer_strip.cc:171
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr ""
 
-#: mixer_strip.cc:190
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr "Solo isolato"
 
-#: mixer_strip.cc:199
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr "Blocca lo stato di solo"
 
-#: mixer_strip.cc:201 mixer_strip.cc:1929
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 msgid "lock"
 msgstr "blocca"
 
-#: mixer_strip.cc:202 mixer_strip.cc:1928
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 msgid "iso"
 msgstr ""
 
-#: mixer_strip.cc:256
+#: mixer_strip.cc:258
 #, fuzzy
 msgid "Mix group"
 msgstr "nessun gruppo"
 
-#: mixer_strip.cc:349 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 #, fuzzy
 msgid "Phase Invert"
 msgstr "Inverti"
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 #, fuzzy
 msgid "Solo Safe"
 msgstr "Intervallo di loop"
 
-#: mixer_strip.cc:353 mixer_ui.cc:124 route_time_axis.cc:664
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 msgid "Group"
 msgstr "Gruppo"
 
-#: mixer_strip.cc:354 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 #, fuzzy
 msgid "Meter Point"
 msgstr "Misurazione"
 
-#: mixer_strip.cc:466
+#: mixer_strip.cc:470
 #, fuzzy
 msgid "Enable/Disable MIDI input"
 msgstr "Abilita/Disabilita il click audio"
 
-#: mixer_strip.cc:616
+#: mixer_strip.cc:622
 #, fuzzy
 msgid ""
 "Aux\n"
 "Sends"
 msgstr "Mandate"
 
-#: mixer_strip.cc:640
+#: mixer_strip.cc:646
 #, fuzzy
 msgid "Snd"
 msgstr "Secondi"
 
-#: mixer_strip.cc:694 mixer_strip.cc:822 processor_box.cc:2152
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr "Nessuna connessione a JACK - nessuna modifica I/O consentita"
 
-#: mixer_strip.cc:1089
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr ""
 
-#: mixer_strip.cc:1092
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr ""
 
-#: mixer_strip.cc:1167
+#: mixer_strip.cc:1174
 msgid "Disconnected"
 msgstr "Disconnesso"
 
-#: mixer_strip.cc:1296
+#: mixer_strip.cc:1303
 #, fuzzy
 msgid "*Comments*"
 msgstr "Commento"
 
-#: mixer_strip.cc:1303
+#: mixer_strip.cc:1310
 #, fuzzy
 msgid "Cmt"
 msgstr "taglia"
 
-#: mixer_strip.cc:1306
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr ""
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr ""
 
-#: mixer_strip.cc:1351
+#: mixer_strip.cc:1358
 #, fuzzy
 msgid ": comment editor"
 msgstr "IU: impossibile avviare l'editor"
 
-#: mixer_strip.cc:1428
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr ""
 
-#: mixer_strip.cc:1431
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr ""
 
-#: mixer_strip.cc:1460
+#: mixer_strip.cc:1467
 msgid "Comments..."
 msgstr "Commenti..."
 
-#: mixer_strip.cc:1462
+#: mixer_strip.cc:1469
 msgid "Save As Template..."
 msgstr "Salva come modello..."
 
-#: mixer_strip.cc:1468 route_group_dialog.cc:39 route_time_axis.cc:687
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr "Attivo"
 
-#: mixer_strip.cc:1475
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr "Regola la latenza..."
 
-#: mixer_strip.cc:1478
+#: mixer_strip.cc:1485
 msgid "Protect Against Denormals"
 msgstr "Protezione dalla denormalizzazione"
 
-#: mixer_strip.cc:1484 route_time_axis.cc:426
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 #, fuzzy
 msgid "Remote Control ID..."
 msgstr "Rimuovi il punto di sincronizzazione"
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 #, fuzzy
 msgid "in"
 msgstr "vuoto"
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 #, fuzzy
 msgid "post"
 msgstr "entrata"
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 #, fuzzy
 msgid "out"
 msgstr "Circa"
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr "personalizzato"
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 #, fuzzy
 msgid "pr"
 msgstr "entrata"
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 #, fuzzy
 msgid "po"
 msgstr "entrata"
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 #, fuzzy
 msgid "o"
 msgstr "Mono"
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr ""
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr ""
 
-#: mixer_strip.cc:1920 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr "AFL"
 
-#: mixer_strip.cc:1923 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr "PFL"
 
-#: mixer_strip.cc:1936
+#: mixer_strip.cc:1933
 #, fuzzy
 msgid "D"
 msgstr "CD"
 
-#: mixer_strip.cc:1959
+#: mixer_strip.cc:1953
 #, fuzzy
 msgid "i"
 msgstr "vuoto"
 
-#: mixer_strip.cc:2133
+#: mixer_strip.cc:2128
 #, fuzzy
 msgid "Pre-fader"
 msgstr "Pre Fader"
 
-#: mixer_strip.cc:2134
+#: mixer_strip.cc:2129
 #, fuzzy
 msgid "Post-fader"
 msgstr "Post Fader"
 
+#: mixer_strip.cc:2166 meter_strip.cc:728
+msgid "Change all in Group to %1"
+msgstr ""
+
+#: mixer_strip.cc:2168 meter_strip.cc:730
+#, fuzzy
+msgid "Change all to %1"
+msgstr "Canale %1"
+
+#: mixer_strip.cc:2170 meter_strip.cc:732
+msgid "Change same track-type to %1"
+msgstr ""
+
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr ""
@@ -7782,10 +7843,67 @@ msgstr ""
 msgid "-all-"
 msgstr "-tutto-"
 
-#: mixer_ui.cc:1792
+#: mixer_ui.cc:1794
 msgid "Strips"
 msgstr "Strisce"
 
+#: meter_strip.cc:764
+msgid "Variable height"
+msgstr ""
+
+#: meter_strip.cc:765
+#, fuzzy
+msgid "Short"
+msgstr "breve"
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr ""
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr ""
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+msgid "VU"
+msgstr ""
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr "SiP"
@@ -8189,7 +8307,7 @@ msgstr ""
 msgid "Panner (2D)"
 msgstr ""
 
-#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:452
+#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:451
 #, fuzzy
 msgid "Bypass"
 msgstr "Battute"
@@ -8373,7 +8491,7 @@ msgstr "Per categoria"
 msgid "Eh? LADSPA plugins don't have editors!"
 msgstr "Cosa? I plugin LADSPA non hanno editor?"
 
-#: plugin_ui.cc:125 plugin_ui.cc:228
+#: plugin_ui.cc:125 plugin_ui.cc:227
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
@@ -8389,7 +8507,7 @@ msgstr ""
 "tipo di plugin fornito sconosciuto (nota: nessun supporto a VST in questa "
 "versione di ardour)"
 
-#: plugin_ui.cc:258
+#: plugin_ui.cc:257
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no linuxVST support in this "
@@ -8398,76 +8516,88 @@ msgstr ""
 "tipo di plugin fornito sconosciuto (nota: nessun supporto a VST in questa "
 "versione di ardour)"
 
-#: plugin_ui.cc:330
+#: plugin_ui.cc:329
 msgid "create_lv2_editor called on non-LV2 plugin"
 msgstr ""
 
-#: plugin_ui.cc:418
+#: plugin_ui.cc:417
 msgid "Add"
 msgstr "Aggiungi"
 
-#: plugin_ui.cc:422
+#: plugin_ui.cc:421
 #, fuzzy
 msgid "Description"
 msgstr "Direzione:"
 
-#: plugin_ui.cc:423
+#: plugin_ui.cc:422
 msgid "Plugin analysis"
 msgstr "Analisi plugin"
 
-#: plugin_ui.cc:430
+#: plugin_ui.cc:429
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
 msgstr ""
 
-#: plugin_ui.cc:431
+#: plugin_ui.cc:430
 #, fuzzy
 msgid "Save a new preset"
 msgstr "Nome del nuovo preset"
 
-#: plugin_ui.cc:432
+#: plugin_ui.cc:431
 msgid "Save the current preset"
 msgstr ""
 
-#: plugin_ui.cc:433
+#: plugin_ui.cc:432
 msgid "Delete the current preset"
 msgstr ""
 
-#: plugin_ui.cc:434
+#: plugin_ui.cc:433
 msgid "Disable signal processing by the plugin"
 msgstr ""
 
-#: plugin_ui.cc:467 plugin_ui.cc:632
+#: plugin_ui.cc:466 plugin_ui.cc:662
 msgid ""
 "Click to allow the plugin to receive keyboard events that %1 would normally "
 "use as a shortcut"
 msgstr ""
 
-#: plugin_ui.cc:468
+#: plugin_ui.cc:467
 msgid "Click to enable/disable this plugin"
 msgstr ""
 
-#: plugin_ui.cc:507
+#: plugin_ui.cc:506
 #, fuzzy
 msgid "latency (%1 sample)"
 msgid_plural "latency (%1 samples)"
 msgstr[0] "latenza (%1 campioni)"
 msgstr[1] "latenza (%1 campioni)"
 
-#: plugin_ui.cc:509
+#: plugin_ui.cc:508
 msgid "latency (%1 ms)"
 msgstr "latenza (%1 ms)"
 
-#: plugin_ui.cc:520
+#: plugin_ui.cc:519
 msgid "Edit Latency"
 msgstr "Modifica latenza"
 
-#: plugin_ui.cc:559
+#: plugin_ui.cc:558
 msgid "Plugin preset %1 not found"
 msgstr "Preset per plugin %1 non trovato"
 
-#: plugin_ui.cc:639
+#: plugin_ui.cc:595
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin_ui.cc:615 plugin_ui.cc:630
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"newer version"
+msgstr ""
+
+#: plugin_ui.cc:669
 msgid "Click to allow normal use of %1 keyboard shortcuts"
 msgstr "Clicca per consentire il normale utilizzo delle scorciatoie di %1"
 
@@ -8576,47 +8706,47 @@ msgstr "Rilevamento..."
 msgid "Port Insert "
 msgstr "Nuova entrata"
 
-#: port_matrix.cc:323 port_matrix.cc:342
+#: port_matrix.cc:331 port_matrix.cc:357
 #, fuzzy
 msgid "<b>Sources</b>"
 msgstr "Avanzate..."
 
-#: port_matrix.cc:324 port_matrix.cc:343
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr "<b>Destinazioni</b>"
 
-#: port_matrix.cc:419 port_matrix.cc:427
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr "Aggiungi %s %s"
 
-#: port_matrix.cc:435
+#: port_matrix.cc:456
 #, c-format
 msgid "Rename '%s'..."
 msgstr "Rinomina '%s'..."
 
-#: port_matrix.cc:451
+#: port_matrix.cc:472
 msgid "Remove all"
 msgstr "Rimuovi tutto"
 
-#: port_matrix.cc:471 port_matrix.cc:483
+#: port_matrix.cc:492 port_matrix.cc:504
 #, fuzzy, c-format
 msgid "%s all"
 msgstr "azzera"
 
-#: port_matrix.cc:506
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr "Aggiorna"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr "Mostra porte individuali"
 
-#: port_matrix.cc:514
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr ""
 
-#: port_matrix.cc:702
+#: port_matrix.cc:723
 #, fuzzy
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
@@ -8625,33 +8755,35 @@ msgstr ""
 "Questa porta non può essere rimossa visto che il plugin nella traccia/bus  "
 "non può accettare il nuovo numero di ingressi"
 
-#: port_matrix.cc:705
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr ""
 
-#: port_matrix.cc:727
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr "La rimozione delle porte non è consentita"
 
-#: port_matrix.cc:728
+#: port_matrix.cc:749
+#, fuzzy
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
 "Questa porta non può essere rimossa visto che il plugin nella traccia/bus  "
 "non può accettare il nuovo numero di ingressi"
 
-#: port_matrix.cc:945
+#: port_matrix.cc:966
 #, c-format
 msgid "Remove '%s'"
 msgstr "Rimuovi '%s'"
 
-#: port_matrix.cc:960
+#: port_matrix.cc:981
 #, fuzzy, c-format
 msgid "%s all from '%s'"
 msgstr "Seleziona tutto"
 
-#: port_matrix.cc:1026
+#: port_matrix.cc:1047
 msgid "channel"
 msgstr "canali"
 
@@ -8663,53 +8795,53 @@ msgstr "Non ci sono porte cui connettersi."
 msgid "There are no %1 ports to connect."
 msgstr "Non ci sono porte %1 cui connettersi."
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
 "Alt+double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 #, fuzzy
 msgid "Show All Controls"
 msgstr "Mostra le mandate"
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 #, fuzzy
 msgid "Hide All Controls"
 msgstr "Nascondi tutte le dissolvenze"
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 #, fuzzy
 msgid "on"
 msgstr "Mono"
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr "spento"
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
 msgstr ""
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 msgid "Plugin Incompatibility"
 msgstr ""
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr "Hai tentato di aggiungere il plugin \"%1\" nella posizione %2.\n"
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
@@ -8717,21 +8849,21 @@ msgstr ""
 "\n"
 "Questo plugin ha:\n"
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 #, fuzzy
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
 msgstr[0] "\t%1 ingresso MIDI \n"
 msgstr[1] "entrata %1"
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 #, fuzzy
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
 msgstr[0] "\t%1 ingresso audio\n"
 msgstr[1] "entrata %1"
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
@@ -8739,21 +8871,21 @@ msgstr ""
 "\n"
 "ma in corrispondenza del punto di inserimento ci sono:\n"
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 #, fuzzy
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
 msgstr[0] "cancella"
 msgstr[1] "cancella"
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 #, fuzzy
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
 msgstr[0] "cancella"
 msgstr[1] "cancella"
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
@@ -8761,11 +8893,11 @@ msgstr ""
 "\n"
 "%1 non può inserire qui questo plugin.\n"
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 msgid "Cannot set up new send: %1"
 msgstr "Impossibile prepare la nuova mandata: %1"
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
 "in that way because the inputs and\n"
@@ -8775,27 +8907,27 @@ msgstr ""
 "in questa maniera perché gli ingressi e le uscite\n"
 "non funzionerebbero correttamente."
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 msgid "Rename Processor"
 msgstr "Rinomina processore"
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr ""
 "Esistono almeno 100 oggetti I/O con un nome simile a %1 - nome non cambiato"
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr ""
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
 "could not match the configuration of this track."
 msgstr ""
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 #, fuzzy
 msgid ""
 "Do you really want to remove all processors from %1?\n"
@@ -8804,15 +8936,15 @@ msgstr ""
 "Si vuole realmente rimuovere la traccia %1 ?\n"
 "(questa azione non potrà essere annullata)"
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 msgid "Yes, remove them all"
 msgstr "Si, rimuovi tutto"
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 msgid "Remove processors"
 msgstr "Rimuovi processori"
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 #, fuzzy
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
@@ -8821,7 +8953,7 @@ msgstr ""
 "Si vuole realmente rimuovere la traccia \"%1\" ?\n"
 "(questa azione non potrà essere annullata)"
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 #, fuzzy
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
@@ -8830,53 +8962,53 @@ msgstr ""
 "Si vuole realmente rimuovere la traccia \"%1\" ?\n"
 "(questa azione non potrà essere annullata)"
 
-#: processor_box.cc:2198
+#: processor_box.cc:2200
 msgid "New Plugin"
 msgstr "Nuovo plugin"
 
-#: processor_box.cc:2201
+#: processor_box.cc:2203
 msgid "New Insert"
 msgstr "Nuovo insert"
 
-#: processor_box.cc:2204
+#: processor_box.cc:2206
 #, fuzzy
 msgid "New External Send ..."
 msgstr "Nuova mandata ausiliaria..."
 
-#: processor_box.cc:2208
+#: processor_box.cc:2210
 msgid "New Aux Send ..."
 msgstr "Nuova mandata ausiliaria..."
 
-#: processor_box.cc:2212
+#: processor_box.cc:2214
 msgid "Clear (all)"
 msgstr "Pulisci (tutto)"
 
-#: processor_box.cc:2214
+#: processor_box.cc:2216
 msgid "Clear (pre-fader)"
 msgstr "Pulisci (pre-fader)"
 
-#: processor_box.cc:2216
+#: processor_box.cc:2218
 msgid "Clear (post-fader)"
 msgstr "Pulisci (post-fader)"
 
-#: processor_box.cc:2242
+#: processor_box.cc:2244
 msgid "Activate All"
 msgstr "Attiva tutto"
 
-#: processor_box.cc:2244
+#: processor_box.cc:2246
 #, fuzzy
 msgid "Deactivate All"
 msgstr "Disattiva tutto"
 
-#: processor_box.cc:2246
+#: processor_box.cc:2248
 msgid "A/B Plugins"
 msgstr "Plugin A/B"
 
-#: processor_box.cc:2255
+#: processor_box.cc:2257
 msgid "Edit with generic controls..."
 msgstr ""
 
-#: processor_box.cc:2531
+#: processor_box.cc:2557
 msgid "%1: %2 (by %3)"
 msgstr "%1: %2 (per %3)"
 
@@ -9043,7 +9175,7 @@ msgstr ""
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
 
 #: rc_option_editor.cc:836
@@ -9137,7 +9269,7 @@ msgstr ""
 msgid "Click gain level"
 msgstr "File audio (click):"
 
-#: rc_option_editor.cc:1083 route_time_axis.cc:206 route_time_axis.cc:667
+#: rc_option_editor.cc:1083 route_time_axis.cc:215 route_time_axis.cc:676
 msgid "Automation"
 msgstr "Automazione"
 
@@ -9322,97 +9454,101 @@ msgstr ""
 msgid "Show meters on tracks in the editor"
 msgstr "Mostra i meter sulle tracce nell'editor"
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr ""
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr ""
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 msgid "whenever they overlap in time"
 msgstr ""
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr ""
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr ""
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 msgid "Show waveforms in regions"
 msgstr "Mostra le onde nelle regioni"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 #, fuzzy
 msgid "Show gain envelopes in audio regions"
 msgstr "Mostra le onde nelle regioni"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr ""
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr ""
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 #, fuzzy
 msgid "Waveform scale"
 msgstr "Forme wave"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "lineare"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr "logaritmico"
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 #, fuzzy
 msgid "Waveform shape"
 msgstr "Forme wave"
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 #, fuzzy
 msgid "traditional"
 msgstr "Tradizionale"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 #, fuzzy
 msgid "rectified"
 msgstr "Rettificato"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr "Mostra le onde durante la registrazione audio"
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr "Mostra la barra dello zoom"
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr "Colora le regioni utilizzando il colore della traccia di appartenenza"
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr ""
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 msgid "Synchronise editor and mixer track order"
 msgstr "Sincronizza l'ordine delle tracce tra editor e mixer"
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 #, fuzzy
 msgid "Synchronise editor and mixer selection"
 msgstr "Sincronizza l'ordine delle tracce tra editor e mixer"
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 msgid "Name new markers"
 msgstr "Assegna un nome ai nuovi marcatori"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9420,349 +9556,434 @@ msgid ""
 "You can always rename markers by right-clicking on them"
 msgstr ""
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr ""
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr ""
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 msgid "Record monitoring handled by"
 msgstr "Controllo della registrazione da parte di"
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 #, fuzzy
 msgid "ardour"
 msgstr "ardour: orologio"
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 msgid "audio hardware"
 msgstr "hardware audio"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 msgid "Tape machine mode"
 msgstr "Modalità nastro"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr "Connessione di tracce e bus"
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr "Connetti automaticamente i bus master/monitor"
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 msgid "Connect track inputs"
 msgstr "Connetti ingressi della traccia"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 msgid "automatically to physical inputs"
 msgstr "automaticamente agli ingressi fisici"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr "manualmente"
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 msgid "Connect track and bus outputs"
 msgstr "Connetti le uscite della traccia e del bus"
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 msgid "automatically to physical outputs"
 msgstr "automaticamente alle uscite fisiche"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 msgid "automatically to master bus"
 msgstr "automaticamente al bus master"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 #, fuzzy
 msgid "Denormals"
 msgstr "Normale"
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 msgid "Use DC bias to protect against denormals"
 msgstr ""
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr "Gestione processore"
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr "nessuna gestione processore"
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 msgid "use FlushToZero"
 msgstr ""
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr ""
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr ""
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 #, fuzzy
 msgid "Silence plugins when the transport is stopped"
 msgstr "Ferma i plugin insieme alla riproduzione"
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr "Attiva i nuovi plugin"
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr "Abilita l'analisi automatica dell'audio"
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 msgid "Replicate missing region channels"
 msgstr ""
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 msgid "Solo / mute"
 msgstr "Solo / mute"
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 msgid "Solo-in-place mute cut (dB)"
 msgstr ""
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr "I controlli di solo sono controlli di ascolto"
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 #, fuzzy
 msgid "Listen Position"
 msgstr "Posizione"
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 #, fuzzy
 msgid "after-fader (AFL)"
 msgstr "ascolto after-fader"
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 #, fuzzy
 msgid "pre-fader (PFL)"
 msgstr "ascolto pre-fader"
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr "i segnali PFL provengono da"
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 #, fuzzy
 msgid "before pre-fader processors"
 msgstr "rimuovi marcatore"
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr ""
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr "I segnali AFL provengono da"
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 #, fuzzy
 msgid "immediately post-fader"
 msgstr "Pulisci (post-fader)"
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 #, fuzzy
 msgid "after post-fader processors (before pan)"
 msgstr "rimuovi marcatore"
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr "Solo esclusivo"
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 msgid "Show solo muting"
 msgstr ""
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr ""
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 msgid "Default track / bus muting options"
 msgstr "Opzioni di </i>mute</i> base per Tracce/Bus"
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr "Mute agisce sulle mandate pre-fader"
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr "Mute agisce sulle mandate post-fader"
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 msgid "Mute affects control outputs"
 msgstr "Mute agisce sulle uscite"
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr "Mute agisce sulle uscite principali"
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 msgid "Send MIDI Time Code"
 msgstr ""
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr ""
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr ""
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 #, fuzzy
 msgid "Send MIDI control feedback"
 msgstr "Porta MMC"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr ""
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr ""
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr ""
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr ""
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr ""
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 #, fuzzy
 msgid "Sound MIDI notes as they are selected"
 msgstr "Inserisci selezione"
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 #, fuzzy
 msgid "User interaction"
 msgstr "Operazioni sulle regioni"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
 "   <i>(if available for your language preferences)</i>"
 msgstr ""
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr "Tastiera"
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 msgid "Control surface remote ID"
 msgstr "ID della piattaforma di controllo"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 msgid "assigned by user"
 msgstr "assegnato dall'utente"
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr "segue l'ordine del mixer"
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr "segue l'ordine dell'editor"
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1925
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 #, fuzzy
 msgid "Preferences|GUI"
 msgstr "Preferenze"
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr ""
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr ""
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr ""
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 #, fuzzy
 msgid "Mixer Strip"
 msgstr "Mixer"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 #, fuzzy
 msgid "Use narrow strips in the mixer by default"
 msgstr "Strisce del Mixer strette"
 
-#: rc_option_editor.cc:1898
-msgid "Meter hold time"
-msgstr ""
+#: rc_option_editor.cc:1906
+#, fuzzy
+msgid "Peak hold time"
+msgstr "Soglia di picco"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 msgid "short"
 msgstr "breve"
 
-#: rc_option_editor.cc:1905 rc_option_editor.cc:1920
+#: rc_option_editor.cc:1913
 msgid "medium"
 msgstr "medio"
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr "lungo"
 
-#: rc_option_editor.cc:1912
-msgid "Meter fall-off"
+#: rc_option_editor.cc:1920
+#, fuzzy
+msgid "DPM fall-off"
+msgstr "Caduta del misuratore"
+
+#: rc_option_editor.cc:1926
+msgid "slowest [6.6dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1927
+msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
+msgstr ""
+
+#: rc_option_editor.cc:1928
+msgid "slowish [12.0dB/sec] (DIN)"
 msgstr ""
 
-#: rc_option_editor.cc:1918
-msgid "slowest"
-msgstr "più Lento"
+#: rc_option_editor.cc:1929
+msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
+msgstr ""
+
+#: rc_option_editor.cc:1930
+msgid "medium [20dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1931
+msgid "fast [32dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1932
+msgid "faster [46dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1933
+msgid "fastest [70dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1939
+msgid "Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
+
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+msgid "-20dBFS (SMPTE RP.0155)"
+msgstr ""
+
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+msgid "-18dBFS (EBU, BBC)"
+msgstr ""
+
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
+
+#: rc_option_editor.cc:1955
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
+msgstr ""
+
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
+msgstr ""
+
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
+msgstr ""
 
-#: rc_option_editor.cc:1919
-msgid "slow"
-msgstr "lento"
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
+
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
 
-#: rc_option_editor.cc:1921
-msgid "fast"
-msgstr "veloce"
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
 
-#: rc_option_editor.cc:1922
-msgid "faster"
-msgstr "più veloce"
+#: rc_option_editor.cc:1985
+#, fuzzy
+msgid "Peak threshold [dBFS]"
+msgstr "Soglia di picco"
 
-#: rc_option_editor.cc:1923
-msgid "fastest"
-msgstr "velocissimo"
+#: rc_option_editor.cc:1993
+msgid ""
+"Specify the audio signal level in dbFS at and above which the meter-peak "
+"indicator will flash red."
+msgstr ""
+
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
+msgstr ""
 
 #: region_editor.cc:79
 msgid "audition this region"
@@ -9772,11 +9993,11 @@ msgstr "fai l'audition di questa regione"
 msgid "Position:"
 msgstr "Posizione:"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr "Fine:"
 
-#: region_editor.cc:92 sfdb_ui.cc:140
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr "Durata:"
 
@@ -9800,25 +10021,25 @@ msgstr "Sorgenti:"
 msgid "Source:"
 msgstr "Sorgente:"
 
-#: region_editor.cc:167
+#: region_editor.cc:166
 msgid "Region '%1'"
 msgstr "Regione '%1'"
 
-#: region_editor.cc:274
+#: region_editor.cc:273
 #, fuzzy
 msgid "change region start position"
 msgstr "Regioni/posizione"
 
-#: region_editor.cc:290
+#: region_editor.cc:289
 #, fuzzy
 msgid "change region end position"
 msgstr "Regioni/posizione"
 
-#: region_editor.cc:310
+#: region_editor.cc:309
 msgid "change region length"
 msgstr "cambia la durata della regione"
 
-#: region_editor.cc:404 region_editor.cc:416
+#: region_editor.cc:403 region_editor.cc:415
 #, fuzzy
 msgid "change region sync point"
 msgstr "Regioni/posizione"
@@ -10016,340 +10237,340 @@ msgid ""
 "A route group of this name already exists.  Please use a different name."
 msgstr ""
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 msgid "Tracks/Busses"
 msgstr "Tracce/Bus"
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr "Entrate"
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr "Uscite"
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr "Plugin, inserts & mandate"
 
-#: route_params_ui.cc:211
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr ""
 
-#: route_params_ui.cc:258 route_params_ui.cc:286
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr "Ritardo di riproduzione: %<PRId64> campioni"
 
-#: route_params_ui.cc:478
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr "NESSUNA TRACCIA"
 
-#: route_params_ui.cc:611 route_params_ui.cc:612
+#: route_params_ui.cc:613 route_params_ui.cc:614
 msgid "No Track or Bus Selected"
 msgstr "Nessuna traccia o bus selezionati"
 
-#: route_time_axis.cc:96
+#: route_time_axis.cc:97
 msgid "g"
 msgstr ""
 
-#: route_time_axis.cc:97
+#: route_time_axis.cc:98
 msgid "p"
 msgstr ""
 
-#: route_time_axis.cc:98
+#: route_time_axis.cc:99
 msgid "a"
 msgstr ""
 
-#: route_time_axis.cc:168
+#: route_time_axis.cc:173
 msgid "Record (Right-click for Step Edit)"
 msgstr "Registrazione (clicca col destro per la modifica passo passo)"
 
-#: route_time_axis.cc:171
+#: route_time_axis.cc:176
 msgid "Record"
 msgstr "Registra"
 
-#: route_time_axis.cc:201
+#: route_time_axis.cc:210
 #, fuzzy
 msgid "Route Group"
 msgstr "Modifica Gruppo"
 
-#: route_time_axis.cc:204
+#: route_time_axis.cc:213
 #, fuzzy
 msgid "MIDI Controllers and Automation"
 msgstr "Porta MMC"
 
-#: route_time_axis.cc:381
+#: route_time_axis.cc:390
 msgid "Show All Automation"
 msgstr "Mostra tutte le automazioni"
 
-#: route_time_axis.cc:384
+#: route_time_axis.cc:393
 msgid "Show Existing Automation"
 msgstr "Mostra le automazioni esistenti"
 
-#: route_time_axis.cc:387
+#: route_time_axis.cc:396
 msgid "Hide All Automation"
 msgstr "Nascondi tutte le automazioni"
 
-#: route_time_axis.cc:396
+#: route_time_axis.cc:405
 #, fuzzy
 msgid "Processor automation"
 msgstr "pulisci l'automazione"
 
-#: route_time_axis.cc:415
+#: route_time_axis.cc:424
 msgid "Color..."
 msgstr "Colore..."
 
-#: route_time_axis.cc:472
+#: route_time_axis.cc:481
 msgid "Overlaid"
 msgstr ""
 
-#: route_time_axis.cc:478
+#: route_time_axis.cc:487
 msgid "Stacked"
 msgstr ""
 
-#: route_time_axis.cc:486
+#: route_time_axis.cc:495
 msgid "Layers"
 msgstr "Livelli"
 
-#: route_time_axis.cc:555
+#: route_time_axis.cc:564
 msgid "Automatic (based on I/O connections)"
 msgstr "Automatico (basato sulle connessioni I/O)"
 
-#: route_time_axis.cc:564
+#: route_time_axis.cc:573
 #, fuzzy
 msgid "(Currently: Existing Material)"
 msgstr "Materiale esistente"
 
-#: route_time_axis.cc:567
+#: route_time_axis.cc:576
 #, fuzzy
 msgid "(Currently: Capture Time)"
 msgstr "Tempo di registrazione"
 
-#: route_time_axis.cc:575
+#: route_time_axis.cc:584
 #, fuzzy
 msgid "Align With Existing Material"
 msgstr "Materiale esistente"
 
-#: route_time_axis.cc:580
+#: route_time_axis.cc:589
 #, fuzzy
 msgid "Align With Capture Time"
 msgstr "Tempo di registrazione"
 
-#: route_time_axis.cc:585
+#: route_time_axis.cc:594
 #, fuzzy
 msgid "Alignment"
 msgstr "Allinea"
 
-#: route_time_axis.cc:620
+#: route_time_axis.cc:629
 msgid "Normal Mode"
 msgstr "Normale"
 
-#: route_time_axis.cc:626
+#: route_time_axis.cc:635
 msgid "Tape Mode"
 msgstr "Nastro"
 
-#: route_time_axis.cc:632
+#: route_time_axis.cc:641
 #, fuzzy
 msgid "Non-Layered Mode"
 msgstr "Regioni/fine"
 
-#: route_time_axis.cc:645 route_time_axis.cc:1587
+#: route_time_axis.cc:654 route_time_axis.cc:1601
 msgid "Playlist"
 msgstr "Scaletta"
 
-#: route_time_axis.cc:965
+#: route_time_axis.cc:979
 msgid "Rename Playlist"
 msgstr "Rinomina playlist"
 
-#: route_time_axis.cc:966
+#: route_time_axis.cc:980
 msgid "New name for playlist:"
 msgstr "Nuovo nome per la playlist:"
 
-#: route_time_axis.cc:1051
+#: route_time_axis.cc:1065
 msgid "New Copy Playlist"
 msgstr "Copia playlist"
 
-#: route_time_axis.cc:1052 route_time_axis.cc:1105
+#: route_time_axis.cc:1066 route_time_axis.cc:1119
 msgid "Name for new playlist:"
 msgstr "Nome per la nuova playlist:"
 
-#: route_time_axis.cc:1104
+#: route_time_axis.cc:1118
 msgid "New Playlist"
 msgstr "Nuova playlist"
 
-#: route_time_axis.cc:1295
+#: route_time_axis.cc:1309
 msgid "You cannot create a track with that name as it is reserved for %1"
 msgstr ""
 "Non si può creare una traccia con questo nome perché è riservato per %1"
 
-#: route_time_axis.cc:1476
+#: route_time_axis.cc:1490
 msgid "New Copy..."
 msgstr "Nuova copia..."
 
-#: route_time_axis.cc:1480
+#: route_time_axis.cc:1494
 #, fuzzy
 msgid "New Take"
 msgstr "Nuovo tempo"
 
-#: route_time_axis.cc:1481
+#: route_time_axis.cc:1495
 #, fuzzy
 msgid "Copy Take"
 msgstr "Copia"
 
-#: route_time_axis.cc:1486
+#: route_time_axis.cc:1500
 msgid "Clear Current"
 msgstr "Pulisci Corrente"
 
-#: route_time_axis.cc:1489
+#: route_time_axis.cc:1503
 msgid "Select From All..."
 msgstr "Seleziona tutto da..."
 
-#: route_time_axis.cc:1577
+#: route_time_axis.cc:1591
 msgid "Take: %1.%2"
 msgstr ""
 
-#: route_time_axis.cc:2267
+#: route_time_axis.cc:2291
 msgid "Underlays"
 msgstr ""
 
-#: route_time_axis.cc:2270
+#: route_time_axis.cc:2294
 msgid "Remove \"%1\""
 msgstr "Rimuovi  \"%1\""
 
-#: route_time_axis.cc:2320 route_time_axis.cc:2357
+#: route_time_axis.cc:2344 route_time_axis.cc:2381
 msgid "programming error: underlay reference pointer pairs are inconsistent!"
 msgstr ""
 
-#: route_time_axis.cc:2388
+#: route_time_axis.cc:2408
 #, fuzzy
 msgid "After-fade listen (AFL)"
 msgstr "ascolto after-fader"
 
-#: route_time_axis.cc:2392
+#: route_time_axis.cc:2412
 #, fuzzy
 msgid "Pre-fade listen (PFL)"
 msgstr "ascolto pre-fader"
 
-#: route_time_axis.cc:2396
+#: route_time_axis.cc:2416
 msgid "s"
 msgstr ""
 
-#: route_time_axis.cc:2400
+#: route_time_axis.cc:2419
 msgid "m"
 msgstr ""
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 msgid "Mute this track"
 msgstr "Muta questa traccia"
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr ""
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr "Abilita la registrazione"
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr ""
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 #, fuzzy
 msgid "Monitor input"
 msgstr "Controllo"
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 #, fuzzy
 msgid "Monitor playback"
 msgstr "Interrompi la riproduzione"
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 msgid "Not connected to JACK - cannot engage record"
 msgstr ""
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 #, fuzzy
 msgid "Step Entry"
 msgstr "Modifica"
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr ""
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 #, fuzzy
 msgid "Assign all tracks and buses (prefader)"
 msgstr "Inserisci selezione"
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr ""
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 #, fuzzy
 msgid "Assign all tracks and buses (postfader)"
 msgstr "Inserisci selezione"
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 #, fuzzy
 msgid "Assign selected tracks (prefader)"
 msgstr "Inserisci selezione"
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 #, fuzzy
 msgid "Assign selected tracks and buses (prefader)"
 msgstr "Inserisci selezione"
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 #, fuzzy
 msgid "Assign selected tracks (postfader)"
 msgstr "Inserisci selezione"
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 #, fuzzy
 msgid "Assign selected tracks and buses (postfader)"
 msgstr "Inserisci selezione"
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 #, fuzzy
 msgid "Copy track/bus gains to sends"
 msgstr "ardour: aggiungi traccia/bus"
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr "Imposta il volume delle manda su -inf"
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr "Imposta il volume delle mandate a 0dB"
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 msgid "Solo Isolate"
 msgstr ""
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr "Pre Fader"
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr "Post Fader"
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr "Uscite di Controllo"
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr "Uscite Principali"
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 msgid "Color Selection"
 msgstr "Scelta colore"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "\n"
@@ -10364,7 +10585,7 @@ msgstr ""
 "(questa azione non potrà essere annullata ed il file di sessione verrà "
 "sovrascritto)"
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
 "\n"
@@ -10375,64 +10596,64 @@ msgstr ""
 "(questa azione non potrà essere annullata ed il file di sessione verrà "
 "sovrascritto)"
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 msgid "Remove track"
 msgstr "Rimuovi traccia"
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 msgid "Remove bus"
 msgstr "Rimuovi bus"
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
 msgstr ""
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 #, fuzzy
 msgid "Use the new name"
 msgstr "nuovo nome: "
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 msgid "Re-edit the name"
 msgstr ""
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 msgid "Rename Track"
 msgstr "Rinomina traccia"
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 msgid "Rename Bus"
 msgstr "Rinomina bus"
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 msgid " latency"
 msgstr " latenza"
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr ""
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 msgid "Save As Template"
 msgstr "Salva come modello"
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 msgid "Template name:"
 msgstr "Nome del modello:"
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 #, fuzzy
 msgid "Remote Control ID"
 msgstr "Rimuovi il punto di sincronizzazione"
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 #, fuzzy
 msgid "Remote control ID:"
 msgstr "Rimuovi il punto di sincronizzazione"
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -10440,17 +10661,17 @@ msgid ""
 "The remote control ID of %3 cannot be changed."
 msgstr ""
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the master bus"
 msgstr "Crea un master bus"
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the monitor bus"
 msgstr "Crea un master bus"
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -10461,23 +10682,23 @@ msgid ""
 "change this%5"
 msgstr ""
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the mixer"
 msgstr "Prepara il mixer"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the editor"
 msgstr "Altezza"
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
 msgstr ""
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr ""
 
@@ -10494,7 +10715,7 @@ msgstr "Pulisci tutte le posizioni"
 msgid "the session folder"
 msgstr "la cartella di sessione"
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 #, fuzzy
 msgid "Send "
 msgstr "Secondi"
@@ -10991,54 +11212,110 @@ msgstr "Aggancia a battute e battiti"
 msgid "Glue new regions to bars and beats"
 msgstr "Aggancia a battute e battiti"
 
-#: sfdb_ui.cc:87 sfdb_ui.cc:107 sfdb_ui.cc:116
+#: session_option_editor.cc:275 session_option_editor.cc:277
+#: session_option_editor.cc:284 session_option_editor.cc:291
+#: session_option_editor.cc:298 session_option_editor.cc:300
+#: session_option_editor.cc:307 session_option_editor.cc:314
+#: session_option_editor.cc:321 session_option_editor.cc:323
+#, fuzzy
+msgid "Meterbridge"
+msgstr "Misurazione"
+
+#: session_option_editor.cc:275
+msgid "Route Display"
+msgstr ""
+
+#: session_option_editor.cc:279
+#, fuzzy
+msgid "Show Midi Tracks"
+msgstr "Mostra tutte le tracce MIDI"
+
+#: session_option_editor.cc:286
+#, fuzzy
+msgid "Show Busses"
+msgstr "Bus"
+
+#: session_option_editor.cc:293
+#, fuzzy
+msgid "Include Master Bus"
+msgstr "Crea un master bus"
+
+#: session_option_editor.cc:298
+msgid "Button Area"
+msgstr ""
+
+#: session_option_editor.cc:302
+#, fuzzy
+msgid "Rec-enable Button"
+msgstr "Attiva registrazione"
+
+#: session_option_editor.cc:309
+#, fuzzy
+msgid "Mute Button"
+msgstr "+ pulsante"
+
+#: session_option_editor.cc:316
+#, fuzzy
+msgid "Solo Button"
+msgstr "Solo / mute"
+
+#: session_option_editor.cc:321
+msgid "Name Labels"
+msgstr ""
+
+#: session_option_editor.cc:325
+#, fuzzy
+msgid "Track Name"
+msgstr "Tracce/Bus"
+
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 #, fuzzy
 msgid "as new tracks"
 msgstr "Tracce"
 
-#: sfdb_ui.cc:89 sfdb_ui.cc:109
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 msgid "to selected tracks"
 msgstr "nelle tracce selezionate"
 
-#: sfdb_ui.cc:91 sfdb_ui.cc:111
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 msgid "to region list"
 msgstr "nella lista regioni"
 
-#: sfdb_ui.cc:93 sfdb_ui.cc:113
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 msgid "as new tape tracks"
 msgstr "come nuove tracce nastro"
 
-#: sfdb_ui.cc:97
+#: sfdb_ui.cc:96
 msgid "programming error: unknown import mode string %1"
 msgstr "Errore di programmazione: modalità di importazione %1 sconosciuta"
 
-#: sfdb_ui.cc:124
+#: sfdb_ui.cc:123
 #, fuzzy
 msgid "Auto-play"
 msgstr "suona"
 
-#: sfdb_ui.cc:130 sfdb_ui.cc:237
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 msgid "<b>Sound File Information</b>"
 msgstr "<b>Info sul file audio</b>"
 
-#: sfdb_ui.cc:142
+#: sfdb_ui.cc:141
 #, fuzzy
 msgid "Timestamp:"
 msgstr "Per Data di Regione"
 
-#: sfdb_ui.cc:144
+#: sfdb_ui.cc:143
 msgid "Format:"
 msgstr "Formato:"
 
-#: sfdb_ui.cc:183 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr ""
 
-#: sfdb_ui.cc:320
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr ""
 
-#: sfdb_ui.cc:327
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "Editor: impossibile aprire il file %1 (%2)."
 
@@ -11067,11 +11344,11 @@ msgstr "File audio"
 msgid "MIDI files"
 msgstr ""
 
-#: sfdb_ui.cc:458 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 msgid "All files"
 msgstr "Tutti i file"
 
-#: sfdb_ui.cc:477 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 msgid "Browse Files"
 msgstr "Cerca nei file"
 
@@ -11079,180 +11356,168 @@ msgstr "Cerca nei file"
 msgid "Paths"
 msgstr "Percorsi"
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr ""
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 #, fuzzy
 msgid "Sort:"
 msgstr "Ordina"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 #, fuzzy
 msgid "Longest"
 msgstr "Ampissimo"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 #, fuzzy
 msgid "Shortest"
 msgstr "Scorciatoia"
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 #, fuzzy
 msgid "Newest"
 msgstr "Piu' Lento"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr ""
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr ""
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 #, fuzzy
 msgid "Least downloaded"
 msgstr "Inizia il download"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr ""
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr ""
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr ""
 
-#: sfdb_ui.cc:572
+#: sfdb_ui.cc:555
+msgid "Similar"
+msgstr ""
+
+#: sfdb_ui.cc:567
 #, fuzzy
 msgid "ID"
 msgstr "MIDI"
 
-#: sfdb_ui.cc:573 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 #, fuzzy
 msgid "Filename"
 msgstr "Rinomina"
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:570
 #, fuzzy
 msgid "Duration"
 msgstr "Sposta Regione/i"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:571
 #, fuzzy
 msgid "Size"
 msgstr "Dimensione massima"
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:572
 #, fuzzy
 msgid "Samplerate"
 msgstr "Frequenza di campionamento"
 
-#: sfdb_ui.cc:578
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr ""
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr ""
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr ""
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr ""
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr ""
 
-#: sfdb_ui.cc:846
-msgid "found %1 match"
-msgid_plural "found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:862
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr ""
 
-#: sfdb_ui.cc:960
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sfdb_ui.cc:965
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr ""
 
-#: sfdb_ui.cc:1029
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr ""
 
-#: sfdb_ui.cc:1031
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr ""
 
-#: sfdb_ui.cc:1033 sfdb_ui.cc:1035
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr ""
 
-#: sfdb_ui.cc:1037
+#: sfdb_ui.cc:1086
 msgid "GB"
 msgstr ""
 
-#: sfdb_ui.cc:1070
-msgid "Search returned no results."
-msgstr ""
-
-#: sfdb_ui.cc:1072
-msgid "Found %1 match"
-msgid_plural "Found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:1277 sfdb_ui.cc:1585 sfdb_ui.cc:1635 sfdb_ui.cc:1653
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr "una traccia per file"
 
-#: sfdb_ui.cc:1280 sfdb_ui.cc:1636 sfdb_ui.cc:1654
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 msgid "one track per channel"
 msgstr "una traccia per canale"
 
-#: sfdb_ui.cc:1288 sfdb_ui.cc:1638 sfdb_ui.cc:1655
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 #, fuzzy
 msgid "sequence files"
 msgstr "files ripuliti"
 
-#: sfdb_ui.cc:1291 sfdb_ui.cc:1643
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 msgid "all files in one track"
 msgstr "tutti i file in una traccia"
 
-#: sfdb_ui.cc:1292 sfdb_ui.cc:1637
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 msgid "merge files"
 msgstr "Unisci i file"
 
-#: sfdb_ui.cc:1298 sfdb_ui.cc:1640
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 msgid "one region per file"
 msgstr "una regione per file"
 
-#: sfdb_ui.cc:1301 sfdb_ui.cc:1641
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 msgid "one region per channel"
 msgstr "una regione per canale"
 
-#: sfdb_ui.cc:1306 sfdb_ui.cc:1642 sfdb_ui.cc:1656
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 msgid "all files in one region"
 msgstr "tutti i file in una regione"
 
-#: sfdb_ui.cc:1373
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
@@ -11260,60 +11525,60 @@ msgstr ""
 "Uno o alcuni dei file selezionati\n"
 "non possono essere utilizzati da %1"
 
-#: sfdb_ui.cc:1513
+#: sfdb_ui.cc:1534
 msgid "Copy files to session"
 msgstr "Copia i file nella sessione"
 
-#: sfdb_ui.cc:1530 sfdb_ui.cc:1693
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 #, fuzzy
 msgid "file timestamp"
 msgstr "Per Data di Regione"
 
-#: sfdb_ui.cc:1531 sfdb_ui.cc:1695
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 #, fuzzy
 msgid "edit point"
 msgstr "Modifica usando"
 
-#: sfdb_ui.cc:1532 sfdb_ui.cc:1697
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 msgid "playhead"
 msgstr "testina"
 
-#: sfdb_ui.cc:1533
+#: sfdb_ui.cc:1554
 msgid "session start"
 msgstr "inizio sessione"
 
-#: sfdb_ui.cc:1538
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1581
 #, fuzzy
 msgid "<b>Insert at</b>"
 msgstr "Inserisci a:"
 
-#: sfdb_ui.cc:1573
+#: sfdb_ui.cc:1594
 #, fuzzy
 msgid "<b>Mapping</b>"
 msgstr "Avanzate..."
 
-#: sfdb_ui.cc:1591
+#: sfdb_ui.cc:1612
 #, fuzzy
 msgid "<b>Conversion quality</b>"
 msgstr "Qualità di conversione:"
 
-#: sfdb_ui.cc:1603 sfdb_ui.cc:1709
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr "Migliore"
 
-#: sfdb_ui.cc:1604 sfdb_ui.cc:1711
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr "Buona"
 
-#: sfdb_ui.cc:1605 sfdb_ui.cc:1713
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr "Veloce"
 
-#: sfdb_ui.cc:1607
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "Velocissimo"
 
@@ -11407,21 +11672,21 @@ msgstr "Vorrei più opzioni per questa sessione"
 #: startup.cc:194
 #, fuzzy
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -11587,10 +11852,6 @@ msgstr ""
 msgid "Click to open the program website in your web browser"
 msgstr ""
 
-#: startup.cc:594
-msgid "What would you like to do ?"
-msgstr "Cosa vuoi fare?"
-
 #: startup.cc:729
 #, fuzzy
 msgid "Open"
@@ -11605,84 +11866,84 @@ msgstr "Nome della sessione:"
 msgid "Create session folder in:"
 msgstr "Esegui la regione selezionata come loop"
 
-#: startup.cc:813
+#: startup.cc:821
 msgid "Select folder for session"
 msgstr "Seleziona una cartella per la sessione"
 
-#: startup.cc:845
+#: startup.cc:853
 msgid "Use this template"
 msgstr "Usa questo modello"
 
-#: startup.cc:848
+#: startup.cc:856
 msgid "no template"
 msgstr "nessun modello"
 
-#: startup.cc:876
+#: startup.cc:884
 msgid "Use an existing session as a template:"
 msgstr "Usa una sessione salvata come modello"
 
-#: startup.cc:888
+#: startup.cc:896
 msgid "Select template"
 msgstr "Seleziona modello"
 
-#: startup.cc:914
+#: startup.cc:922
 msgid "New Session"
 msgstr "Nuova sessione"
 
-#: startup.cc:1068
+#: startup.cc:1077
 msgid "Select session file"
 msgstr "Seleziona un file sessione"
 
-#: startup.cc:1084
+#: startup.cc:1093
 msgid "Browse:"
 msgstr "Sfoglia:"
 
-#: startup.cc:1093
+#: startup.cc:1102
 msgid "Select a session"
 msgstr "Scegli una sessione"
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 msgid "channels"
 msgstr "canali"
 
-#: startup.cc:1135
+#: startup.cc:1145
 msgid "<b>Busses</b>"
 msgstr "<b>Bus</b>"
 
-#: startup.cc:1136
+#: startup.cc:1146
 msgid "<b>Inputs</b>"
 msgstr "<b>Ingressi</b>"
 
-#: startup.cc:1137
+#: startup.cc:1147
 msgid "<b>Outputs</b>"
 msgstr "<b>Uscite</b>"
 
-#: startup.cc:1145
+#: startup.cc:1155
 msgid "Create master bus"
 msgstr "Crea un master bus"
 
-#: startup.cc:1155
+#: startup.cc:1165
 #, fuzzy
 msgid "Automatically connect to physical inputs"
 msgstr "Connetti automaticamente alle entrate fisiche"
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr "Usa soltanto"
 
-#: startup.cc:1215
+#: startup.cc:1225
 msgid "Automatically connect outputs"
 msgstr "Connetti automaticamente le uscite"
 
-#: startup.cc:1237
+#: startup.cc:1247
 msgid "... to master bus"
 msgstr "... al bus Master"
 
-#: startup.cc:1247
+#: startup.cc:1257
 msgid "... to physical outputs"
 msgstr "... alle uscite fisiche."
 
-#: startup.cc:1297
+#: startup.cc:1307
 msgid "Advanced Session Options"
 msgstr "Opzioni avanzate della sessione"
 
@@ -12391,20 +12652,20 @@ msgstr "Il file di configurazione %1 non è stato salvato."
 msgid "bad XPM header %1"
 msgstr ""
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr "stile RGBA mancante per \"%1\""
 
-#: utils.cc:544
+#: utils.cc:591
 msgid "cannot find XPM file for %1"
 msgstr "non riesco a trovare un file XPM per %1"
 
-#: utils.cc:570
+#: utils.cc:617
 #, fuzzy
 msgid "cannot find icon image for %1 using %2"
 msgstr "non riesco a trovare una icona per %1"
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr ""
 
@@ -12412,84 +12673,86 @@ msgstr ""
 msgid "VerboseCanvasCursor"
 msgstr ""
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 #, fuzzy
 msgid "Set Video Track"
 msgstr "Aggiungi traccia audio"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 #, fuzzy
 msgid "Launch External Video Monitor"
 msgstr "Controllo"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr ""
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr ""
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 #, fuzzy
 msgid "Video files"
 msgstr "File audio"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 #, fuzzy
 msgid "<b>Video Information</b>"
 msgstr "<b>Info sul file audio</b>"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 #, fuzzy
 msgid "Start:"
 msgstr "Inizio"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 #, fuzzy
 msgid "Frame rate:"
 msgstr "Frequenza di campionamento"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr ""
 
-#: editor_videotimeline.cc:138
+#: editor_videotimeline.cc:146
 msgid "Export Successful: %1"
 msgstr ""
 
-#: video_timeline.cc:467
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:501
-msgid "Failed to set session-framerate: "
-msgstr ""
-
-#: video_timeline.cc:501
-msgid " does not have a corresponding option setting in Ardour."
+#: video_timeline.cc:507
+msgid ""
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:507
+#: video_timeline.cc:515
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:508
-msgid " vs "
+#: video_timeline.cc:588
+msgid ""
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:690
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12497,18 +12760,18 @@ msgid ""
 "xjadeo's remote-control interface 'xjremote')."
 msgstr ""
 
-#: video_monitor.cc:282
+#: video_monitor.cc:281
 #, fuzzy
 msgid "Video Monitor: File Not Found."
 msgstr "Controllo"
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -12518,380 +12781,389 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 #, fuzzy
 msgid "Transcode/Import Video File "
 msgstr "Esporta la sessione come file audio..."
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 #, fuzzy
 msgid "Output File:"
 msgstr "Dispositivo di uscita"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr ""
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 #, fuzzy
 msgid "Height = "
 msgstr "Altezza"
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr ""
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 #, fuzzy
 msgid "<b>File Information</b>"
 msgstr "<b>Info sul file audio</b>"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr ""
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 #, fuzzy
 msgid "Duration:"
 msgstr "Sposta Regione/i"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr ""
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr ""
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 #, fuzzy
 msgid "??"
 msgstr "???"
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 #, fuzzy
 msgid "<b>Import Settings</b>"
 msgstr "Opzioni"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr ""
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr ""
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 #, fuzzy
 msgid "Import/Transcode Video to Session"
 msgstr "Importa da una sessione"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr ""
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 msgid "Original Width"
 msgstr ""
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr ""
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 #, fuzzy
 msgid "Extract Audio:"
 msgstr "Esporta l'audio"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 #, fuzzy
 msgid "Extracting Audio.."
 msgstr "Esporta l'audio"
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr ""
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 #, fuzzy
 msgid "Transcoding Failed."
 msgstr "Traduzione abilitata"
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 #, fuzzy
 msgid "Save Transcoded Video File"
 msgstr "Esporta la sessione come file audio..."
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr ""
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr ""
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 #, fuzzy
 msgid "Server Docroot:"
 msgstr "Server:"
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr ""
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 #, fuzzy
 msgid "Listen Port:"
 msgstr "Posizione"
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 #, fuzzy
 msgid "Cache Size:"
 msgstr "Dimensione massima"
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr ""
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr ""
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 #, fuzzy
 msgid "Confirm Overwrite"
 msgstr "Conferma sovrascrittura istantanea"
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 #, fuzzy
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr "Esiste già un'istantanea con questo nome. Vuoi sovrascriverla?"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 #, fuzzy
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr "impossibile creare la cartella utente ardour %1 (%2)"
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 #, fuzzy
 msgid "Export Video File "
 msgstr "Esporta la sessione come file audio..."
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 #, fuzzy
 msgid "Video:"
 msgstr "Inizio"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr ""
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr ""
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 #, fuzzy
 msgid "Normalize Audio"
 msgstr "Normalizza a:"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr ""
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr ""
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 #, fuzzy
 msgid "Deinterlace"
 msgstr "interno"
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr ""
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 #, fuzzy
 msgid "Include Session Metadata"
 msgstr "Modifica i metadati della sessione"
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr ""
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 #, fuzzy
 msgid "<b>Output:</b>"
 msgstr "<b>Uscite</b>"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 #, fuzzy
 msgid "<b>Input:</b>"
 msgstr "<b>Ingressi</b>"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 #, fuzzy
 msgid "Audio:"
 msgstr "Audio"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 #, fuzzy
 msgid "Master Bus"
 msgstr "Crea un master bus"
 
-#: export_video_dialog.cc:166
+#: export_video_dialog.cc:145
+msgid "from the %1 session's start to the session's end"
+msgstr ""
+
+#: export_video_dialog.cc:149
+msgid "from 00:00:00:00 to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:151
+msgid "from the video's start to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:184
 #, fuzzy
 msgid "<b>Settings:</b>"
 msgstr "<b>Destinazioni</b>"
 
-#: export_video_dialog.cc:174
+#: export_video_dialog.cc:192
 #, fuzzy
 msgid "Range:"
 msgstr "Intervallo"
 
-#: export_video_dialog.cc:177
+#: export_video_dialog.cc:195
 #, fuzzy
 msgid "Preset:"
 msgstr "Preimpostazione"
 
-#: export_video_dialog.cc:180
+#: export_video_dialog.cc:198
 #, fuzzy
 msgid "Video Codec:"
 msgstr "Cartella:"
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:201
 #, fuzzy
 msgid "Video KBit/s:"
 msgstr "Inizio"
 
-#: export_video_dialog.cc:186
+#: export_video_dialog.cc:204
 #, fuzzy
 msgid "Audio Codec:"
 msgstr "Modalità audio:"
 
-#: export_video_dialog.cc:189
+#: export_video_dialog.cc:207
 #, fuzzy
 msgid "Audio KBit/s:"
 msgstr "File audio"
 
-#: export_video_dialog.cc:192
+#: export_video_dialog.cc:210
 #, fuzzy
 msgid "Audio Samplerate:"
 msgstr "Frequenza di campionamento"
 
-#: export_video_dialog.cc:369
+#: export_video_dialog.cc:387
 #, fuzzy
 msgid "Normalizing audio"
 msgstr "Normalizza i valori"
 
-#: export_video_dialog.cc:373
+#: export_video_dialog.cc:391
 #, fuzzy
 msgid "Exporting audio"
 msgstr "Esporta l'audio"
 
-#: export_video_dialog.cc:419
+#: export_video_dialog.cc:437
 #, fuzzy
-msgid "Exporting Audio.."
+msgid "Exporting Audio..."
 msgstr "Esporta l'audio"
 
-#: export_video_dialog.cc:476
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:505
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:544
-msgid "Encoding Video.."
-msgstr ""
+#: export_video_dialog.cc:562
+#, fuzzy
+msgid "Encoding Video..."
+msgstr "Traduzione abilitata"
 
-#: export_video_dialog.cc:563
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:661
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr ""
 
-#: export_video_dialog.cc:673
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr ""
 
-#: export_video_dialog.cc:761
+#: export_video_dialog.cc:779
 #, fuzzy
 msgid "Transcoding failed."
 msgstr "Traduzione abilitata"
 
-#: export_video_dialog.cc:930 export_video_dialog.cc:950
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 #, fuzzy
 msgid "Save Exported Video File"
 msgstr "Esporta la sessione come file audio..."
@@ -12909,33 +13181,33 @@ msgstr ""
 msgid "<b>Video Export Info</b>"
 msgstr ""
 
-#: export_video_infobox.cc:46
+#: export_video_infobox.cc:48
 msgid ""
-"Ardour video export is not recommended for mastering!\n"
-"While 'ffmpeg' (which is used by ardour) can produce high-quality files, "
-"this export lacks the possibility to tweak many settings. We recommend to "
-"use 'winff', 'devede' or 'dvdauthor' to mux & master. Nevertheless this "
-"video-export comes in handy to do quick snapshots, intermediates, dailies or "
-"online videos.\n"
+"Video encoding is a non-trivial task with many details.\n"
 "\n"
-"The soundtrack is created from the master-bus of the current Ardour "
-"session.\n"
+"Please see the manual at %1/video-timeline/operations/#export.\n"
 "\n"
-"The video soure defaults to the file used in the video timeline, which may "
-"not the best quality to start with, you should the original video file.\n"
-"\n"
-"If the export-range is longer than the original video, black video frames "
-"are prefixed and/or appended. This process may fail with non-standard pixel-"
-"aspect-ratios.\n"
-"\n"
-"The file-format is determined by the extension that you choose for the "
-"output file (.avi, .mov, .flv, .ogv,...)\n"
-"Note: not all combinations of format+codec+settings produce files which are "
-"according so spec. e.g. flv files require sample-rates of 22.1kHz or "
-"44.1kHz, mpeg containers can not be used with ac3 audio-codec, etc. If in "
-"doubt, use one of the built-in presets."
+"Open Manual in Browser? "
 msgstr ""
 
+#~ msgid "slowest"
+#~ msgstr "più Lento"
+
+#~ msgid "slow"
+#~ msgstr "lento"
+
+#~ msgid "fast"
+#~ msgstr "veloce"
+
+#~ msgid "faster"
+#~ msgstr "più veloce"
+
+#~ msgid "fastest"
+#~ msgstr "velocissimo"
+
+#~ msgid "What would you like to do ?"
+#~ msgstr "Cosa vuoi fare?"
+
 #~ msgid "Connect"
 #~ msgstr "Connetti"
 
@@ -14191,13 +14463,6 @@ msgstr ""
 #~ msgid "Beat"
 #~ msgstr "Battito"
 
-#~ msgid ""
-#~ "Do you really want to remove track \"%1\" ?\n"
-#~ "(cannot be undone)"
-#~ msgstr ""
-#~ "Si vuole realmente rimuovere la traccia \"%1\" ?\n"
-#~ "(questa azione non potrà essere annullata)"
-
 #, fuzzy
 #~ msgid "set selected regionview"
 #~ msgstr "Esegui la regione selezionata come loop"
@@ -14298,9 +14563,6 @@ msgstr ""
 #~ msgid "rescan"
 #~ msgstr "Aggiorna"
 
-#~ msgid "UI: cannot setup meter_bridge"
-#~ msgstr "IU: impossibile avviare il meter_bridge"
-
 #, fuzzy
 #~ msgid "Enable/Disable follow playhead"
 #~ msgstr "Abilita/Disabilita il click audio"
diff --git a/gtk2_ardour/po/nn.po b/gtk2_ardour/po/nn.po
index 832c5d05b7..f288526c94 100644
--- a/gtk2_ardour/po/nn.po
+++ b/gtk2_ardour/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk2_ardour 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2013-01-05 14:48+0100\n"
 "Last-Translator: Eivind Ødegård <meinmycell-lists@yahoo.no>\n"
 "Language-Team:  <i18n-nn@lister.ping.uio.no>\n"
@@ -407,7 +407,7 @@ msgstr "Fann ikkje menydefinisjonsfila til %1"
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr "%1 verkar ikkje utan ei gyldig ardour.menus-fil"
 
-#: add_route_dialog.cc:53 route_params_ui.cc:503
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 msgid "Add Track or Bus"
 msgstr "Legg til spor eller buss"
 
@@ -443,8 +443,8 @@ msgstr "Bussar"
 msgid "Add:"
 msgstr "Legg til:"
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 msgid "<b>Options</b>"
 msgstr "<b>Val</b>"
 
@@ -458,21 +458,21 @@ msgid "Group:"
 msgstr "Gruppe:"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 msgid "Audio"
 msgstr "Lyd"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -499,7 +499,7 @@ msgstr ""
 "lyd- eller MIDI-spor i staden."
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1301
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr "Normal"
 
@@ -543,7 +543,7 @@ msgstr "8 kanalar"
 msgid "12 Channel"
 msgstr "12 kanalar"
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2136
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr "Eigen"
 
@@ -632,7 +632,7 @@ msgid "Track"
 msgstr "Spor"
 
 #: analysis_window.cc:68 editor_actions.cc:616 mixer_ui.cc:125
-#: mixer_ui.cc:1793
+#: mixer_ui.cc:1795
 msgid "Show"
 msgstr "Vis"
 
@@ -640,94 +640,90 @@ msgstr "Vis"
 msgid "Re-analyze data"
 msgstr "Analyser data på nytt"
 
-#: ardour_button.cc:658
+#: ardour_button.cc:704
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr "knappen kan ikkje overvaka status for ikkje-eksisterande kontroll\n"
 
-#: ardour_ui.cc:179
+#: ardour_ui.cc:180
 msgid "audition"
 msgstr "lytting"
 
-#: ardour_ui.cc:180
+#: ardour_ui.cc:181
 msgid "solo"
 msgstr "solo"
 
-#: ardour_ui.cc:181
+#: ardour_ui.cc:182
 msgid "feedback"
 msgstr "feedback"
 
-#: ardour_ui.cc:183 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 msgid "Speaker Configuration"
 msgstr "Høgtalaroppsett"
 
-#: ardour_ui.cc:184 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 msgid "Theme Manager"
 msgstr "Temabehandlar"
 
-#: ardour_ui.cc:185 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr "Snøggtastar"
 
-#: ardour_ui.cc:186
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr "Innstillingar"
 
-#: ardour_ui.cc:187 ardour_ui.cc:192
+#: ardour_ui.cc:191 ardour_ui.cc:196
 #, fuzzy
 msgid "Add Tracks/Busses"
 msgstr "Spor/bussar"
 
-#: ardour_ui.cc:188
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "Om"
 
-#: ardour_ui.cc:189 location_ui.cc:1134
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "Stader"
 
-#: ardour_ui.cc:190 route_params_ui.cc:57 route_params_ui.cc:604
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 msgid "Tracks and Busses"
 msgstr "Spor og bussar"
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr "Eigenskapar"
 
-#: ardour_ui.cc:193 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr "Bundelordnar"
 
-#: ardour_ui.cc:194 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "Stor klokke"
 
-#: ardour_ui.cc:195
+#: ardour_ui.cc:199
 #, fuzzy
 msgid "Audio Connections"
 msgstr "Lydtilkoplingar"
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:200
 #, fuzzy
 msgid "MIDI Connections"
 msgstr "Inngangstilkoplingar"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr "Feil"
 
-#: ardour_ui.cc:299
-msgid "could not initialize %1."
-msgstr "greidde ikkje starta %1."
-
-#: ardour_ui.cc:394
+#: ardour_ui.cc:388
 msgid "Starting audio engine"
 msgstr "Startar lydmaskin"
 
-#: ardour_ui.cc:763 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 msgid "%1 is ready for use"
 msgstr "%1 er klar til bruk"
 
-#: ardour_ui.cc:811
+#: ardour_ui.cc:806
 msgid ""
 "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"
@@ -741,23 +737,23 @@ msgstr ""
 "Du kan finna ut kva minnegrensa er med 'ulimit -l'. Minnegrensa er vanlegvis "
 "kontrollert av %2"
 
-#: ardour_ui.cc:828
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr "Ikkje vis denne ruta att"
 
-#: ardour_ui.cc:870
+#: ardour_ui.cc:865
 msgid "Don't quit"
 msgstr "Ikkje avslutt"
 
-#: ardour_ui.cc:871
+#: ardour_ui.cc:866
 msgid "Just quit"
 msgstr "Berre avslutt"
 
-#: ardour_ui.cc:872
+#: ardour_ui.cc:867
 msgid "Save and quit"
 msgstr "Lagra og avslutt"
 
-#: ardour_ui.cc:882
+#: ardour_ui.cc:877
 msgid ""
 "%1 was unable to save your session.\n"
 "\n"
@@ -771,15 +767,15 @@ msgstr ""
 "\n"
 "\"Berre avslutt\"-alternativet."
 
-#: ardour_ui.cc:913
+#: ardour_ui.cc:908
 msgid "Please wait while %1 cleans up..."
 msgstr "Vent medan %1 ryddar opp..."
 
-#: ardour_ui.cc:930
+#: ardour_ui.cc:925
 msgid "Unsaved Session"
 msgstr "Ulagra økt"
 
-#: ardour_ui.cc:951
+#: ardour_ui.cc:946
 msgid ""
 "The session \"%1\"\n"
 "has not been saved.\n"
@@ -797,7 +793,7 @@ msgstr ""
 "\n"
 "Kva vil du gjera?"
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:949
 msgid ""
 "The snapshot \"%1\"\n"
 "has not been saved.\n"
@@ -815,74 +811,74 @@ msgstr ""
 "\n"
 "Kva vil du gjera?"
 
-#: ardour_ui.cc:968
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr "Spørsmål"
 
-#: ardour_ui.cc:1045
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "fråkopla"
 
-#: ardour_ui.cc:1052
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 
-#: ardour_ui.cc:1056
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 
-#: ardour_ui.cc:1074 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 msgid "File:"
 msgstr "Fil:"
 
-#: ardour_ui.cc:1078
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr "BWF"
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr "WAV"
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr "WAV64"
 
-#: ardour_ui.cc:1087 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr "CAF"
 
-#: ardour_ui.cc:1090
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr "AIFF"
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr "iXML"
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr "RF64"
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr "32-flyt"
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr "24-heiltal"
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr "16-heiltal"
 
-#: ardour_ui.cc:1129
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 
-#: ardour_ui.cc:1148
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -893,33 +889,33 @@ msgstr ""
 "%%</span> <span foreground=\"green\">c:</span><span foreground=\"%s\">"
 "%<PRIu32>%%</span>"
 
-#: ardour_ui.cc:1184
+#: ardour_ui.cc:1188
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr "Disk: <span foreground=\"green\">Ukjent</span>"
 
-#: ardour_ui.cc:1186
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr "Disk: <span foreground=\"green\">24t+</span>"
 
-#: ardour_ui.cc:1204
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr "Disk: <span foreground=\"green\">&gt;24t</span>"
 
-#: ardour_ui.cc:1215
+#: ardour_ui.cc:1219
 #, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr "Disk: <span foreground=\"%s\">%02dt:%02dm:%02ds</span>"
 
-#: ardour_ui.cc:1241
+#: ardour_ui.cc:1245
 #, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr "Tidskode|TC: <span foreground=\"%s\">%s</span>"
 
-#: ardour_ui.cc:1358 ardour_ui.cc:1367 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr "Siste øktene"
 
-#: ardour_ui.cc:1447
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
@@ -927,28 +923,28 @@ msgstr ""
 "%1 er ikkje kopla til JACK.\n"
 "Du kan ikkje opna eller lukka økter når det står slik til."
 
-#: ardour_ui.cc:1474
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr "Opna økt"
 
-#: ardour_ui.cc:1492 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 msgid "%1 sessions"
 msgstr "%1 økter"
 
-#: ardour_ui.cc:1529
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr ""
 "Du kan ikkje leggja til eit spor eller ein buss når du ikkje har ei økt "
 "innlasta."
 
-#: ardour_ui.cc:1537
+#: ardour_ui.cc:1548
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] "greidde ikkje laga %1 nye miksa spor"
 msgstr[1] "ugreidde ikkje laga %1 nye miksa spor"
 
-#: ardour_ui.cc:1543 ardour_ui.cc:1604
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 msgid ""
 "There are insufficient JACK ports available\n"
 "to create a new track or bus.\n"
@@ -960,25 +956,25 @@ msgstr ""
 "Du bør lagra %1, avslutta og starta\n"
 "omatt JACK med fleire portar."
 
-#: ardour_ui.cc:1578
+#: ardour_ui.cc:1589
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr ""
 "Du kan ikkje leggja til eit spor eller ein buss når du ikkje har ei økt "
 "innlasta."
 
-#: ardour_ui.cc:1587
+#: ardour_ui.cc:1598
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] "greidde ikkje laga nytt lydspor"
 msgstr[1] "greidde ikkje laga %1 nye lydspor"
 
-#: ardour_ui.cc:1596
+#: ardour_ui.cc:1607
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] "greidde ikkje laga ny lydbuss"
 msgstr[1] "greidde ikkje laga %1 nye lydbussar"
 
-#: ardour_ui.cc:1713
+#: ardour_ui.cc:1724
 msgid ""
 "Please create one or more tracks before trying to record.\n"
 "You can do this with the \"Add Track or Bus\" option in the Session menu."
@@ -986,7 +982,7 @@ msgstr ""
 "Lag eitt eller fleire spor før du prøver å ta opp.\n"
 "Du kan gjera det med «Legg til spor eller buss» i økt-menyen."
 
-#: ardour_ui.cc:2103
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
@@ -996,7 +992,7 @@ msgstr ""
 "\n"
 "%1"
 
-#: ardour_ui.cc:2105
+#: ardour_ui.cc:2116
 msgid ""
 "JACK has either been shutdown or it\n"
 "disconnected %1 because %1\n"
@@ -1008,19 +1004,19 @@ msgstr ""
 "ikkje var rask nok. Du kan lagra økta\n"
 "og/eller prøva å kopla til JACK att ."
 
-#: ardour_ui.cc:2131
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "Greidde ikkje starta økta"
 
-#: ardour_ui.cc:2211
+#: ardour_ui.cc:2222
 msgid "Take Snapshot"
 msgstr "Ta snøggbilete"
 
-#: ardour_ui.cc:2212
+#: ardour_ui.cc:2223
 msgid "Name of new snapshot"
 msgstr "Namn på det nye snøggbiletet"
 
-#: ardour_ui.cc:2236
+#: ardour_ui.cc:2247
 msgid ""
 "To ensure compatibility with various systems\n"
 "snapshot names may not contain a '%1' character"
@@ -1028,27 +1024,27 @@ msgstr ""
 "For å tryggja kompatibiliteten med ymse system,\n"
 "kan ikkje namn på snøggbilete innehalda teiknet '%1'"
 
-#: ardour_ui.cc:2248
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr "Stadfest at du vil skriva over snøggbilete"
 
-#: ardour_ui.cc:2249
+#: ardour_ui.cc:2260
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr "Dette snøggbiletet finst frå før. Vil du skriva over det?"
 
-#: ardour_ui.cc:2252 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 msgid "Overwrite"
 msgstr "Skriv over"
 
-#: ardour_ui.cc:2286
+#: ardour_ui.cc:2297
 msgid "Rename Session"
 msgstr "Døyp om økt"
 
-#: ardour_ui.cc:2287
+#: ardour_ui.cc:2298
 msgid "New session name"
 msgstr "Nytt øktnamn"
 
-#: ardour_ui.cc:2301 ardour_ui.cc:2681 ardour_ui.cc:2726
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 msgid ""
 "To ensure compatibility with various systems\n"
 "session names may not contain a '%1' character"
@@ -1056,12 +1052,12 @@ msgstr ""
 "For å tryggja kompatibiliteten med ymse system,\n"
 "kan ikkje namn på økter innehalda teiknet '%1'"
 
-#: ardour_ui.cc:2309
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr "Dette namnet er alt i bruk på ei anna mappe. Prøv på nytt."
 
-#: ardour_ui.cc:2318
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
@@ -1069,19 +1065,19 @@ msgstr ""
 "Fekk ikkje til å døypa om denne økta.\n"
 "Her kan det vera noko skikkeleg rot."
 
-#: ardour_ui.cc:2429
+#: ardour_ui.cc:2440
 msgid "Save Template"
 msgstr "Lagra mal"
 
-#: ardour_ui.cc:2430
+#: ardour_ui.cc:2441
 msgid "Name for template:"
 msgstr "Namn på malen:"
 
-#: ardour_ui.cc:2431
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-mal"
 
-#: ardour_ui.cc:2469
+#: ardour_ui.cc:2480
 msgid ""
 "This session\n"
 "%1\n"
@@ -1091,52 +1087,52 @@ msgstr ""
 "%1,\n"
 "finst frå før. Vil du opna henne?"
 
-#: ardour_ui.cc:2479
+#: ardour_ui.cc:2490
 msgid "Open Existing Session"
 msgstr "Opna økt"
 
-#: ardour_ui.cc:2717
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr "Det finst inga økt i \"%1\""
 
-#: ardour_ui.cc:2804
+#: ardour_ui.cc:2815
 msgid "Please wait while %1 loads your session"
 msgstr "Vent medan %1 lastar økta di"
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr "Feil ved portregistrering"
 
-#: ardour_ui.cc:2820
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr "Klikk på Lukk for å prøva att."
 
-#: ardour_ui.cc:2841
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "Økta \"%1 (snøggbilete %2)\" vart ikkje lasta"
 
-#: ardour_ui.cc:2847
+#: ardour_ui.cc:2858
 msgid "Loading Error"
 msgstr "Feil ved lasting"
 
-#: ardour_ui.cc:2848
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr "Klikk på Last omatt for å prøva att."
 
-#: ardour_ui.cc:2930
+#: ardour_ui.cc:2941
 msgid "Could not create session in \"%1\""
 msgstr "Greidde ikkje laga økt i \"%1\""
 
-#: ardour_ui.cc:3030
+#: ardour_ui.cc:3041
 msgid "No files were ready for clean-up"
 msgstr "Ingen filer var klare for rydding"
 
-#: ardour_ui.cc:3034 ardour_ui.cc:3044 ardour_ui.cc:3177 ardour_ui.cc:3184
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 msgid "Clean-up"
 msgstr "Opprydding"
 
-#: ardour_ui.cc:3035
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1148,19 +1144,19 @@ msgstr ""
 "Det kan hende dei inneheld bolkar\n"
 "som treng ubrukte lydfiler for å eksistera."
 
-#: ardour_ui.cc:3094
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr "kilo"
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr "mega"
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr "giga"
 
-#: ardour_ui.cc:3105
+#: ardour_ui.cc:3116
 #, fuzzy
 msgid ""
 "The following file was deleted from %2,\n"
@@ -1175,7 +1171,7 @@ msgstr[1] ""
 "Denne fila vart sletta frå%2,\n"
 "og frigjorde %3 %4byte lagringsplass"
 
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3123
 #, fuzzy
 msgid ""
 "The following file was not in use and \n"
@@ -1214,11 +1210,11 @@ msgstr[1] ""
 "\n"
 "frigjer du %3 %4byte lagringsplass.\n"
 
-#: ardour_ui.cc:3172
+#: ardour_ui.cc:3183
 msgid "Are you sure you want to clean-up?"
 msgstr "Er du sikker på at du vil rydda opp?"
 
-#: ardour_ui.cc:3179
+#: ardour_ui.cc:3190
 msgid ""
 "Clean-up is a destructive operation.\n"
 "ALL undo/redo information will be lost if you clean-up.\n"
@@ -1228,82 +1224,82 @@ msgstr ""
 "ALL angra- og gjer om-informasjon blir sletta om du ryddar.\n"
 "Etter opprydding blir alle ubrukte lydfiler flytte til ei \"daudlyd\"-mappe."
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr "Ryddedialog"
 
-#: ardour_ui.cc:3217
+#: ardour_ui.cc:3228
 msgid "Cleaned Files"
 msgstr "Rydda filer"
 
-#: ardour_ui.cc:3234
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr "sletta fil"
 
-#: ardour_ui.cc:3326
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 
-#: ardour_ui.cc:3330
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr ""
 
-#: ardour_ui.cc:3331
+#: ardour_ui.cc:3342
 #, fuzzy
 msgid "Do you really want to stop the Video Server?"
 msgstr "Vil du verkeleg fjerna %1? %2?"
 
-#: ardour_ui.cc:3334
+#: ardour_ui.cc:3345
 #, fuzzy
 msgid "Yes, Stop It"
 msgstr "Ja, øydelegg det."
 
-#: ardour_ui.cc:3360
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr ""
 
-#: ardour_ui.cc:3362
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
 msgstr ""
 
-#: ardour_ui.cc:3370 ardour_ui.cc:3455
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
 
-#: ardour_ui.cc:3394
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr ""
 
-#: ardour_ui.cc:3399
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr ""
 
-#: ardour_ui.cc:3432
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr ""
 
-#: ardour_ui.cc:3441
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3477 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "greidde ikkje opna %1"
 
-#: ardour_ui.cc:3481
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
 msgstr ""
 
-#: ardour_ui.cc:3641
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr "Opptaket stoppa fordi datamaskina di ikkje greidde å henga med."
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3702
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1317,7 +1313,7 @@ msgstr ""
 "Det tyder at harddisksystemet ditt ikkje\n"
 "greidde lagra raskt nok til å ta opp.\n"
 
-#: ardour_ui.cc:3689
+#: ardour_ui.cc:3721
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1331,11 +1327,11 @@ msgstr ""
 "Det tyder at harddisksystemet ditt ikkje\n"
 "greidde lesa raskt nok til å spela av.\n"
 
-#: ardour_ui.cc:3729
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr "Gjenoppretting etter krasj"
 
-#: ardour_ui.cc:3730
+#: ardour_ui.cc:3762
 #, fuzzy
 msgid ""
 "This session appears to have been in the\n"
@@ -1354,19 +1350,19 @@ msgstr ""
 "deg, eller sjå bort frå sist opptak.\n"
 "Vel kva du vil gjera. \n"
 
-#: ardour_ui.cc:3742
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr "Sjå bort frå krasjdata"
 
-#: ardour_ui.cc:3743
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr "Hent fram att etter krasj"
 
-#: ardour_ui.cc:3763
+#: ardour_ui.cc:3795
 msgid "Sample Rate Mismatch"
 msgstr "Punktfrekvensen passar ikkje"
 
-#: ardour_ui.cc:3764
+#: ardour_ui.cc:3796
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
 "%2 is currently running at %3 Hz.  If you load this session,\n"
@@ -1376,23 +1372,23 @@ msgstr ""
 "%2 køyrer på %3 Hz nett no. Viss du lastar denne økta,\n"
 "kan det henda lyden blir spelt med feil punktfrekvens.\n"
 
-#: ardour_ui.cc:3773
+#: ardour_ui.cc:3805
 msgid "Do not load session"
 msgstr "Ikkje last økta"
 
-#: ardour_ui.cc:3774
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr "Last økta likevel"
 
-#: ardour_ui.cc:3797
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "Greidde ikkje kopla frå JACK"
 
-#: ardour_ui.cc:3810
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr "Greidde ikkje kopla til JACK att"
 
-#: ardour_ui.cc:4084
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1415,58 +1411,63 @@ msgstr "Grensesnitt: Greier ikkje setja opp redigeringa"
 msgid "UI: cannot setup mixer"
 msgstr "Grensesnitt: Greier ikkje setja opp miksaren"
 
-#: ardour_ui2.cc:125
+#: ardour_ui2.cc:82
+#, fuzzy
+msgid "UI: cannot setup meterbridge"
+msgstr "Grensesnitt: Greier ikkje setja opp miksaren"
+
+#: ardour_ui2.cc:130
 msgid "Play from playhead"
 msgstr "Spel frå spelehovudet"
 
-#: ardour_ui2.cc:126
+#: ardour_ui2.cc:131
 msgid "Stop playback"
 msgstr "Stopp avspelinga"
 
-#: ardour_ui2.cc:127
+#: ardour_ui2.cc:132
 msgid "Toggle record"
 msgstr "Skru på/av opptak"
 
-#: ardour_ui2.cc:128
+#: ardour_ui2.cc:133
 msgid "Play range/selection"
 msgstr "Spel område/utval"
 
-#: ardour_ui2.cc:129
+#: ardour_ui2.cc:134
 msgid "Go to start of session"
 msgstr "Gå til starten av økta"
 
-#: ardour_ui2.cc:130
+#: ardour_ui2.cc:135
 msgid "Go to end of session"
 msgstr "Gå til slutten av økta"
 
-#: ardour_ui2.cc:131
+#: ardour_ui2.cc:136
 msgid "Play loop range"
 msgstr "Spel lykkje-området"
 
-#: ardour_ui2.cc:132
+#: ardour_ui2.cc:137
 msgid ""
 "MIDI Panic\n"
 "Send note off and reset controller messages on all MIDI channels"
 msgstr ""
 "MIDI-panikknSend note av og nullstill kontrollmeldingar på alle MIDI-kanalar"
 
-#: ardour_ui2.cc:133
+#: ardour_ui2.cc:138
 msgid "Return to last playback start when stopped"
 msgstr "GÃ¥ til der du sist byrja avspeling"
 
-#: ardour_ui2.cc:134
+#: ardour_ui2.cc:139
 msgid "Playhead follows Range Selections and Edits"
 msgstr "Spelehovudet fylgjer områdeval og redigeringar"
 
-#: ardour_ui2.cc:135
+#: ardour_ui2.cc:140
 msgid "Be sensible about input monitoring"
 msgstr "Fornuftig inngangslytting"
 
-#: ardour_ui2.cc:136
+#: ardour_ui2.cc:141
 msgid "Enable/Disable audio click"
 msgstr "Slå på/av lydklikk"
 
-#: ardour_ui2.cc:137 monitor_section.cc:101
+#: ardour_ui2.cc:142 monitor_section.cc:101
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
@@ -1474,7 +1475,7 @@ msgstr ""
 "NÃ¥r knappen er trykt inn, er noko i solo.\n"
 "Klikk for å slå av solo på alt."
 
-#: ardour_ui2.cc:138
+#: ardour_ui2.cc:143
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
@@ -1482,11 +1483,11 @@ msgstr ""
 "Når knappen er trykt inn, blir noko lytta på.\n"
 "Klikk for å slå av lyttinga."
 
-#: ardour_ui2.cc:139
+#: ardour_ui2.cc:144
 msgid "When active, there is a feedback loop."
 msgstr "Når denne er på, er det ei rundgangssløyfe."
 
-#: ardour_ui2.cc:140
+#: ardour_ui2.cc:145
 #, fuzzy
 msgid ""
 "<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
@@ -1502,7 +1503,7 @@ msgstr ""
 "Sjå <span color=\"blue\">http://ardour.org/a3_features_clocks</span> for "
 "fleire opplysingar."
 
-#: ardour_ui2.cc:141
+#: ardour_ui2.cc:146
 #, fuzzy
 msgid ""
 "<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
@@ -1518,27 +1519,32 @@ msgstr ""
 "Sjå <span color=\"blue\">http://ardour.org/a3_features_clocks</span> for "
 "fleire opplysingar."
 
-#: ardour_ui2.cc:173
+#: ardour_ui2.cc:147
+#, fuzzy
+msgid "Reset Level Meter"
+msgstr "Nullstill omhylling"
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr "[FEIL]:"
 
-#: ardour_ui2.cc:175
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr "[Ã…TVARING]:"
 
-#: ardour_ui2.cc:177
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr "[INFO]:"
 
-#: ardour_ui2.cc:241 ardour_ui_ed.cc:376
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 msgid "Auto Return"
 msgstr "Autoretur"
 
-#: ardour_ui2.cc:243 ardour_ui_ed.cc:379
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr "Fylg endringar"
 
-#: ardour_ui2.cc:621 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1558,23 +1564,23 @@ msgstr "Set opp redigeringa"
 msgid "Setup Mixer"
 msgstr "Set opp miksaren"
 
-#: ardour_ui_dependents.cc:84
+#: ardour_ui_dependents.cc:85
 msgid "Reload Session History"
 msgstr "Oppdater øktliste"
 
-#: ardour_ui_dialogs.cc:206
+#: ardour_ui_dialogs.cc:242
 msgid "Don't close"
 msgstr "Ikkje lukk"
 
-#: ardour_ui_dialogs.cc:207
+#: ardour_ui_dialogs.cc:243
 msgid "Just close"
 msgstr "Berre lukk"
 
-#: ardour_ui_dialogs.cc:208
+#: ardour_ui_dialogs.cc:244
 msgid "Save and close"
 msgstr "Lagra og lukk"
 
-#: ardour_ui_dialogs.cc:293
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr "Denne skjermen er ikkje høg nok til å visa miksarvindauga"
 
@@ -1587,7 +1593,7 @@ msgstr "Økt"
 msgid "Sync"
 msgstr "Synk"
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr "Val"
 
@@ -1615,15 +1621,15 @@ msgstr "Filtype"
 msgid "Sample Format"
 msgstr "Punktformat"
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr "Kontrollflater"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "Utvidingar"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr "Nivåmåling"
 
@@ -1639,7 +1645,7 @@ msgstr "Haldetid"
 msgid "Denormal Handling"
 msgstr "Handtering av unormale hendingar"
 
-#: ardour_ui_ed.cc:123 route_time_axis.cc:1475
+#: ardour_ui_ed.cc:123 route_time_axis.cc:1489
 msgid "New..."
 msgstr "Ny..."
 
@@ -1682,8 +1688,8 @@ msgstr "Snøggbilete..."
 msgid "Save As..."
 msgstr "Lagra som..."
 
-#: ardour_ui_ed.cc:153 editor_actions.cc:1710 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1464 route_time_axis.cc:1471
+#: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 msgid "Rename..."
 msgstr "Døyp om..."
 
@@ -1712,7 +1718,7 @@ msgid "Stem export..."
 msgstr "Staveksport..."
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "Eksporter"
 
@@ -1724,11 +1730,11 @@ msgstr "Rydd bort ubrukte kjelder..."
 msgid "Flush Wastebasket"
 msgstr "Tøm søppelkorga"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr "JACK"
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr "Treigskap"
 
@@ -1736,8 +1742,8 @@ msgstr "Treigskap"
 msgid "Reconnect"
 msgstr "Kopla til att"
 
-#: ardour_ui_ed.cc:195 global_port_matrix.cc:198 io_selector.cc:210
-#: mixer_strip.cc:712 mixer_strip.cc:838
+#: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr "Kopla frå"
 
@@ -1753,7 +1759,7 @@ msgstr "Gje redigeringa mest plass"
 msgid "Show Toolbars"
 msgstr "Vis verktylinene"
 
-#: ardour_ui_ed.cc:230 mixer_ui.cc:1863 mixer_ui.cc:1869
+#: ardour_ui_ed.cc:230 mixer_ui.cc:1865 mixer_ui.cc:1871
 msgid "Window|Mixer"
 msgstr "Vindauga|miksar"
 
@@ -1762,27 +1768,32 @@ msgstr "Vindauga|miksar"
 msgid "Toggle Editor+Mixer"
 msgstr "Legg redigeringsmiksaren på topp"
 
-#: ardour_ui_ed.cc:233 midi_tracer.cc:39
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
+#, fuzzy
+msgid "Window|Meterbridge"
+msgstr "Vindauga|miksar"
+
+#: ardour_ui_ed.cc:234 midi_tracer.cc:39
 msgid "MIDI Tracer"
 msgstr "MIDI-sporar"
 
-#: ardour_ui_ed.cc:235
+#: ardour_ui_ed.cc:236
 msgid "Chat"
 msgstr "Prat"
 
-#: ardour_ui_ed.cc:237
+#: ardour_ui_ed.cc:238
 msgid "Help|Manual"
 msgstr "Hjelp|Rettleiing"
 
-#: ardour_ui_ed.cc:238
+#: ardour_ui_ed.cc:239
 msgid "Reference"
 msgstr "Referanse"
 
-#: ardour_ui_ed.cc:240 plugin_ui.cc:419
+#: ardour_ui_ed.cc:241 plugin_ui.cc:418
 msgid "Save"
 msgstr "Lagre"
 
-#: ardour_ui_ed.cc:248 rc_option_editor.cc:1114 rc_option_editor.cc:1125
+#: ardour_ui_ed.cc:249 rc_option_editor.cc:1114 rc_option_editor.cc:1125
 #: rc_option_editor.cc:1134 rc_option_editor.cc:1147 rc_option_editor.cc:1160
 #: rc_option_editor.cc:1169 rc_option_editor.cc:1179 rc_option_editor.cc:1181
 #: rc_option_editor.cc:1191 rc_option_editor.cc:1207 rc_option_editor.cc:1220
@@ -1792,99 +1803,99 @@ msgstr "Lagre"
 msgid "Transport"
 msgstr "Speling"
 
-#: ardour_ui_ed.cc:254 engine_dialog.cc:85 sfdb_ui.cc:559
+#: ardour_ui_ed.cc:255 engine_dialog.cc:85
 msgid "Stop"
 msgstr "Stopp"
 
-#: ardour_ui_ed.cc:257
+#: ardour_ui_ed.cc:258
 msgid "Roll"
 msgstr "Rull"
 
-#: ardour_ui_ed.cc:261
+#: ardour_ui_ed.cc:262
 msgid "Start/Stop"
 msgstr "Start/stopp"
 
-#: ardour_ui_ed.cc:264
+#: ardour_ui_ed.cc:265
 msgid "Start/Continue/Stop"
 msgstr "Start/hald fram/stopp"
 
-#: ardour_ui_ed.cc:267
+#: ardour_ui_ed.cc:268
 msgid "Stop and Forget Capture"
 msgstr "Stopp og gløym opptaket"
 
-#: ardour_ui_ed.cc:277
+#: ardour_ui_ed.cc:278
 msgid "Transition To Roll"
 msgstr "Overgang til rulling"
 
-#: ardour_ui_ed.cc:281
+#: ardour_ui_ed.cc:282
 msgid "Transition To Reverse"
 msgstr "Overgang til baklengs"
 
-#: ardour_ui_ed.cc:285
+#: ardour_ui_ed.cc:286
 msgid "Play Loop Range"
 msgstr "Spel lykkje-området"
 
-#: ardour_ui_ed.cc:288
+#: ardour_ui_ed.cc:289
 msgid "Play Selected Range"
 msgstr "Spel det valte området"
 
-#: ardour_ui_ed.cc:291
+#: ardour_ui_ed.cc:292
 msgid "Play Selection w/Preroll"
 msgstr "Spel utvalet m/førrull"
 
-#: ardour_ui_ed.cc:295
+#: ardour_ui_ed.cc:296
 msgid "Enable Record"
 msgstr "Skru på opptak"
 
-#: ardour_ui_ed.cc:298
+#: ardour_ui_ed.cc:299
 msgid "Start Recording"
 msgstr "Start opptak"
 
-#: ardour_ui_ed.cc:302
+#: ardour_ui_ed.cc:303
 msgid "Rewind"
 msgstr "Spol bakover"
 
-#: ardour_ui_ed.cc:305
+#: ardour_ui_ed.cc:306
 msgid "Rewind (Slow)"
 msgstr "Spol sakte bakover"
 
-#: ardour_ui_ed.cc:308
+#: ardour_ui_ed.cc:309
 msgid "Rewind (Fast)"
 msgstr "Spol fort bakover"
 
-#: ardour_ui_ed.cc:311 startup.cc:727
+#: ardour_ui_ed.cc:312 startup.cc:727
 msgid "Forward"
 msgstr "Framover"
 
-#: ardour_ui_ed.cc:314
+#: ardour_ui_ed.cc:315
 msgid "Forward (Slow)"
 msgstr "Spol sakte framover"
 
-#: ardour_ui_ed.cc:317
+#: ardour_ui_ed.cc:318
 msgid "Forward (Fast)"
 msgstr "Spol fort framover"
 
-#: ardour_ui_ed.cc:320
+#: ardour_ui_ed.cc:321
 msgid "Goto Zero"
 msgstr "GÃ¥ til null"
 
-#: ardour_ui_ed.cc:323
+#: ardour_ui_ed.cc:324
 msgid "Goto Start"
 msgstr "GÃ¥ til starten"
 
-#: ardour_ui_ed.cc:326
+#: ardour_ui_ed.cc:327
 msgid "Goto End"
 msgstr "GÃ¥ til slutten"
 
-#: ardour_ui_ed.cc:329
+#: ardour_ui_ed.cc:330
 msgid "Goto Wall Clock"
 msgstr "GÃ¥ til Veggur"
 
-#: ardour_ui_ed.cc:333
+#: ardour_ui_ed.cc:334
 msgid "Focus On Clock"
 msgstr "Fokuser på klokka"
 
-#: ardour_ui_ed.cc:337 ardour_ui_ed.cc:346 audio_clock.cc:2046 editor.cc:237
+#: ardour_ui_ed.cc:338 ardour_ui_ed.cc:347 audio_clock.cc:2046 editor.cc:237
 #: editor_actions.cc:544 editor_actions.cc:553 export_timespan_selector.cc:88
 #: session_option_editor.cc:41 session_option_editor.cc:61
 #: session_option_editor.cc:80 session_option_editor.cc:96
@@ -1893,125 +1904,125 @@ msgstr "Fokuser på klokka"
 msgid "Timecode"
 msgstr "Tidskode"
 
-#: ardour_ui_ed.cc:339 ardour_ui_ed.cc:348 editor_actions.cc:542
+#: ardour_ui_ed.cc:340 ardour_ui_ed.cc:349 editor_actions.cc:542
 msgid "Bars & Beats"
 msgstr "Takter og taktslag"
 
-#: ardour_ui_ed.cc:341 ardour_ui_ed.cc:350
+#: ardour_ui_ed.cc:342 ardour_ui_ed.cc:351
 msgid "Minutes & Seconds"
 msgstr "Minutt og sekund"
 
-#: ardour_ui_ed.cc:343 ardour_ui_ed.cc:352 audio_clock.cc:2050 editor.cc:238
+#: ardour_ui_ed.cc:344 ardour_ui_ed.cc:353 audio_clock.cc:2050 editor.cc:238
 #: editor_actions.cc:543
 msgid "Samples"
 msgstr "Punktprøver"
 
-#: ardour_ui_ed.cc:355
+#: ardour_ui_ed.cc:356
 msgid "Punch In"
 msgstr "Slå inn"
 
-#: ardour_ui_ed.cc:356 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr "Inn"
 
-#: ardour_ui_ed.cc:359
+#: ardour_ui_ed.cc:360
 msgid "Punch Out"
 msgstr "Slå ut"
 
-#: ardour_ui_ed.cc:360 time_info_box.cc:114
+#: ardour_ui_ed.cc:361 time_info_box.cc:114
 msgid "Out"
 msgstr "Ut"
 
-#: ardour_ui_ed.cc:363
+#: ardour_ui_ed.cc:364
 msgid "Punch In/Out"
 msgstr "Slå inn og ut"
 
-#: ardour_ui_ed.cc:364
+#: ardour_ui_ed.cc:365
 msgid "In/Out"
 msgstr "Inn/ut"
 
-#: ardour_ui_ed.cc:367 rc_option_editor.cc:1071
+#: ardour_ui_ed.cc:368 rc_option_editor.cc:1071
 msgid "Click"
 msgstr "Klikk"
 
-#: ardour_ui_ed.cc:370
+#: ardour_ui_ed.cc:371
 msgid "Auto Input"
 msgstr "Autoinngang"
 
-#: ardour_ui_ed.cc:373
+#: ardour_ui_ed.cc:374
 msgid "Auto Play"
 msgstr "Autospel"
 
-#: ardour_ui_ed.cc:384
+#: ardour_ui_ed.cc:385
 msgid "Sync Startup to Video"
 msgstr "Synk oppstart til video"
 
-#: ardour_ui_ed.cc:386
+#: ardour_ui_ed.cc:387
 msgid "Time Master"
 msgstr "Hovudklokke"
 
-#: ardour_ui_ed.cc:393
+#: ardour_ui_ed.cc:394
 msgid "Toggle Record Enable Track %1"
 msgstr "Skru på/av opptak for spor %1"
 
-#: ardour_ui_ed.cc:400
+#: ardour_ui_ed.cc:401
 msgid "Percentage"
 msgstr "Prosent"
 
-#: ardour_ui_ed.cc:401 shuttle_control.cc:169
+#: ardour_ui_ed.cc:402 shuttle_control.cc:169
 msgid "Semitones"
 msgstr "Halvtonar"
 
-#: ardour_ui_ed.cc:405
+#: ardour_ui_ed.cc:406
 msgid "Send MTC"
 msgstr "Send MTC (Midi Time Code)"
 
-#: ardour_ui_ed.cc:407
+#: ardour_ui_ed.cc:408
 msgid "Send MMC"
 msgstr "Send MMC (Midi Machine Control)"
 
-#: ardour_ui_ed.cc:409
+#: ardour_ui_ed.cc:410
 msgid "Use MMC"
 msgstr "Bruk MMC (Midi Machine Control)"
 
-#: ardour_ui_ed.cc:411 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 msgid "Send MIDI Clock"
 msgstr "Send MIDI-klokke"
 
-#: ardour_ui_ed.cc:413
+#: ardour_ui_ed.cc:414
 msgid "Send MIDI Feedback"
 msgstr "Send MIDI-svar"
 
-#: ardour_ui_ed.cc:419
+#: ardour_ui_ed.cc:420
 msgid "Panic"
 msgstr "Panikk"
 
-#: ardour_ui_ed.cc:559
+#: ardour_ui_ed.cc:560
 msgid "Wall Clock"
 msgstr "Veggur"
 
-#: ardour_ui_ed.cc:560
+#: ardour_ui_ed.cc:561
 msgid "Disk Space"
 msgstr "Diskplass"
 
-#: ardour_ui_ed.cc:561
+#: ardour_ui_ed.cc:562
 msgid "DSP"
 msgstr "DSP"
 
-#: ardour_ui_ed.cc:562
+#: ardour_ui_ed.cc:563
 msgid "Buffers"
 msgstr "Bufrar"
 
-#: ardour_ui_ed.cc:563
+#: ardour_ui_ed.cc:564
 msgid "JACK Sampling Rate and Latency"
 msgstr "JACK-punktrate og -treigskap"
 
-#: ardour_ui_ed.cc:564
+#: ardour_ui_ed.cc:565
 msgid "Timecode Format"
 msgstr "Tidskodeformat"
 
-#: ardour_ui_ed.cc:565
+#: ardour_ui_ed.cc:566
 msgid "File Format"
 msgstr "Filformat"
 
@@ -2027,11 +2038,11 @@ msgstr ""
 msgid "Internal"
 msgstr "Intern"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 msgid "Enable/Disable external positional sync"
 msgstr "Skru på/av ekstern posisjonssynk"
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr "Ikkje mogleg å synka til JACK: opp- og nedtrekk for video er fastsett"
 
@@ -2061,7 +2072,7 @@ msgstr "Tempo"
 msgid "Meter"
 msgstr "Taktart"
 
-#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1030
+#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1039
 #: midi_region_view.cc:2991 session_metadata_dialog.cc:331
 #: session_metadata_dialog.cc:379 session_metadata_dialog.cc:435
 #: session_metadata_dialog.cc:716
@@ -2150,32 +2161,32 @@ msgid "hide track"
 msgstr "gøym spor"
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:196 generic_pluginui.cc:456
-#: generic_pluginui.cc:733 panner_ui.cc:150
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
+#: generic_pluginui.cc:746 panner_ui.cc:150
 msgid "Automation|Manual"
 msgstr "Automasjon|Manuell"
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1856 gain_meter.cc:199
-#: generic_pluginui.cc:459 generic_pluginui.cc:735 midi_time_axis.cc:1488
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
+#: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr "Spel"
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:202 generic_pluginui.cc:462
-#: generic_pluginui.cc:737 panner_ui.cc:156
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
+#: generic_pluginui.cc:750 panner_ui.cc:156
 msgid "Write"
 msgstr "Skriv"
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:205 generic_pluginui.cc:465
-#: generic_pluginui.cc:739 panner_ui.cc:159
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
+#: generic_pluginui.cc:752 panner_ui.cc:159
 msgid "Touch"
 msgstr "Rør"
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr "???"
 
@@ -2184,7 +2195,7 @@ msgid "clear automation"
 msgstr "tøm automasjon"
 
 #: automation_time_axis.cc:485 editor_actions.cc:613 editor_markers.cc:857
-#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:699
+#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:708
 msgid "Hide"
 msgstr "Gøym"
 
@@ -2205,7 +2216,7 @@ msgstr "Diskret"
 msgid "Linear"
 msgstr "Rettlinja"
 
-#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:638
+#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:647
 #: shuttle_control.cc:188
 msgid "Mode"
 msgstr "Modus"
@@ -2222,13 +2233,13 @@ msgstr "Endra bundelen"
 msgid "Direction:"
 msgstr "Retning:"
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:156
-#: mixer_strip.cc:2132
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 msgid "Input"
 msgstr "Inngang"
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:161 mixer_strip.cc:2135
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 msgid "Output"
 msgstr "Utgang"
 
@@ -2238,8 +2249,8 @@ msgid "Edit"
 msgstr "Rediger"
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:420 processor_box.cc:2227
-#: route_time_axis.cc:704
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
+#: route_time_axis.cc:713
 msgid "Delete"
 msgstr "Slett"
 
@@ -2407,7 +2418,7 @@ msgstr "Tid"
 
 #: edit_note_dialog.cc:98 editor_regions.cc:114
 #: export_timespan_selector.cc:359 export_timespan_selector.cc:421
-#: location_ui.cc:313 midi_list_editor.cc:114 time_info_box.cc:105
+#: location_ui.cc:317 midi_list_editor.cc:114 time_info_box.cc:105
 msgid "Length"
 msgstr "Lengd"
 
@@ -2653,17 +2664,17 @@ msgid "Ranges & Marks"
 msgstr "Område og merke"
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 msgid "Editor"
 msgstr "Redigering"
 
 #: editor.cc:1215 editor.cc:1225 editor.cc:4440 editor_actions.cc:130
-#: editor_actions.cc:1804
+#: editor_actions.cc:1813
 msgid "Loop"
 msgstr "Spel i lykkje"
 
@@ -2689,8 +2700,8 @@ msgstr "Symmetrisk"
 msgid "Slow"
 msgstr "Sakte"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1606
-#: sfdb_ui.cc:1715
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "Fort"
 
@@ -2711,7 +2722,7 @@ msgstr "Slå på"
 msgid "Slowest"
 msgstr "Saktast"
 
-#: editor.cc:1572 route_time_axis.cc:1863 selection.cc:1009 selection.cc:1064
+#: editor.cc:1572 route_time_axis.cc:1877 selection.cc:1009 selection.cc:1064
 msgid "programming error: "
 msgstr "programmeringsfeil: "
 
@@ -2828,7 +2839,7 @@ msgid "Select All in Track"
 msgstr "Vel heile sporet"
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2235
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr "Vel alt"
 
@@ -2880,15 +2891,15 @@ msgstr "Vel område mellom spelehovudet og redigeringspunktet"
 msgid "Select"
 msgstr "Vel"
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2220
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr "Klypp ut"
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2223
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr "Kopier"
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2231
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr "Lim inn"
 
@@ -3044,7 +3055,7 @@ msgstr "Gjer omatt"
 msgid "Redo (%1)"
 msgstr "Gjer omatt (%1)"
 
-#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1785
+#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1794
 msgid "Duplicate"
 msgstr "Klon"
 
@@ -3074,8 +3085,8 @@ msgstr "Slett speleliste"
 msgid "Keep Playlist"
 msgstr "Ha speleliste"
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -3095,7 +3106,7 @@ msgstr "tøm spelelister"
 msgid "Please wait while %1 loads visual data."
 msgstr "Vent medan %1 lastar visuelle data"
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2251
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 msgid "Edit..."
 msgstr "Endra..."
 
@@ -3144,7 +3155,7 @@ msgstr "Lag"
 msgid "Position"
 msgstr "Posisjon"
 
-#: editor_actions.cc:101 gain_meter.cc:124 gain_meter.cc:755 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr "Skjer til"
@@ -3157,7 +3168,7 @@ msgstr "Innvolum"
 msgid "Ranges"
 msgstr "Område"
 
-#: editor_actions.cc:104 editor_actions.cc:1781 session_option_editor.cc:145
+#: editor_actions.cc:104 editor_actions.cc:1790 session_option_editor.cc:145
 #: session_option_editor.cc:147 session_option_editor.cc:156
 #: session_option_editor.cc:163
 msgid "Fades"
@@ -3195,7 +3206,7 @@ msgstr "MIDI-oppsett"
 msgid "Misc Options"
 msgstr "Ymse val"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr "Lytting"
@@ -3236,8 +3247,8 @@ msgstr "Sekundærklokke"
 msgid "Separate"
 msgstr "Skil"
 
-#: editor_actions.cc:132 mixer_strip.cc:1916 route_time_axis.cc:199
-#: route_time_axis.cc:2397
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
+#: route_time_axis.cc:2417
 msgid "Solo"
 msgstr "Solo"
 
@@ -3249,7 +3260,7 @@ msgstr "Underruter"
 msgid "Timecode fps"
 msgstr "Tidskode-RPS"
 
-#: editor_actions.cc:137 route_time_axis.cc:421
+#: editor_actions.cc:137 route_time_axis.cc:430
 msgid "Height"
 msgstr "Høgd"
 
@@ -3373,7 +3384,7 @@ msgstr "Spelehovudet til starten på området"
 msgid "Playhead to Range End"
 msgstr "Spelehovudet til slutten av området"
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2237
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 msgid "Deselect All"
 msgstr "Fjern markering"
 
@@ -3641,9 +3652,9 @@ msgstr "Set inn tid"
 msgid "Toggle Active"
 msgstr "Slå av/på"
 
-#: editor_actions.cc:370 editor_actions.cc:1707 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1488
-#: route_time_axis.cc:701
+#: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
+#: route_time_axis.cc:710
 msgid "Remove"
 msgstr "Fjern"
 
@@ -3651,19 +3662,19 @@ msgstr "Fjern"
 msgid "Fit Selected Tracks"
 msgstr "Tilpass dei valde spora"
 
-#: editor_actions.cc:376 time_axis_view.cc:1298
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr "Størst"
 
-#: editor_actions.cc:379 time_axis_view.cc:1299
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr "Større"
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1300
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr "Stor"
 
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr "Liten"
 
@@ -3759,7 +3770,7 @@ msgstr "Spleis"
 msgid "Slide"
 msgstr "Gli"
 
-#: editor_actions.cc:478 editor_actions.cc:1728 editor_markers.cc:860
+#: editor_actions.cc:478 editor_actions.cc:1737 editor_markers.cc:860
 #: editor_rulers.cc:386 location_ui.cc:56
 msgid "Lock"
 msgstr "LÃ¥s"
@@ -3933,7 +3944,7 @@ msgstr "Min:sek"
 msgid "Video Monitor"
 msgstr "Lytting"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr ""
 
@@ -3944,7 +3955,7 @@ msgstr "Hev til toppen"
 
 #: editor_actions.cc:554
 #, fuzzy
-msgid "Framenumber"
+msgid "Frame number"
 msgstr "Spor nummer"
 
 #: editor_actions.cc:555
@@ -4036,7 +4047,7 @@ msgstr "Fjern ubrukte"
 
 #: editor_actions.cc:652 editor_audio_import.cc:279
 #: session_import_dialog.cc:74 session_import_dialog.cc:94
-#: session_metadata_dialog.cc:297 editor_videotimeline.cc:107
+#: session_metadata_dialog.cc:297 editor_videotimeline.cc:108
 msgid "Import"
 msgstr "Importer"
 
@@ -4076,289 +4087,289 @@ msgstr "Lastar redigerinsbindingar frå %1"
 msgid "Could not find editor.bindings in search path %1"
 msgstr "Fann ikkje editor.bindings i søkjestigen %1"
 
-#: editor_actions.cc:1019 editor_actions.cc:1415 editor_actions.cc:1426
-#: editor_actions.cc:1479 editor_actions.cc:1490 editor_actions.cc:1537
-#: editor_actions.cc:1547 editor_regions.cc:1561
+#: editor_actions.cc:1028 editor_actions.cc:1424 editor_actions.cc:1435
+#: editor_actions.cc:1488 editor_actions.cc:1499 editor_actions.cc:1546
+#: editor_actions.cc:1556 editor_regions.cc:1561
 msgid "programming error: %1: %2"
 msgstr "Programmeringsfeil: %1: %2"
 
-#: editor_actions.cc:1713
+#: editor_actions.cc:1722
 msgid "Raise"
 msgstr "Hev"
 
-#: editor_actions.cc:1716
+#: editor_actions.cc:1725
 msgid "Raise to Top"
 msgstr "Hev til toppen"
 
-#: editor_actions.cc:1719 gtk-custom-ruler.c:132
+#: editor_actions.cc:1728 gtk-custom-ruler.c:132
 msgid "Lower"
 msgstr "Lægste"
 
-#: editor_actions.cc:1722
+#: editor_actions.cc:1731
 msgid "Lower to Bottom"
 msgstr "Senk til botnen"
 
-#: editor_actions.cc:1725
+#: editor_actions.cc:1734
 msgid "Move to Original Position"
 msgstr "Flytt til opphavleg plass"
 
-#: editor_actions.cc:1730
+#: editor_actions.cc:1739
 msgid "Lock to Video"
 msgstr ""
 
-#: editor_actions.cc:1735 editor_markers.cc:867
+#: editor_actions.cc:1744 editor_markers.cc:867
 msgid "Glue to Bars and Beats"
 msgstr "Lim til takter og taktslag"
 
-#: editor_actions.cc:1740
+#: editor_actions.cc:1749
 msgid "Remove Sync"
 msgstr "Fjern synk"
 
-#: editor_actions.cc:1743 mixer_strip.cc:1903 route_time_axis.cc:200
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr "Demp"
 
-#: editor_actions.cc:1746
+#: editor_actions.cc:1755
 msgid "Normalize..."
 msgstr "Normaliser..."
 
-#: editor_actions.cc:1749
+#: editor_actions.cc:1758
 msgid "Reverse"
 msgstr "Baklengs"
 
-#: editor_actions.cc:1752
+#: editor_actions.cc:1761
 msgid "Make Mono Regions"
 msgstr "Lag mono-bolkar"
 
-#: editor_actions.cc:1755
+#: editor_actions.cc:1764
 msgid "Boost Gain"
 msgstr "Auk volumet"
 
-#: editor_actions.cc:1758
+#: editor_actions.cc:1767
 msgid "Cut Gain"
 msgstr "Mink volumet"
 
-#: editor_actions.cc:1761
+#: editor_actions.cc:1770
 msgid "Pitch Shift..."
 msgstr "Endra tonehøgd..."
 
-#: editor_actions.cc:1764
+#: editor_actions.cc:1773
 msgid "Transpose..."
 msgstr "Transponer..."
 
-#: editor_actions.cc:1767
+#: editor_actions.cc:1776
 msgid "Opaque"
 msgstr "Heildekkjande"
 
-#: editor_actions.cc:1771 editor_regions.cc:116
+#: editor_actions.cc:1780 editor_regions.cc:116
 msgid "Fade In"
 msgstr "Ton inn"
 
-#: editor_actions.cc:1776 editor_regions.cc:117
+#: editor_actions.cc:1785 editor_regions.cc:117
 msgid "Fade Out"
 msgstr "Ton ut"
 
-#: editor_actions.cc:1791
+#: editor_actions.cc:1800
 msgid "Multi-Duplicate..."
 msgstr "Multi-kopier..."
 
-#: editor_actions.cc:1796
+#: editor_actions.cc:1805
 msgid "Fill Track"
 msgstr "Fyll sporet"
 
-#: editor_actions.cc:1800 editor_markers.cc:955
+#: editor_actions.cc:1809 editor_markers.cc:955
 msgid "Set Loop Range"
 msgstr "Set lykkje-område"
 
-#: editor_actions.cc:1807
+#: editor_actions.cc:1816
 msgid "Set Punch"
 msgstr "Set innslag"
 
-#: editor_actions.cc:1811
+#: editor_actions.cc:1820
 msgid "Add Single Range Marker"
 msgstr "Legg til einskild områdemarkør"
 
-#: editor_actions.cc:1816
+#: editor_actions.cc:1825
 msgid "Add Range Marker Per Region"
 msgstr "Legg til områdemarkør per bolk"
 
-#: editor_actions.cc:1820
+#: editor_actions.cc:1829
 msgid "Snap Position To Grid"
 msgstr "Fest posisjonen til gitteret"
 
-#: editor_actions.cc:1823
+#: editor_actions.cc:1832
 msgid "Close Gaps"
 msgstr "Steng gap"
 
-#: editor_actions.cc:1826
+#: editor_actions.cc:1835
 msgid "Rhythm Ferret..."
 msgstr "Rytmefinnar..."
 
-#: editor_actions.cc:1829
+#: editor_actions.cc:1838
 msgid "Export..."
 msgstr "Eksporter..."
 
-#: editor_actions.cc:1835
+#: editor_actions.cc:1844
 msgid "Separate Under"
 msgstr "Skil under"
 
-#: editor_actions.cc:1839
+#: editor_actions.cc:1848
 msgid "Set Fade In Length"
 msgstr "Endre inntoningslengd"
 
-#: editor_actions.cc:1840
+#: editor_actions.cc:1849
 msgid "Set Fade Out Length"
 msgstr "Endre uttoningslengd"
 
-#: editor_actions.cc:1841
+#: editor_actions.cc:1850
 msgid "Set Tempo from Region = Bar"
 msgstr "Set tempoet ut frå at bolken = ei takt"
 
-#: editor_actions.cc:1846
+#: editor_actions.cc:1855
 msgid "Split at Percussion Onsets"
 msgstr "Del opp bolkane der perkusjonen kjem inn"
 
-#: editor_actions.cc:1851
+#: editor_actions.cc:1860
 msgid "List Editor..."
 msgstr "Listeredigering..."
 
-#: editor_actions.cc:1854
+#: editor_actions.cc:1863
 msgid "Properties..."
 msgstr "Eigenskapar..."
 
-#: editor_actions.cc:1858
+#: editor_actions.cc:1867
 msgid "Bounce (with processing)"
 msgstr "Miks ned området (med signalhandsaming)"
 
-#: editor_actions.cc:1859
+#: editor_actions.cc:1868
 msgid "Bounce (without processing)"
 msgstr "Nedmiks (utan signalhandsaming)"
 
-#: editor_actions.cc:1860
+#: editor_actions.cc:1869
 msgid "Combine"
 msgstr "Kombiner"
 
-#: editor_actions.cc:1861
+#: editor_actions.cc:1870
 msgid "Uncombine"
 msgstr "Løys opp"
 
-#: editor_actions.cc:1863
+#: editor_actions.cc:1872
 msgid "Spectral Analysis..."
 msgstr "Spektrumanalyse..."
 
-#: editor_actions.cc:1865
+#: editor_actions.cc:1874
 msgid "Reset Envelope"
 msgstr "Nullstill omhylling"
 
-#: editor_actions.cc:1867
+#: editor_actions.cc:1876
 msgid "Reset Gain"
 msgstr "Nullstill volum"
 
-#: editor_actions.cc:1872
+#: editor_actions.cc:1881
 msgid "Envelope Active"
 msgstr "Omhylling på"
 
-#: editor_actions.cc:1876
+#: editor_actions.cc:1885
 msgid "Quantize..."
 msgstr "Gitterfordel..."
 
-#: editor_actions.cc:1877 editor_actions.cc:1878
+#: editor_actions.cc:1886 editor_actions.cc:1887
 msgid "Insert Patch Change..."
 msgstr "Set inn koplingsendring..."
 
-#: editor_actions.cc:1879
+#: editor_actions.cc:1888
 msgid "Unlink from other copies"
 msgstr "Fjern lenkjer frå andre kopiar"
 
-#: editor_actions.cc:1880
+#: editor_actions.cc:1889
 msgid "Strip Silence..."
 msgstr "Skjer bort stille..."
 
-#: editor_actions.cc:1881
+#: editor_actions.cc:1890
 msgid "Set Range Selection"
 msgstr "Definer områdeval"
 
-#: editor_actions.cc:1883
+#: editor_actions.cc:1892
 msgid "Nudge Later"
 msgstr "Skubb seinare"
 
-#: editor_actions.cc:1884
+#: editor_actions.cc:1893
 msgid "Nudge Earlier"
 msgstr "Skubb tidlegare"
 
-#: editor_actions.cc:1889
+#: editor_actions.cc:1898
 msgid "Nudge Later by Capture Offset"
 msgstr "Skubb seinare etter innspelingsforskuvinga"
 
-#: editor_actions.cc:1896
+#: editor_actions.cc:1905
 msgid "Nudge Earlier by Capture Offset"
 msgstr "Skubb tidlegare etter innspelingsforskuvinga"
 
-#: editor_actions.cc:1900
+#: editor_actions.cc:1909
 msgid "Trim to Loop"
 msgstr "Skjer til lykkja"
 
-#: editor_actions.cc:1901
+#: editor_actions.cc:1910
 msgid "Trim to Punch"
 msgstr "Skjer til innslaget"
 
-#: editor_actions.cc:1903
+#: editor_actions.cc:1912
 msgid "Trim to Previous"
 msgstr "Skjer til førre"
 
-#: editor_actions.cc:1904
+#: editor_actions.cc:1913
 msgid "Trim to Next"
 msgstr "Skjer til neste"
 
-#: editor_actions.cc:1911
+#: editor_actions.cc:1920
 msgid "Insert Region From Region List"
 msgstr "Set inn bolk frå lista"
 
-#: editor_actions.cc:1917
+#: editor_actions.cc:1926
 msgid "Set Sync Position"
 msgstr "Set synkposisjon"
 
-#: editor_actions.cc:1918
+#: editor_actions.cc:1927
 msgid "Place Transient"
 msgstr "Plasser signaltopp"
 
-#: editor_actions.cc:1919
+#: editor_actions.cc:1928
 msgid "Split"
 msgstr "Del opp"
 
-#: editor_actions.cc:1920
+#: editor_actions.cc:1929
 msgid "Trim Start at Edit Point"
 msgstr "Skjer til starten ved redigeringspunktet"
 
-#: editor_actions.cc:1921
+#: editor_actions.cc:1930
 msgid "Trim End at Edit Point"
 msgstr "Skjer til slutten ved redigeringspunktet"
 
-#: editor_actions.cc:1926
+#: editor_actions.cc:1935
 msgid "Align Start"
 msgstr "Juster starten"
 
-#: editor_actions.cc:1933
+#: editor_actions.cc:1942
 msgid "Align Start Relative"
 msgstr "Juster starten relativt"
 
-#: editor_actions.cc:1937
+#: editor_actions.cc:1946
 msgid "Align End"
 msgstr "Juster slutten"
 
-#: editor_actions.cc:1942
+#: editor_actions.cc:1951
 msgid "Align End Relative"
 msgstr "Juster slutten relativt"
 
-#: editor_actions.cc:1949
+#: editor_actions.cc:1958
 msgid "Align Sync"
 msgstr "Juster synk"
 
-#: editor_actions.cc:1956
+#: editor_actions.cc:1965
 msgid "Align Sync Relative"
 msgstr "Juster synken relativt"
 
-#: editor_actions.cc:1960 editor_actions.cc:1963
+#: editor_actions.cc:1969 editor_actions.cc:1972
 msgid "Choose Top..."
 msgstr "Vel topp..."
 
@@ -4387,32 +4398,32 @@ msgstr ""
 "Denne økta bruker alt ei kjeldefil som heiter %1. Vil du importera %2 som ny "
 "fil, eller hoppa over ho?"
 
-#: editor_audio_import.cc:279 editor_videotimeline.cc:107
+#: editor_audio_import.cc:279 editor_videotimeline.cc:108
 msgid "Cancel Import"
 msgstr "Avbryt import"
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr "Redigering: Kan ikkje opna fila \"%1\" (%2)"
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 msgid "Cancel entire import"
 msgstr "Avbryt heile importen"
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 msgid "Don't embed it"
 msgstr "Ikkje set inn"
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr "Set inn alle utan å spørja"
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 msgid "Sample rate"
 msgstr "Punktfrekvens"
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
@@ -4420,7 +4431,7 @@ msgstr ""
 "%1\n"
 "Denne lydfila har ikkje same punktfrekvens som økta du arbeider med!"
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 msgid "Embed it anyway"
 msgstr "Set inn likevel"
 
@@ -4457,31 +4468,31 @@ msgstr "kopier tempomerke"
 msgid "move tempo mark"
 msgstr "flytt tempomerke"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr "endra inntoningslengd"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr "endra uttoningslengd"
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr "flytt markør"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr "Feil med tidsstrekkinga"
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 msgid "programming_error: %1"
 msgstr "programming_error: %1"
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr "nytt områdemerke"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 msgid "rubberband selection"
 msgstr "gummistrikkval"
 
@@ -4550,7 +4561,7 @@ msgid "Sharing Solo?"
 msgstr "Deler solo?"
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 msgid "Rec"
 msgstr "Ta opp"
 
@@ -4621,7 +4632,7 @@ msgid "end"
 msgstr "slutt"
 
 #: editor_markers.cc:646 editor_ops.cc:1744 editor_ops.cc:1764
-#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1005
+#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1017
 msgid "add marker"
 msgstr "legg til merke"
 
@@ -4629,7 +4640,7 @@ msgstr "legg til merke"
 msgid "range"
 msgstr "område"
 
-#: editor_markers.cc:713 location_ui.cc:840
+#: editor_markers.cc:713 location_ui.cc:852
 msgid "remove marker"
 msgstr "fjern markør"
 
@@ -4709,8 +4720,8 @@ msgstr "Døyp om merke"
 msgid "Rename Range"
 msgstr "Døyp om området"
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2233 route_time_axis.cc:968 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr "Døyp om"
 
@@ -4846,7 +4857,7 @@ msgstr "senk bolkane til botnlaget"
 msgid "Rename Region"
 msgstr "Døyp om bolken"
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 msgid "New name:"
 msgstr "Nytt namn:"
 
@@ -5024,7 +5035,7 @@ msgstr ""
 "(Dette er endeleg og kan ikkje angrast)"
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr "Nei, ikkje gjer noko."
 
@@ -5216,11 +5227,11 @@ msgstr "Ok"
 msgid "close region gaps"
 msgstr "steng gap mellom bolkane"
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr "Det ville vore dårleg nytt..."
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5240,7 +5251,7 @@ msgstr ""
 msgid "tracks"
 msgstr "spor"
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 msgid "track"
 msgstr "spor"
 
@@ -5248,7 +5259,7 @@ msgstr "spor"
 msgid "busses"
 msgstr "bussar"
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 msgid "bus"
 msgstr "buss"
 
@@ -5290,7 +5301,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr "Ja, slett dei."
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr "Ja, slett det."
 
@@ -5361,7 +5372,7 @@ msgid "Length of region fade-out (units: secondary clock), () if dsisabled"
 msgstr ""
 "Lengd på uttoninga på bolken (eining: sekundærklokke), () viss avskrudd"
 
-#: editor_regions.cc:118 mixer_strip.cc:1960 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr "V"
@@ -5378,8 +5389,9 @@ msgstr "G"
 msgid "Region position glued to Bars|Beats time?"
 msgstr "Er bolkplasseringa limt til takter|taktslag-tida?"
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:723
-#: mixer_strip.cc:1934 panner_ui.cc:554 stereo_panner.cc:237
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
+#: stereo_panner.cc:237
 msgid "M"
 msgstr "M"
 
@@ -5448,7 +5460,8 @@ msgstr "Namn på spor/buss"
 msgid "Track/Bus visible ?"
 msgstr "Er sporet/bussen synleg?"
 
-#: editor_routes.cc:204 mixer_strip.cc:1951 route_time_axis.cc:2387
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
+#: route_time_axis.cc:2407
 msgid "A"
 msgstr "A"
 
@@ -5456,7 +5469,7 @@ msgstr "A"
 msgid "Track/Bus active ?"
 msgstr "Er sporet/bussen aktiv?"
 
-#: editor_routes.cc:205 mixer_strip.cc:1935
+#: editor_routes.cc:205 mixer_strip.cc:1932
 msgid "I"
 msgstr "I"
 
@@ -5464,7 +5477,7 @@ msgstr "I"
 msgid "MIDI input enabled"
 msgstr "MIDI-inngang skrudd på"
 
-#: editor_routes.cc:206 mixer_strip.cc:1933 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr "R"
@@ -5477,7 +5490,7 @@ msgstr "Opptak skrudd på"
 msgid "Muted"
 msgstr "Dempa"
 
-#: editor_routes.cc:208 mixer_strip.cc:1947
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr "S"
 
@@ -5489,7 +5502,7 @@ msgstr "Solo"
 msgid "SI"
 msgstr "SI"
 
-#: editor_routes.cc:209 mixer_strip.cc:351 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 msgid "Solo Isolated"
 msgstr "Isolert solo"
 
@@ -5774,140 +5787,144 @@ msgid "192000Hz"
 msgstr "192000Hz"
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr "Ingen"
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr "Trekantbølgje"
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr "Firkantbølgje"
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 msgid "Shaped"
 msgstr "Forma"
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr "Avspeling/opptak på 1 eining"
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr "Avspeling/opptak på 2 einingar"
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr "Berre avspeling"
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 msgid "Recording only"
 msgstr "Berre opptak"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr "sekv"
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 msgid "raw"
 msgstr "rå"
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr "Drivar:"
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 msgid "Audio Interface:"
 msgstr "Lydkort:"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:148 sfdb_ui.cc:261 sfdb_ui.cc:266
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 msgid "Sample rate:"
 msgstr "Punktfrekvens:"
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr "Bufferstorleik:"
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr "Kor mange bufrar:"
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr "Omrentleg treigskap:"
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 msgid "Audio mode:"
 msgstr "Lydmodus:"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr "Oversjå"
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr "Klienttidsgrense"
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr "Kor mange portar:"
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr "MIDI-drivar"
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 msgid "Dither:"
 msgstr "Utjamning:"
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr ""
 "Fann ingen JACK-tenar på denne maskina. Installer JACK og start på nytt."
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr "Tenar:"
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr "Inneining:"
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 msgid "Output device:"
 msgstr "Uteining:"
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 msgid "Hardware input latency:"
 msgstr "Treigskap for maskinvare-inngangar:"
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 msgid "samples"
 msgstr "punkt"
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 msgid "Hardware output latency:"
 msgstr "Treigskap for maskinvare-utgangar:"
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr "Eining"
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 msgid "Advanced"
 msgstr "Avansert"
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr "greier ikkje opna JACK-rc-fila %1 for å lagra val."
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 #, fuzzy
 msgid ""
 "You do not have any audio devices capable of\n"
@@ -5938,32 +5955,32 @@ msgstr ""
 "eller opptak, men ikkje båe deler, kan du starte JACK\n"
 "før du startar Ardour, og så velja rett lydeining."
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr "Ingen brukande lydeiningar"
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr "Det ser ut som JACK ikkje er med i %1-bundelen"
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr "Du må velja ei lydeining fyrst."
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr "Lydeininga \"%1\" er ukjend for denne datamaskina."
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr "Lydoppsett-verdien for %1 manglar data"
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 "oppsettsfilene inneheld ein ikkje-eksisterande stig til JACK-tenaren (%1)"
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:146
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 msgid "Channels:"
 msgstr "Kanalar:"
 
@@ -6119,9 +6136,9 @@ msgid "Folder:"
 msgstr "Mappe:"
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "Bla gjennom"
 
@@ -6248,6 +6265,11 @@ msgstr "Val for FLAC"
 msgid "Broadcast Wave options"
 msgstr "Val for kringkastingsformat"
 
+#: export_format_selector.cc:136
+#, fuzzy
+msgid "Do you really want to remove the format?"
+msgstr "Vil du verkeleg fjerna %1? %2?"
+
 #: export_preset_selector.cc:28
 msgid "Preset"
 msgstr "Ferdigoppsett"
@@ -6260,6 +6282,11 @@ msgstr ""
 "Greidde ikkje lasta dei valde ferdigoppsetta!\n"
 "Kan henda dei viser til eit format som har vorte fjerna?"
 
+#: export_preset_selector.cc:156
+#, fuzzy
+msgid "Do you really want to remove this preset?"
+msgstr "Vil du verkeleg fjerna %1? %2?"
+
 #: export_timespan_selector.cc:46
 msgid "Show Times as:"
 msgstr "Vis tider som:"
@@ -6272,36 +6299,50 @@ msgstr "til"
 msgid "Range"
 msgstr "Område"
 
-#: gain_meter.cc:109 gain_meter.cc:431 gain_meter.cc:820
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+#, fuzzy
+msgid "curl error %1 (%2)"
+msgstr "Programmeringsfeil: %1 (%2)"
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+#, fuzzy
+msgid "%1"
+msgstr "%"
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr "-�"
 
-#: gain_meter.cc:115 gain_meter.cc:869
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr "Volumautomasjonsmodus"
 
-#: gain_meter.cc:116 gain_meter.cc:870
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr "Automasjonstype for volum"
 
-#: gain_meter.cc:125 gain_meter.cc:759 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr "Abs"
 
-#: gain_meter.cc:334
-msgid "-Inf"
-msgstr "-�"
-
-#: gain_meter.cc:726 mixer_strip.cc:1954 panner_ui.cc:557
-#: route_time_axis.cc:2391
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
+#: route_time_axis.cc:2411
 msgid "P"
 msgstr "S"
 
-#: gain_meter.cc:729 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr "T"
 
-#: gain_meter.cc:732 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr "W"
 
@@ -6313,7 +6354,7 @@ msgstr "<span size=\"large\">Ferdiginnstillingar</span>"
 msgid "Switches"
 msgstr "Brytarar"
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2210
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 msgid "Controls"
 msgstr "Kontrollar"
 
@@ -6341,63 +6382,63 @@ msgstr "Lydtilkoplingar"
 msgid "MIDI Connection Manager"
 msgstr "MIDI-tilkoplingar"
 
-#: global_port_matrix.cc:204 io_selector.cc:216
+#: global_port_matrix.cc:213 io_selector.cc:216
 msgid "port"
 msgstr "port"
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 msgid "Selection..."
 msgstr "Utval..."
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr "Opptak på..."
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 msgid "Soloed..."
 msgstr "Solo..."
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 msgid "Create New Group ..."
 msgstr "Lag ny gruppe..."
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr "Lag ny gruppe frå"
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 msgid "Edit Group..."
 msgstr "Rediger gruppe..."
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 msgid "Collect Group"
 msgstr "Samla gruppa"
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 msgid "Remove Group"
 msgstr "Fjern gruppa"
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 msgid "Remove Subgroup Bus"
 msgstr "Fjern subgruppe-buss"
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 msgid "Add New Subgroup Bus"
 msgstr "Legg til subgruppe-buss"
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr "Legg til ny aux-buss (før volum)"
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 msgid "Add New Aux Bus (post-fader)"
 msgstr "Legg til aux-buss (etter volum)"
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 msgid "Enable All Groups"
 msgstr "Skru på alle grupper"
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 msgid "Disable All Groups"
 msgstr "Slå av alle gruppene"
 
@@ -6493,11 +6534,11 @@ msgstr "Importerer fil: %1 av %2"
 msgid "I/O selector"
 msgstr "I/U-veljar"
 
-#: io_selector.cc:266
+#: io_selector.cc:265
 msgid "%1 input"
 msgstr "%1-inngang"
 
-#: io_selector.cc:268
+#: io_selector.cc:267
 msgid "%1 output"
 msgstr "%1-utgang"
 
@@ -6572,7 +6613,7 @@ msgstr[1] "%1 punkt"
 msgid "Reset"
 msgstr "Nullstill"
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1734
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 msgid "programming error: %1 (%2)"
 msgstr "Programmeringsfeil: %1 (%2)"
 
@@ -6600,63 +6641,63 @@ msgstr "Komponist:"
 msgid "Pre-Emphasis"
 msgstr "Før-framheving for CD"
 
-#: location_ui.cc:310
+#: location_ui.cc:314
 msgid "Remove this range"
 msgstr "Fjern dette området"
 
-#: location_ui.cc:311
+#: location_ui.cc:315
 msgid "Start time - middle click to locate here"
 msgstr "Starttid - midtklikk for å gå hit"
 
-#: location_ui.cc:312
+#: location_ui.cc:316
 msgid "End time - middle click to locate here"
 msgstr "Sluttid - midtklikk for å gå hit"
 
-#: location_ui.cc:315
+#: location_ui.cc:319
 msgid "Set range start from playhead location"
 msgstr "Set områdestart ved spelehovudet"
 
-#: location_ui.cc:316
+#: location_ui.cc:320
 msgid "Set range end from playhead location"
 msgstr "Set områdeslutt ved spelehovudet"
 
-#: location_ui.cc:320
+#: location_ui.cc:324
 msgid "Remove this marker"
 msgstr "Fjern denne markøren"
 
-#: location_ui.cc:321
+#: location_ui.cc:325
 msgid "Position - middle click to locate here"
 msgstr "Posisjon - midtklikk for å gå hit"
 
-#: location_ui.cc:323
+#: location_ui.cc:327
 msgid "Set marker time from playhead location"
 msgstr "Set markørtid ved spelehovudet"
 
-#: location_ui.cc:462
+#: location_ui.cc:494
 msgid "You cannot put a CD marker at the start of the session"
 msgstr "Du kan ikkje leggja ein CD-markør på starten av økta"
 
-#: location_ui.cc:708
+#: location_ui.cc:720
 msgid "New Marker"
 msgstr "Nytt merke"
 
-#: location_ui.cc:709
+#: location_ui.cc:721
 msgid "New Range"
 msgstr "Nytt område"
 
-#: location_ui.cc:722
+#: location_ui.cc:734
 msgid "<b>Loop/Punch Ranges</b>"
 msgstr "<b>Lykkje-/innslagsområde</b>"
 
-#: location_ui.cc:747
+#: location_ui.cc:759
 msgid "<b>Markers (Including CD Index)</b>"
 msgstr "<b>Markørar (inkl. CD-indeks)</b>"
 
-#: location_ui.cc:782
+#: location_ui.cc:794
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
 msgstr "<b>Bolkar (inkl. CD-sporbolkar)</b>"
 
-#: location_ui.cc:1024
+#: location_ui.cc:1036
 msgid "add range marker"
 msgstr "legg til områdemarkørar"
 
@@ -6741,19 +6782,19 @@ msgstr ""
 "og kopla til %1 på nytt, eller avslutta %1 no. Du kan ikkje lagra økta\n"
 "di no, fordi då mistar me all informasjon om tilkoplingar.\n"
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr " (bygd med "
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr " og GCC-version "
 
-#: main.cc:504
+#: main.cc:500
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr "Copyright (C) 1999-2012 Paul Davis"
 
-#: main.cc:505
+#: main.cc:501
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
@@ -6761,30 +6802,34 @@ msgstr ""
 "Nokre deler (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker, Robin "
 "Gareus"
 
-#: main.cc:507
+#: main.cc:503
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr "%1 har ABSOLUTT INGEN GARANTI"
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 "mogleik for sal eller bruk til eit spesielt føremål er heller ikkje "
 "garantert."
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "Dette er gratis programvare, og du må gjerne gje henne vidare"
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr ""
 "på visse vilkår, sjå kjeldekoden for kopierings- og vidareformidlingsvilkår. "
 
-#: main.cc:519
+#: main.cc:513
+msgid "could not initialize %1."
+msgstr "greidde ikkje starta %1."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr "Kan ikkje xinstallera SIGPIPE-feilhandterar"
 
-#: main.cc:525
+#: main.cc:528
 #, fuzzy
 msgid "could not create %1 GUI"
 msgstr "greidde ikkje laga Ardour-brukarflate"
@@ -6793,7 +6838,7 @@ msgstr "greidde ikkje laga Ardour-brukarflate"
 msgid "Display delta to edit cursor"
 msgstr "Vis delta til redigeringspunktet"
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 msgid "MarkerText"
 msgstr "MarkørTekst"
 
@@ -7289,7 +7334,7 @@ msgstr "Klikk for å velja ei mappe til"
 msgid "Missing Plugins"
 msgstr "Manglande utvidingar"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr "OK"
 
@@ -7361,20 +7406,20 @@ msgstr "Lasta miksarbindingar frå %1"
 msgid "Could not find mixer.bindings in search path %1"
 msgstr "Fann ikkje mixer.bindings i søkjestigen %1"
 
-#: mixer_strip.cc:91 mixer_strip.cc:119 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr "før"
 
-#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:352 mixer_strip.cc:1293
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 msgid "Comments"
 msgstr "Kommentarar"
 
-#: mixer_strip.cc:145
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr "Klikk for å endra breidd på denne miksarstripa."
 
-#: mixer_strip.cc:147
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
@@ -7382,59 +7427,59 @@ msgstr ""
 "\n"
 "%1-%2-klikk for å endra breidda på alle stripene."
 
-#: mixer_strip.cc:154
+#: mixer_strip.cc:156
 msgid "Hide this mixer strip"
 msgstr "Gøym denne miksarstripa"
 
-#: mixer_strip.cc:165
+#: mixer_strip.cc:167
 msgid "Click to select metering point"
 msgstr "Klikk for å velja mælepunkt"
 
-#: mixer_strip.cc:171
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr "gnagnni"
 
-#: mixer_strip.cc:190
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr "Isoler solo"
 
-#: mixer_strip.cc:199
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr "LÃ¥s solostatus"
 
-#: mixer_strip.cc:201 mixer_strip.cc:1929
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 msgid "lock"
 msgstr "lås"
 
-#: mixer_strip.cc:202 mixer_strip.cc:1928
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 msgid "iso"
 msgstr "iso"
 
-#: mixer_strip.cc:256
+#: mixer_strip.cc:258
 msgid "Mix group"
 msgstr "Miksgruppe"
 
-#: mixer_strip.cc:349 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 msgid "Phase Invert"
 msgstr "Polaritetsvending"
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 msgid "Solo Safe"
 msgstr "Solo-sikker"
 
-#: mixer_strip.cc:353 mixer_ui.cc:124 route_time_axis.cc:664
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 msgid "Group"
 msgstr "Gruppe"
 
-#: mixer_strip.cc:354 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 msgid "Meter Point"
 msgstr "Mælepunkt"
 
-#: mixer_strip.cc:466
+#: mixer_strip.cc:470
 msgid "Enable/Disable MIDI input"
 msgstr "Slå på/av MIDI-inngang"
 
-#: mixer_strip.cc:616
+#: mixer_strip.cc:622
 msgid ""
 "Aux\n"
 "Sends"
@@ -7442,139 +7487,152 @@ msgstr ""
 "Aux\n"
 "send"
 
-#: mixer_strip.cc:640
+#: mixer_strip.cc:646
 msgid "Snd"
 msgstr "Snd"
 
-#: mixer_strip.cc:694 mixer_strip.cc:822 processor_box.cc:2152
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr "Ikkje tilkopla JACK - I/U-endringar er ikkje mogleg"
 
-#: mixer_strip.cc:1089
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr "<b>INNGANG</b> til %1"
 
-#: mixer_strip.cc:1092
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr "<b>UTGANG</b> frå %1"
 
-#: mixer_strip.cc:1167
+#: mixer_strip.cc:1174
 msgid "Disconnected"
 msgstr "Fråkopla"
 
-#: mixer_strip.cc:1296
+#: mixer_strip.cc:1303
 msgid "*Comments*"
 msgstr "*Kommentarar*"
 
-#: mixer_strip.cc:1303
+#: mixer_strip.cc:1310
 msgid "Cmt"
 msgstr "Kmt"
 
-#: mixer_strip.cc:1306
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr "*Kmt*"
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr "Klikk for å leggja til/redigera kommentarar"
 
-#: mixer_strip.cc:1351
+#: mixer_strip.cc:1358
 msgid ": comment editor"
 msgstr ": rediger kommentarar"
 
-#: mixer_strip.cc:1428
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr "Grp"
 
-#: mixer_strip.cc:1431
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr "~G"
 
-#: mixer_strip.cc:1460
+#: mixer_strip.cc:1467
 msgid "Comments..."
 msgstr "Merknader …"
 
-#: mixer_strip.cc:1462
+#: mixer_strip.cc:1469
 msgid "Save As Template..."
 msgstr "Lagra som mal..."
 
-#: mixer_strip.cc:1468 route_group_dialog.cc:39 route_time_axis.cc:687
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr "Aktiv"
 
-#: mixer_strip.cc:1475
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr "Juster treigskap..."
 
-#: mixer_strip.cc:1478
+#: mixer_strip.cc:1485
 msgid "Protect Against Denormals"
 msgstr "Vern mot unormalar"
 
-#: mixer_strip.cc:1484 route_time_axis.cc:426
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 msgid "Remote Control ID..."
 msgstr "Fjernstyrings-ID..."
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 msgid "in"
 msgstr "inn"
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 msgid "post"
 msgstr "etter"
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 msgid "out"
 msgstr "ut"
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr "eigen"
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 msgid "pr"
 msgstr "fø"
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 msgid "po"
 msgstr "et"
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 msgid "o"
 msgstr ""
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr ""
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr "Disk"
 
-#: mixer_strip.cc:1920 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr "EL"
 
-#: mixer_strip.cc:1923 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr "FL"
 
-#: mixer_strip.cc:1936
+#: mixer_strip.cc:1933
 msgid "D"
 msgstr "D"
 
-#: mixer_strip.cc:1959
+#: mixer_strip.cc:1953
 #, fuzzy
 msgid "i"
 msgstr "inn"
 
-#: mixer_strip.cc:2133
+#: mixer_strip.cc:2128
 msgid "Pre-fader"
 msgstr "Før volumkontroll"
 
-#: mixer_strip.cc:2134
+#: mixer_strip.cc:2129
 msgid "Post-fader"
 msgstr "Etter volumkontroll"
 
+#: mixer_strip.cc:2166 meter_strip.cc:728
+msgid "Change all in Group to %1"
+msgstr ""
+
+#: mixer_strip.cc:2168 meter_strip.cc:730
+#, fuzzy
+msgid "Change all to %1"
+msgstr "Kanal %1"
+
+#: mixer_strip.cc:2170 meter_strip.cc:732
+msgid "Change same track-type to %1"
+msgstr ""
+
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr "fann ikkje sporvisingslisteobjekt for omdøypt stripe!"
@@ -7583,10 +7641,69 @@ msgstr "fann ikkje sporvisingslisteobjekt for omdøypt stripe!"
 msgid "-all-"
 msgstr "-alle-"
 
-#: mixer_ui.cc:1792
+#: mixer_ui.cc:1794
 msgid "Strips"
 msgstr "Striper"
 
+#: meter_strip.cc:764
+#, fuzzy
+msgid "Variable height"
+msgstr "høgda"
+
+#: meter_strip.cc:765
+#, fuzzy
+msgid "Short"
+msgstr "kort"
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr ""
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr ""
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+#, fuzzy
+msgid "VU"
+msgstr "V"
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr "Spp"
@@ -7975,7 +8092,7 @@ msgstr ""
 msgid "Panner (2D)"
 msgstr "Panorering (2D)"
 
-#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:452
+#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:451
 msgid "Bypass"
 msgstr "Forbikopla"
 
@@ -8151,7 +8268,7 @@ msgstr "Etter kategori"
 msgid "Eh? LADSPA plugins don't have editors!"
 msgstr "Hm? LADSPA-utvidingar har ikkje redigering!"
 
-#: plugin_ui.cc:125 plugin_ui.cc:228
+#: plugin_ui.cc:125 plugin_ui.cc:227
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
@@ -8164,7 +8281,7 @@ msgstr ""
 msgid "unknown type of editor-supplying plugin"
 msgstr "ukjent redigerbar utvidingstype"
 
-#: plugin_ui.cc:258
+#: plugin_ui.cc:257
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no linuxVST support in this "
@@ -8173,23 +8290,23 @@ msgstr ""
 "ukjend type utviding med redigering (tips: linuxVST-utvidingar er ikkje "
 "støtta i denne versjonen av Ardour)"
 
-#: plugin_ui.cc:330
+#: plugin_ui.cc:329
 msgid "create_lv2_editor called on non-LV2 plugin"
 msgstr "create_lv2_editor oppkalla på ikkje-LV2-utviding"
 
-#: plugin_ui.cc:418
+#: plugin_ui.cc:417
 msgid "Add"
 msgstr "Legg til"
 
-#: plugin_ui.cc:422
+#: plugin_ui.cc:421
 msgid "Description"
 msgstr "Skildring"
 
-#: plugin_ui.cc:423
+#: plugin_ui.cc:422
 msgid "Plugin analysis"
 msgstr "Analyse av programutvidingar"
 
-#: plugin_ui.cc:430
+#: plugin_ui.cc:429
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
@@ -8197,23 +8314,23 @@ msgstr ""
 "Førehandsoppsett (viss dei finst) for utvidinga\n"
 "(Både frå produsent og brukarar)"
 
-#: plugin_ui.cc:431
+#: plugin_ui.cc:430
 msgid "Save a new preset"
 msgstr "Lagra nytt ferdigoppsett"
 
-#: plugin_ui.cc:432
+#: plugin_ui.cc:431
 msgid "Save the current preset"
 msgstr "Lagra ferdigoppsettet"
 
-#: plugin_ui.cc:433
+#: plugin_ui.cc:432
 msgid "Delete the current preset"
 msgstr "Slett dette ferdigoppsett"
 
-#: plugin_ui.cc:434
+#: plugin_ui.cc:433
 msgid "Disable signal processing by the plugin"
 msgstr "Skru av signalhandsaminga åt utvidinga"
 
-#: plugin_ui.cc:467 plugin_ui.cc:632
+#: plugin_ui.cc:466 plugin_ui.cc:662
 msgid ""
 "Click to allow the plugin to receive keyboard events that %1 would normally "
 "use as a shortcut"
@@ -8221,29 +8338,41 @@ msgstr ""
 "Klikk for å gje utvidinga lov til å ta imot tastetrykk som %1 vanlegvis "
 "bruker som snøggtastar"
 
-#: plugin_ui.cc:468
+#: plugin_ui.cc:467
 msgid "Click to enable/disable this plugin"
 msgstr "Klikk for å skru av/på denne utvidinga"
 
-#: plugin_ui.cc:507
+#: plugin_ui.cc:506
 msgid "latency (%1 sample)"
 msgid_plural "latency (%1 samples)"
 msgstr[0] "utreigskap (%1 punkt)"
 msgstr[1] "treigskap (%1 punkt)"
 
-#: plugin_ui.cc:509
+#: plugin_ui.cc:508
 msgid "latency (%1 ms)"
 msgstr "treigskap (%1 ms)"
 
-#: plugin_ui.cc:520
+#: plugin_ui.cc:519
 msgid "Edit Latency"
 msgstr "Endra treigskap"
 
-#: plugin_ui.cc:559
+#: plugin_ui.cc:558
 msgid "Plugin preset %1 not found"
 msgstr "Fann ikkje ferdiginnstillinga %1"
 
-#: plugin_ui.cc:639
+#: plugin_ui.cc:595
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin_ui.cc:615 plugin_ui.cc:630
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"newer version"
+msgstr ""
+
+#: plugin_ui.cc:669
 msgid "Click to allow normal use of %1 keyboard shortcuts"
 msgstr "Klikk for å bruka snøggtastane som vanleg i %1"
 
@@ -8347,46 +8476,46 @@ msgstr "Lyttar etter signal..."
 msgid "Port Insert "
 msgstr "Portinnstikk"
 
-#: port_matrix.cc:323 port_matrix.cc:342
+#: port_matrix.cc:331 port_matrix.cc:357
 msgid "<b>Sources</b>"
 msgstr "<b>Kjelder</b>"
 
-#: port_matrix.cc:324 port_matrix.cc:343
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr "<b>MÃ¥l</b>"
 
-#: port_matrix.cc:419 port_matrix.cc:427
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr "Legg til %s %s"
 
-#: port_matrix.cc:435
+#: port_matrix.cc:456
 #, c-format
 msgid "Rename '%s'..."
 msgstr "Døyp om '%s'..."
 
-#: port_matrix.cc:451
+#: port_matrix.cc:472
 msgid "Remove all"
 msgstr "Fjern alt"
 
-#: port_matrix.cc:471 port_matrix.cc:483
+#: port_matrix.cc:492 port_matrix.cc:504
 #, c-format
 msgid "%s all"
 msgstr "%s alt"
 
-#: port_matrix.cc:506
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr "Oppdater"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr "Vis individuelle portart"
 
-#: port_matrix.cc:514
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr "Flipp"
 
-#: port_matrix.cc:702
+#: port_matrix.cc:723
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
 "or buss cannot support the new configuration."
@@ -8394,33 +8523,35 @@ msgstr ""
 "Du kan ikkje leggja til ein port her, fordi den fyrste signalprosessen på "
 "sporet eller bussen ikkje godtek det nye oppsettet."
 
-#: port_matrix.cc:705
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr "Kan ikkje leggja til port"
 
-#: port_matrix.cc:727
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr "Ikkje lov å fjerna portar"
 
-#: port_matrix.cc:728
+#: port_matrix.cc:749
+#, fuzzy
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
 "Du kan ikkje fjerna denne porten, fordi den fyrste utvidinga på sporet eller "
 "bussen ikkje godtek det nye talet på inngangar."
 
-#: port_matrix.cc:945
+#: port_matrix.cc:966
 #, c-format
 msgid "Remove '%s'"
 msgstr "Fjern '%s'"
 
-#: port_matrix.cc:960
+#: port_matrix.cc:981
 #, c-format
 msgid "%s all from '%s'"
 msgstr "%s alt frå '%s'"
 
-#: port_matrix.cc:1026
+#: port_matrix.cc:1047
 msgid "channel"
 msgstr "kanal"
 
@@ -8432,36 +8563,36 @@ msgstr "Ingen portar å kopla til."
 msgid "There are no %1 ports to connect."
 msgstr "Ingen %1-portar å kopla til."
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
 "Alt+double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 msgid "Show All Controls"
 msgstr "Vis alle kontrollar"
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 msgid "Hide All Controls"
 msgstr "Gøym alle kontrollar"
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 msgid "on"
 msgstr "på"
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr "av"
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
@@ -8469,15 +8600,15 @@ msgstr ""
 "Høgreklikk for å leggja til/fjerna/redigera\n"
 "utvidingar, innstikk, send og meir"
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 msgid "Plugin Incompatibility"
 msgstr "Utvidinga samsvarar ikkje"
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr "Du prøvde å leggja til utvidinga \"%1\" i skuffen %2.\n"
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
@@ -8485,19 +8616,19 @@ msgstr ""
 "\n"
 "Denne utvidinga har:\n"
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
 msgstr[0] "\t%1 MIDI-inngang\n"
 msgstr[1] "\t%1 MIDI-inngangar\n"
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
 msgstr[0] "\t%1 lydinngang\n"
 msgstr[1] "\t%1 lydinngangar\n"
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
@@ -8505,19 +8636,19 @@ msgstr ""
 "\n"
 "men på innsetingspunktet er det:\n"
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
 msgstr[0] "\t%1 MIDI-kanal\n"
 msgstr[1] "\t%1 MIDI-kanalar\n"
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
 msgstr[0] "\t%1 lydkanal\n"
 msgstr[1] "\t%1 lydkanalar\n"
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
@@ -8525,11 +8656,11 @@ msgstr ""
 "\n"
 "%1 greier ikkje setja inn utvidinga her.\n"
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 msgid "Cannot set up new send: %1"
 msgstr "Greier ikkje setja opp ny send: %1"
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
 "in that way because the inputs and\n"
@@ -8539,19 +8670,19 @@ msgstr ""
 "signal-omdirigeringar, fordi inn- og utgangane\n"
 "ikkje verkar skikkeleg då."
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 msgid "Rename Processor"
 msgstr "Døyp om handsaming"
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr "Det finst minst 100 IU-objekt med namn som %1 - namnet er ikkje endra"
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr "greidde ikkje laga instikkpunkt for utvidinga"
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
@@ -8561,7 +8692,7 @@ msgstr ""
 "tavla, truleg fordi I/U-oppsettet for utvidingane\n"
 "ikkje passar med oppsettet for dette sporet."
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 msgid ""
 "Do you really want to remove all processors from %1?\n"
 "(this cannot be undone)"
@@ -8569,15 +8700,15 @@ msgstr ""
 "Vil du verkeleg fjerna alle handsamingar frå %1?\n"
 "(Du kan ikkje angra)"
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 msgid "Yes, remove them all"
 msgstr "Ja, slett alle"
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 msgid "Remove processors"
 msgstr "Fjern handsamingar"
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
 "(this cannot be undone)"
@@ -8585,7 +8716,7 @@ msgstr ""
 "Vil du verkeleg fjerna alle før-dempar-handsamingar frå %1?\n"
 "(Du kan ikkje angra)"
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
 "(this cannot be undone)"
@@ -8593,52 +8724,52 @@ msgstr ""
 "Vil du verkeleg fjerna alle før-dempar-handsamingar frå %1?\n"
 "(Du kan ikkje angra)"
 
-#: processor_box.cc:2198
+#: processor_box.cc:2200
 msgid "New Plugin"
 msgstr "Ny utviding"
 
-#: processor_box.cc:2201
+#: processor_box.cc:2203
 msgid "New Insert"
 msgstr "Nytt innstikk"
 
-#: processor_box.cc:2204
+#: processor_box.cc:2206
 msgid "New External Send ..."
 msgstr "Ny ekstern send..."
 
-#: processor_box.cc:2208
+#: processor_box.cc:2210
 msgid "New Aux Send ..."
 msgstr "Ny aux-send..."
 
-#: processor_box.cc:2212
+#: processor_box.cc:2214
 msgid "Clear (all)"
 msgstr "Tøm (alt)"
 
-#: processor_box.cc:2214
+#: processor_box.cc:2216
 msgid "Clear (pre-fader)"
 msgstr "Fjern (før-dempar)"
 
-#: processor_box.cc:2216
+#: processor_box.cc:2218
 msgid "Clear (post-fader)"
 msgstr "Fjern (etter-dempar)"
 
-#: processor_box.cc:2242
+#: processor_box.cc:2244
 msgid "Activate All"
 msgstr "Slå på alle"
 
-#: processor_box.cc:2244
+#: processor_box.cc:2246
 msgid "Deactivate All"
 msgstr "Slå av alle"
 
-#: processor_box.cc:2246
+#: processor_box.cc:2248
 msgid "A/B Plugins"
 msgstr "A/B programutvidingar"
 
-#: processor_box.cc:2255
+#: processor_box.cc:2257
 #, fuzzy
 msgid "Edit with generic controls..."
 msgstr "Rediger med grunnleggande kontrollar..."
 
-#: processor_box.cc:2531
+#: processor_box.cc:2557
 msgid "%1: %2 (by %3)"
 msgstr "%1: %2 (av %3)"
 
@@ -8798,7 +8929,7 @@ msgstr ""
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
 
 #: rc_option_editor.cc:836
@@ -8887,7 +9018,7 @@ msgstr "Største tal på samtidige økter"
 msgid "Click gain level"
 msgstr "Klikkvolum"
 
-#: rc_option_editor.cc:1083 route_time_axis.cc:206 route_time_axis.cc:667
+#: rc_option_editor.cc:1083 route_time_axis.cc:215 route_time_axis.cc:676
 msgid "Automation"
 msgstr "Automasjon"
 
@@ -9115,92 +9246,96 @@ msgstr "Flytt relevant automasjon saman med lydbolkane"
 msgid "Show meters on tracks in the editor"
 msgstr "Vis mælarar på spor i redigeringa"
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr ""
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr ""
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 #, fuzzy
 msgid "whenever they overlap in time"
 msgstr "kort ned den overlappa nye noten"
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr ""
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr "Få gummistrikkval-rektangelet til å festa til gitteret"
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 msgid "Show waveforms in regions"
 msgstr "Vis bylgjeformer i bolkane"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 msgid "Show gain envelopes in audio regions"
 msgstr "Vis lydomhylling i lydbolkane"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr "i alle modi"
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr "berre i bolkvolum-modus"
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 msgid "Waveform scale"
 msgstr "Bylgjeskala"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "rettlinja"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr "logaritmisk"
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 msgid "Waveform shape"
 msgstr "Bylgjeform"
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 msgid "traditional"
 msgstr "tradisjonell"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 msgid "rectified"
 msgstr "innretta"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr "Vis bylgjeformer ved opptak"
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr "Vis zoom-verktylina"
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr "Fargelegg bolkar med sporfarga"
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr "Oppdater redigeringsvindauga når du dreg samandraget"
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 msgid "Synchronise editor and mixer track order"
 msgstr "Samkøyr redigeringa og kanalrekkjefylgja på miksaren"
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 msgid "Synchronise editor and mixer selection"
 msgstr "Samkøyr redigeringa og miksarvalet"
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 msgid "Name new markers"
 msgstr "Døyp nye markørar"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9212,335 +9347,420 @@ msgstr ""
 "\n"
 "Du kan alltid døypa om markørar ved å høgreklikka på dei."
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr "Autorull redigeringsvindauga når du dreg nær kantane"
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr "Bufring"
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 msgid "Record monitoring handled by"
 msgstr "Opptakslyttinga blir handtert av"
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 msgid "ardour"
 msgstr "ardour"
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 msgid "audio hardware"
 msgstr "lydmaskinvare"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 msgid "Tape machine mode"
 msgstr "Bandopptakarmodus"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr "Tilkopling av spor og bussar"
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr "Kopla til master- og lyttebussane automatisk"
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 msgid "Connect track inputs"
 msgstr "Kopla sporinngangane"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 msgid "automatically to physical inputs"
 msgstr "automatisk til fysiske inngangar"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr "manuelt"
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 msgid "Connect track and bus outputs"
 msgstr "Kopla til spor- og bussutgangar"
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 msgid "automatically to physical outputs"
 msgstr "automatisk til fysiske inngangar"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 msgid "automatically to master bus"
 msgstr "automatisk til masterbussen"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 msgid "Denormals"
 msgstr "Unormalar"
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 msgid "Use DC bias to protect against denormals"
 msgstr "Bruk likestraumsbias for å verna mot unormalar"
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr "Prosessorhandtering"
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr "inga prosessorhandtering"
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 msgid "use FlushToZero"
 msgstr "bruk SpylTilNull"
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr "bruk UnormalarErNull"
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr "bruk SpylTilNull og UnormalarErNull"
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 msgid "Silence plugins when the transport is stopped"
 msgstr "Demp lyden frå utvidingar ved stopp"
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr "Gjer nye utvidingar aktive"
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr "Skru på automatisk analyse av lyd"
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 msgid "Replicate missing region channels"
 msgstr "Kopier manglande bolk-kanalar"
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 msgid "Solo / mute"
 msgstr "Solo / demp"
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 msgid "Solo-in-place mute cut (dB)"
 msgstr "Demping for solo-på-plass (dB)"
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr "Solo-kontrollar er lyttekontrollar"
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 msgid "Listen Position"
 msgstr "Lytteposisjon"
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 msgid "after-fader (AFL)"
 msgstr "etterlytting (AFL)"
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 msgid "pre-fader (PFL)"
 msgstr "førlytting (PFL)"
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr "Førlyttingssignal kjem frå "
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 msgid "before pre-fader processors"
 msgstr "før før-volum-handsamingar"
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr "før-volum, men etter før-volum-signalhandsaming"
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr "AFL-signal kjem frå "
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 msgid "immediately post-fader"
 msgstr "rett etter volum"
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 msgid "after post-fader processors (before pan)"
 msgstr "etter etter-volum-signalprosessar (før panorering)"
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr "Eksklusiv solo"
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 msgid "Show solo muting"
 msgstr "Vis solodemping"
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr "Solo overstyrer demping"
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 msgid "Default track / bus muting options"
 msgstr "Standard spor- og bussdempeval"
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr "Demping verkar på send før volum"
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr "Demping verkar på send etter volum"
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 msgid "Mute affects control outputs"
 msgstr "Demping påverkar kontrollutgangane"
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr "Demping verkar på hovudutgangar"
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 msgid "Send MIDI Time Code"
 msgstr "Send MIDI-tidskode"
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr "Prosentdel til kvar side av normal transportfart for å senda MTC"
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr "Lyd MIDI-maskinkontrollkommandoar"
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr "Send MIDI-maskinkontrollkommandoar"
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 msgid "Send MIDI control feedback"
 msgstr "Send MIDI-kontrollsvar"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr "ID for innkomande MMC-eining"
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr "ID for utgåande MMC-eining"
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr "Tidleg programendring"
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr "Vis fyrste MIDI-bank/program som 0"
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr "Aldri vis periodiske MIDI-meldingar (MTC, MIDI-klokke)"
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 msgid "Sound MIDI notes as they are selected"
 msgstr "Lytt på MIDI-notar medan du vel dei"
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 msgid "User interaction"
 msgstr "Brukarsamhandling"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
 "   <i>(if available for your language preferences)</i>"
 msgstr ""
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 msgid "Control surface remote ID"
 msgstr "Fjernstyrings-ID for kontrollflate"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 msgid "assigned by user"
 msgstr "fastsett av brukaren"
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr "fylgjer miksaren"
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr "fylgjer redigeringa"
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1925
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 #, fuzzy
 msgid "Preferences|GUI"
 msgstr "Innstillingar"
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr "Vis musepeikaren grafisk når han er over ulike småprogram"
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr "Vis verktøytips når peikaren er over ein kontroll"
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr "Brukarflate"
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr ""
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 msgid "Mixer Strip"
 msgstr "Miksarstripe"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 msgid "Use narrow strips in the mixer by default"
 msgstr "Bruk smale miksarstriper i miksaren som standard"
 
-#: rc_option_editor.cc:1898
-msgid "Meter hold time"
+#: rc_option_editor.cc:1906
+#, fuzzy
+msgid "Peak hold time"
 msgstr "Hald nivåtoppar"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 msgid "short"
 msgstr "kort"
 
-#: rc_option_editor.cc:1905 rc_option_editor.cc:1920
+#: rc_option_editor.cc:1913
 msgid "medium"
 msgstr "middels"
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr "lenge"
 
-#: rc_option_editor.cc:1912
-msgid "Meter fall-off"
+#: rc_option_editor.cc:1920
+#, fuzzy
+msgid "DPM fall-off"
 msgstr "Slepp nivåtoppar"
 
-#: rc_option_editor.cc:1918
-msgid "slowest"
-msgstr "saktast"
+#: rc_option_editor.cc:1926
+msgid "slowest [6.6dB/sec]"
+msgstr ""
 
-#: rc_option_editor.cc:1919
-msgid "slow"
-msgstr "sakte"
+#: rc_option_editor.cc:1927
+msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
+msgstr ""
 
-#: rc_option_editor.cc:1921
-msgid "fast"
-msgstr "snøgt"
+#: rc_option_editor.cc:1928
+msgid "slowish [12.0dB/sec] (DIN)"
+msgstr ""
 
-#: rc_option_editor.cc:1922
-msgid "faster"
-msgstr "snøggare"
+#: rc_option_editor.cc:1929
+msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
+msgstr ""
+
+#: rc_option_editor.cc:1930
+msgid "medium [20dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1931
+msgid "fast [32dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1932
+msgid "faster [46dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1933
+msgid "fastest [70dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1939
+msgid "Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
+
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+msgid "-20dBFS (SMPTE RP.0155)"
+msgstr ""
+
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+msgid "-18dBFS (EBU, BBC)"
+msgstr ""
+
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
+
+#: rc_option_editor.cc:1955
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
+msgstr ""
+
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
+msgstr ""
+
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
+msgstr ""
+
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
+
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
 
-#: rc_option_editor.cc:1923
-msgid "fastest"
-msgstr "snøggast"
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1985
+#, fuzzy
+msgid "Peak threshold [dBFS]"
+msgstr "Toppterskel"
+
+#: rc_option_editor.cc:1993
+msgid ""
+"Specify the audio signal level in dbFS at and above which the meter-peak "
+"indicator will flash red."
+msgstr ""
+
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
+msgstr ""
 
 #: region_editor.cc:79
 msgid "audition this region"
@@ -9550,11 +9770,11 @@ msgstr "lytt på denne bolken"
 msgid "Position:"
 msgstr "Posisjon:"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr "Slutt:"
 
-#: region_editor.cc:92 sfdb_ui.cc:140
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr "Lengd:"
 
@@ -9578,23 +9798,23 @@ msgstr "Kjelder:"
 msgid "Source:"
 msgstr "Kjelde:"
 
-#: region_editor.cc:167
+#: region_editor.cc:166
 msgid "Region '%1'"
 msgstr "Bolk '%1'"
 
-#: region_editor.cc:274
+#: region_editor.cc:273
 msgid "change region start position"
 msgstr "endre bolkstartposisjon"
 
-#: region_editor.cc:290
+#: region_editor.cc:289
 msgid "change region end position"
 msgstr "endre boksluttposisjon"
 
-#: region_editor.cc:310
+#: region_editor.cc:309
 msgid "change region length"
 msgstr "endre bolklengd"
 
-#: region_editor.cc:404 region_editor.cc:416
+#: region_editor.cc:403 region_editor.cc:415
 msgid "change region sync point"
 msgstr "endre bolksynkposisjon"
 
@@ -9785,319 +10005,319 @@ msgid ""
 "A route group of this name already exists.  Please use a different name."
 msgstr "Det finst alt ei rutegruppe med det namnet. Vel eit anna namn."
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 msgid "Tracks/Busses"
 msgstr "Spor/bussar"
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr "Inngangar"
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr "Utgangar"
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr "Utvidingar, innstikk og send"
 
-#: route_params_ui.cc:211
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr "fann ikkje rutevisingslisteobjekt for omdøypt rute!"
 
-#: route_params_ui.cc:258 route_params_ui.cc:286
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr "Avspelingsseinking: %<PRId64> punkt"
 
-#: route_params_ui.cc:478
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr "IKKJE NOKO SPOR"
 
-#: route_params_ui.cc:611 route_params_ui.cc:612
+#: route_params_ui.cc:613 route_params_ui.cc:614
 msgid "No Track or Bus Selected"
 msgstr "Ingen spor eller bussar valde"
 
-#: route_time_axis.cc:96
+#: route_time_axis.cc:97
 msgid "g"
 msgstr "g"
 
-#: route_time_axis.cc:97
+#: route_time_axis.cc:98
 msgid "p"
 msgstr "p"
 
-#: route_time_axis.cc:98
+#: route_time_axis.cc:99
 msgid "a"
 msgstr "a"
 
-#: route_time_axis.cc:168
+#: route_time_axis.cc:173
 msgid "Record (Right-click for Step Edit)"
 msgstr "Ta opp (høgreklikk for stegredigering)"
 
-#: route_time_axis.cc:171
+#: route_time_axis.cc:176
 msgid "Record"
 msgstr "Ta opp"
 
-#: route_time_axis.cc:201
+#: route_time_axis.cc:210
 msgid "Route Group"
 msgstr "Rut gruppe"
 
-#: route_time_axis.cc:204
+#: route_time_axis.cc:213
 msgid "MIDI Controllers and Automation"
 msgstr "MIDI-kontrollar og -automasjon"
 
-#: route_time_axis.cc:381
+#: route_time_axis.cc:390
 msgid "Show All Automation"
 msgstr "Vis all automasjon"
 
-#: route_time_axis.cc:384
+#: route_time_axis.cc:393
 msgid "Show Existing Automation"
 msgstr "Vis gjeldande automasjon"
 
-#: route_time_axis.cc:387
+#: route_time_axis.cc:396
 msgid "Hide All Automation"
 msgstr "Gøym all automasjon"
 
-#: route_time_axis.cc:396
+#: route_time_axis.cc:405
 #, fuzzy
 msgid "Processor automation"
 msgstr "tøm automasjon"
 
-#: route_time_axis.cc:415
+#: route_time_axis.cc:424
 msgid "Color..."
 msgstr "Farge..."
 
-#: route_time_axis.cc:472
+#: route_time_axis.cc:481
 msgid "Overlaid"
 msgstr "Overlagt"
 
-#: route_time_axis.cc:478
+#: route_time_axis.cc:487
 msgid "Stacked"
 msgstr "Stabla"
 
-#: route_time_axis.cc:486
+#: route_time_axis.cc:495
 msgid "Layers"
 msgstr "Lag"
 
-#: route_time_axis.cc:555
+#: route_time_axis.cc:564
 msgid "Automatic (based on I/O connections)"
 msgstr "Automatisk (basert på I/U-tilkoplingar)"
 
-#: route_time_axis.cc:564
+#: route_time_axis.cc:573
 msgid "(Currently: Existing Material)"
 msgstr "(No: eksisterande materiale)"
 
-#: route_time_axis.cc:567
+#: route_time_axis.cc:576
 msgid "(Currently: Capture Time)"
 msgstr "(No: opptakstidspunkt)"
 
-#: route_time_axis.cc:575
+#: route_time_axis.cc:584
 msgid "Align With Existing Material"
 msgstr "Juster til eksisterande materiale"
 
-#: route_time_axis.cc:580
+#: route_time_axis.cc:589
 msgid "Align With Capture Time"
 msgstr "Juster til innspelingstid"
 
-#: route_time_axis.cc:585
+#: route_time_axis.cc:594
 msgid "Alignment"
 msgstr "Justering"
 
-#: route_time_axis.cc:620
+#: route_time_axis.cc:629
 msgid "Normal Mode"
 msgstr "Normalmodus"
 
-#: route_time_axis.cc:626
+#: route_time_axis.cc:635
 msgid "Tape Mode"
 msgstr "Bandmodus"
 
-#: route_time_axis.cc:632
+#: route_time_axis.cc:641
 msgid "Non-Layered Mode"
 msgstr "Ikkje lagdelt modus"
 
-#: route_time_axis.cc:645 route_time_axis.cc:1587
+#: route_time_axis.cc:654 route_time_axis.cc:1601
 msgid "Playlist"
 msgstr "Speleliste"
 
-#: route_time_axis.cc:965
+#: route_time_axis.cc:979
 msgid "Rename Playlist"
 msgstr "Døyp om spelelista"
 
-#: route_time_axis.cc:966
+#: route_time_axis.cc:980
 msgid "New name for playlist:"
 msgstr "Nytt namn på spelelista:"
 
-#: route_time_axis.cc:1051
+#: route_time_axis.cc:1065
 msgid "New Copy Playlist"
 msgstr "Ny spelelistekopi"
 
-#: route_time_axis.cc:1052 route_time_axis.cc:1105
+#: route_time_axis.cc:1066 route_time_axis.cc:1119
 msgid "Name for new playlist:"
 msgstr "Namn på den nye spelelista:"
 
-#: route_time_axis.cc:1104
+#: route_time_axis.cc:1118
 msgid "New Playlist"
 msgstr "Ny speleliste"
 
-#: route_time_axis.cc:1295
+#: route_time_axis.cc:1309
 msgid "You cannot create a track with that name as it is reserved for %1"
 msgstr ""
 "Du kan ikkje laga eit spor med det namnet, fordi det er halde att for %1"
 
-#: route_time_axis.cc:1476
+#: route_time_axis.cc:1490
 msgid "New Copy..."
 msgstr "Ny kopi..."
 
-#: route_time_axis.cc:1480
+#: route_time_axis.cc:1494
 msgid "New Take"
 msgstr "Nytt tak"
 
-#: route_time_axis.cc:1481
+#: route_time_axis.cc:1495
 msgid "Copy Take"
 msgstr "Kopier tak"
 
-#: route_time_axis.cc:1486
+#: route_time_axis.cc:1500
 msgid "Clear Current"
 msgstr "Tøm gjeldande"
 
-#: route_time_axis.cc:1489
+#: route_time_axis.cc:1503
 msgid "Select From All..."
 msgstr "Vel frå alt..."
 
-#: route_time_axis.cc:1577
+#: route_time_axis.cc:1591
 msgid "Take: %1.%2"
 msgstr "Tak: %1.%2"
 
-#: route_time_axis.cc:2267
+#: route_time_axis.cc:2291
 msgid "Underlays"
 msgstr "Underlag"
 
-#: route_time_axis.cc:2270
+#: route_time_axis.cc:2294
 msgid "Remove \"%1\""
 msgstr "Fjern \"%1\""
 
-#: route_time_axis.cc:2320 route_time_axis.cc:2357
+#: route_time_axis.cc:2344 route_time_axis.cc:2381
 msgid "programming error: underlay reference pointer pairs are inconsistent!"
 msgstr ""
 "Programmeringsfeil: underlags-tilvisingspeikarpar er ikkje samanhengande!"
 
-#: route_time_axis.cc:2388
+#: route_time_axis.cc:2408
 msgid "After-fade listen (AFL)"
 msgstr "Etterlytting (AFL)"
 
-#: route_time_axis.cc:2392
+#: route_time_axis.cc:2412
 msgid "Pre-fade listen (PFL)"
 msgstr "Førlytting (PFL)"
 
-#: route_time_axis.cc:2396
+#: route_time_axis.cc:2416
 msgid "s"
 msgstr "s"
 
-#: route_time_axis.cc:2400
+#: route_time_axis.cc:2419
 msgid "m"
 msgstr "d"
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 msgid "Mute this track"
 msgstr "Demp dette sporet"
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr "Demp alle andre (ikkje-solo) spor"
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr "Gjer klar til opptak på dette sporet"
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr "få miksarstripene til å visa send for denne bussen"
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 msgid "Monitor input"
 msgstr "Lytt på inngangen"
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 msgid "Monitor playback"
 msgstr "Lytt på avspelinga"
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 msgid "Not connected to JACK - cannot engage record"
 msgstr "Ikkje tilkopla JACK - kan ikkje gjera klar til opptak"
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 msgid "Step Entry"
 msgstr "Steginnskriving"
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr "Tildel alle spor (før volum)"
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 msgid "Assign all tracks and buses (prefader)"
 msgstr "Tildel alle spor og bussar (førvolum)"
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr "Tildel alle spor (etter volum)"
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 msgid "Assign all tracks and buses (postfader)"
 msgstr "Tildel alle spor og bussar (ettervolum)"
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 msgid "Assign selected tracks (prefader)"
 msgstr "Tildel dei valde spora (førvolum)"
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 msgid "Assign selected tracks and buses (prefader)"
 msgstr "Tildel dei valde spora og bussane (førvolum)"
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 msgid "Assign selected tracks (postfader)"
 msgstr "Tildel dei valde spora (ettervolum)"
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 msgid "Assign selected tracks and buses (postfader)"
 msgstr "Tildel dei valde spora og bussane (ettervolum)"
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 msgid "Copy track/bus gains to sends"
 msgstr "Kopier spor-/bussvolum til send"
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr "Set sendvolum til -inf"
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr "Set sendvolum til 0dB"
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 msgid "Solo Isolate"
 msgstr "Isoler solo"
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr "Før volumkontroll"
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr "Etter volumkontroll"
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr "Kontrollutgangar"
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr "Hovudutgangar"
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 msgid "Color Selection"
 msgstr "Fargeval"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "\n"
@@ -10111,7 +10331,7 @@ msgstr ""
 "\n"
 "(Du kan ikkje angra dette, og øktfila vil bli overskriven)"
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
 "\n"
@@ -10121,15 +10341,15 @@ msgstr ""
 "\n"
 "(Du kan ikkje angra, og øktfila vil bli overskriven!)"
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 msgid "Remove track"
 msgstr "Fjern spor"
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 msgid "Remove bus"
 msgstr "Fjern buss"
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
@@ -10137,47 +10357,47 @@ msgstr ""
 "Me rår ikkje til at du bruker kolon (':') i namn på spor og bussar.\n"
 "Vil du bruka dette nye namnet?"
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 msgid "Use the new name"
 msgstr "Bruk det nye namnet"
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 msgid "Re-edit the name"
 msgstr "Endra namnet på nytt"
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 msgid "Rename Track"
 msgstr "Døyp om spor"
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 msgid "Rename Bus"
 msgstr "Døyp om bussen"
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 msgid " latency"
 msgstr "treigskap"
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr "Greier ikkje laga malmappa for ruter  %1"
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 msgid "Save As Template"
 msgstr "Lagra som mal"
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 msgid "Template name:"
 msgstr "Namn på malen :"
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 msgid "Remote Control ID"
 msgstr "Fjernstyrings-ID"
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 msgid "Remote control ID:"
 msgstr "Fjernstyrings-ID:"
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -10189,15 +10409,15 @@ msgstr ""
 "\n"
 "Du kan ikkje endra fjernkontroll-IDen for %3."
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 msgid "the master bus"
 msgstr "hovudbussen"
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 msgid "the monitor bus"
 msgstr "lyttebussen"
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -10215,15 +10435,15 @@ msgstr ""
 "%4Sjå på brukarsamhandling-fana i vindauga for innstillingar viss du vil "
 "endra dette%5"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 msgid "the mixer"
 msgstr "miksaren"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 msgid "the editor"
 msgstr "redigeringa"
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
@@ -10231,7 +10451,7 @@ msgstr ""
 "Venstreklikk for å fasevenda kanal %1 på dette sporet. Høgreklikk for å sjå "
 "menyen."
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr "Klikk for å visa ein meny over kanalar å invertera (fasevenda)"
 
@@ -10247,7 +10467,7 @@ msgstr "Klikk for å leggja til ein ny stad"
 msgid "the session folder"
 msgstr "øktmappa"
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 msgid "Send "
 msgstr "Send"
 
@@ -10727,51 +10947,107 @@ msgstr "Lim nye markørar til takter og taktslag"
 msgid "Glue new regions to bars and beats"
 msgstr "Lim nye bolkar til takter og taktslag"
 
-#: sfdb_ui.cc:87 sfdb_ui.cc:107 sfdb_ui.cc:116
+#: session_option_editor.cc:275 session_option_editor.cc:277
+#: session_option_editor.cc:284 session_option_editor.cc:291
+#: session_option_editor.cc:298 session_option_editor.cc:300
+#: session_option_editor.cc:307 session_option_editor.cc:314
+#: session_option_editor.cc:321 session_option_editor.cc:323
+#, fuzzy
+msgid "Meterbridge"
+msgstr "Nivåmåling"
+
+#: session_option_editor.cc:275
+msgid "Route Display"
+msgstr ""
+
+#: session_option_editor.cc:279
+#, fuzzy
+msgid "Show Midi Tracks"
+msgstr "Vis alle midipsor"
+
+#: session_option_editor.cc:286
+#, fuzzy
+msgid "Show Busses"
+msgstr "Bussar"
+
+#: session_option_editor.cc:293
+#, fuzzy
+msgid "Include Master Bus"
+msgstr "hovudbussen"
+
+#: session_option_editor.cc:298
+msgid "Button Area"
+msgstr ""
+
+#: session_option_editor.cc:302
+#, fuzzy
+msgid "Rec-enable Button"
+msgstr "slå på/av opptak"
+
+#: session_option_editor.cc:309
+#, fuzzy
+msgid "Mute Button"
+msgstr "+ museknapp"
+
+#: session_option_editor.cc:316
+#, fuzzy
+msgid "Solo Button"
+msgstr "Solo-volumauke"
+
+#: session_option_editor.cc:321
+msgid "Name Labels"
+msgstr ""
+
+#: session_option_editor.cc:325
+#, fuzzy
+msgid "Track Name"
+msgstr "Namn på spor/buss"
+
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 msgid "as new tracks"
 msgstr "som nytt spor"
 
-#: sfdb_ui.cc:89 sfdb_ui.cc:109
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 msgid "to selected tracks"
 msgstr "til valde spor"
 
-#: sfdb_ui.cc:91 sfdb_ui.cc:111
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 msgid "to region list"
 msgstr "til bolklista"
 
-#: sfdb_ui.cc:93 sfdb_ui.cc:113
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 msgid "as new tape tracks"
 msgstr "som nytt bandspor"
 
-#: sfdb_ui.cc:97
+#: sfdb_ui.cc:96
 msgid "programming error: unknown import mode string %1"
 msgstr "programmeringsfeil: ukjend importmodusstreng %1"
 
-#: sfdb_ui.cc:124
+#: sfdb_ui.cc:123
 msgid "Auto-play"
 msgstr "Autospel"
 
-#: sfdb_ui.cc:130 sfdb_ui.cc:237
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 msgid "<b>Sound File Information</b>"
 msgstr "<b>Lydfilinformasjon</b>"
 
-#: sfdb_ui.cc:142
+#: sfdb_ui.cc:141
 msgid "Timestamp:"
 msgstr "Tidsstempel:"
 
-#: sfdb_ui.cc:144
+#: sfdb_ui.cc:143
 msgid "Format:"
 msgstr "Format:"
 
-#: sfdb_ui.cc:183 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr "Knaggar:"
 
-#: sfdb_ui.cc:320
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr "Me har ikkje gjort klart for å lytta på MIDI-filer enno"
 
-#: sfdb_ui.cc:327
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "Greidde ikkje lesa fil: %1 (%2)."
 
@@ -10799,11 +11075,11 @@ msgstr "Lydfiler"
 msgid "MIDI files"
 msgstr "MIDI-filer"
 
-#: sfdb_ui.cc:458 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 msgid "All files"
 msgstr "Alle filer"
 
-#: sfdb_ui.cc:477 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 msgid "Browse Files"
 msgstr "Bla gjennom filer"
 
@@ -10811,169 +11087,157 @@ msgstr "Bla gjennom filer"
 msgid "Paths"
 msgstr "Stigar"
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr "Søk i knaggar"
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 msgid "Sort:"
 msgstr "Sorter:"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 msgid "Longest"
 msgstr "Lengst"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 msgid "Shortest"
 msgstr "Kortast"
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 msgid "Newest"
 msgstr "Nyast"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr "Eldste"
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr "Mest nedlasta"
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 msgid "Least downloaded"
 msgstr "Minst nedlasta"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr "Høgst vurderte"
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr "LÃ¥gast vurderte"
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr ""
 
-#: sfdb_ui.cc:572
+#: sfdb_ui.cc:555
+msgid "Similar"
+msgstr ""
+
+#: sfdb_ui.cc:567
 msgid "ID"
 msgstr "ID"
 
-#: sfdb_ui.cc:573 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 msgid "Filename"
 msgstr "Filnamn"
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:570
 msgid "Duration"
 msgstr "Lengd"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:571
 msgid "Size"
 msgstr "Storleik"
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:572
 msgid "Samplerate"
 msgstr "Punktfrekvens"
 
-#: sfdb_ui.cc:578
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr "Lisens"
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr "Søk på Freesound"
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr "Trykk for å importera filene og lukka dette vindauga"
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr "Press for å importera filene og la dette vindauga vera ope"
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr "Press for å lukka dette vindauga utan å importera nokon filer"
 
-#: sfdb_ui.cc:846
-msgid "found %1 match"
-msgid_plural "found %1 matches"
-msgstr[0] "Fann %1 treff"
-msgstr[1] "uFann %1 treff"
-
-#: sfdb_ui.cc:862
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr "SoundFileBrowser: Greidde ikkje laga teikn av strengen: "
 
-#: sfdb_ui.cc:960
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sfdb_ui.cc:965
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr ""
 
-#: sfdb_ui.cc:1029
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr "B"
 
-#: sfdb_ui.cc:1031
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr "kB"
 
-#: sfdb_ui.cc:1033 sfdb_ui.cc:1035
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr "MB"
 
-#: sfdb_ui.cc:1037
+#: sfdb_ui.cc:1086
 msgid "GB"
 msgstr "GB"
 
-#: sfdb_ui.cc:1070
-msgid "Search returned no results."
-msgstr "Søket gav ingen resultat."
-
-#: sfdb_ui.cc:1072
-msgid "Found %1 match"
-msgid_plural "Found %1 matches"
-msgstr[0] "Fann %1 treff"
-msgstr[1] "Fann %1 treff"
-
-#: sfdb_ui.cc:1277 sfdb_ui.cc:1585 sfdb_ui.cc:1635 sfdb_ui.cc:1653
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr "Eitt spor per fil"
 
-#: sfdb_ui.cc:1280 sfdb_ui.cc:1636 sfdb_ui.cc:1654
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 msgid "one track per channel"
 msgstr "Eitt spor per kanal"
 
-#: sfdb_ui.cc:1288 sfdb_ui.cc:1638 sfdb_ui.cc:1655
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 msgid "sequence files"
 msgstr "sekvensfiler"
 
-#: sfdb_ui.cc:1291 sfdb_ui.cc:1643
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 msgid "all files in one track"
 msgstr "alle filene i eitt spor"
 
-#: sfdb_ui.cc:1292 sfdb_ui.cc:1637
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 msgid "merge files"
 msgstr "flett filer"
 
-#: sfdb_ui.cc:1298 sfdb_ui.cc:1640
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 msgid "one region per file"
 msgstr "ein bolk per fil"
 
-#: sfdb_ui.cc:1301 sfdb_ui.cc:1641
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 msgid "one region per channel"
 msgstr "ein bolk for kvar kanal"
 
-#: sfdb_ui.cc:1306 sfdb_ui.cc:1642 sfdb_ui.cc:1656
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 msgid "all files in one region"
 msgstr "alle filene i ein bolk"
 
-#: sfdb_ui.cc:1373
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
@@ -10981,55 +11245,55 @@ msgstr ""
 "%1 kan ikkje bruka\n"
 "ei eller fleire av desse filene"
 
-#: sfdb_ui.cc:1513
+#: sfdb_ui.cc:1534
 msgid "Copy files to session"
 msgstr "Kopier filer til økta"
 
-#: sfdb_ui.cc:1530 sfdb_ui.cc:1693
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 msgid "file timestamp"
 msgstr "filtidsstempel"
 
-#: sfdb_ui.cc:1531 sfdb_ui.cc:1695
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 msgid "edit point"
 msgstr "redigeringspunkt"
 
-#: sfdb_ui.cc:1532 sfdb_ui.cc:1697
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 msgid "playhead"
 msgstr "spelehovud"
 
-#: sfdb_ui.cc:1533
+#: sfdb_ui.cc:1554
 msgid "session start"
 msgstr "øktstart"
 
-#: sfdb_ui.cc:1538
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr "<b>Legg til filer som ...</b>"
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1581
 msgid "<b>Insert at</b>"
 msgstr "<b>Set inn ved</b>"
 
-#: sfdb_ui.cc:1573
+#: sfdb_ui.cc:1594
 msgid "<b>Mapping</b>"
 msgstr "<b>Punktlegging</b>"
 
-#: sfdb_ui.cc:1591
+#: sfdb_ui.cc:1612
 msgid "<b>Conversion quality</b>"
 msgstr "<b>Omkodingskvalitet</b>"
 
-#: sfdb_ui.cc:1603 sfdb_ui.cc:1709
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr "Best"
 
-#: sfdb_ui.cc:1604 sfdb_ui.cc:1711
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr "God"
 
-#: sfdb_ui.cc:1605 sfdb_ui.cc:1713
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr "Snøgg"
 
-#: sfdb_ui.cc:1607
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "Fortast"
 
@@ -11119,21 +11383,21 @@ msgstr "Eg vil gjerne ha fleire val for denne økta"
 #: startup.cc:194
 #, fuzzy
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -11289,10 +11553,6 @@ msgstr ""
 msgid "Click to open the program website in your web browser"
 msgstr ""
 
-#: startup.cc:594
-msgid "What would you like to do ?"
-msgstr "Kva vil du gjera?"
-
 #: startup.cc:729
 msgid "Open"
 msgstr "Opna"
@@ -11305,83 +11565,83 @@ msgstr "Namn på økta:"
 msgid "Create session folder in:"
 msgstr "Lag øktmappa i :"
 
-#: startup.cc:813
+#: startup.cc:821
 msgid "Select folder for session"
 msgstr "Vel mappe for økta"
 
-#: startup.cc:845
+#: startup.cc:853
 msgid "Use this template"
 msgstr "Bruk denne malen"
 
-#: startup.cc:848
+#: startup.cc:856
 msgid "no template"
 msgstr "ingen mal"
 
-#: startup.cc:876
+#: startup.cc:884
 msgid "Use an existing session as a template:"
 msgstr "Bruk ei eksisterande økt som mal:"
 
-#: startup.cc:888
+#: startup.cc:896
 msgid "Select template"
 msgstr "Vel mal"
 
-#: startup.cc:914
+#: startup.cc:922
 msgid "New Session"
 msgstr "Ny økt"
 
-#: startup.cc:1068
+#: startup.cc:1077
 msgid "Select session file"
 msgstr "Vel øktfil"
 
-#: startup.cc:1084
+#: startup.cc:1093
 msgid "Browse:"
 msgstr "Bla gjennom:"
 
-#: startup.cc:1093
+#: startup.cc:1102
 msgid "Select a session"
 msgstr "Vel ei økt"
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 msgid "channels"
 msgstr "kanalar"
 
-#: startup.cc:1135
+#: startup.cc:1145
 msgid "<b>Busses</b>"
 msgstr "<b>Bussar</b>"
 
-#: startup.cc:1136
+#: startup.cc:1146
 msgid "<b>Inputs</b>"
 msgstr "<b>Ingangar</b>"
 
-#: startup.cc:1137
+#: startup.cc:1147
 msgid "<b>Outputs</b>"
 msgstr "<b>Utgangar</b>"
 
-#: startup.cc:1145
+#: startup.cc:1155
 msgid "Create master bus"
 msgstr "Lag hovudbuss"
 
-#: startup.cc:1155
+#: startup.cc:1165
 msgid "Automatically connect to physical inputs"
 msgstr "Kopla automatisk til fysiske inngangar"
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr "Bruk berre"
 
-#: startup.cc:1215
+#: startup.cc:1225
 msgid "Automatically connect outputs"
 msgstr "Kopla utgangane automatisk"
 
-#: startup.cc:1237
+#: startup.cc:1247
 msgid "... to master bus"
 msgstr "... til hovudbussen"
 
-#: startup.cc:1247
+#: startup.cc:1257
 msgid "... to physical outputs"
 msgstr "... til fysiske utgangar"
 
-#: startup.cc:1297
+#: startup.cc:1307
 msgid "Advanced Session Options"
 msgstr "Avanserte innstillingar for økta"
 
@@ -12053,19 +12313,19 @@ msgstr "Oppsettsfila %1 vart ikkje lagra"
 msgid "bad XPM header %1"
 msgstr "Feil med XPM-tittellinja %1"
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr "manglar RGBA-stil for \"%1\""
 
-#: utils.cc:544
+#: utils.cc:591
 msgid "cannot find XPM file for %1"
 msgstr "greier ikkje finna XPM-fil for %1"
 
-#: utils.cc:570
+#: utils.cc:617
 msgid "cannot find icon image for %1 using %2"
 msgstr "greier ikkje finna ikonbilete for %1 ved bruk av %2"
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr "Fekk unntak når me lasta ikonet %1"
 
@@ -12073,85 +12333,87 @@ msgstr "Fekk unntak når me lasta ikonet %1"
 msgid "VerboseCanvasCursor"
 msgstr "VerboseCanvasCursor"
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 #, fuzzy
 msgid "Set Video Track"
 msgstr "Legg til lydspor"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 #, fuzzy
 msgid "Launch External Video Monitor"
 msgstr "Lytting"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr ""
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr ""
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 #, fuzzy
 msgid "Video files"
 msgstr "Lydfiler"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 #, fuzzy
 msgid "<b>Video Information</b>"
 msgstr "<b>Lydfilinformasjon</b>"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 #, fuzzy
 msgid "Start:"
 msgstr "Start"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 #, fuzzy
 msgid "Frame rate:"
 msgstr "Punktfrekvens:"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr ""
 
-#: editor_videotimeline.cc:138
+#: editor_videotimeline.cc:146
 #, fuzzy
 msgid "Export Successful: %1"
 msgstr "Eksporter MIDI: %1"
 
-#: video_timeline.cc:467
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:501
-msgid "Failed to set session-framerate: "
-msgstr ""
-
-#: video_timeline.cc:501
-msgid " does not have a corresponding option setting in Ardour."
+#: video_timeline.cc:507
+msgid ""
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:507
+#: video_timeline.cc:515
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:508
-msgid " vs "
+#: video_timeline.cc:588
+msgid ""
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:690
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12159,18 +12421,18 @@ msgid ""
 "xjadeo's remote-control interface 'xjremote')."
 msgstr ""
 
-#: video_monitor.cc:282
+#: video_monitor.cc:281
 #, fuzzy
 msgid "Video Monitor: File Not Found."
 msgstr "Lytting"
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -12180,381 +12442,390 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 #, fuzzy
 msgid "Transcode/Import Video File "
 msgstr "Eksporter økta til lydfil(er)..."
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 #, fuzzy
 msgid "Output File:"
 msgstr "Uteining:"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr ""
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 #, fuzzy
 msgid "Height = "
 msgstr "Høgd"
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr ""
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 #, fuzzy
 msgid "<b>File Information</b>"
 msgstr "<b>Lydfilinformasjon</b>"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr ""
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 #, fuzzy
 msgid "Duration:"
 msgstr "Lengd"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr ""
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr ""
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 #, fuzzy
 msgid "??"
 msgstr "???"
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 #, fuzzy
 msgid "<b>Import Settings</b>"
 msgstr "<b>Val</b>"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr ""
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr ""
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 #, fuzzy
 msgid "Import/Transcode Video to Session"
 msgstr "Importer frå økt"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr ""
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 #, fuzzy
 msgid "Original Width"
 msgstr "Opphaveleg posisjon"
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr ""
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 #, fuzzy
 msgid "Extract Audio:"
 msgstr "Eksporter lyd"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 #, fuzzy
 msgid "Extracting Audio.."
 msgstr "Eksporter lyd"
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr ""
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 #, fuzzy
 msgid "Transcoding Failed."
 msgstr "Omsetjingar skrudde på"
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 #, fuzzy
 msgid "Save Transcoded Video File"
 msgstr "Eksporter økta til lydfil(er)..."
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr ""
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr ""
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 #, fuzzy
 msgid "Server Docroot:"
 msgstr "Tenar:"
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr ""
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 #, fuzzy
 msgid "Listen Port:"
 msgstr "Lytteposisjon"
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 #, fuzzy
 msgid "Cache Size:"
 msgstr "Største storleik"
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr ""
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr ""
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 #, fuzzy
 msgid "Confirm Overwrite"
 msgstr "Stadfest at du vil skriva over snøggbilete"
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 #, fuzzy
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr "Dette snøggbiletet finst frå før. Vil du skriva over det?"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 #, fuzzy
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr "greier ikkje laga ardourmappa %1 (%2)"
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 #, fuzzy
 msgid "Export Video File "
 msgstr "Eksporter økta til lydfil(er)..."
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 #, fuzzy
 msgid "Video:"
 msgstr "Mike Start"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr ""
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr ""
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 #, fuzzy
 msgid "Normalize Audio"
 msgstr "Normaliser til:"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr ""
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr ""
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 #, fuzzy
 msgid "Deinterlace"
 msgstr "Spelehovudet i midten"
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr ""
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 #, fuzzy
 msgid "Include Session Metadata"
 msgstr "Endra metadata for økta"
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr ""
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 #, fuzzy
 msgid "<b>Output:</b>"
 msgstr "<b>Utgangar</b>"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 #, fuzzy
 msgid "<b>Input:</b>"
 msgstr "<b>Ingangar</b>"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 #, fuzzy
 msgid "Audio:"
 msgstr "Lyd"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 #, fuzzy
 msgid "Master Bus"
 msgstr "hovudbussen"
 
-#: export_video_dialog.cc:166
+#: export_video_dialog.cc:145
+msgid "from the %1 session's start to the session's end"
+msgstr ""
+
+#: export_video_dialog.cc:149
+msgid "from 00:00:00:00 to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:151
+msgid "from the video's start to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:184
 #, fuzzy
 msgid "<b>Settings:</b>"
 msgstr "<b>MÃ¥l</b>"
 
-#: export_video_dialog.cc:174
+#: export_video_dialog.cc:192
 #, fuzzy
 msgid "Range:"
 msgstr "Område"
 
-#: export_video_dialog.cc:177
+#: export_video_dialog.cc:195
 #, fuzzy
 msgid "Preset:"
 msgstr "Ferdigoppsett"
 
-#: export_video_dialog.cc:180
+#: export_video_dialog.cc:198
 #, fuzzy
 msgid "Video Codec:"
 msgstr "Mappe:"
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:201
 #, fuzzy
 msgid "Video KBit/s:"
 msgstr "Mike Start"
 
-#: export_video_dialog.cc:186
+#: export_video_dialog.cc:204
 #, fuzzy
 msgid "Audio Codec:"
 msgstr "Lydmodus:"
 
-#: export_video_dialog.cc:189
+#: export_video_dialog.cc:207
 #, fuzzy
 msgid "Audio KBit/s:"
 msgstr "Lydfiler"
 
-#: export_video_dialog.cc:192
+#: export_video_dialog.cc:210
 #, fuzzy
 msgid "Audio Samplerate:"
 msgstr "Punktfrekvens:"
 
-#: export_video_dialog.cc:369
+#: export_video_dialog.cc:387
 #, fuzzy
 msgid "Normalizing audio"
 msgstr "Normaliser verdiar"
 
-#: export_video_dialog.cc:373
+#: export_video_dialog.cc:391
 #, fuzzy
 msgid "Exporting audio"
 msgstr "Eksporter lyd"
 
-#: export_video_dialog.cc:419
+#: export_video_dialog.cc:437
 #, fuzzy
-msgid "Exporting Audio.."
+msgid "Exporting Audio..."
 msgstr "Eksporter lyd"
 
-#: export_video_dialog.cc:476
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:505
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:544
-msgid "Encoding Video.."
-msgstr ""
+#: export_video_dialog.cc:562
+#, fuzzy
+msgid "Encoding Video..."
+msgstr "Omsetjingar skrudde på"
 
-#: export_video_dialog.cc:563
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:661
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr ""
 
-#: export_video_dialog.cc:673
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr ""
 
-#: export_video_dialog.cc:761
+#: export_video_dialog.cc:779
 #, fuzzy
 msgid "Transcoding failed."
 msgstr "Omsetjingar skrudde på"
 
-#: export_video_dialog.cc:930 export_video_dialog.cc:950
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 #, fuzzy
 msgid "Save Exported Video File"
 msgstr "Eksporter økta til lydfil(er)..."
@@ -12572,33 +12843,49 @@ msgstr ""
 msgid "<b>Video Export Info</b>"
 msgstr ""
 
-#: export_video_infobox.cc:46
+#: export_video_infobox.cc:48
 msgid ""
-"Ardour video export is not recommended for mastering!\n"
-"While 'ffmpeg' (which is used by ardour) can produce high-quality files, "
-"this export lacks the possibility to tweak many settings. We recommend to "
-"use 'winff', 'devede' or 'dvdauthor' to mux & master. Nevertheless this "
-"video-export comes in handy to do quick snapshots, intermediates, dailies or "
-"online videos.\n"
-"\n"
-"The soundtrack is created from the master-bus of the current Ardour "
-"session.\n"
+"Video encoding is a non-trivial task with many details.\n"
 "\n"
-"The video soure defaults to the file used in the video timeline, which may "
-"not the best quality to start with, you should the original video file.\n"
+"Please see the manual at %1/video-timeline/operations/#export.\n"
 "\n"
-"If the export-range is longer than the original video, black video frames "
-"are prefixed and/or appended. This process may fail with non-standard pixel-"
-"aspect-ratios.\n"
-"\n"
-"The file-format is determined by the extension that you choose for the "
-"output file (.avi, .mov, .flv, .ogv,...)\n"
-"Note: not all combinations of format+codec+settings produce files which are "
-"according so spec. e.g. flv files require sample-rates of 22.1kHz or "
-"44.1kHz, mpeg containers can not be used with ac3 audio-codec, etc. If in "
-"doubt, use one of the built-in presets."
+"Open Manual in Browser? "
 msgstr ""
 
+#~ msgid "-Inf"
+#~ msgstr "-�"
+
+#~ msgid "slowest"
+#~ msgstr "saktast"
+
+#~ msgid "slow"
+#~ msgstr "sakte"
+
+#~ msgid "fast"
+#~ msgstr "snøgt"
+
+#~ msgid "faster"
+#~ msgstr "snøggare"
+
+#~ msgid "fastest"
+#~ msgstr "snøggast"
+
+#~ msgid "found %1 match"
+#~ msgid_plural "found %1 matches"
+#~ msgstr[0] "Fann %1 treff"
+#~ msgstr[1] "uFann %1 treff"
+
+#~ msgid "Search returned no results."
+#~ msgstr "Søket gav ingen resultat."
+
+#~ msgid "Found %1 match"
+#~ msgid_plural "Found %1 matches"
+#~ msgstr[0] "Fann %1 treff"
+#~ msgstr[1] "Fann %1 treff"
+
+#~ msgid "What would you like to do ?"
+#~ msgstr "Kva vil du gjera?"
+
 #~ msgid "Connect"
 #~ msgstr "Kopla til"
 
@@ -14427,9 +14714,6 @@ msgstr ""
 #~ msgid "mute change"
 #~ msgstr "endra demping"
 
-#~ msgid "rec-enable change"
-#~ msgstr "slå på/av opptak"
-
 #~ msgid "mix group solo  change"
 #~ msgstr "soloendring for miksgruppa"
 
diff --git a/gtk2_ardour/po/pl.po b/gtk2_ardour/po/pl.po
index 3e6b7881b3..1a33b99249 100644
--- a/gtk2_ardour/po/pl.po
+++ b/gtk2_ardour/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk2_ardour\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2008-04-10 10:47+0100\n"
 "Last-Translator: Piotr Zaryk <pzaryk@gmail.com>\n"
 "Language-Team: Polish <pzaryk@gmail.com>\n"
@@ -398,7 +398,7 @@ msgstr "Nie odnaleziono pliku definicji menu"
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr "Ardour nie zadziała bez poprawnego pliku ardour.menus"
 
-#: add_route_dialog.cc:53 route_params_ui.cc:503
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 #, fuzzy
 msgid "Add Track or Bus"
 msgstr "Dodaj ścieżkę/szynę"
@@ -441,8 +441,8 @@ msgstr "szyny"
 msgid "Add:"
 msgstr ""
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "<b>Wyjścia</b>"
@@ -459,22 +459,22 @@ msgid "Group:"
 msgstr "Grupa"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 #, fuzzy
 msgid "Audio"
 msgstr "Odsłuch"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -498,7 +498,7 @@ msgid ""
 msgstr ""
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1301
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr "Normalny"
 
@@ -548,7 +548,7 @@ msgstr "8 kanałów"
 msgid "12 Channel"
 msgstr "3 kanały"
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2136
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr ""
 
@@ -634,7 +634,7 @@ msgid "Track"
 msgstr "Ścieżka"
 
 #: analysis_window.cc:68 editor_actions.cc:616 mixer_ui.cc:125
-#: mixer_ui.cc:1793
+#: mixer_ui.cc:1795
 msgid "Show"
 msgstr "Wyświetl"
 
@@ -642,103 +642,98 @@ msgstr "Wyświetl"
 msgid "Re-analyze data"
 msgstr "Analizuj ponownie"
 
-#: ardour_button.cc:658
+#: ardour_button.cc:704
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr ""
 
-#: ardour_ui.cc:179
+#: ardour_ui.cc:180
 #, fuzzy
 msgid "audition"
 msgstr "Odsłuch"
 
-#: ardour_ui.cc:180
+#: ardour_ui.cc:181
 #, fuzzy
 msgid "solo"
 msgstr "zmiana ustawienia solo"
 
-#: ardour_ui.cc:181
+#: ardour_ui.cc:182
 #, fuzzy
 msgid "feedback"
 msgstr "Sprzężenie zwrotne"
 
-#: ardour_ui.cc:183 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 #, fuzzy
 msgid "Speaker Configuration"
 msgstr "Konfiguracja kanałów"
 
-#: ardour_ui.cc:184 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 msgid "Theme Manager"
 msgstr "Menedżer motywów"
 
-#: ardour_ui.cc:185 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 #, fuzzy
 msgid "Key Bindings"
 msgstr "Skróty klawiszowe"
 
-#: ardour_ui.cc:186
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ardour_ui.cc:187 ardour_ui.cc:192
+#: ardour_ui.cc:191 ardour_ui.cc:196
 #, fuzzy
 msgid "Add Tracks/Busses"
 msgstr "Ścieżki/szyny"
 
-#: ardour_ui.cc:188
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "O programie"
 
-#: ardour_ui.cc:189 location_ui.cc:1134
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "Położenia"
 
-#: ardour_ui.cc:190 route_params_ui.cc:57 route_params_ui.cc:604
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 #, fuzzy
 msgid "Tracks and Busses"
 msgstr "Ścieżki/szyny"
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr ""
 
-#: ardour_ui.cc:193 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 #, fuzzy
 msgid "Bundle Manager"
 msgstr "Menedżer motywów"
 
-#: ardour_ui.cc:194 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "Duży zegar"
 
-#: ardour_ui.cc:195
+#: ardour_ui.cc:199
 #, fuzzy
 msgid "Audio Connections"
 msgstr "Połączenie \""
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:200
 #, fuzzy
 msgid "MIDI Connections"
 msgstr "Połączenia wejściowe"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr "Błędy"
 
-#: ardour_ui.cc:299
-#, fuzzy
-msgid "could not initialize %1."
-msgstr "Nie można dokonać inicjalizacji programu."
-
-#: ardour_ui.cc:394
+#: ardour_ui.cc:388
 msgid "Starting audio engine"
 msgstr "Uruchamianie systemu dźwięku"
 
-#: ardour_ui.cc:763 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 #, fuzzy
 msgid "%1 is ready for use"
 msgstr "Ardour jest gotowy do użycia"
 
-#: ardour_ui.cc:811
+#: ardour_ui.cc:806
 #, fuzzy
 msgid ""
 "WARNING: Your system has a limit for maximum amount of locked memory. This "
@@ -754,26 +749,26 @@ msgstr ""
 "Można sprawdzić limit pamięci przy użyciu 'ulimit -l'. Standardowo limit ten "
 "jest kontrolowany przez /etc/security/limits.conf"
 
-#: ardour_ui.cc:828
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr "Nie pokazuj tego okna więcej"
 
-#: ardour_ui.cc:870
+#: ardour_ui.cc:865
 #, fuzzy
 msgid "Don't quit"
 msgstr "Nie kończ"
 
-#: ardour_ui.cc:871
+#: ardour_ui.cc:866
 #, fuzzy
 msgid "Just quit"
 msgstr "Po prostu %1"
 
-#: ardour_ui.cc:872
+#: ardour_ui.cc:867
 #, fuzzy
 msgid "Save and quit"
 msgstr "Zapisz i %1"
 
-#: ardour_ui.cc:882
+#: ardour_ui.cc:877
 #, fuzzy
 msgid ""
 "%1 was unable to save your session.\n"
@@ -788,17 +783,17 @@ msgstr ""
 "\n"
 "opcji \"Po prostu zakończ\"."
 
-#: ardour_ui.cc:913
+#: ardour_ui.cc:908
 #, fuzzy
 msgid "Please wait while %1 cleans up..."
 msgstr "Proszę czekać na wczytanie danych wizualnych"
 
-#: ardour_ui.cc:930
+#: ardour_ui.cc:925
 #, fuzzy
 msgid "Unsaved Session"
 msgstr "Nowa Sesja"
 
-#: ardour_ui.cc:951
+#: ardour_ui.cc:946
 #, fuzzy
 msgid ""
 "The session \"%1\"\n"
@@ -816,7 +811,7 @@ msgstr ""
 "\n"
 "Co zrobić?"
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:949
 #, fuzzy
 msgid ""
 "The snapshot \"%1\"\n"
@@ -834,75 +829,75 @@ msgstr ""
 "\n"
 "Co zrobić?"
 
-#: ardour_ui.cc:968
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr "Prompter"
 
-#: ardour_ui.cc:1045
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "rozłączono"
 
-#: ardour_ui.cc:1052
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1056
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1074 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 #, fuzzy
 msgid "File:"
 msgstr "Pliki"
 
-#: ardour_ui.cc:1078
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr ""
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr "WAV"
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr ""
 
-#: ardour_ui.cc:1087 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr ""
 
-#: ardour_ui.cc:1090
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr ""
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr ""
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr ""
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr ""
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr ""
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr ""
 
-#: ardour_ui.cc:1129
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1148
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -910,34 +905,34 @@ msgid ""
 "\">%<PRIu32>%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1184
+#: ardour_ui.cc:1188
 #, fuzzy
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr "Dysk: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1186
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr ""
 
-#: ardour_ui.cc:1204
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr ""
 
-#: ardour_ui.cc:1215
+#: ardour_ui.cc:1219
 #, fuzzy, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr "Dysk: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1241
+#: ardour_ui.cc:1245
 #, fuzzy, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr "Dysk: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1358 ardour_ui.cc:1367 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr "Poprzednie sesje"
 
-#: ardour_ui.cc:1447
+#: ardour_ui.cc:1451
 #, fuzzy
 msgid ""
 "%1 is not connected to JACK\n"
@@ -946,22 +941,22 @@ msgstr ""
 "Ardour nie jest połączony z JACK.\n"
 "W tej sytuacji nie możesz otwierać lub zamykać sesji."
 
-#: ardour_ui.cc:1474
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr "Otwieranie sesji"
 
-#: ardour_ui.cc:1492 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 #, fuzzy
 msgid "%1 sessions"
 msgstr "Sesja"
 
-#: ardour_ui.cc:1529
+#: ardour_ui.cc:1540
 #, fuzzy
 msgid "You cannot add a track without a session already loaded."
 msgstr "Nie możesz dodać ścieżki lub szyny bez otwierania sesji."
 
-#: ardour_ui.cc:1537
+#: ardour_ui.cc:1548
 #, fuzzy
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
@@ -969,7 +964,7 @@ msgstr[0] "nie można było utworzyć %1 nowych ścieżek dźwiękowych"
 msgstr[1] "nie można było utworzyć %1 nowych ścieżek dźwiękowych"
 msgstr[2] "nie można było utworzyć %1 nowych ścieżek dźwiękowych"
 
-#: ardour_ui.cc:1543 ardour_ui.cc:1604
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 msgid ""
 "There are insufficient JACK ports available\n"
 "to create a new track or bus.\n"
@@ -977,11 +972,11 @@ msgid ""
 "restart JACK with more ports."
 msgstr ""
 
-#: ardour_ui.cc:1578
+#: ardour_ui.cc:1589
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr "Nie możesz dodać ścieżki lub szyny bez otwierania sesji."
 
-#: ardour_ui.cc:1587
+#: ardour_ui.cc:1598
 #, fuzzy
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
@@ -989,7 +984,7 @@ msgstr[0] "nie można było utworzyć nowej ścieżki dźwiękowej"
 msgstr[1] "nie można było utworzyć nowej ścieżki dźwiękowej"
 msgstr[2] "nie można było utworzyć nowej ścieżki dźwiękowej"
 
-#: ardour_ui.cc:1596
+#: ardour_ui.cc:1607
 #, fuzzy
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
@@ -997,7 +992,7 @@ msgstr[0] "nie można było utworzyć %1 nowych ścieżek dźwiękowych"
 msgstr[1] "nie można było utworzyć %1 nowych ścieżek dźwiękowych"
 msgstr[2] "nie można było utworzyć %1 nowych ścieżek dźwiękowych"
 
-#: ardour_ui.cc:1713
+#: ardour_ui.cc:1724
 #, fuzzy
 msgid ""
 "Please create one or more tracks before trying to record.\n"
@@ -1007,14 +1002,14 @@ msgstr ""
 "przed rozpoczęciem nagrywania.\n"
 "Sprawdź menu Sesji."
 
-#: ardour_ui.cc:2103
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
 "%1"
 msgstr ""
 
-#: ardour_ui.cc:2105
+#: ardour_ui.cc:2116
 #, fuzzy
 msgid ""
 "JACK has either been shutdown or it\n"
@@ -1026,81 +1021,81 @@ msgstr ""
 "niewystarczającej szybkości. Można zapisać sesję i/lub spróbować połączyć "
 "ponownie z JACK."
 
-#: ardour_ui.cc:2131
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "Nie można wczytać sesji, gdyż jest aktualnie w użyciu."
 
-#: ardour_ui.cc:2211
+#: ardour_ui.cc:2222
 #, fuzzy
 msgid "Take Snapshot"
 msgstr "Zrzut"
 
-#: ardour_ui.cc:2212
+#: ardour_ui.cc:2223
 #, fuzzy
 msgid "Name of new snapshot"
 msgstr "Nazwa zrzutu:"
 
-#: ardour_ui.cc:2236
+#: ardour_ui.cc:2247
 msgid ""
 "To ensure compatibility with various systems\n"
 "snapshot names may not contain a '%1' character"
 msgstr ""
 
-#: ardour_ui.cc:2248
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr ""
 
-#: ardour_ui.cc:2249
+#: ardour_ui.cc:2260
 #, fuzzy
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr "Plik już istnieje. Zastąpić go?"
 
-#: ardour_ui.cc:2252 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 msgid "Overwrite"
 msgstr ""
 
-#: ardour_ui.cc:2286
+#: ardour_ui.cc:2297
 #, fuzzy
 msgid "Rename Session"
 msgstr "Zmień nazwę obszaru"
 
-#: ardour_ui.cc:2287
+#: ardour_ui.cc:2298
 #, fuzzy
 msgid "New session name"
 msgstr "Sesja"
 
-#: ardour_ui.cc:2301 ardour_ui.cc:2681 ardour_ui.cc:2726
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 msgid ""
 "To ensure compatibility with various systems\n"
 "session names may not contain a '%1' character"
 msgstr ""
 
-#: ardour_ui.cc:2309
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr ""
 
-#: ardour_ui.cc:2318
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
 msgstr ""
 
-#: ardour_ui.cc:2429
+#: ardour_ui.cc:2440
 #, fuzzy
 msgid "Save Template"
 msgstr "Zapisz szablon"
 
-#: ardour_ui.cc:2430
+#: ardour_ui.cc:2441
 #, fuzzy
 msgid "Name for template:"
 msgstr "Nazwa szablonu miksu:"
 
-#: ardour_ui.cc:2431
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-szablon"
 
-#: ardour_ui.cc:2469
+#: ardour_ui.cc:2480
 msgid ""
 "This session\n"
 "%1\n"
@@ -1110,56 +1105,56 @@ msgstr ""
 "%1\n"
 "już istnieje. Otworzyć ją?"
 
-#: ardour_ui.cc:2479
+#: ardour_ui.cc:2490
 #, fuzzy
 msgid "Open Existing Session"
 msgstr "Otwieranie sesji"
 
-#: ardour_ui.cc:2717
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr ""
 
-#: ardour_ui.cc:2804
+#: ardour_ui.cc:2815
 #, fuzzy
 msgid "Please wait while %1 loads your session"
 msgstr "Proszę czekać. Trwa wczytywanie sesji..."
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr ""
 
-#: ardour_ui.cc:2820
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr ""
 
-#: ardour_ui.cc:2841
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "Sesja \"%1 (zrzut %2)\" nie została załadowana poprawnie"
 
-#: ardour_ui.cc:2847
+#: ardour_ui.cc:2858
 msgid "Loading Error"
 msgstr "BÅ‚Ä…d wczytywania"
 
-#: ardour_ui.cc:2848
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr ""
 
-#: ardour_ui.cc:2930
+#: ardour_ui.cc:2941
 msgid "Could not create session in \"%1\""
 msgstr "Nie udało się utworzyć sesji w \"%1\""
 
-#: ardour_ui.cc:3030
+#: ardour_ui.cc:3041
 #, fuzzy
 msgid "No files were ready for clean-up"
 msgstr "Żadne pliki dźwiękowe nie były gotowe do wyczyszczenia"
 
-#: ardour_ui.cc:3034 ardour_ui.cc:3044 ardour_ui.cc:3177 ardour_ui.cc:3184
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 #, fuzzy
 msgid "Clean-up"
 msgstr "Wyczyść"
 
-#: ardour_ui.cc:3035
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1171,19 +1166,19 @@ msgstr ""
 "Wciąż mogą zawierać obszary\n"
 "wymagające obecności nieużywanych plików."
 
-#: ardour_ui.cc:3094
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr ""
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr ""
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr ""
 
-#: ardour_ui.cc:3105
+#: ardour_ui.cc:3116
 msgid ""
 "The following file was deleted from %2,\n"
 "releasing %3 %4bytes of disk space"
@@ -1194,7 +1189,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3123
 msgid ""
 "The following file was not in use and \n"
 "has been moved to: %2\n"
@@ -1217,12 +1212,12 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ardour_ui.cc:3172
+#: ardour_ui.cc:3183
 #, fuzzy
 msgid "Are you sure you want to clean-up?"
 msgstr "Na pewno wyczyścić?"
 
-#: ardour_ui.cc:3179
+#: ardour_ui.cc:3190
 #, fuzzy
 msgid ""
 "Clean-up is a destructive operation.\n"
@@ -1234,83 +1229,83 @@ msgstr ""
 "Po czyszczeniu nieużywane pliki audio zostaną przeniesione do katalogu "
 "\"dead sounds\"."
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr "Okno dialogowe czyszczenia"
 
-#: ardour_ui.cc:3217
+#: ardour_ui.cc:3228
 #, fuzzy
 msgid "Cleaned Files"
 msgstr "usunięte pliki"
 
-#: ardour_ui.cc:3234
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr "usunięty plik"
 
-#: ardour_ui.cc:3326
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 
-#: ardour_ui.cc:3330
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr ""
 
-#: ardour_ui.cc:3331
+#: ardour_ui.cc:3342
 #, fuzzy
 msgid "Do you really want to stop the Video Server?"
 msgstr "Na pewno usunąć %1 %2?"
 
-#: ardour_ui.cc:3334
+#: ardour_ui.cc:3345
 #, fuzzy
 msgid "Yes, Stop It"
 msgstr "Tak, usuń go."
 
-#: ardour_ui.cc:3360
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr ""
 
-#: ardour_ui.cc:3362
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
 msgstr ""
 
-#: ardour_ui.cc:3370 ardour_ui.cc:3455
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
 
-#: ardour_ui.cc:3394
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr ""
 
-#: ardour_ui.cc:3399
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr ""
 
-#: ardour_ui.cc:3432
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr ""
 
-#: ardour_ui.cc:3441
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3477 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "nie można otworzyć %1"
 
-#: ardour_ui.cc:3481
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
 msgstr ""
 
-#: ardour_ui.cc:3641
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr ""
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3702
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1319,7 +1314,7 @@ msgid ""
 "quickly enough to keep up with recording.\n"
 msgstr ""
 
-#: ardour_ui.cc:3689
+#: ardour_ui.cc:3721
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1328,11 +1323,11 @@ msgid ""
 "quickly enough to keep up with playback.\n"
 msgstr ""
 
-#: ardour_ui.cc:3729
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr ""
 
-#: ardour_ui.cc:3730
+#: ardour_ui.cc:3762
 #, fuzzy
 msgid ""
 "This session appears to have been in the\n"
@@ -1350,42 +1345,42 @@ msgstr ""
 "Ardour może przywrócić nagranie dla Ciebie.\n"
 "Co chcesz zrobić?\n"
 
-#: ardour_ui.cc:3742
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr "Ignorowanie dane z awarii"
 
-#: ardour_ui.cc:3743
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr "Przywróć dane z awarii"
 
-#: ardour_ui.cc:3763
+#: ardour_ui.cc:3795
 msgid "Sample Rate Mismatch"
 msgstr "Błędna częstotliwość próbkowania"
 
-#: ardour_ui.cc:3764
+#: ardour_ui.cc:3796
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
 "%2 is currently running at %3 Hz.  If you load this session,\n"
 "audio may be played at the wrong sample rate.\n"
 msgstr ""
 
-#: ardour_ui.cc:3773
+#: ardour_ui.cc:3805
 msgid "Do not load session"
 msgstr "Nie Å‚aduj sesji"
 
-#: ardour_ui.cc:3774
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr "Załaduj sesję mimo to"
 
-#: ardour_ui.cc:3797
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "Nie można się rozłączyć z JACK"
 
-#: ardour_ui.cc:3810
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr "Nie udało się połączyć ponownie z JACK"
 
-#: ardour_ui.cc:4084
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1408,59 +1403,64 @@ msgstr "UI: nie można ustawić edytora"
 msgid "UI: cannot setup mixer"
 msgstr "UI: nie można ustawić miksera"
 
-#: ardour_ui2.cc:125
+#: ardour_ui2.cc:82
+#, fuzzy
+msgid "UI: cannot setup meterbridge"
+msgstr "UI: nie można ustawić miksera"
+
+#: ardour_ui2.cc:130
 msgid "Play from playhead"
 msgstr "Odtwórz od położenia głowicy"
 
-#: ardour_ui2.cc:126
+#: ardour_ui2.cc:131
 msgid "Stop playback"
 msgstr "Zatrzymaj odtwarzanie"
 
-#: ardour_ui2.cc:127
+#: ardour_ui2.cc:132
 #, fuzzy
 msgid "Toggle record"
 msgstr "nagrywanie"
 
-#: ardour_ui2.cc:128
+#: ardour_ui2.cc:133
 msgid "Play range/selection"
 msgstr "Odtwórz zakres/zaznaczenie"
 
-#: ardour_ui2.cc:129
+#: ardour_ui2.cc:134
 msgid "Go to start of session"
 msgstr "Przejdź do początku sesji"
 
-#: ardour_ui2.cc:130
+#: ardour_ui2.cc:135
 msgid "Go to end of session"
 msgstr "Przejdź do końca sesji"
 
-#: ardour_ui2.cc:131
+#: ardour_ui2.cc:136
 msgid "Play loop range"
 msgstr "Zakres pętli"
 
-#: ardour_ui2.cc:132
+#: ardour_ui2.cc:137
 msgid ""
 "MIDI Panic\n"
 "Send note off and reset controller messages on all MIDI channels"
 msgstr ""
 
-#: ardour_ui2.cc:133
+#: ardour_ui2.cc:138
 msgid "Return to last playback start when stopped"
 msgstr "Powróć do początku ostatniego odtwarzania przy zatrzymaniu"
 
-#: ardour_ui2.cc:134
+#: ardour_ui2.cc:139
 #, fuzzy
 msgid "Playhead follows Range Selections and Edits"
 msgstr "GÅ‚owica do poczÄ…tku zakresu"
 
-#: ardour_ui2.cc:135
+#: ardour_ui2.cc:140
 msgid "Be sensible about input monitoring"
 msgstr ""
 
-#: ardour_ui2.cc:136
+#: ardour_ui2.cc:141
 msgid "Enable/Disable audio click"
 msgstr "Włącz/wyłącz metronom"
 
-#: ardour_ui2.cc:137 monitor_section.cc:101
+#: ardour_ui2.cc:142 monitor_section.cc:101
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
@@ -1468,7 +1468,7 @@ msgstr ""
 "Gdy aktywne, gdzieś włączone jest solo.\n"
 "Kliknij by wyłączyć solo wszędzie."
 
-#: ardour_ui2.cc:138
+#: ardour_ui2.cc:143
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
@@ -1476,11 +1476,11 @@ msgstr ""
 "Gdy aktywne, odsłuchiwanie jest włączone\n"
 "Kliknij, by zatrzymać odsłuchiwanie."
 
-#: ardour_ui2.cc:139
+#: ardour_ui2.cc:144
 msgid "When active, there is a feedback loop."
 msgstr ""
 
-#: ardour_ui2.cc:140
+#: ardour_ui2.cc:145
 msgid ""
 "<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1488,7 +1488,7 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:141
+#: ardour_ui2.cc:146
 msgid ""
 "<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1496,27 +1496,32 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:173
+#: ardour_ui2.cc:147
+#, fuzzy
+msgid "Reset Level Meter"
+msgstr "Resetuj obwiedniÄ™"
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr "[B�AD]: "
 
-#: ardour_ui2.cc:175
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr "[OSTRZEŻENIE]: "
 
-#: ardour_ui2.cc:177
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr "[INFORMACJA]: "
 
-#: ardour_ui2.cc:241 ardour_ui_ed.cc:376
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 msgid "Auto Return"
 msgstr "Autopowracanie"
 
-#: ardour_ui2.cc:243 ardour_ui_ed.cc:379
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr ""
 
-#: ardour_ui2.cc:621 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1536,26 +1541,26 @@ msgstr "Ustawianie edytora"
 msgid "Setup Mixer"
 msgstr "Ustawianie miksera"
 
-#: ardour_ui_dependents.cc:84
+#: ardour_ui_dependents.cc:85
 msgid "Reload Session History"
 msgstr "Wczytywanie historii sesji"
 
-#: ardour_ui_dialogs.cc:206
+#: ardour_ui_dialogs.cc:242
 #, fuzzy
 msgid "Don't close"
 msgstr "Nie kończ"
 
-#: ardour_ui_dialogs.cc:207
+#: ardour_ui_dialogs.cc:243
 #, fuzzy
 msgid "Just close"
 msgstr "zamknij"
 
-#: ardour_ui_dialogs.cc:208
+#: ardour_ui_dialogs.cc:244
 #, fuzzy
 msgid "Save and close"
 msgstr "Zapisz i %1"
 
-#: ardour_ui_dialogs.cc:293
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr ""
 
@@ -1568,7 +1573,7 @@ msgstr "Sesja"
 msgid "Sync"
 msgstr "Synchronizacja"
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr "Opcje"
 
@@ -1596,15 +1601,15 @@ msgstr "Format pliku"
 msgid "Sample Format"
 msgstr "Format próbkowania"
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr "UrzÄ…dzenia sterujÄ…ce"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr "Ustawienia metrum"
 
@@ -1621,7 +1626,7 @@ msgstr "Czas przytrzymania"
 msgid "Denormal Handling"
 msgstr "Obsługa liczb zdenormalizowanych"
 
-#: ardour_ui_ed.cc:123 route_time_axis.cc:1475
+#: ardour_ui_ed.cc:123 route_time_axis.cc:1489
 msgid "New..."
 msgstr ""
 
@@ -1669,8 +1674,8 @@ msgstr "Zrzut"
 msgid "Save As..."
 msgstr "Zapisz szablon"
 
-#: ardour_ui_ed.cc:153 editor_actions.cc:1710 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1464 route_time_axis.cc:1471
+#: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 #, fuzzy
 msgid "Rename..."
 msgstr "Zmień nazwę"
@@ -1702,7 +1707,7 @@ msgid "Stem export..."
 msgstr "Eksportuj"
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "Eksportuj"
 
@@ -1716,11 +1721,11 @@ msgstr "Nieużywane zasoby"
 msgid "Flush Wastebasket"
 msgstr "Opróżnij kosz"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr "JACK"
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr "Opóźnienie"
 
@@ -1728,8 +1733,8 @@ msgstr "Opóźnienie"
 msgid "Reconnect"
 msgstr "Połącz ponownie"
 
-#: ardour_ui_ed.cc:195 global_port_matrix.cc:198 io_selector.cc:210
-#: mixer_strip.cc:712 mixer_strip.cc:838
+#: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr "Rozłącz"
 
@@ -1746,7 +1751,7 @@ msgstr "Maksymalizacja edytora"
 msgid "Show Toolbars"
 msgstr "Wyświetlanie logo"
 
-#: ardour_ui_ed.cc:230 mixer_ui.cc:1863 mixer_ui.cc:1869
+#: ardour_ui_ed.cc:230 mixer_ui.cc:1865 mixer_ui.cc:1871
 #, fuzzy
 msgid "Window|Mixer"
 msgstr "Okno"
@@ -1756,29 +1761,34 @@ msgstr "Okno"
 msgid "Toggle Editor+Mixer"
 msgstr "Przełącz tryb edycji"
 
-#: ardour_ui_ed.cc:233 midi_tracer.cc:39
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
+#, fuzzy
+msgid "Window|Meterbridge"
+msgstr "Okno"
+
+#: ardour_ui_ed.cc:234 midi_tracer.cc:39
 msgid "MIDI Tracer"
 msgstr ""
 
-#: ardour_ui_ed.cc:235
+#: ardour_ui_ed.cc:236
 msgid "Chat"
 msgstr ""
 
-#: ardour_ui_ed.cc:237
+#: ardour_ui_ed.cc:238
 #, fuzzy
 msgid "Help|Manual"
 msgstr "Ręcznie"
 
-#: ardour_ui_ed.cc:238
+#: ardour_ui_ed.cc:239
 #, fuzzy
 msgid "Reference"
 msgstr "Preferencje"
 
-#: ardour_ui_ed.cc:240 plugin_ui.cc:419
+#: ardour_ui_ed.cc:241 plugin_ui.cc:418
 msgid "Save"
 msgstr "Zapisz"
 
-#: ardour_ui_ed.cc:248 rc_option_editor.cc:1114 rc_option_editor.cc:1125
+#: ardour_ui_ed.cc:249 rc_option_editor.cc:1114 rc_option_editor.cc:1125
 #: rc_option_editor.cc:1134 rc_option_editor.cc:1147 rc_option_editor.cc:1160
 #: rc_option_editor.cc:1169 rc_option_editor.cc:1179 rc_option_editor.cc:1181
 #: rc_option_editor.cc:1191 rc_option_editor.cc:1207 rc_option_editor.cc:1220
@@ -1788,103 +1798,103 @@ msgstr "Zapisz"
 msgid "Transport"
 msgstr "Nagrywanie i odtwarzanie"
 
-#: ardour_ui_ed.cc:254 engine_dialog.cc:85 sfdb_ui.cc:559
+#: ardour_ui_ed.cc:255 engine_dialog.cc:85
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ardour_ui_ed.cc:257
+#: ardour_ui_ed.cc:258
 msgid "Roll"
 msgstr ""
 
-#: ardour_ui_ed.cc:261
+#: ardour_ui_ed.cc:262
 msgid "Start/Stop"
 msgstr "Uruchom/Zatrzymaj"
 
-#: ardour_ui_ed.cc:264
+#: ardour_ui_ed.cc:265
 #, fuzzy
 msgid "Start/Continue/Stop"
 msgstr "Uruchom/Zatrzymaj"
 
-#: ardour_ui_ed.cc:267
+#: ardour_ui_ed.cc:268
 #, fuzzy
 msgid "Stop and Forget Capture"
 msgstr "Zatrzymaj i usuń nagranie"
 
-#: ardour_ui_ed.cc:277
+#: ardour_ui_ed.cc:278
 msgid "Transition To Roll"
 msgstr "Do przodu"
 
-#: ardour_ui_ed.cc:281
+#: ardour_ui_ed.cc:282
 msgid "Transition To Reverse"
 msgstr "Od tyłu"
 
-#: ardour_ui_ed.cc:285
+#: ardour_ui_ed.cc:286
 msgid "Play Loop Range"
 msgstr "Odtwórz zakres pętli"
 
-#: ardour_ui_ed.cc:288
+#: ardour_ui_ed.cc:289
 #, fuzzy
 msgid "Play Selected Range"
 msgstr "Zaznacz zakres"
 
-#: ardour_ui_ed.cc:291
+#: ardour_ui_ed.cc:292
 #, fuzzy
 msgid "Play Selection w/Preroll"
 msgstr "Odtwórz zaznaczenie"
 
-#: ardour_ui_ed.cc:295
+#: ardour_ui_ed.cc:296
 msgid "Enable Record"
 msgstr "WÅ‚Ä…cz nagrywanie"
 
-#: ardour_ui_ed.cc:298
+#: ardour_ui_ed.cc:299
 msgid "Start Recording"
 msgstr "Rozpocznij nagrywanie"
 
-#: ardour_ui_ed.cc:302
+#: ardour_ui_ed.cc:303
 msgid "Rewind"
 msgstr "Przewiń do tyłu"
 
-#: ardour_ui_ed.cc:305
+#: ardour_ui_ed.cc:306
 msgid "Rewind (Slow)"
 msgstr "Przewiń do tyłu (powoli)"
 
-#: ardour_ui_ed.cc:308
+#: ardour_ui_ed.cc:309
 msgid "Rewind (Fast)"
 msgstr "Przewiń do tyłu (szybko)"
 
-#: ardour_ui_ed.cc:311 startup.cc:727
+#: ardour_ui_ed.cc:312 startup.cc:727
 msgid "Forward"
 msgstr "Przewiń do przodu"
 
-#: ardour_ui_ed.cc:314
+#: ardour_ui_ed.cc:315
 msgid "Forward (Slow)"
 msgstr "Przewiń do przodu (powoli)"
 
-#: ardour_ui_ed.cc:317
+#: ardour_ui_ed.cc:318
 msgid "Forward (Fast)"
 msgstr "Przewiń do przodu (szybko)"
 
-#: ardour_ui_ed.cc:320
+#: ardour_ui_ed.cc:321
 msgid "Goto Zero"
 msgstr "Do punktu zerowego"
 
-#: ardour_ui_ed.cc:323
+#: ardour_ui_ed.cc:324
 msgid "Goto Start"
 msgstr "Do poczÄ…tku"
 
-#: ardour_ui_ed.cc:326
+#: ardour_ui_ed.cc:327
 msgid "Goto End"
 msgstr "Do końca"
 
-#: ardour_ui_ed.cc:329
+#: ardour_ui_ed.cc:330
 msgid "Goto Wall Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:333
+#: ardour_ui_ed.cc:334
 msgid "Focus On Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:337 ardour_ui_ed.cc:346 audio_clock.cc:2046 editor.cc:237
+#: ardour_ui_ed.cc:338 ardour_ui_ed.cc:347 audio_clock.cc:2046 editor.cc:237
 #: editor_actions.cc:544 editor_actions.cc:553 export_timespan_selector.cc:88
 #: session_option_editor.cc:41 session_option_editor.cc:61
 #: session_option_editor.cc:80 session_option_editor.cc:96
@@ -1893,135 +1903,135 @@ msgstr ""
 msgid "Timecode"
 msgstr "Zegar"
 
-#: ardour_ui_ed.cc:339 ardour_ui_ed.cc:348 editor_actions.cc:542
+#: ardour_ui_ed.cc:340 ardour_ui_ed.cc:349 editor_actions.cc:542
 msgid "Bars & Beats"
 msgstr "Takty i uderzenia"
 
-#: ardour_ui_ed.cc:341 ardour_ui_ed.cc:350
+#: ardour_ui_ed.cc:342 ardour_ui_ed.cc:351
 msgid "Minutes & Seconds"
 msgstr "Minuty i Sekundy"
 
-#: ardour_ui_ed.cc:343 ardour_ui_ed.cc:352 audio_clock.cc:2050 editor.cc:238
+#: ardour_ui_ed.cc:344 ardour_ui_ed.cc:353 audio_clock.cc:2050 editor.cc:238
 #: editor_actions.cc:543
 msgid "Samples"
 msgstr "Próbki"
 
-#: ardour_ui_ed.cc:355
+#: ardour_ui_ed.cc:356
 msgid "Punch In"
 msgstr "Wejście przełącznika"
 
-#: ardour_ui_ed.cc:356 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr "Wejście"
 
-#: ardour_ui_ed.cc:359
+#: ardour_ui_ed.cc:360
 msgid "Punch Out"
 msgstr "Wyjście przełącznika"
 
-#: ardour_ui_ed.cc:360 time_info_box.cc:114
+#: ardour_ui_ed.cc:361 time_info_box.cc:114
 msgid "Out"
 msgstr "Wyjście"
 
-#: ardour_ui_ed.cc:363
+#: ardour_ui_ed.cc:364
 msgid "Punch In/Out"
 msgstr "We/wy przełącznika"
 
-#: ardour_ui_ed.cc:364
+#: ardour_ui_ed.cc:365
 #, fuzzy
 msgid "In/Out"
 msgstr "We/wy przełącznika"
 
-#: ardour_ui_ed.cc:367 rc_option_editor.cc:1071
+#: ardour_ui_ed.cc:368 rc_option_editor.cc:1071
 msgid "Click"
 msgstr "Metronom"
 
-#: ardour_ui_ed.cc:370
+#: ardour_ui_ed.cc:371
 msgid "Auto Input"
 msgstr "Wejście dźwięku"
 
-#: ardour_ui_ed.cc:373
+#: ardour_ui_ed.cc:374
 msgid "Auto Play"
 msgstr "Autoodtwarzanie"
 
-#: ardour_ui_ed.cc:384
+#: ardour_ui_ed.cc:385
 #, fuzzy
 msgid "Sync Startup to Video"
 msgstr "Synchronizuj poczÄ…tek z wideo"
 
-#: ardour_ui_ed.cc:386
+#: ardour_ui_ed.cc:387
 #, fuzzy
 msgid "Time Master"
 msgstr "ZarzÄ…dzanie czasem"
 
-#: ardour_ui_ed.cc:393
+#: ardour_ui_ed.cc:394
 #, fuzzy
 msgid "Toggle Record Enable Track %1"
 msgstr "Przełącz nagrywanie Ścieżki1"
 
-#: ardour_ui_ed.cc:400
+#: ardour_ui_ed.cc:401
 msgid "Percentage"
 msgstr "Procenty"
 
-#: ardour_ui_ed.cc:401 shuttle_control.cc:169
+#: ardour_ui_ed.cc:402 shuttle_control.cc:169
 msgid "Semitones"
 msgstr "Półtony"
 
-#: ardour_ui_ed.cc:405
+#: ardour_ui_ed.cc:406
 msgid "Send MTC"
 msgstr "Wysyłanie MTC"
 
-#: ardour_ui_ed.cc:407
+#: ardour_ui_ed.cc:408
 msgid "Send MMC"
 msgstr "Wysyłanie MMC"
 
-#: ardour_ui_ed.cc:409
+#: ardour_ui_ed.cc:410
 msgid "Use MMC"
 msgstr "Używanie MMC"
 
-#: ardour_ui_ed.cc:411 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 #, fuzzy
 msgid "Send MIDI Clock"
 msgstr "Sprzężenie zwrotne MIDI"
 
-#: ardour_ui_ed.cc:413
+#: ardour_ui_ed.cc:414
 #, fuzzy
 msgid "Send MIDI Feedback"
 msgstr "Sprzężenie zwrotne MIDI"
 
-#: ardour_ui_ed.cc:419
+#: ardour_ui_ed.cc:420
 msgid "Panic"
 msgstr ""
 
-#: ardour_ui_ed.cc:559
+#: ardour_ui_ed.cc:560
 #, fuzzy
 msgid "Wall Clock"
 msgstr "Duży zegar"
 
-#: ardour_ui_ed.cc:560
+#: ardour_ui_ed.cc:561
 msgid "Disk Space"
 msgstr ""
 
-#: ardour_ui_ed.cc:561
+#: ardour_ui_ed.cc:562
 #, fuzzy
 msgid "DSP"
 msgstr "LADSPA"
 
-#: ardour_ui_ed.cc:562
+#: ardour_ui_ed.cc:563
 #, fuzzy
 msgid "Buffers"
 msgstr "Rozmiar bufora"
 
-#: ardour_ui_ed.cc:563
+#: ardour_ui_ed.cc:564
 msgid "JACK Sampling Rate and Latency"
 msgstr ""
 
-#: ardour_ui_ed.cc:564
+#: ardour_ui_ed.cc:565
 #, fuzzy
 msgid "Timecode Format"
 msgstr "Klatek na sekundÄ™ licznika czasu"
 
-#: ardour_ui_ed.cc:565
+#: ardour_ui_ed.cc:566
 #, fuzzy
 msgid "File Format"
 msgstr "Format pliku dźwiękowego"
@@ -2037,12 +2047,12 @@ msgstr ""
 msgid "Internal"
 msgstr "wewnętrzny"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 #, fuzzy
 msgid "Enable/Disable external positional sync"
 msgstr "Włącz/wyłącz metronom"
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr ""
 
@@ -2073,7 +2083,7 @@ msgstr "Tempo"
 msgid "Meter"
 msgstr "Metrum"
 
-#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1030
+#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1039
 #: midi_region_view.cc:2991 session_metadata_dialog.cc:331
 #: session_metadata_dialog.cc:379 session_metadata_dialog.cc:435
 #: session_metadata_dialog.cc:716
@@ -2168,33 +2178,33 @@ msgid "hide track"
 msgstr "ukryj ścieżkę"
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:196 generic_pluginui.cc:456
-#: generic_pluginui.cc:733 panner_ui.cc:150
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
+#: generic_pluginui.cc:746 panner_ui.cc:150
 #, fuzzy
 msgid "Automation|Manual"
 msgstr "Automatyka"
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1856 gain_meter.cc:199
-#: generic_pluginui.cc:459 generic_pluginui.cc:735 midi_time_axis.cc:1488
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
+#: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr "Odtwórz"
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:202 generic_pluginui.cc:462
-#: generic_pluginui.cc:737 panner_ui.cc:156
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
+#: generic_pluginui.cc:750 panner_ui.cc:156
 msgid "Write"
 msgstr "Zapisz"
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:205 generic_pluginui.cc:465
-#: generic_pluginui.cc:739 panner_ui.cc:159
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
+#: generic_pluginui.cc:752 panner_ui.cc:159
 msgid "Touch"
 msgstr "Dotyk"
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr "???"
 
@@ -2203,7 +2213,7 @@ msgid "clear automation"
 msgstr "wyczyść automatyzację"
 
 #: automation_time_axis.cc:485 editor_actions.cc:613 editor_markers.cc:857
-#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:699
+#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:708
 msgid "Hide"
 msgstr "Ukryj"
 
@@ -2225,7 +2235,7 @@ msgstr "Rozłącz"
 msgid "Linear"
 msgstr "Liniowy"
 
-#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:638
+#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:647
 #: shuttle_control.cc:188
 msgid "Mode"
 msgstr "Tryb"
@@ -2244,13 +2254,13 @@ msgstr "Zmienianie przy użyciu:"
 msgid "Direction:"
 msgstr "Zaznaczenie"
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:156
-#: mixer_strip.cc:2132
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 msgid "Input"
 msgstr "Wejście"
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:161 mixer_strip.cc:2135
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 msgid "Output"
 msgstr "Wyjście"
 
@@ -2260,8 +2270,8 @@ msgid "Edit"
 msgstr "Edycja"
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:420 processor_box.cc:2227
-#: route_time_axis.cc:704
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
+#: route_time_axis.cc:713
 msgid "Delete"
 msgstr "Usuń"
 
@@ -2436,7 +2446,7 @@ msgstr "Zegar"
 
 #: edit_note_dialog.cc:98 editor_regions.cc:114
 #: export_timespan_selector.cc:359 export_timespan_selector.cc:421
-#: location_ui.cc:313 midi_list_editor.cc:114 time_info_box.cc:105
+#: location_ui.cc:317 midi_list_editor.cc:114 time_info_box.cc:105
 #, fuzzy
 msgid "Length"
 msgstr "Długość:"
@@ -2702,17 +2712,17 @@ msgid "Ranges & Marks"
 msgstr "Znaczniki zakresu"
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 msgid "Editor"
 msgstr "Edytor"
 
 #: editor.cc:1215 editor.cc:1225 editor.cc:4440 editor_actions.cc:130
-#: editor_actions.cc:1804
+#: editor_actions.cc:1813
 msgid "Loop"
 msgstr "Pętla"
 
@@ -2737,8 +2747,8 @@ msgstr ""
 msgid "Slow"
 msgstr "Wolno"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1606
-#: sfdb_ui.cc:1715
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "Szybko"
 
@@ -2758,7 +2768,7 @@ msgstr "WÅ‚Ä…cz"
 msgid "Slowest"
 msgstr "Najwolniej"
 
-#: editor.cc:1572 route_time_axis.cc:1863 selection.cc:1009 selection.cc:1064
+#: editor.cc:1572 route_time_axis.cc:1877 selection.cc:1009 selection.cc:1064
 msgid "programming error: "
 msgstr "błąd programowania:"
 
@@ -2892,7 +2902,7 @@ msgid "Select All in Track"
 msgstr "Całą ścieżkę"
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2235
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr "Wszystko"
 
@@ -2950,15 +2960,15 @@ msgstr "Ustaw zakres między głowicą a punktem edycji"
 msgid "Select"
 msgstr "Zaznacz"
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2220
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr "Wytnij"
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2223
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr "Skopiuj"
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2231
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr "Wklej"
 
@@ -3126,7 +3136,7 @@ msgstr "Powtórz"
 msgid "Redo (%1)"
 msgstr "Powtórz (%1)"
 
-#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1785
+#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1794
 msgid "Duplicate"
 msgstr "Powiel"
 
@@ -3157,8 +3167,8 @@ msgstr "Usuń listę odtwarzania"
 msgid "Keep Playlist"
 msgstr "Zachowaj listÄ™ odtwarzania"
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -3179,7 +3189,7 @@ msgstr "wyczyść listy odtwarzania"
 msgid "Please wait while %1 loads visual data."
 msgstr "Proszę czekać na wczytanie danych wizualnych"
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2251
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 #, fuzzy
 msgid "Edit..."
 msgstr "Edycja"
@@ -3230,7 +3240,7 @@ msgstr "Warstwy"
 msgid "Position"
 msgstr "Pozycja"
 
-#: editor_actions.cc:101 gain_meter.cc:124 gain_meter.cc:755 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr "Przytnij"
@@ -3243,7 +3253,7 @@ msgstr "Wzmocnienie"
 msgid "Ranges"
 msgstr "Zakresy"
 
-#: editor_actions.cc:104 editor_actions.cc:1781 session_option_editor.cc:145
+#: editor_actions.cc:104 editor_actions.cc:1790 session_option_editor.cc:145
 #: session_option_editor.cc:147 session_option_editor.cc:156
 #: session_option_editor.cc:163
 #, fuzzy
@@ -3284,7 +3294,7 @@ msgstr "Różne"
 msgid "Misc Options"
 msgstr "Różne"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr "Monitorowanie"
@@ -3326,8 +3336,8 @@ msgstr "Zegar dodatkowy"
 msgid "Separate"
 msgstr "Oddziel"
 
-#: editor_actions.cc:132 mixer_strip.cc:1916 route_time_axis.cc:199
-#: route_time_axis.cc:2397
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
+#: route_time_axis.cc:2417
 msgid "Solo"
 msgstr "Solo"
 
@@ -3339,7 +3349,7 @@ msgstr "Podklatki"
 msgid "Timecode fps"
 msgstr "Klatek na sekundÄ™ licznika czasu"
 
-#: editor_actions.cc:137 route_time_axis.cc:421
+#: editor_actions.cc:137 route_time_axis.cc:430
 msgid "Height"
 msgstr "Rozmiar"
 
@@ -3478,7 +3488,7 @@ msgstr "GÅ‚owica do poczÄ…tku zakresu"
 msgid "Playhead to Range End"
 msgstr "Głowica do końca zakresu"
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2237
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 msgid "Deselect All"
 msgstr "Nic"
 
@@ -3783,9 +3793,9 @@ msgstr "Czas wstawienia"
 msgid "Toggle Active"
 msgstr "Przełącz aktywność"
 
-#: editor_actions.cc:370 editor_actions.cc:1707 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1488
-#: route_time_axis.cc:701
+#: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
+#: route_time_axis.cc:710
 msgid "Remove"
 msgstr "Usuń"
 
@@ -3794,19 +3804,19 @@ msgstr "Usuń"
 msgid "Fit Selected Tracks"
 msgstr "do zaznaczonych ścieżek"
 
-#: editor_actions.cc:376 time_axis_view.cc:1298
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr "Największy"
 
-#: editor_actions.cc:379 time_axis_view.cc:1299
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr "Większy"
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1300
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr "Duży"
 
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr "Mały"
 
@@ -3910,7 +3920,7 @@ msgstr "Klocek"
 msgid "Slide"
 msgstr "Åšlizg"
 
-#: editor_actions.cc:478 editor_actions.cc:1728 editor_markers.cc:860
+#: editor_actions.cc:478 editor_actions.cc:1737 editor_markers.cc:860
 #: editor_rulers.cc:386 location_ui.cc:56
 msgid "Lock"
 msgstr "Zablokuj"
@@ -4118,7 +4128,7 @@ msgstr "Minuty i sekundy"
 msgid "Video Monitor"
 msgstr "Monitorowanie"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr ""
 
@@ -4128,8 +4138,9 @@ msgid "Always on Top"
 msgstr "PrzenieÅ› na wierzch"
 
 #: editor_actions.cc:554
-msgid "Framenumber"
-msgstr ""
+#, fuzzy
+msgid "Frame number"
+msgstr "zmień nazwę znacznika"
 
 #: editor_actions.cc:555
 #, fuzzy
@@ -4222,7 +4233,7 @@ msgstr "Usuń"
 
 #: editor_actions.cc:652 editor_audio_import.cc:279
 #: session_import_dialog.cc:74 session_import_dialog.cc:94
-#: session_metadata_dialog.cc:297 editor_videotimeline.cc:107
+#: session_metadata_dialog.cc:297 editor_videotimeline.cc:108
 msgid "Import"
 msgstr "Importuj"
 
@@ -4265,331 +4276,331 @@ msgstr ""
 msgid "Could not find editor.bindings in search path %1"
 msgstr ""
 
-#: editor_actions.cc:1019 editor_actions.cc:1415 editor_actions.cc:1426
-#: editor_actions.cc:1479 editor_actions.cc:1490 editor_actions.cc:1537
-#: editor_actions.cc:1547 editor_regions.cc:1561
+#: editor_actions.cc:1028 editor_actions.cc:1424 editor_actions.cc:1435
+#: editor_actions.cc:1488 editor_actions.cc:1499 editor_actions.cc:1546
+#: editor_actions.cc:1556 editor_regions.cc:1561
 msgid "programming error: %1: %2"
 msgstr "błąd programowania: %1: %2"
 
-#: editor_actions.cc:1713
+#: editor_actions.cc:1722
 msgid "Raise"
 msgstr ""
 
-#: editor_actions.cc:1716
+#: editor_actions.cc:1725
 #, fuzzy
 msgid "Raise to Top"
 msgstr "PrzenieÅ› na wierzch"
 
-#: editor_actions.cc:1719 gtk-custom-ruler.c:132
+#: editor_actions.cc:1728 gtk-custom-ruler.c:132
 msgid "Lower"
 msgstr ""
 
-#: editor_actions.cc:1722
+#: editor_actions.cc:1731
 #, fuzzy
 msgid "Lower to Bottom"
 msgstr "Przenieś na spód"
 
-#: editor_actions.cc:1725
+#: editor_actions.cc:1734
 #, fuzzy
 msgid "Move to Original Position"
 msgstr "PrzenieÅ› do pozycji poczÄ…tkowej"
 
-#: editor_actions.cc:1730
+#: editor_actions.cc:1739
 msgid "Lock to Video"
 msgstr ""
 
-#: editor_actions.cc:1735 editor_markers.cc:867
+#: editor_actions.cc:1744 editor_markers.cc:867
 #, fuzzy
 msgid "Glue to Bars and Beats"
 msgstr "Przyklejenie do taktów i uderzeń"
 
-#: editor_actions.cc:1740
+#: editor_actions.cc:1749
 #, fuzzy
 msgid "Remove Sync"
 msgstr "usuń synchronizację"
 
-#: editor_actions.cc:1743 mixer_strip.cc:1903 route_time_axis.cc:200
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr "Wyciszenie"
 
-#: editor_actions.cc:1746
+#: editor_actions.cc:1755
 #, fuzzy
 msgid "Normalize..."
 msgstr "Normalizuj"
 
-#: editor_actions.cc:1749
+#: editor_actions.cc:1758
 msgid "Reverse"
 msgstr "Odwróć"
 
-#: editor_actions.cc:1752
+#: editor_actions.cc:1761
 #, fuzzy
 msgid "Make Mono Regions"
 msgstr "Ustaw obszary mono"
 
-#: editor_actions.cc:1755
+#: editor_actions.cc:1764
 #, fuzzy
 msgid "Boost Gain"
 msgstr "Zwiększ wzmocnienie"
 
-#: editor_actions.cc:1758
+#: editor_actions.cc:1767
 #, fuzzy
 msgid "Cut Gain"
 msgstr "Zmniejsz wzmocnienie"
 
-#: editor_actions.cc:1761
+#: editor_actions.cc:1770
 msgid "Pitch Shift..."
 msgstr ""
 
-#: editor_actions.cc:1764
+#: editor_actions.cc:1773
 #, fuzzy
 msgid "Transpose..."
 msgstr "Transponuj"
 
-#: editor_actions.cc:1767
+#: editor_actions.cc:1776
 msgid "Opaque"
 msgstr "Mętna"
 
-#: editor_actions.cc:1771 editor_regions.cc:116
+#: editor_actions.cc:1780 editor_regions.cc:116
 msgid "Fade In"
 msgstr "Stopniowe wzmocnienie"
 
-#: editor_actions.cc:1776 editor_regions.cc:117
+#: editor_actions.cc:1785 editor_regions.cc:117
 msgid "Fade Out"
 msgstr "Stopniowe wyciszenie"
 
-#: editor_actions.cc:1791
+#: editor_actions.cc:1800
 #, fuzzy
 msgid "Multi-Duplicate..."
 msgstr "Powiel"
 
-#: editor_actions.cc:1796
+#: editor_actions.cc:1805
 msgid "Fill Track"
 msgstr "Wypełnij ścieżkę"
 
-#: editor_actions.cc:1800 editor_markers.cc:955
+#: editor_actions.cc:1809 editor_markers.cc:955
 msgid "Set Loop Range"
 msgstr "Ustaw zakres pętli"
 
-#: editor_actions.cc:1807
+#: editor_actions.cc:1816
 #, fuzzy
 msgid "Set Punch"
 msgstr "Ustaw zakres przełącznika"
 
-#: editor_actions.cc:1811
+#: editor_actions.cc:1820
 #, fuzzy
 msgid "Add Single Range Marker"
 msgstr "Dodaj znaczniki zakresu"
 
-#: editor_actions.cc:1816
+#: editor_actions.cc:1825
 #, fuzzy
 msgid "Add Range Marker Per Region"
 msgstr "Dodaj znaczniki zakresu"
 
-#: editor_actions.cc:1820
+#: editor_actions.cc:1829
 #, fuzzy
 msgid "Snap Position To Grid"
 msgstr "Do taktów"
 
-#: editor_actions.cc:1823
+#: editor_actions.cc:1832
 #, fuzzy
 msgid "Close Gaps"
 msgstr "Zamknij"
 
-#: editor_actions.cc:1826
+#: editor_actions.cc:1835
 msgid "Rhythm Ferret..."
 msgstr ""
 
-#: editor_actions.cc:1829
+#: editor_actions.cc:1838
 #, fuzzy
 msgid "Export..."
 msgstr "Eksportuj"
 
-#: editor_actions.cc:1835
+#: editor_actions.cc:1844
 #, fuzzy
 msgid "Separate Under"
 msgstr "Oddziel"
 
-#: editor_actions.cc:1839
+#: editor_actions.cc:1848
 msgid "Set Fade In Length"
 msgstr "Zmień długość stopniowego wzmocnienia"
 
-#: editor_actions.cc:1840
+#: editor_actions.cc:1849
 msgid "Set Fade Out Length"
 msgstr "Zmień długość stopniowego wyciszenia"
 
-#: editor_actions.cc:1841
+#: editor_actions.cc:1850
 #, fuzzy
 msgid "Set Tempo from Region = Bar"
 msgstr "Ustaw tempo od obszar=takt"
 
-#: editor_actions.cc:1846
+#: editor_actions.cc:1855
 #, fuzzy
 msgid "Split at Percussion Onsets"
 msgstr "WystÄ…pienie perkusji"
 
-#: editor_actions.cc:1851
+#: editor_actions.cc:1860
 #, fuzzy
 msgid "List Editor..."
 msgstr "Ustawianie edytora"
 
-#: editor_actions.cc:1854
+#: editor_actions.cc:1863
 msgid "Properties..."
 msgstr ""
 
-#: editor_actions.cc:1858
+#: editor_actions.cc:1867
 msgid "Bounce (with processing)"
 msgstr ""
 
-#: editor_actions.cc:1859
+#: editor_actions.cc:1868
 msgid "Bounce (without processing)"
 msgstr ""
 
-#: editor_actions.cc:1860
+#: editor_actions.cc:1869
 msgid "Combine"
 msgstr ""
 
-#: editor_actions.cc:1861
+#: editor_actions.cc:1870
 msgid "Uncombine"
 msgstr ""
 
-#: editor_actions.cc:1863
+#: editor_actions.cc:1872
 #, fuzzy
 msgid "Spectral Analysis..."
 msgstr "Analiza spektrum"
 
-#: editor_actions.cc:1865
+#: editor_actions.cc:1874
 msgid "Reset Envelope"
 msgstr "Resetuj obwiedniÄ™"
 
-#: editor_actions.cc:1867
+#: editor_actions.cc:1876
 #, fuzzy
 msgid "Reset Gain"
 msgstr "Resetuj wszystko"
 
-#: editor_actions.cc:1872
+#: editor_actions.cc:1881
 msgid "Envelope Active"
 msgstr "WÅ‚Ä…cz obwiedniÄ™"
 
-#: editor_actions.cc:1876
+#: editor_actions.cc:1885
 #, fuzzy
 msgid "Quantize..."
 msgstr "Format pliku"
 
-#: editor_actions.cc:1877 editor_actions.cc:1878
+#: editor_actions.cc:1886 editor_actions.cc:1887
 msgid "Insert Patch Change..."
 msgstr ""
 
-#: editor_actions.cc:1879
+#: editor_actions.cc:1888
 msgid "Unlink from other copies"
 msgstr ""
 
-#: editor_actions.cc:1880
+#: editor_actions.cc:1889
 msgid "Strip Silence..."
 msgstr ""
 
-#: editor_actions.cc:1881
+#: editor_actions.cc:1890
 msgid "Set Range Selection"
 msgstr "Ustaw zakres zaznaczenia"
 
-#: editor_actions.cc:1883
+#: editor_actions.cc:1892
 #, fuzzy
 msgid "Nudge Later"
 msgstr "Do przodu"
 
-#: editor_actions.cc:1884
+#: editor_actions.cc:1893
 #, fuzzy
 msgid "Nudge Earlier"
 msgstr "Do przodu"
 
-#: editor_actions.cc:1889
+#: editor_actions.cc:1898
 #, fuzzy
 msgid "Nudge Later by Capture Offset"
 msgstr "Do przodu wg wyrównania nagrania"
 
-#: editor_actions.cc:1896
+#: editor_actions.cc:1905
 #, fuzzy
 msgid "Nudge Earlier by Capture Offset"
 msgstr "Do przodu wg wyrównania nagrania"
 
-#: editor_actions.cc:1900
+#: editor_actions.cc:1909
 #, fuzzy
 msgid "Trim to Loop"
 msgstr "Do pętli"
 
-#: editor_actions.cc:1901
+#: editor_actions.cc:1910
 #, fuzzy
 msgid "Trim to Punch"
 msgstr "Do przełącznika"
 
-#: editor_actions.cc:1903
+#: editor_actions.cc:1912
 #, fuzzy
 msgid "Trim to Previous"
 msgstr "Do przełącznika"
 
-#: editor_actions.cc:1904
+#: editor_actions.cc:1913
 #, fuzzy
 msgid "Trim to Next"
 msgstr "przytnij do zaznaczenia"
 
-#: editor_actions.cc:1911
+#: editor_actions.cc:1920
 #, fuzzy
 msgid "Insert Region From Region List"
 msgstr "Do poczÄ…tku obszaru"
 
-#: editor_actions.cc:1917
+#: editor_actions.cc:1926
 #, fuzzy
 msgid "Set Sync Position"
 msgstr "Ustaw pozycjÄ™ synchronizacji"
 
-#: editor_actions.cc:1918
+#: editor_actions.cc:1927
 msgid "Place Transient"
 msgstr ""
 
-#: editor_actions.cc:1919
+#: editor_actions.cc:1928
 msgid "Split"
 msgstr "Podziel"
 
-#: editor_actions.cc:1920
+#: editor_actions.cc:1929
 #, fuzzy
 msgid "Trim Start at Edit Point"
 msgstr "PoczÄ…tek do punktu edycji"
 
-#: editor_actions.cc:1921
+#: editor_actions.cc:1930
 #, fuzzy
 msgid "Trim End at Edit Point"
 msgstr "Podziel w punkcie edycji"
 
-#: editor_actions.cc:1926
+#: editor_actions.cc:1935
 #, fuzzy
 msgid "Align Start"
 msgstr "Wyrównaj relatywnie"
 
-#: editor_actions.cc:1933
+#: editor_actions.cc:1942
 #, fuzzy
 msgid "Align Start Relative"
 msgstr "Wyrównaj relatywnie"
 
-#: editor_actions.cc:1937
+#: editor_actions.cc:1946
 #, fuzzy
 msgid "Align End"
 msgstr "Wyrównaj"
 
-#: editor_actions.cc:1942
+#: editor_actions.cc:1951
 #, fuzzy
 msgid "Align End Relative"
 msgstr "Wyrównaj relatywnie"
 
-#: editor_actions.cc:1949
+#: editor_actions.cc:1958
 #, fuzzy
 msgid "Align Sync"
 msgstr "Wyrównaj"
 
-#: editor_actions.cc:1956
+#: editor_actions.cc:1965
 #, fuzzy
 msgid "Align Sync Relative"
 msgstr "Wyrównaj relatywnie"
 
-#: editor_actions.cc:1960 editor_actions.cc:1963
+#: editor_actions.cc:1969 editor_actions.cc:1972
 msgid "Choose Top..."
 msgstr ""
 
@@ -4616,33 +4627,33 @@ msgid ""
 "%2 as a new source, or skip it?"
 msgstr ""
 
-#: editor_audio_import.cc:279 editor_videotimeline.cc:107
+#: editor_audio_import.cc:279 editor_videotimeline.cc:108
 msgid "Cancel Import"
 msgstr "Anuluj import"
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr "Edytor: nie można otworzyć pliku \"%1\", (%2)"
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 msgid "Cancel entire import"
 msgstr "Anuluj cały import"
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 msgid "Don't embed it"
 msgstr "Nie osadzaj tego"
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr "Osadź wszystko bez zadawania pytań"
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 #, fuzzy
 msgid "Sample rate"
 msgstr "Częstotliwość próbkowania:"
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
@@ -4651,7 +4662,7 @@ msgstr ""
 "Częstotliwość próbkowania tego pliku nie odpowiada częstotliwości "
 "próbkowania sesji!"
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 msgid "Embed it anyway"
 msgstr "Osadź mimo to"
 
@@ -4688,32 +4699,32 @@ msgstr "kopiuj znacznik tempa"
 msgid "move tempo mark"
 msgstr "przesuń znacznik tempa"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr "zmień długość stopniowego wzmocnienia"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr ""
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr "przesuń znacznik"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr ""
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 #, fuzzy
 msgid "programming_error: %1"
 msgstr "błąd programowania: %1"
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr "nowy znacznik zakresu"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 msgid "rubberband selection"
 msgstr ""
 
@@ -4792,7 +4803,7 @@ msgid "Sharing Solo?"
 msgstr ""
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 msgid "Rec"
 msgstr "Nagr"
 
@@ -4872,7 +4883,7 @@ msgid "end"
 msgstr "Przewiń do tyłu"
 
 #: editor_markers.cc:646 editor_ops.cc:1744 editor_ops.cc:1764
-#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1005
+#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1017
 msgid "add marker"
 msgstr "dodaj znacznik"
 
@@ -4881,7 +4892,7 @@ msgstr "dodaj znacznik"
 msgid "range"
 msgstr " zakres"
 
-#: editor_markers.cc:713 location_ui.cc:840
+#: editor_markers.cc:713 location_ui.cc:852
 msgid "remove marker"
 msgstr "usuń znacznik"
 
@@ -4966,8 +4977,8 @@ msgstr "Zmień nazwę znacznika"
 msgid "Rename Range"
 msgstr "Zmień nazwę zakresu"
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2233 route_time_axis.cc:968 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr "Zmień nazwę"
 
@@ -5113,7 +5124,7 @@ msgstr "Przenieś na spód"
 msgid "Rename Region"
 msgstr "Zmień nazwę obszaru"
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 msgid "New name:"
 msgstr "Nazwa:"
 
@@ -5286,7 +5297,7 @@ msgstr ""
 "(Ta operacja nie może zostać cofnięta)"
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr "Nie usuwaj niczego"
 
@@ -5481,11 +5492,11 @@ msgstr ""
 msgid "close region gaps"
 msgstr "zresetuj wzmocnienie obszaru"
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr ""
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5499,7 +5510,7 @@ msgstr ""
 msgid "tracks"
 msgstr "ścieżki"
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 msgid "track"
 msgstr "ścieżka"
 
@@ -5507,7 +5518,7 @@ msgstr "ścieżka"
 msgid "busses"
 msgstr "szyny"
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 msgid "bus"
 msgstr "szyna"
 
@@ -5550,7 +5561,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr "Tak, usuń je."
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr "Tak, usuń."
 
@@ -5626,7 +5637,7 @@ msgstr ""
 msgid "Length of region fade-out (units: secondary clock), () if dsisabled"
 msgstr ""
 
-#: editor_regions.cc:118 mixer_strip.cc:1960 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr ""
@@ -5645,8 +5656,9 @@ msgstr "Przejdź"
 msgid "Region position glued to Bars|Beats time?"
 msgstr ""
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:723
-#: mixer_strip.cc:1934 panner_ui.cc:554 stereo_panner.cc:237
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
+#: stereo_panner.cc:237
 msgid "M"
 msgstr ""
 
@@ -5725,7 +5737,8 @@ msgstr "Ścieżki/szyny"
 msgid "Track/Bus visible ?"
 msgstr "Ścieżki/szyny"
 
-#: editor_routes.cc:204 mixer_strip.cc:1951 route_time_axis.cc:2387
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
+#: route_time_axis.cc:2407
 msgid "A"
 msgstr ""
 
@@ -5734,7 +5747,7 @@ msgstr ""
 msgid "Track/Bus active ?"
 msgstr "Ścieżki/szyny"
 
-#: editor_routes.cc:205 mixer_strip.cc:1935
+#: editor_routes.cc:205 mixer_strip.cc:1932
 #, fuzzy
 msgid "I"
 msgstr "Wejście"
@@ -5744,7 +5757,7 @@ msgstr "Wejście"
 msgid "MIDI input enabled"
 msgstr "Wejścia"
 
-#: editor_routes.cc:206 mixer_strip.cc:1933 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr ""
@@ -5759,7 +5772,7 @@ msgstr "Tylko nagrywanie"
 msgid "Muted"
 msgstr "Wyciszenie"
 
-#: editor_routes.cc:208 mixer_strip.cc:1947
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr ""
 
@@ -5773,7 +5786,7 @@ msgstr "Solo"
 msgid "SI"
 msgstr "Wejście"
 
-#: editor_routes.cc:209 mixer_strip.cc:351 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 #, fuzzy
 msgid "Solo Isolated"
 msgstr "Bezpieczne solo"
@@ -6062,158 +6075,162 @@ msgid "192000Hz"
 msgstr "192000Hz"
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr "Brak"
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr "Triangular"
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr "Rectangular"
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 msgid "Shaped"
 msgstr "Shaped"
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 #, fuzzy
 msgid "Playback/recording on 1 device"
 msgstr "Odtwarzanie/nagrywanie przy użyciu 1 urządzenia"
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 #, fuzzy
 msgid "Playback/recording on 2 devices"
 msgstr "Odtwarzanie/nagrywanie przy użyciu 2 urządzeń"
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr "Tylko odtwarzanie"
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 msgid "Recording only"
 msgstr "Tylko nagrywanie"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr ""
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 #, fuzzy
 msgid "raw"
 msgstr "rysuj"
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 #, fuzzy
 msgid "Driver:"
 msgstr "Sterownik"
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 #, fuzzy
 msgid "Audio Interface:"
 msgstr "Interfejs"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:148 sfdb_ui.cc:261 sfdb_ui.cc:266
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 msgid "Sample rate:"
 msgstr "Częstotliwość próbkowania:"
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 #, fuzzy
 msgid "Buffer size:"
 msgstr "Rozmiar bufora"
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 #, fuzzy
 msgid "Number of buffers:"
 msgstr "Liczba buforów"
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 #, fuzzy
 msgid "Approximate latency:"
 msgstr "Przybliżone opóźnienie"
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 #, fuzzy
 msgid "Audio mode:"
 msgstr "Tryb dźwięku"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr "Ignorowanie"
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr "Limit czasu na opowiedź klienta"
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 #, fuzzy
 msgid "Number of ports:"
 msgstr "Liczba portów"
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 #, fuzzy
 msgid "MIDI driver:"
 msgstr "Sterownik"
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 #, fuzzy
 msgid "Dither:"
 msgstr "Rodzaj ditheringu"
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr ""
 "Nie znaleziono serwera JACK w systemie. Proszę zainstalować JACK i spróbować "
 "ponownie."
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr "Serwer:"
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 #, fuzzy
 msgid "Input device:"
 msgstr "Urządzenie wejściowe"
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 #, fuzzy
 msgid "Output device:"
 msgstr "Urządzenie wyjściowe"
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 #, fuzzy
 msgid "Hardware input latency:"
 msgstr "Sprzętowe opóźnienie dla wejścia (próbki)"
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 #, fuzzy
 msgid "samples"
 msgstr "Próbki"
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 #, fuzzy
 msgid "Hardware output latency:"
 msgstr "Sprzętowe opóźnienie dla wyjścia (próbki)"
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr "UrzÄ…dzenie"
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr ""
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 msgid ""
 "You do not have any audio devices capable of\n"
 "simultaneous playback and recording.\n"
@@ -6230,32 +6247,32 @@ msgid ""
 "%1 and choose the relevant device then."
 msgstr ""
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr ""
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr ""
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr ""
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr ""
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr ""
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 "pliki konfiguracyjne zawierają nieistniejące położenie serwera JACK (%1)"
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:146
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 msgid "Channels:"
 msgstr "Kanały:"
 
@@ -6419,9 +6436,9 @@ msgid "Folder:"
 msgstr ""
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "PrzeglÄ…daj"
 
@@ -6557,6 +6574,11 @@ msgstr "Położenia"
 msgid "Broadcast Wave options"
 msgstr ""
 
+#: export_format_selector.cc:136
+#, fuzzy
+msgid "Do you really want to remove the format?"
+msgstr "Na pewno usunąć %1 %2?"
+
 #: export_preset_selector.cc:28
 #, fuzzy
 msgid "Preset"
@@ -6568,6 +6590,11 @@ msgid ""
 "Perhaps it references a format that has been removed?"
 msgstr ""
 
+#: export_preset_selector.cc:156
+#, fuzzy
+msgid "Do you really want to remove this preset?"
+msgstr "Na pewno usunąć %1 %2?"
+
 #: export_timespan_selector.cc:46
 msgid "Show Times as:"
 msgstr ""
@@ -6581,36 +6608,49 @@ msgstr ""
 msgid "Range"
 msgstr "Zakresy"
 
-#: gain_meter.cc:109 gain_meter.cc:431 gain_meter.cc:820
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+#, fuzzy
+msgid "curl error %1 (%2)"
+msgstr "błąd programisty: %1 %2"
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+msgid "%1"
+msgstr ""
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr ""
 
-#: gain_meter.cc:115 gain_meter.cc:869
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr "Tryb automatyzacji wzmocnienia"
 
-#: gain_meter.cc:116 gain_meter.cc:870
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr "Rodzaj automatyzacji wzmocnienia"
 
-#: gain_meter.cc:125 gain_meter.cc:759 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr ""
 
-#: gain_meter.cc:334
-msgid "-Inf"
-msgstr ""
-
-#: gain_meter.cc:726 mixer_strip.cc:1954 panner_ui.cc:557
-#: route_time_axis.cc:2391
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
+#: route_time_axis.cc:2411
 msgid "P"
 msgstr ""
 
-#: gain_meter.cc:729 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr ""
 
-#: gain_meter.cc:732 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr ""
 
@@ -6622,7 +6662,7 @@ msgstr ""
 msgid "Switches"
 msgstr ""
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2210
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 msgid "Controls"
 msgstr "Sterowanie"
 
@@ -6653,73 +6693,73 @@ msgstr "Połączenie \""
 msgid "MIDI Connection Manager"
 msgstr "Połączenie \""
 
-#: global_port_matrix.cc:204 io_selector.cc:216
+#: global_port_matrix.cc:213 io_selector.cc:216
 #, fuzzy
 msgid "port"
 msgstr "Eksportuj"
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 #, fuzzy
 msgid "Selection..."
 msgstr "Zaznaczenie"
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr ""
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 #, fuzzy
 msgid "Soloed..."
 msgstr "Solo"
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 #, fuzzy
 msgid "Create New Group ..."
 msgstr "Brak grupy"
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr ""
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 #, fuzzy
 msgid "Edit Group..."
 msgstr "Brak grupy"
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 #, fuzzy
 msgid "Collect Group"
 msgstr "Zaznacz"
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 #, fuzzy
 msgid "Remove Group"
 msgstr "Edycja grupy"
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 #, fuzzy
 msgid "Remove Subgroup Bus"
 msgstr "Dodaj grupÄ™"
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 #, fuzzy
 msgid "Add New Subgroup Bus"
 msgstr "Dodaj grupÄ™"
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr ""
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 #, fuzzy
 msgid "Add New Aux Bus (post-fader)"
 msgstr "Wyczyść metrum"
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 msgid "Enable All Groups"
 msgstr ""
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 #, fuzzy
 msgid "Disable All Groups"
 msgstr "Wyłącz wszystko"
@@ -6826,11 +6866,11 @@ msgstr "błąd programowania: %1 %2"
 msgid "I/O selector"
 msgstr "Odwróć zaznaczenie"
 
-#: io_selector.cc:266
+#: io_selector.cc:265
 msgid "%1 input"
 msgstr "%1 wejście"
 
-#: io_selector.cc:268
+#: io_selector.cc:267
 msgid "%1 output"
 msgstr "%1 wyjście"
 
@@ -6910,7 +6950,7 @@ msgstr[2] "Próbki"
 msgid "Reset"
 msgstr "Zresetuj"
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1734
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 msgid "programming error: %1 (%2)"
 msgstr ""
 
@@ -6939,71 +6979,71 @@ msgstr ""
 msgid "Pre-Emphasis"
 msgstr "Przed naciskiem"
 
-#: location_ui.cc:310
+#: location_ui.cc:314
 #, fuzzy
 msgid "Remove this range"
 msgstr "ustaw zakres przełącznika"
 
-#: location_ui.cc:311
+#: location_ui.cc:315
 msgid "Start time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:312
+#: location_ui.cc:316
 msgid "End time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:315
+#: location_ui.cc:319
 #, fuzzy
 msgid "Set range start from playhead location"
 msgstr "Przenieś znacznik zakresu do głowicy"
 
-#: location_ui.cc:316
+#: location_ui.cc:320
 #, fuzzy
 msgid "Set range end from playhead location"
 msgstr "Ustaw zakres według zaznaczenia"
 
-#: location_ui.cc:320
+#: location_ui.cc:324
 #, fuzzy
 msgid "Remove this marker"
 msgstr "przesuń znacznik"
 
-#: location_ui.cc:321
+#: location_ui.cc:325
 msgid "Position - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:323
+#: location_ui.cc:327
 #, fuzzy
 msgid "Set marker time from playhead location"
 msgstr "Ustaw zakres według zaznaczenia"
 
-#: location_ui.cc:462
+#: location_ui.cc:494
 msgid "You cannot put a CD marker at the start of the session"
 msgstr ""
 
-#: location_ui.cc:708
+#: location_ui.cc:720
 #, fuzzy
 msgid "New Marker"
 msgstr "Znacznik"
 
-#: location_ui.cc:709
+#: location_ui.cc:721
 #, fuzzy
 msgid "New Range"
 msgstr "Dodaj nowy zakres"
 
-#: location_ui.cc:722
+#: location_ui.cc:734
 #, fuzzy
 msgid "<b>Loop/Punch Ranges</b>"
 msgstr "Zakresy pętli/przełącznika"
 
-#: location_ui.cc:747
+#: location_ui.cc:759
 msgid "<b>Markers (Including CD Index)</b>"
 msgstr ""
 
-#: location_ui.cc:782
+#: location_ui.cc:794
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
 msgstr ""
 
-#: location_ui.cc:1024
+#: location_ui.cc:1036
 msgid "add range marker"
 msgstr "dodaj znacznik zakresu"
 
@@ -7079,20 +7119,20 @@ msgid ""
 "session at this time, because we would lose your connection information.\n"
 msgstr ""
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr " (skompilowany przy użyciu "
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr " oraz GCC w wesji "
 
-#: main.cc:504
+#: main.cc:500
 #, fuzzy
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr "Copyright (C) 1999-2008 Paul Davis"
 
-#: main.cc:505
+#: main.cc:501
 #, fuzzy
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
@@ -7101,29 +7141,34 @@ msgstr ""
 "Prawa autorskie do niektórych fragmentów (C) Steve Harris, Ari Johnson, "
 "Brett Viren, Joel Baker"
 
-#: main.cc:507
+#: main.cc:503
 #, fuzzy
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr "Na program Ardour nie udziela się ABSOLUTNIE ŻADNEJ GWARANCJI"
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "To jest oprogramowanie darmowe i możesz je rozpowszechniać"
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr ""
 "na ściśle określonych zasadach; zobacz plik COPYING by dowiedzieć się więcej."
 
-#: main.cc:519
+#: main.cc:513
+#, fuzzy
+msgid "could not initialize %1."
+msgstr "Nie można dokonać inicjalizacji programu."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr ""
 
-#: main.cc:525
+#: main.cc:528
 #, fuzzy
 msgid "could not create %1 GUI"
 msgstr "Nie można utworzyć Ardour GUI"
@@ -7133,7 +7178,7 @@ msgstr "Nie można utworzyć Ardour GUI"
 msgid "Display delta to edit cursor"
 msgstr "Zegar podstawowy wyświetla odstęp od wskaźnika"
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 msgid "MarkerText"
 msgstr "Tekst znacznika"
 
@@ -7672,7 +7717,7 @@ msgstr ""
 msgid "Missing Plugins"
 msgstr "Wtyczki"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr "OK"
 
@@ -7751,239 +7796,252 @@ msgstr ""
 msgid "Could not find mixer.bindings in search path %1"
 msgstr ""
 
-#: mixer_strip.cc:91 mixer_strip.cc:119 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr "przed"
 
-#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:352 mixer_strip.cc:1293
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 #, fuzzy
 msgid "Comments"
 msgstr "Komentarze"
 
-#: mixer_strip.cc:145
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr ""
 
-#: mixer_strip.cc:147
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
 msgstr ""
 
-#: mixer_strip.cc:154
+#: mixer_strip.cc:156
 msgid "Hide this mixer strip"
 msgstr ""
 
-#: mixer_strip.cc:165
+#: mixer_strip.cc:167
 #, fuzzy
 msgid "Click to select metering point"
 msgstr "Wszystko za punktem edycji"
 
-#: mixer_strip.cc:171
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr ""
 
-#: mixer_strip.cc:190
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr ""
 
-#: mixer_strip.cc:199
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr ""
 
-#: mixer_strip.cc:201 mixer_strip.cc:1929
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 #, fuzzy
 msgid "lock"
 msgstr "Zegar"
 
-#: mixer_strip.cc:202 mixer_strip.cc:1928
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 msgid "iso"
 msgstr ""
 
-#: mixer_strip.cc:256
+#: mixer_strip.cc:258
 #, fuzzy
 msgid "Mix group"
 msgstr "Brak grupy"
 
-#: mixer_strip.cc:349 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 msgid "Phase Invert"
 msgstr ""
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 #, fuzzy
 msgid "Solo Safe"
 msgstr "Bezpieczne solo"
 
-#: mixer_strip.cc:353 mixer_ui.cc:124 route_time_axis.cc:664
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 msgid "Group"
 msgstr "Grupa"
 
-#: mixer_strip.cc:354 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 #, fuzzy
 msgid "Meter Point"
 msgstr "Ustawienia metrum"
 
-#: mixer_strip.cc:466
+#: mixer_strip.cc:470
 #, fuzzy
 msgid "Enable/Disable MIDI input"
 msgstr "Włącz/wyłącz metronom"
 
-#: mixer_strip.cc:616
+#: mixer_strip.cc:622
 #, fuzzy
 msgid ""
 "Aux\n"
 "Sends"
 msgstr "Wysyłanie MTC"
 
-#: mixer_strip.cc:640
+#: mixer_strip.cc:646
 #, fuzzy
 msgid "Snd"
 msgstr "Sekundy"
 
-#: mixer_strip.cc:694 mixer_strip.cc:822 processor_box.cc:2152
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr ""
 
-#: mixer_strip.cc:1089
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr ""
 
-#: mixer_strip.cc:1092
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr ""
 
-#: mixer_strip.cc:1167
+#: mixer_strip.cc:1174
 #, fuzzy
 msgid "Disconnected"
 msgstr "rozłączono"
 
-#: mixer_strip.cc:1296
+#: mixer_strip.cc:1303
 msgid "*Comments*"
 msgstr "*Komentarze*"
 
-#: mixer_strip.cc:1303
+#: mixer_strip.cc:1310
 #, fuzzy
 msgid "Cmt"
 msgstr "Wytnij"
 
-#: mixer_strip.cc:1306
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr ""
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr "Kliknij by dodać/edytować komentarze"
 
-#: mixer_strip.cc:1351
+#: mixer_strip.cc:1358
 msgid ": comment editor"
 msgstr ": edytor komentarzy"
 
-#: mixer_strip.cc:1428
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr ""
 
-#: mixer_strip.cc:1431
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr ""
 
-#: mixer_strip.cc:1460
+#: mixer_strip.cc:1467
 #, fuzzy
 msgid "Comments..."
 msgstr "Komentarze"
 
-#: mixer_strip.cc:1462
+#: mixer_strip.cc:1469
 #, fuzzy
 msgid "Save As Template..."
 msgstr "Zapisz szablon"
 
-#: mixer_strip.cc:1468 route_group_dialog.cc:39 route_time_axis.cc:687
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr "Aktywne"
 
-#: mixer_strip.cc:1475
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr ""
 
-#: mixer_strip.cc:1478
+#: mixer_strip.cc:1485
 #, fuzzy
 msgid "Protect Against Denormals"
 msgstr "Chroń przed liczbami zdenormalizowanymi"
 
-#: mixer_strip.cc:1484 route_time_axis.cc:426
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 #, fuzzy
 msgid "Remote Control ID..."
 msgstr "ID zdalnego sterowania"
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 #, fuzzy
 msgid "in"
 msgstr "Wzmocnienie"
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 msgid "post"
 msgstr "za"
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 #, fuzzy
 msgid "out"
 msgstr "O programie"
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr ""
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 #, fuzzy
 msgid "pr"
 msgstr "przed"
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 #, fuzzy
 msgid "po"
 msgstr "L"
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 #, fuzzy
 msgid "o"
 msgstr "Mono"
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr ""
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr ""
 
-#: mixer_strip.cc:1920 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr ""
 
-#: mixer_strip.cc:1923 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr ""
 
-#: mixer_strip.cc:1936
+#: mixer_strip.cc:1933
 #, fuzzy
 msgid "D"
 msgstr "CD"
 
-#: mixer_strip.cc:1959
+#: mixer_strip.cc:1953
 #, fuzzy
 msgid "i"
 msgstr "Wzmocnienie"
 
-#: mixer_strip.cc:2133
+#: mixer_strip.cc:2128
 #, fuzzy
 msgid "Pre-fader"
 msgstr "Przed potencjometrem"
 
-#: mixer_strip.cc:2134
+#: mixer_strip.cc:2129
 #, fuzzy
 msgid "Post-fader"
 msgstr "Za potencjometrem"
 
+#: mixer_strip.cc:2166 meter_strip.cc:728
+msgid "Change all in Group to %1"
+msgstr ""
+
+#: mixer_strip.cc:2168 meter_strip.cc:730
+#, fuzzy
+msgid "Change all to %1"
+msgstr "Kanały"
+
+#: mixer_strip.cc:2170 meter_strip.cc:732
+msgid "Change same track-type to %1"
+msgstr ""
+
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr ""
@@ -7992,10 +8050,68 @@ msgstr ""
 msgid "-all-"
 msgstr "-wszystko-"
 
-#: mixer_ui.cc:1792
+#: mixer_ui.cc:1794
 msgid "Strips"
 msgstr "Pas"
 
+#: meter_strip.cc:764
+#, fuzzy
+msgid "Variable height"
+msgstr "wysokość"
+
+#: meter_strip.cc:765
+#, fuzzy
+msgid "Short"
+msgstr "Krótko"
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr ""
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr ""
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+msgid "VU"
+msgstr ""
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr ""
@@ -8383,7 +8499,7 @@ msgstr ""
 msgid "Panner (2D)"
 msgstr ""
 
-#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:452
+#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:451
 msgid "Bypass"
 msgstr "Pomiń"
 
@@ -8566,7 +8682,7 @@ msgstr "Kategoria"
 msgid "Eh? LADSPA plugins don't have editors!"
 msgstr ""
 
-#: plugin_ui.cc:125 plugin_ui.cc:228
+#: plugin_ui.cc:125 plugin_ui.cc:227
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
 "version of %1)"
@@ -8576,64 +8692,64 @@ msgstr ""
 msgid "unknown type of editor-supplying plugin"
 msgstr ""
 
-#: plugin_ui.cc:258
+#: plugin_ui.cc:257
 msgid ""
 "unknown type of editor-supplying plugin (note: no linuxVST support in this "
 "version of %1)"
 msgstr ""
 
-#: plugin_ui.cc:330
+#: plugin_ui.cc:329
 msgid "create_lv2_editor called on non-LV2 plugin"
 msgstr ""
 
-#: plugin_ui.cc:418
+#: plugin_ui.cc:417
 msgid "Add"
 msgstr "Dodaj"
 
-#: plugin_ui.cc:422
+#: plugin_ui.cc:421
 #, fuzzy
 msgid "Description"
 msgstr "Zaznaczenie"
 
-#: plugin_ui.cc:423
+#: plugin_ui.cc:422
 #, fuzzy
 msgid "Plugin analysis"
 msgstr "Wtyczki"
 
-#: plugin_ui.cc:430
+#: plugin_ui.cc:429
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
 msgstr ""
 
-#: plugin_ui.cc:431
+#: plugin_ui.cc:430
 #, fuzzy
 msgid "Save a new preset"
 msgstr "Nazwa zrzutu:"
 
-#: plugin_ui.cc:432
+#: plugin_ui.cc:431
 msgid "Save the current preset"
 msgstr ""
 
-#: plugin_ui.cc:433
+#: plugin_ui.cc:432
 msgid "Delete the current preset"
 msgstr ""
 
-#: plugin_ui.cc:434
+#: plugin_ui.cc:433
 msgid "Disable signal processing by the plugin"
 msgstr ""
 
-#: plugin_ui.cc:467 plugin_ui.cc:632
+#: plugin_ui.cc:466 plugin_ui.cc:662
 msgid ""
 "Click to allow the plugin to receive keyboard events that %1 would normally "
 "use as a shortcut"
 msgstr ""
 
-#: plugin_ui.cc:468
+#: plugin_ui.cc:467
 msgid "Click to enable/disable this plugin"
 msgstr ""
 
-#: plugin_ui.cc:507
+#: plugin_ui.cc:506
 #, fuzzy
 msgid "latency (%1 sample)"
 msgid_plural "latency (%1 samples)"
@@ -8641,21 +8757,33 @@ msgstr[0] "Opóźnienie"
 msgstr[1] "Opóźnienie"
 msgstr[2] "Opóźnienie"
 
-#: plugin_ui.cc:509
+#: plugin_ui.cc:508
 #, fuzzy
 msgid "latency (%1 ms)"
 msgstr "Opóźnienie"
 
-#: plugin_ui.cc:520
+#: plugin_ui.cc:519
 #, fuzzy
 msgid "Edit Latency"
 msgstr "Opóźnienie"
 
-#: plugin_ui.cc:559
+#: plugin_ui.cc:558
 msgid "Plugin preset %1 not found"
 msgstr ""
 
-#: plugin_ui.cc:639
+#: plugin_ui.cc:595
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin_ui.cc:615 plugin_ui.cc:630
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"newer version"
+msgstr ""
+
+#: plugin_ui.cc:669
 msgid "Click to allow normal use of %1 keyboard shortcuts"
 msgstr ""
 
@@ -8770,79 +8898,80 @@ msgstr ""
 msgid "Port Insert "
 msgstr "Nazwa portu"
 
-#: port_matrix.cc:323 port_matrix.cc:342
+#: port_matrix.cc:331 port_matrix.cc:357
 #, fuzzy
 msgid "<b>Sources</b>"
 msgstr "<b>Szyny</b>"
 
-#: port_matrix.cc:324 port_matrix.cc:343
+#: port_matrix.cc:332 port_matrix.cc:358
 #, fuzzy
 msgid "<b>Destinations</b>"
 msgstr "<b>Wejścia</b>"
 
-#: port_matrix.cc:419 port_matrix.cc:427
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr ""
 
-#: port_matrix.cc:435
+#: port_matrix.cc:456
 #, fuzzy, c-format
 msgid "Rename '%s'..."
 msgstr "Zmień nazwę"
 
-#: port_matrix.cc:451
+#: port_matrix.cc:472
 #, fuzzy
 msgid "Remove all"
 msgstr "Usuń znak"
 
-#: port_matrix.cc:471 port_matrix.cc:483
+#: port_matrix.cc:492 port_matrix.cc:504
 #, fuzzy, c-format
 msgid "%s all"
 msgstr "Resetuj wszystko"
 
-#: port_matrix.cc:506
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr "Skanuj ponownie"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr ""
 
-#: port_matrix.cc:514
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr ""
 
-#: port_matrix.cc:702
+#: port_matrix.cc:723
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
 "or buss cannot support the new configuration."
 msgstr ""
 
-#: port_matrix.cc:705
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr ""
 
-#: port_matrix.cc:727
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr ""
 
-#: port_matrix.cc:728
+#: port_matrix.cc:749
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
 
-#: port_matrix.cc:945
+#: port_matrix.cc:966
 #, fuzzy, c-format
 msgid "Remove '%s'"
 msgstr "Usuń"
 
-#: port_matrix.cc:960
+#: port_matrix.cc:981
 #, c-format
 msgid "%s all from '%s'"
 msgstr ""
 
-#: port_matrix.cc:1026
+#: port_matrix.cc:1047
 #, fuzzy
 msgid "channel"
 msgstr " "
@@ -8857,59 +8986,59 @@ msgstr "Nie ma więcej dostępnych portów JACK."
 msgid "There are no %1 ports to connect."
 msgstr "Nie ma więcej dostępnych portów JACK."
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
 "Alt+double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 #, fuzzy
 msgid "Show All Controls"
 msgstr "Wyświetl ustawienia wysyłu"
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 #, fuzzy
 msgid "Hide All Controls"
 msgstr "Ukryj wszystkie przejścia krzyżowe"
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 #, fuzzy
 msgid "on"
 msgstr "Mono"
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr "wył"
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
 msgstr ""
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 msgid "Plugin Incompatibility"
 msgstr ""
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr ""
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
 msgstr ""
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 #, fuzzy
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
@@ -8917,7 +9046,7 @@ msgstr[0] "%1 wejście"
 msgstr[1] "%1 wejście"
 msgstr[2] "%1 wejście"
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 #, fuzzy
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
@@ -8925,13 +9054,13 @@ msgstr[0] "%1 wejście"
 msgstr[1] "%1 wejście"
 msgstr[2] "%1 wejście"
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
 msgstr ""
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 #, fuzzy
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
@@ -8939,7 +9068,7 @@ msgstr[0] "Kanały wejściowe"
 msgstr[1] "Kanały wejściowe"
 msgstr[2] "Kanały wejściowe"
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 #, fuzzy
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
@@ -8947,44 +9076,44 @@ msgstr[0] "Kanały wejściowe"
 msgstr[1] "Kanały wejściowe"
 msgstr[2] "Kanały wejściowe"
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
 msgstr ""
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 msgid "Cannot set up new send: %1"
 msgstr ""
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
 "in that way because the inputs and\n"
 "outputs will not work correctly."
 msgstr ""
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 #, fuzzy
 msgid "Rename Processor"
 msgstr "Zmień nazwę ścieżki"
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr ""
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr ""
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
 "could not match the configuration of this track."
 msgstr ""
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 #, fuzzy
 msgid ""
 "Do you really want to remove all processors from %1?\n"
@@ -8993,16 +9122,16 @@ msgstr ""
 "Na pewno usunąć wszystkie przekierowania przed potencjometrem z tej szyny?\n"
 "(tej operacji nie można cofnąć)"
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 msgid "Yes, remove them all"
 msgstr "Tak, usuń je wszystkie"
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 #, fuzzy
 msgid "Remove processors"
 msgstr "Usuń znacznik"
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 #, fuzzy
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
@@ -9011,7 +9140,7 @@ msgstr ""
 "Na pewno usunąć wszystkie przekierowania przed potencjometrem z tej szyny?\n"
 "(tej operacji nie można cofnąć)"
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 #, fuzzy
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
@@ -9020,59 +9149,59 @@ msgstr ""
 "Na pewno sunąć wszystkie przekierowania za potencjometrem z tej szyny?\n"
 "(tej operacji nie można cofnąć)"
 
-#: processor_box.cc:2198
+#: processor_box.cc:2200
 #, fuzzy
 msgid "New Plugin"
 msgstr "Nowa wtyczka..."
 
-#: processor_box.cc:2201
+#: processor_box.cc:2203
 msgid "New Insert"
 msgstr "Nowy przysył"
 
-#: processor_box.cc:2204
+#: processor_box.cc:2206
 #, fuzzy
 msgid "New External Send ..."
 msgstr "Nowy wysył..."
 
-#: processor_box.cc:2208
+#: processor_box.cc:2210
 #, fuzzy
 msgid "New Aux Send ..."
 msgstr "Nowy wysył..."
 
-#: processor_box.cc:2212
+#: processor_box.cc:2214
 #, fuzzy
 msgid "Clear (all)"
 msgstr "Wyczyść wszystkie zakresy"
 
-#: processor_box.cc:2214
+#: processor_box.cc:2216
 #, fuzzy
 msgid "Clear (pre-fader)"
 msgstr "Wyczyść metrum"
 
-#: processor_box.cc:2216
+#: processor_box.cc:2218
 #, fuzzy
 msgid "Clear (post-fader)"
 msgstr "Wyczyść metrum"
 
-#: processor_box.cc:2242
+#: processor_box.cc:2244
 msgid "Activate All"
 msgstr "WÅ‚Ä…cz wszystko"
 
-#: processor_box.cc:2244
+#: processor_box.cc:2246
 #, fuzzy
 msgid "Deactivate All"
 msgstr "Wyłącz wszystko"
 
-#: processor_box.cc:2246
+#: processor_box.cc:2248
 #, fuzzy
 msgid "A/B Plugins"
 msgstr "Wtyczki"
 
-#: processor_box.cc:2255
+#: processor_box.cc:2257
 msgid "Edit with generic controls..."
 msgstr ""
 
-#: processor_box.cc:2531
+#: processor_box.cc:2557
 msgid "%1: %2 (by %3)"
 msgstr ""
 
@@ -9250,7 +9379,7 @@ msgstr ""
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
 
 #: rc_option_editor.cc:836
@@ -9346,7 +9475,7 @@ msgstr ""
 msgid "Click gain level"
 msgstr "Plik dźwiękowy uderzenia"
 
-#: rc_option_editor.cc:1083 route_time_axis.cc:206 route_time_axis.cc:667
+#: rc_option_editor.cc:1083 route_time_axis.cc:215 route_time_axis.cc:676
 msgid "Automation"
 msgstr "Automatyka"
 
@@ -9535,101 +9664,105 @@ msgstr ""
 msgid "Show meters on tracks in the editor"
 msgstr ""
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr ""
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr ""
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 msgid "whenever they overlap in time"
 msgstr ""
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr ""
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr ""
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 #, fuzzy
 msgid "Show waveforms in regions"
 msgstr "Wyświetl obszary automatyczne"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 #, fuzzy
 msgid "Show gain envelopes in audio regions"
 msgstr "Wyświetl obszary automatyczne"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr ""
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr ""
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 #, fuzzy
 msgid "Waveform scale"
 msgstr "Wykres fali"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "linearna"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 #, fuzzy
 msgid "logarithmic"
 msgstr "Logarytmiczny"
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 #, fuzzy
 msgid "Waveform shape"
 msgstr "Wykres fali"
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 #, fuzzy
 msgid "traditional"
 msgstr "Tradycyjny"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 #, fuzzy
 msgid "rectified"
 msgstr "Poprawiony"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr ""
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr ""
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr ""
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr ""
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 #, fuzzy
 msgid "Synchronise editor and mixer track order"
 msgstr "Synchronizacja kolejności ścieżek miksera i edytora"
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 #, fuzzy
 msgid "Synchronise editor and mixer selection"
 msgstr "Synchronizacja kolejności ścieżek miksera i edytora"
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 #, fuzzy
 msgid "Name new markers"
 msgstr "Dodaj nowy znacznik"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9637,380 +9770,460 @@ msgid ""
 "You can always rename markers by right-clicking on them"
 msgstr ""
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr ""
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 #, fuzzy
 msgid "Buffering"
 msgstr "Rozmiar bufora"
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 #, fuzzy
 msgid "Record monitoring handled by"
 msgstr "Monitorowanie"
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 #, fuzzy
 msgid "ardour"
 msgstr "ardour: "
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 #, fuzzy
 msgid "audio hardware"
 msgstr "Klatki audio"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 #, fuzzy
 msgid "Tape machine mode"
 msgstr "Tryb taśmowy"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr ""
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 #, fuzzy
 msgid "Auto-connect master/monitor busses"
 msgstr "�ącz wyjścia z główną szyną automatycznie"
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 #, fuzzy
 msgid "Connect track inputs"
 msgstr "Połączenia"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 #, fuzzy
 msgid "automatically to physical inputs"
 msgstr "Automatyczne łączenie do wejść fizycznych"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 #, fuzzy
 msgid "manually"
 msgstr "Ręcznie"
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 msgid "Connect track and bus outputs"
 msgstr ""
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 #, fuzzy
 msgid "automatically to physical outputs"
 msgstr "Automatyczne łączenie do wejść fizycznych"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 #, fuzzy
 msgid "automatically to master bus"
 msgstr "Automatyczne łączenie wyjść"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 #, fuzzy
 msgid "Denormals"
 msgstr "Cofnij normalizacjÄ™"
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 #, fuzzy
 msgid "Use DC bias to protect against denormals"
 msgstr "Chroń przed liczbami zdenormalizowanymi"
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 #, fuzzy
 msgid "Processor handling"
 msgstr "Nieobsługiwane przez procesor"
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 #, fuzzy
 msgid "no processor handling"
 msgstr "Nieobsługiwane przez procesor"
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 #, fuzzy
 msgid "use FlushToZero"
 msgstr "Użyj FlushToZero"
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 #, fuzzy
 msgid "use DenormalsAreZero"
 msgstr "Użyj DenormalsAreZero"
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 #, fuzzy
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr "Użyj FlushToZero & DenormalsAreZero"
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 #, fuzzy
 msgid "Silence plugins when the transport is stopped"
 msgstr "Zatrzymanie wtyczek przy zakończeniu nagrywania/odtwarzania"
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 #, fuzzy
 msgid "Make new plugins active"
 msgstr "włącz stopniowe wzmocnienie"
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr ""
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 msgid "Replicate missing region channels"
 msgstr ""
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 msgid "Solo / mute"
 msgstr ""
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 msgid "Solo-in-place mute cut (dB)"
 msgstr ""
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr ""
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 #, fuzzy
 msgid "Listen Position"
 msgstr "Pozycja"
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 #, fuzzy
 msgid "after-fader (AFL)"
 msgstr "Stefan Kersten"
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 #, fuzzy
 msgid "pre-fader (PFL)"
 msgstr "Przekierowania przed potencjometrem"
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr ""
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 #, fuzzy
 msgid "before pre-fader processors"
 msgstr "Usuń znacznik"
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr ""
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr ""
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 #, fuzzy
 msgid "immediately post-fader"
 msgstr "Wyczyść metrum"
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 #, fuzzy
 msgid "after post-fader processors (before pan)"
 msgstr "Usuń znacznik"
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr ""
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 msgid "Show solo muting"
 msgstr "Wyświetlanie wyciszania solo"
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr ""
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 msgid "Default track / bus muting options"
 msgstr ""
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr ""
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr ""
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 #, fuzzy
 msgid "Mute affects control outputs"
 msgstr "�ącz wyjścia ręcznie"
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr ""
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 #, fuzzy
 msgid "Send MIDI Time Code"
 msgstr "Sprzężenie zwrotne MIDI"
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr ""
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr ""
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 #, fuzzy
 msgid "Send MIDI control feedback"
 msgstr "Sprzężenie zwrotne MIDI"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 #, fuzzy
 msgid "Inbound MMC device ID"
 msgstr "ID przychodzącego sygnału MMC"
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 #, fuzzy
 msgid "Outbound MMC device ID"
 msgstr "ID wychodzącego sygnału MMC"
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr ""
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr ""
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr ""
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 msgid "Sound MIDI notes as they are selected"
 msgstr ""
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 #, fuzzy
 msgid "User interaction"
 msgstr "Operacje na obszarach"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
 "   <i>(if available for your language preferences)</i>"
 msgstr ""
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 #, fuzzy
 msgid "Keyboard"
 msgstr "Układ klawiatury"
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 #, fuzzy
 msgid "Control surface remote ID"
 msgstr "UrzÄ…dzenia sterujÄ…ce"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 #, fuzzy
 msgid "assigned by user"
 msgstr "ID urządzenia zdalnego przydzielone ręcznie"
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 #, fuzzy
 msgid "follows order of mixer"
 msgstr "ID urządzenia zdalnego zgodne z kolejnością miksera"
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 #, fuzzy
 msgid "follows order of editor"
 msgstr "ID urządzenia zdalnego zgodne z kolejnością edytora"
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1925
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 #, fuzzy
 msgid "Preferences|GUI"
 msgstr "Preferencje"
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr ""
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr ""
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr ""
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 #, fuzzy
 msgid "Mixer Strip"
 msgstr "Mikser"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 msgid "Use narrow strips in the mixer by default"
 msgstr ""
 
-#: rc_option_editor.cc:1898
+#: rc_option_editor.cc:1906
 #, fuzzy
-msgid "Meter hold time"
+msgid "Peak hold time"
 msgstr "Przytrzymanie metrum"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 #, fuzzy
 msgid "short"
 msgstr "Krótko"
 
-#: rc_option_editor.cc:1905 rc_option_editor.cc:1920
+#: rc_option_editor.cc:1913
 #, fuzzy
 msgid "medium"
 msgstr "Åšrednio"
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr ""
 
-#: rc_option_editor.cc:1912
+#: rc_option_editor.cc:1920
 #, fuzzy
-msgid "Meter fall-off"
+msgid "DPM fall-off"
 msgstr "Zmniejszanie metrum"
 
-#: rc_option_editor.cc:1918
-#, fuzzy
-msgid "slowest"
-msgstr "Najwolniej"
+#: rc_option_editor.cc:1926
+msgid "slowest [6.6dB/sec]"
+msgstr ""
 
-#: rc_option_editor.cc:1919
-msgid "slow"
+#: rc_option_editor.cc:1927
+msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
 msgstr ""
 
-#: rc_option_editor.cc:1921
-#, fuzzy
-msgid "fast"
-msgstr "najszybsza"
+#: rc_option_editor.cc:1928
+msgid "slowish [12.0dB/sec] (DIN)"
+msgstr ""
 
-#: rc_option_editor.cc:1922
+#: rc_option_editor.cc:1929
+msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
+msgstr ""
+
+#: rc_option_editor.cc:1930
+msgid "medium [20dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1931
+msgid "fast [32dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1932
+msgid "faster [46dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1933
+msgid "fastest [70dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1939
+msgid "Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
+
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+msgid "-20dBFS (SMPTE RP.0155)"
+msgstr ""
+
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+msgid "-18dBFS (EBU, BBC)"
+msgstr ""
+
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
+
+#: rc_option_editor.cc:1955
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
+msgstr ""
+
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
+msgstr ""
+
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
+msgstr ""
+
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
+
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
+
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1985
 #, fuzzy
-msgid "faster"
-msgstr "Szybciej"
+msgid "Peak threshold [dBFS]"
+msgstr "Wartość progowa"
 
-#: rc_option_editor.cc:1923
-msgid "fastest"
-msgstr "najszybsza"
+#: rc_option_editor.cc:1993
+msgid ""
+"Specify the audio signal level in dbFS at and above which the meter-peak "
+"indicator will flash red."
+msgstr ""
+
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
+msgstr ""
 
 #: region_editor.cc:79
 msgid "audition this region"
@@ -10021,11 +10234,11 @@ msgstr "przesłuchaj ten obszar"
 msgid "Position:"
 msgstr "Pozycja"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr ""
 
-#: region_editor.cc:92 sfdb_ui.cc:140
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr "Długość:"
 
@@ -10051,24 +10264,24 @@ msgstr ""
 msgid "Source:"
 msgstr "Źródło sygnału"
 
-#: region_editor.cc:167
+#: region_editor.cc:166
 #, fuzzy
 msgid "Region '%1'"
 msgstr "Obszar %1"
 
-#: region_editor.cc:274
+#: region_editor.cc:273
 msgid "change region start position"
 msgstr "zmień pozycję początkową obszaru"
 
-#: region_editor.cc:290
+#: region_editor.cc:289
 msgid "change region end position"
 msgstr "zmień pozycję końcową obszaru"
 
-#: region_editor.cc:310
+#: region_editor.cc:309
 msgid "change region length"
 msgstr "zmień długość obszaru"
 
-#: region_editor.cc:404 region_editor.cc:416
+#: region_editor.cc:403 region_editor.cc:415
 #, fuzzy
 msgid "change region sync point"
 msgstr "zmień pozycję końcową obszaru"
@@ -10277,358 +10490,358 @@ msgid ""
 "A route group of this name already exists.  Please use a different name."
 msgstr ""
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 msgid "Tracks/Busses"
 msgstr "Ścieżki/szyny"
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr "Wejścia"
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr "Wyjścia"
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr ""
 
-#: route_params_ui.cc:211
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr ""
 
-#: route_params_ui.cc:258 route_params_ui.cc:286
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr ""
 
-#: route_params_ui.cc:478
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr "BRAK ŚCIEŻKI"
 
-#: route_params_ui.cc:611 route_params_ui.cc:612
+#: route_params_ui.cc:613 route_params_ui.cc:614
 #, fuzzy
 msgid "No Track or Bus Selected"
 msgstr "Brak zaznaczonego szlaku"
 
-#: route_time_axis.cc:96
+#: route_time_axis.cc:97
 msgid "g"
 msgstr "g"
 
-#: route_time_axis.cc:97
+#: route_time_axis.cc:98
 msgid "p"
 msgstr "L"
 
-#: route_time_axis.cc:98
+#: route_time_axis.cc:99
 msgid "a"
 msgstr "a"
 
-#: route_time_axis.cc:168
+#: route_time_axis.cc:173
 msgid "Record (Right-click for Step Edit)"
 msgstr ""
 
-#: route_time_axis.cc:171
+#: route_time_axis.cc:176
 msgid "Record"
 msgstr "Nagrywanie"
 
-#: route_time_axis.cc:201
+#: route_time_axis.cc:210
 #, fuzzy
 msgid "Route Group"
 msgstr "Edycja grupy"
 
-#: route_time_axis.cc:204
+#: route_time_axis.cc:213
 #, fuzzy
 msgid "MIDI Controllers and Automation"
 msgstr "Reguluje automatyzacjÄ™ wzmocnienia"
 
-#: route_time_axis.cc:381
+#: route_time_axis.cc:390
 #, fuzzy
 msgid "Show All Automation"
 msgstr "Wyświetl całą automatykę"
 
-#: route_time_axis.cc:384
+#: route_time_axis.cc:393
 #, fuzzy
 msgid "Show Existing Automation"
 msgstr "Wyświetl istniejącą automatykę"
 
-#: route_time_axis.cc:387
+#: route_time_axis.cc:396
 #, fuzzy
 msgid "Hide All Automation"
 msgstr "Ukryj całą automatykę"
 
-#: route_time_axis.cc:396
+#: route_time_axis.cc:405
 #, fuzzy
 msgid "Processor automation"
 msgstr "wyczyść automatyzację"
 
-#: route_time_axis.cc:415
+#: route_time_axis.cc:424
 #, fuzzy
 msgid "Color..."
 msgstr "Kolor"
 
-#: route_time_axis.cc:472
+#: route_time_axis.cc:481
 msgid "Overlaid"
 msgstr ""
 
-#: route_time_axis.cc:478
+#: route_time_axis.cc:487
 msgid "Stacked"
 msgstr ""
 
-#: route_time_axis.cc:486
+#: route_time_axis.cc:495
 #, fuzzy
 msgid "Layers"
 msgstr "Warstwy"
 
-#: route_time_axis.cc:555
+#: route_time_axis.cc:564
 #, fuzzy
 msgid "Automatic (based on I/O connections)"
 msgstr "Automatyczne łączenie wyjść"
 
-#: route_time_axis.cc:564
+#: route_time_axis.cc:573
 #, fuzzy
 msgid "(Currently: Existing Material)"
 msgstr "Do istniejącego materiału"
 
-#: route_time_axis.cc:567
+#: route_time_axis.cc:576
 #, fuzzy
 msgid "(Currently: Capture Time)"
 msgstr "Z czasem nagrania"
 
-#: route_time_axis.cc:575
+#: route_time_axis.cc:584
 #, fuzzy
 msgid "Align With Existing Material"
 msgstr "Do istniejącego materiału"
 
-#: route_time_axis.cc:580
+#: route_time_axis.cc:589
 #, fuzzy
 msgid "Align With Capture Time"
 msgstr "Z czasem nagrania"
 
-#: route_time_axis.cc:585
+#: route_time_axis.cc:594
 msgid "Alignment"
 msgstr "Wyrównanie"
 
-#: route_time_axis.cc:620
+#: route_time_axis.cc:629
 #, fuzzy
 msgid "Normal Mode"
 msgstr "Tryb standardowy"
 
-#: route_time_axis.cc:626
+#: route_time_axis.cc:635
 #, fuzzy
 msgid "Tape Mode"
 msgstr "Tryb taśmowy"
 
-#: route_time_axis.cc:632
+#: route_time_axis.cc:641
 #, fuzzy
 msgid "Non-Layered Mode"
 msgstr "Tryb przyciÄ…gania"
 
-#: route_time_axis.cc:645 route_time_axis.cc:1587
+#: route_time_axis.cc:654 route_time_axis.cc:1601
 msgid "Playlist"
 msgstr "Lista odtwarzania"
 
-#: route_time_axis.cc:965
+#: route_time_axis.cc:979
 #, fuzzy
 msgid "Rename Playlist"
 msgstr "Nazwa listy odtwarzania"
 
-#: route_time_axis.cc:966
+#: route_time_axis.cc:980
 #, fuzzy
 msgid "New name for playlist:"
 msgstr "Nazwa listy odtwarzania"
 
-#: route_time_axis.cc:1051
+#: route_time_axis.cc:1065
 #, fuzzy
 msgid "New Copy Playlist"
 msgstr "Nazwa listy odtwarzania"
 
-#: route_time_axis.cc:1052 route_time_axis.cc:1105
+#: route_time_axis.cc:1066 route_time_axis.cc:1119
 #, fuzzy
 msgid "Name for new playlist:"
 msgstr "Nazwa listy odtwarzania"
 
-#: route_time_axis.cc:1104
+#: route_time_axis.cc:1118
 #, fuzzy
 msgid "New Playlist"
 msgstr "Lista odtwarzania"
 
-#: route_time_axis.cc:1295
+#: route_time_axis.cc:1309
 msgid "You cannot create a track with that name as it is reserved for %1"
 msgstr ""
 
-#: route_time_axis.cc:1476
+#: route_time_axis.cc:1490
 #, fuzzy
 msgid "New Copy..."
 msgstr "Nowa kopia"
 
-#: route_time_axis.cc:1480
+#: route_time_axis.cc:1494
 #, fuzzy
 msgid "New Take"
 msgstr "Nowe tempo"
 
-#: route_time_axis.cc:1481
+#: route_time_axis.cc:1495
 #, fuzzy
 msgid "Copy Take"
 msgstr "Skopiuj"
 
-#: route_time_axis.cc:1486
+#: route_time_axis.cc:1500
 msgid "Clear Current"
 msgstr "Wyczyść aktualną"
 
-#: route_time_axis.cc:1489
+#: route_time_axis.cc:1503
 #, fuzzy
 msgid "Select From All..."
 msgstr "Wybierz spośród wszystkich..."
 
-#: route_time_axis.cc:1577
+#: route_time_axis.cc:1591
 msgid "Take: %1.%2"
 msgstr ""
 
-#: route_time_axis.cc:2267
+#: route_time_axis.cc:2291
 msgid "Underlays"
 msgstr ""
 
-#: route_time_axis.cc:2270
+#: route_time_axis.cc:2294
 #, fuzzy
 msgid "Remove \"%1\""
 msgstr "Usuń"
 
-#: route_time_axis.cc:2320 route_time_axis.cc:2357
+#: route_time_axis.cc:2344 route_time_axis.cc:2381
 msgid "programming error: underlay reference pointer pairs are inconsistent!"
 msgstr ""
 
-#: route_time_axis.cc:2388
+#: route_time_axis.cc:2408
 #, fuzzy
 msgid "After-fade listen (AFL)"
 msgstr "Stefan Kersten"
 
-#: route_time_axis.cc:2392
+#: route_time_axis.cc:2412
 #, fuzzy
 msgid "Pre-fade listen (PFL)"
 msgstr "Przekierowania przed potencjometrem"
 
-#: route_time_axis.cc:2396
+#: route_time_axis.cc:2416
 msgid "s"
 msgstr "s"
 
-#: route_time_axis.cc:2400
+#: route_time_axis.cc:2419
 msgid "m"
 msgstr "w"
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 #, fuzzy
 msgid "Mute this track"
 msgstr "Ukryj tę ścieżkę"
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr ""
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr ""
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr ""
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 #, fuzzy
 msgid "Monitor input"
 msgstr "Monitorowanie"
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 #, fuzzy
 msgid "Monitor playback"
 msgstr "Zatrzymaj odtwarzanie"
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 msgid "Not connected to JACK - cannot engage record"
 msgstr "Brak połączenia z JACK - nie można rozpocząć nagrywania"
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 #, fuzzy
 msgid "Step Entry"
 msgstr "Ustawianie edytora"
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr ""
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 #, fuzzy
 msgid "Assign all tracks and buses (prefader)"
 msgstr "do zaznaczonych ścieżek"
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr ""
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 #, fuzzy
 msgid "Assign all tracks and buses (postfader)"
 msgstr "do zaznaczonych ścieżek"
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 #, fuzzy
 msgid "Assign selected tracks (prefader)"
 msgstr "do zaznaczonych ścieżek"
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 #, fuzzy
 msgid "Assign selected tracks and buses (prefader)"
 msgstr "do zaznaczonych ścieżek"
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 #, fuzzy
 msgid "Assign selected tracks (postfader)"
 msgstr "do zaznaczonych ścieżek"
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 #, fuzzy
 msgid "Assign selected tracks and buses (postfader)"
 msgstr "do zaznaczonych ścieżek"
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 #, fuzzy
 msgid "Copy track/bus gains to sends"
 msgstr "Skopiuj pliki do sesji"
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr ""
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr ""
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 #, fuzzy
 msgid "Solo Isolate"
 msgstr "Bezpieczne solo"
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr "Przed potencjometrem"
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr "Za potencjometrem"
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr ""
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr "Główne wyjścia"
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 #, fuzzy
 msgid "Color Selection"
 msgstr "Odtwórz zaznaczenie"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 #, fuzzy
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
@@ -10642,7 +10855,7 @@ msgstr ""
 "Można również utracić listę odtwarzania używaną przez tę ścieżkę.\n"
 "(tej operacji nie można cofnąć)"
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 #, fuzzy
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
@@ -10654,69 +10867,69 @@ msgstr ""
 "Można również utracić listę odtwarzania używaną przez tę ścieżkę.\n"
 "(tej operacji nie można cofnąć)"
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 #, fuzzy
 msgid "Remove track"
 msgstr "Usuń znak"
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 #, fuzzy
 msgid "Remove bus"
 msgstr "Usuń"
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
 msgstr ""
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 #, fuzzy
 msgid "Use the new name"
 msgstr "nazwa:"
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 msgid "Re-edit the name"
 msgstr ""
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 msgid "Rename Track"
 msgstr "Zmień nazwę ścieżki"
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 #, fuzzy
 msgid "Rename Bus"
 msgstr "Zmień nazwę"
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 #, fuzzy
 msgid " latency"
 msgstr "Opóźnienie"
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr ""
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 #, fuzzy
 msgid "Save As Template"
 msgstr "Zapisz szablon"
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 #, fuzzy
 msgid "Template name:"
 msgstr "Szablon:"
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 msgid "Remote Control ID"
 msgstr "ID zdalnego sterowania"
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 #, fuzzy
 msgid "Remote control ID:"
 msgstr "ID zdalnego sterowania"
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -10724,17 +10937,17 @@ msgid ""
 "The remote control ID of %3 cannot be changed."
 msgstr ""
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the master bus"
 msgstr "Tworzenie głównej szyny"
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the monitor bus"
 msgstr "Tworzenie głównej szyny"
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -10745,23 +10958,23 @@ msgid ""
 "change this%5"
 msgstr ""
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the mixer"
 msgstr "Mikser"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the editor"
 msgstr "edytor"
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
 msgstr ""
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr ""
 
@@ -10779,7 +10992,7 @@ msgstr "Wyczyść wszystkie położenia"
 msgid "the session folder"
 msgstr "Wybieranie pliku sesji"
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 #, fuzzy
 msgid "Send "
 msgstr "Wysyłanie MTC"
@@ -11295,52 +11508,108 @@ msgstr "Przyklejenie do taktów i uderzeń"
 msgid "Glue new regions to bars and beats"
 msgstr "Przyklejenie do taktów i uderzeń"
 
-#: sfdb_ui.cc:87 sfdb_ui.cc:107 sfdb_ui.cc:116
+#: session_option_editor.cc:275 session_option_editor.cc:277
+#: session_option_editor.cc:284 session_option_editor.cc:291
+#: session_option_editor.cc:298 session_option_editor.cc:300
+#: session_option_editor.cc:307 session_option_editor.cc:314
+#: session_option_editor.cc:321 session_option_editor.cc:323
+#, fuzzy
+msgid "Meterbridge"
+msgstr "Ustawienia metrum"
+
+#: session_option_editor.cc:275
+msgid "Route Display"
+msgstr ""
+
+#: session_option_editor.cc:279
+#, fuzzy
+msgid "Show Midi Tracks"
+msgstr "Wyświetl wszystkie ścieżki audio"
+
+#: session_option_editor.cc:286
+#, fuzzy
+msgid "Show Busses"
+msgstr "szyny"
+
+#: session_option_editor.cc:293
+#, fuzzy
+msgid "Include Master Bus"
+msgstr "Tworzenie głównej szyny"
+
+#: session_option_editor.cc:298
+msgid "Button Area"
+msgstr ""
+
+#: session_option_editor.cc:302
+#, fuzzy
+msgid "Rec-enable Button"
+msgstr "zmiana ustawienia nagrywania"
+
+#: session_option_editor.cc:309
+#, fuzzy
+msgid "Mute Button"
+msgstr "i przycisk:"
+
+#: session_option_editor.cc:316
+#, fuzzy
+msgid "Solo Button"
+msgstr "i przycisk:"
+
+#: session_option_editor.cc:321
+msgid "Name Labels"
+msgstr ""
+
+#: session_option_editor.cc:325
+#, fuzzy
+msgid "Track Name"
+msgstr "Ścieżki/szyny"
+
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 msgid "as new tracks"
 msgstr "jako nowe ścieżki"
 
-#: sfdb_ui.cc:89 sfdb_ui.cc:109
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 msgid "to selected tracks"
 msgstr "do zaznaczonych ścieżek"
 
-#: sfdb_ui.cc:91 sfdb_ui.cc:111
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 msgid "to region list"
 msgstr ""
 
-#: sfdb_ui.cc:93 sfdb_ui.cc:113
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 msgid "as new tape tracks"
 msgstr "jako nowe ścieżki taśmowe"
 
-#: sfdb_ui.cc:97
+#: sfdb_ui.cc:96
 msgid "programming error: unknown import mode string %1"
 msgstr ""
 
-#: sfdb_ui.cc:124
+#: sfdb_ui.cc:123
 msgid "Auto-play"
 msgstr "Autoodtwarzanie"
 
-#: sfdb_ui.cc:130 sfdb_ui.cc:237
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 #, fuzzy
 msgid "<b>Sound File Information</b>"
 msgstr "<b>Informacje o pliku dźwiękowym</b>"
 
-#: sfdb_ui.cc:142
+#: sfdb_ui.cc:141
 msgid "Timestamp:"
 msgstr ""
 
-#: sfdb_ui.cc:144
+#: sfdb_ui.cc:143
 msgid "Format:"
 msgstr "Format:"
 
-#: sfdb_ui.cc:183 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr "Etykiety:"
 
-#: sfdb_ui.cc:320
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr ""
 
-#: sfdb_ui.cc:327
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "Nie można odczytać pliku: %1 (%2)."
 
@@ -11370,11 +11639,11 @@ msgstr "Pliki dźwiękowe"
 msgid "MIDI files"
 msgstr "Wszystkie pliki"
 
-#: sfdb_ui.cc:458 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: sfdb_ui.cc:477 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 msgid "Browse Files"
 msgstr "Przeglądanie plików"
 
@@ -11382,245 +11651,231 @@ msgstr "Przeglądanie plików"
 msgid "Paths"
 msgstr "Ścieżki"
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr "Wyszukiwanie etykiet"
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 #, fuzzy
 msgid "Sort:"
 msgstr "Sortuj"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 #, fuzzy
 msgid "Longest"
 msgstr "Największy"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 #, fuzzy
 msgid "Shortest"
 msgstr "Skrót"
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 #, fuzzy
 msgid "Newest"
 msgstr "Najwolniej"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr ""
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr ""
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 #, fuzzy
 msgid "Least downloaded"
 msgstr "Rozpocznij pobieranie"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr ""
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr ""
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr ""
 
-#: sfdb_ui.cc:572
+#: sfdb_ui.cc:555
+msgid "Similar"
+msgstr ""
+
+#: sfdb_ui.cc:567
 #, fuzzy
 msgid "ID"
 msgstr "MIDI"
 
-#: sfdb_ui.cc:573 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 #, fuzzy
 msgid "Filename"
 msgstr "Zmień nazwę"
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:570
 #, fuzzy
 msgid "Duration"
 msgstr "Czas trwania (s)"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:571
 #, fuzzy
 msgid "Size"
 msgstr "Największy rozmiar"
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:572
 #, fuzzy
 msgid "Samplerate"
 msgstr "Częstotliwość próbkowania:"
 
-#: sfdb_ui.cc:578
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr ""
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr ""
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr ""
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr ""
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr ""
 
-#: sfdb_ui.cc:846
-msgid "found %1 match"
-msgid_plural "found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: sfdb_ui.cc:862
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr ""
 
-#: sfdb_ui.cc:960
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: sfdb_ui.cc:965
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr ""
 
-#: sfdb_ui.cc:1029
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr ""
 
-#: sfdb_ui.cc:1031
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr ""
 
-#: sfdb_ui.cc:1033 sfdb_ui.cc:1035
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr ""
 
-#: sfdb_ui.cc:1037
+#: sfdb_ui.cc:1086
 #, fuzzy
 msgid "GB"
 msgstr "Przejdź"
 
-#: sfdb_ui.cc:1070
-msgid "Search returned no results."
-msgstr ""
-
-#: sfdb_ui.cc:1072
-msgid "Found %1 match"
-msgid_plural "Found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: sfdb_ui.cc:1277 sfdb_ui.cc:1585 sfdb_ui.cc:1635 sfdb_ui.cc:1653
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr "jedna ścieżka na plik"
 
-#: sfdb_ui.cc:1280 sfdb_ui.cc:1636 sfdb_ui.cc:1654
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 msgid "one track per channel"
 msgstr "jedna ścieżka na kanał"
 
-#: sfdb_ui.cc:1288 sfdb_ui.cc:1638 sfdb_ui.cc:1655
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 msgid "sequence files"
 msgstr ""
 
-#: sfdb_ui.cc:1291 sfdb_ui.cc:1643
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 #, fuzzy
 msgid "all files in one track"
 msgstr "jako nowe ścieżki"
 
-#: sfdb_ui.cc:1292 sfdb_ui.cc:1637
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 msgid "merge files"
 msgstr "połącz pliki"
 
-#: sfdb_ui.cc:1298 sfdb_ui.cc:1640
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 msgid "one region per file"
 msgstr ""
 
-#: sfdb_ui.cc:1301 sfdb_ui.cc:1641
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 msgid "one region per channel"
 msgstr ""
 
-#: sfdb_ui.cc:1306 sfdb_ui.cc:1642 sfdb_ui.cc:1656
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 msgid "all files in one region"
 msgstr ""
 
-#: sfdb_ui.cc:1373
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
 msgstr ""
 
-#: sfdb_ui.cc:1513
+#: sfdb_ui.cc:1534
 msgid "Copy files to session"
 msgstr "Skopiuj pliki do sesji"
 
-#: sfdb_ui.cc:1530 sfdb_ui.cc:1693
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 #, fuzzy
 msgid "file timestamp"
 msgstr "Według timestamp obszaru"
 
-#: sfdb_ui.cc:1531 sfdb_ui.cc:1695
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 #, fuzzy
 msgid "edit point"
 msgstr "Punkt edycji"
 
-#: sfdb_ui.cc:1532 sfdb_ui.cc:1697
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 #, fuzzy
 msgid "playhead"
 msgstr "GÅ‚owica"
 
-#: sfdb_ui.cc:1533
+#: sfdb_ui.cc:1554
 #, fuzzy
 msgid "session start"
 msgstr "od poczÄ…tku sesji"
 
-#: sfdb_ui.cc:1538
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1581
 #, fuzzy
 msgid "<b>Insert at</b>"
 msgstr "Wstaw:"
 
-#: sfdb_ui.cc:1573
+#: sfdb_ui.cc:1594
 #, fuzzy
 msgid "<b>Mapping</b>"
 msgstr "<b>Wyjścia</b>"
 
-#: sfdb_ui.cc:1591
+#: sfdb_ui.cc:1612
 #, fuzzy
 msgid "<b>Conversion quality</b>"
 msgstr "Jakość konwersji:"
 
-#: sfdb_ui.cc:1603 sfdb_ui.cc:1709
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr "Najlepsza"
 
-#: sfdb_ui.cc:1604 sfdb_ui.cc:1711
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr "Dobra"
 
-#: sfdb_ui.cc:1605 sfdb_ui.cc:1713
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr "Szybka"
 
-#: sfdb_ui.cc:1607
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "Najszybciej"
 
@@ -11716,21 +11971,21 @@ msgstr ""
 
 #: startup.cc:194
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -11840,10 +12095,6 @@ msgstr ""
 msgid "Click to open the program website in your web browser"
 msgstr ""
 
-#: startup.cc:594
-msgid "What would you like to do ?"
-msgstr ""
-
 #: startup.cc:729
 #, fuzzy
 msgid "Open"
@@ -11859,94 +12110,94 @@ msgstr "Sesja"
 msgid "Create session folder in:"
 msgstr "Położenie folderu:"
 
-#: startup.cc:813
+#: startup.cc:821
 #, fuzzy
 msgid "Select folder for session"
 msgstr "Wszystko przed punktem edycji"
 
-#: startup.cc:845
+#: startup.cc:853
 #, fuzzy
 msgid "Use this template"
 msgstr "Wybieranie szablonu"
 
-#: startup.cc:848
+#: startup.cc:856
 #, fuzzy
 msgid "no template"
 msgstr "-szablon"
 
-#: startup.cc:876
+#: startup.cc:884
 msgid "Use an existing session as a template:"
 msgstr ""
 
-#: startup.cc:888
+#: startup.cc:896
 #, fuzzy
 msgid "Select template"
 msgstr "Wybieranie szablonu"
 
-#: startup.cc:914
+#: startup.cc:922
 msgid "New Session"
 msgstr "Nowa Sesja"
 
-#: startup.cc:1068
+#: startup.cc:1077
 #, fuzzy
 msgid "Select session file"
 msgstr "Wybieranie pliku sesji"
 
-#: startup.cc:1084
+#: startup.cc:1093
 msgid "Browse:"
 msgstr "Położenie:"
 
-#: startup.cc:1093
+#: startup.cc:1102
 #, fuzzy
 msgid "Select a session"
 msgstr "Wybieranie pliku sesji"
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 msgid "channels"
 msgstr " "
 
-#: startup.cc:1135
+#: startup.cc:1145
 msgid "<b>Busses</b>"
 msgstr "<b>Szyny</b>"
 
-#: startup.cc:1136
+#: startup.cc:1146
 msgid "<b>Inputs</b>"
 msgstr "<b>Wejścia</b>"
 
-#: startup.cc:1137
+#: startup.cc:1147
 msgid "<b>Outputs</b>"
 msgstr "<b>Wyjścia</b>"
 
-#: startup.cc:1145
+#: startup.cc:1155
 #, fuzzy
 msgid "Create master bus"
 msgstr "Tworzenie głównej szyny"
 
-#: startup.cc:1155
+#: startup.cc:1165
 #, fuzzy
 msgid "Automatically connect to physical inputs"
 msgstr "Automatyczne łączenie do wejść fizycznych"
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr "Ilość używanych kanałów:"
 
-#: startup.cc:1215
+#: startup.cc:1225
 #, fuzzy
 msgid "Automatically connect outputs"
 msgstr "Automatyczne łączenie wyjść"
 
-#: startup.cc:1237
+#: startup.cc:1247
 #, fuzzy
 msgid "... to master bus"
 msgstr "do głównej szyny"
 
-#: startup.cc:1247
+#: startup.cc:1257
 #, fuzzy
 msgid "... to physical outputs"
 msgstr "do wyjść fizycznych"
 
-#: startup.cc:1297
+#: startup.cc:1307
 #, fuzzy
 msgid "Advanced Session Options"
 msgstr "Opcje zaawansowane"
@@ -12673,21 +12924,21 @@ msgstr ""
 msgid "bad XPM header %1"
 msgstr ""
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr ""
 
-#: utils.cc:544
+#: utils.cc:591
 #, fuzzy
 msgid "cannot find XPM file for %1"
 msgstr "nie można otworzyć pliku pango.rc %1"
 
-#: utils.cc:570
+#: utils.cc:617
 #, fuzzy
 msgid "cannot find icon image for %1 using %2"
 msgstr "nie można otworzyć pliku pango.rc %1"
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr ""
 
@@ -12695,84 +12946,86 @@ msgstr ""
 msgid "VerboseCanvasCursor"
 msgstr ""
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 #, fuzzy
 msgid "Set Video Track"
 msgstr "Dodaj ścieżkę dźwiękową"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 #, fuzzy
 msgid "Launch External Video Monitor"
 msgstr "Rozszerzone"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr ""
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr ""
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 #, fuzzy
 msgid "Video files"
 msgstr "Pliki dźwiękowe"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 #, fuzzy
 msgid "<b>Video Information</b>"
 msgstr "<b>Informacje o pliku dźwiękowym</b>"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 #, fuzzy
 msgid "Start:"
 msgstr "Wyrównaj relatywnie"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 #, fuzzy
 msgid "Frame rate:"
 msgstr "Częstotliwość próbkowania:"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr ""
 
-#: editor_videotimeline.cc:138
+#: editor_videotimeline.cc:146
 msgid "Export Successful: %1"
 msgstr ""
 
-#: video_timeline.cc:467
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:501
-msgid "Failed to set session-framerate: "
-msgstr ""
-
-#: video_timeline.cc:501
-msgid " does not have a corresponding option setting in Ardour."
+#: video_timeline.cc:507
+msgid ""
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:507
+#: video_timeline.cc:515
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:508
-msgid " vs "
+#: video_timeline.cc:588
+msgid ""
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:690
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12780,18 +13033,18 @@ msgid ""
 "xjadeo's remote-control interface 'xjremote')."
 msgstr ""
 
-#: video_monitor.cc:282
+#: video_monitor.cc:281
 #, fuzzy
 msgid "Video Monitor: File Not Found."
 msgstr "Monitorowanie"
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -12801,377 +13054,385 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 #, fuzzy
 msgid "Transcode/Import Video File "
 msgstr "Sesję do pliku dźwiękowego..."
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 #, fuzzy
 msgid "Output File:"
 msgstr "Urządzenie wyjściowe"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr ""
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 #, fuzzy
 msgid "Height = "
 msgstr "Rozmiar"
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr ""
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 #, fuzzy
 msgid "<b>File Information</b>"
 msgstr "<b>Informacje o pliku dźwiękowym</b>"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr ""
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 #, fuzzy
 msgid "Duration:"
 msgstr "Czas trwania (s)"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr ""
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr ""
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 #, fuzzy
 msgid "??"
 msgstr "???"
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 #, fuzzy
 msgid "<b>Import Settings</b>"
 msgstr "<b>Wyjścia</b>"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr ""
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr ""
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 #, fuzzy
 msgid "Import/Transcode Video to Session"
 msgstr "Ekspor sesji"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr ""
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 #, fuzzy
 msgid "Original Width"
 msgstr "Pozycja poczÄ…tkowa"
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr ""
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 #, fuzzy
 msgid "Extract Audio:"
 msgstr "Eksportuj obszar"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 #, fuzzy
 msgid "Extracting Audio.."
 msgstr "Eksportuj obszar"
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr ""
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 msgid "Transcoding Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 #, fuzzy
 msgid "Save Transcoded Video File"
 msgstr "Sesję do pliku dźwiękowego..."
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr ""
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr ""
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 #, fuzzy
 msgid "Server Docroot:"
 msgstr "Serwer:"
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr ""
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 #, fuzzy
 msgid "Listen Port:"
 msgstr "Pozycja"
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 #, fuzzy
 msgid "Cache Size:"
 msgstr "Największy rozmiar"
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr ""
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr ""
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 msgid "Confirm Overwrite"
 msgstr ""
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 #, fuzzy
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr "Plik już istnieje. Zastąpić go?"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 #, fuzzy
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr "Nie można odczytać pliku: %1 (%2)."
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 #, fuzzy
 msgid "Export Video File "
 msgstr "Sesję do pliku dźwiękowego..."
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 #, fuzzy
 msgid "Video:"
 msgstr "Wyrównaj relatywnie"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr ""
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr ""
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 #, fuzzy
 msgid "Normalize Audio"
 msgstr "Normalizuj"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr ""
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr ""
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 #, fuzzy
 msgid "Deinterlace"
 msgstr "Wyśrodkuj"
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr ""
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 #, fuzzy
 msgid "Include Session Metadata"
 msgstr "od poczÄ…tku sesji"
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr ""
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 #, fuzzy
 msgid "<b>Output:</b>"
 msgstr "<b>Wyjścia</b>"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 #, fuzzy
 msgid "<b>Input:</b>"
 msgstr "<b>Wejścia</b>"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 #, fuzzy
 msgid "Audio:"
 msgstr "Odsłuch"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 #, fuzzy
 msgid "Master Bus"
 msgstr "Tworzenie głównej szyny"
 
-#: export_video_dialog.cc:166
+#: export_video_dialog.cc:145
+msgid "from the %1 session's start to the session's end"
+msgstr ""
+
+#: export_video_dialog.cc:149
+msgid "from 00:00:00:00 to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:151
+msgid "from the video's start to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:184
 #, fuzzy
 msgid "<b>Settings:</b>"
 msgstr "<b>Wejścia</b>"
 
-#: export_video_dialog.cc:174
+#: export_video_dialog.cc:192
 #, fuzzy
 msgid "Range:"
 msgstr "Zakresy"
 
-#: export_video_dialog.cc:177
+#: export_video_dialog.cc:195
 #, fuzzy
 msgid "Preset:"
 msgstr "Zresetuj"
 
-#: export_video_dialog.cc:180
+#: export_video_dialog.cc:198
 msgid "Video Codec:"
 msgstr ""
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:201
 #, fuzzy
 msgid "Video KBit/s:"
 msgstr "Wyrównaj relatywnie"
 
-#: export_video_dialog.cc:186
+#: export_video_dialog.cc:204
 #, fuzzy
 msgid "Audio Codec:"
 msgstr "Tryb dźwięku"
 
-#: export_video_dialog.cc:189
+#: export_video_dialog.cc:207
 #, fuzzy
 msgid "Audio KBit/s:"
 msgstr "Pliki dźwiękowe"
 
-#: export_video_dialog.cc:192
+#: export_video_dialog.cc:210
 #, fuzzy
 msgid "Audio Samplerate:"
 msgstr "Częstotliwość próbkowania:"
 
-#: export_video_dialog.cc:369
+#: export_video_dialog.cc:387
 #, fuzzy
 msgid "Normalizing audio"
 msgstr "Normalizacja wartości"
 
-#: export_video_dialog.cc:373
+#: export_video_dialog.cc:391
 #, fuzzy
 msgid "Exporting audio"
 msgstr "Eksportuj obszar"
 
-#: export_video_dialog.cc:419
+#: export_video_dialog.cc:437
 #, fuzzy
-msgid "Exporting Audio.."
+msgid "Exporting Audio..."
 msgstr "Eksportuj obszar"
 
-#: export_video_dialog.cc:476
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:505
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:544
-msgid "Encoding Video.."
+#: export_video_dialog.cc:562
+msgid "Encoding Video..."
 msgstr ""
 
-#: export_video_dialog.cc:563
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:661
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr ""
 
-#: export_video_dialog.cc:673
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr ""
 
-#: export_video_dialog.cc:761
+#: export_video_dialog.cc:779
 msgid "Transcoding failed."
 msgstr ""
 
-#: export_video_dialog.cc:930 export_video_dialog.cc:950
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 #, fuzzy
 msgid "Save Exported Video File"
 msgstr "Sesję do pliku dźwiękowego..."
@@ -13189,33 +13450,30 @@ msgstr ""
 msgid "<b>Video Export Info</b>"
 msgstr ""
 
-#: export_video_infobox.cc:46
+#: export_video_infobox.cc:48
 msgid ""
-"Ardour video export is not recommended for mastering!\n"
-"While 'ffmpeg' (which is used by ardour) can produce high-quality files, "
-"this export lacks the possibility to tweak many settings. We recommend to "
-"use 'winff', 'devede' or 'dvdauthor' to mux & master. Nevertheless this "
-"video-export comes in handy to do quick snapshots, intermediates, dailies or "
-"online videos.\n"
-"\n"
-"The soundtrack is created from the master-bus of the current Ardour "
-"session.\n"
+"Video encoding is a non-trivial task with many details.\n"
 "\n"
-"The video soure defaults to the file used in the video timeline, which may "
-"not the best quality to start with, you should the original video file.\n"
+"Please see the manual at %1/video-timeline/operations/#export.\n"
 "\n"
-"If the export-range is longer than the original video, black video frames "
-"are prefixed and/or appended. This process may fail with non-standard pixel-"
-"aspect-ratios.\n"
-"\n"
-"The file-format is determined by the extension that you choose for the "
-"output file (.avi, .mov, .flv, .ogv,...)\n"
-"Note: not all combinations of format+codec+settings produce files which are "
-"according so spec. e.g. flv files require sample-rates of 22.1kHz or "
-"44.1kHz, mpeg containers can not be used with ac3 audio-codec, etc. If in "
-"doubt, use one of the built-in presets."
+"Open Manual in Browser? "
 msgstr ""
 
+#, fuzzy
+#~ msgid "slowest"
+#~ msgstr "Najwolniej"
+
+#, fuzzy
+#~ msgid "fast"
+#~ msgstr "najszybsza"
+
+#, fuzzy
+#~ msgid "faster"
+#~ msgstr "Szybciej"
+
+#~ msgid "fastest"
+#~ msgstr "najszybsza"
+
 #~ msgid "Connect"
 #~ msgstr "Połącz"
 
@@ -13779,9 +14037,6 @@ msgstr ""
 #~ "na określonych warunkach - zobacz plik COPYING, by dowiedzieć się "
 #~ "więcej.\n"
 
-#~ msgid "programmer error: %1 %2"
-#~ msgstr "błąd programisty: %1 %2"
-
 #~ msgid "Unknown action name: %1"
 #~ msgstr "Nieznana nazwa czynności: %1"
 
@@ -14507,9 +14762,6 @@ msgstr ""
 #~ msgid "Display Height"
 #~ msgstr "Rozmiar wyświetlania"
 
-#~ msgid "rec-enable change"
-#~ msgstr "zmiana ustawienia nagrywania"
-
 #~ msgid "ardour: color selection"
 #~ msgstr "Wybieranie koloru"
 
diff --git a/gtk2_ardour/po/pt.po b/gtk2_ardour/po/pt.po
index bc02d059ab..01dfaa9ffc 100644
--- a/gtk2_ardour/po/pt.po
+++ b/gtk2_ardour/po/pt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ardour 0.688.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2005-08-15 21:50-0000\n"
 "Last-Translator: Chris Ross, Alexander Franca & Leandro Marco\n"
 "Language-Team: Portuguese\n"
@@ -371,7 +371,7 @@ msgstr ""
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr ""
 
-#: add_route_dialog.cc:53 route_params_ui.cc:503
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 #, fuzzy
 msgid "Add Track or Bus"
 msgstr "Adicionar Trilha/Barramento"
@@ -414,8 +414,8 @@ msgstr "Barramentos"
 msgid "Add:"
 msgstr ""
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "Preferências"
@@ -432,22 +432,22 @@ msgid "Group:"
 msgstr "Grupos de Mixer"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 #, fuzzy
 msgid "Audio"
 msgstr "Audição"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -471,7 +471,7 @@ msgid ""
 msgstr ""
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1301
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr "Normal"
 
@@ -525,7 +525,7 @@ msgstr "cancelar"
 msgid "12 Channel"
 msgstr "cancelar"
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2136
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr ""
 
@@ -615,7 +615,7 @@ msgid "Track"
 msgstr "Trilha"
 
 #: analysis_window.cc:68 editor_actions.cc:616 mixer_ui.cc:125
-#: mixer_ui.cc:1793
+#: mixer_ui.cc:1795
 #, fuzzy
 msgid "Show"
 msgstr "Mostrar tudo"
@@ -624,101 +624,96 @@ msgstr "Mostrar tudo"
 msgid "Re-analyze data"
 msgstr ""
 
-#: ardour_button.cc:658
+#: ardour_button.cc:704
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr ""
 
-#: ardour_ui.cc:179
+#: ardour_ui.cc:180
 #, fuzzy
 msgid "audition"
 msgstr "Audição"
 
-#: ardour_ui.cc:180
+#: ardour_ui.cc:181
 #, fuzzy
 msgid "solo"
 msgstr "solo"
 
-#: ardour_ui.cc:181
+#: ardour_ui.cc:182
 msgid "feedback"
 msgstr ""
 
-#: ardour_ui.cc:183 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 #, fuzzy
 msgid "Speaker Configuration"
 msgstr "Cancelar importação"
 
-#: ardour_ui.cc:184 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 #, fuzzy
 msgid "Theme Manager"
 msgstr "Remover Marca"
 
-#: ardour_ui.cc:185 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr ""
 
-#: ardour_ui.cc:186
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr ""
 
-#: ardour_ui.cc:187 ardour_ui.cc:192
+#: ardour_ui.cc:191 ardour_ui.cc:196
 #, fuzzy
 msgid "Add Tracks/Busses"
 msgstr "Trilhas/Barramentos"
 
-#: ardour_ui.cc:188
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "Sobre"
 
-#: ardour_ui.cc:189 location_ui.cc:1134
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "Localizações"
 
-#: ardour_ui.cc:190 route_params_ui.cc:57 route_params_ui.cc:604
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 #, fuzzy
 msgid "Tracks and Busses"
 msgstr "Trilhas/Barramentos"
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr ""
 
-#: ardour_ui.cc:193 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr ""
 
-#: ardour_ui.cc:194 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "Metrônomo"
 
-#: ardour_ui.cc:195
+#: ardour_ui.cc:199
 #, fuzzy
 msgid "Audio Connections"
 msgstr "Conexões"
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:200
 #, fuzzy
 msgid "MIDI Connections"
 msgstr "Conexões"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr ""
 
-#: ardour_ui.cc:299
-#, fuzzy
-msgid "could not initialize %1."
-msgstr "não foi possível iniciar o Ardour."
-
-#: ardour_ui.cc:394
+#: ardour_ui.cc:388
 #, fuzzy
 msgid "Starting audio engine"
 msgstr "Separar intervalo"
 
-#: ardour_ui.cc:763 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 msgid "%1 is ready for use"
 msgstr ""
 
-#: ardour_ui.cc:811
+#: ardour_ui.cc:806
 msgid ""
 "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"
@@ -727,26 +722,26 @@ msgid ""
 "controlled by %2"
 msgstr ""
 
-#: ardour_ui.cc:828
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr ""
 
-#: ardour_ui.cc:870
+#: ardour_ui.cc:865
 #, fuzzy
 msgid "Don't quit"
 msgstr "Não %1"
 
-#: ardour_ui.cc:871
+#: ardour_ui.cc:866
 #, fuzzy
 msgid "Just quit"
 msgstr "Apenas %1"
 
-#: ardour_ui.cc:872
+#: ardour_ui.cc:867
 #, fuzzy
 msgid "Save and quit"
 msgstr "Salvar e %1"
 
-#: ardour_ui.cc:882
+#: ardour_ui.cc:877
 #, fuzzy
 msgid ""
 "%1 was unable to save your session.\n"
@@ -760,17 +755,17 @@ msgstr ""
 "Se mesmo assim você deseja sair, por favor utilize\n"
 "a opção \"Apenas Sair\"."
 
-#: ardour_ui.cc:913
+#: ardour_ui.cc:908
 #, fuzzy
 msgid "Please wait while %1 cleans up..."
 msgstr "Continuar com a limpeza"
 
-#: ardour_ui.cc:930
+#: ardour_ui.cc:925
 #, fuzzy
 msgid "Unsaved Session"
 msgstr "Sessão"
 
-#: ardour_ui.cc:951
+#: ardour_ui.cc:946
 #, fuzzy
 msgid ""
 "The session \"%1\"\n"
@@ -790,7 +785,7 @@ msgstr ""
 "\n"
 "O que você quer fazer?"
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:949
 #, fuzzy
 msgid ""
 "The snapshot \"%1\"\n"
@@ -810,75 +805,75 @@ msgstr ""
 "\n"
 "O que você quer fazer?"
 
-#: ardour_ui.cc:968
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr ""
 
-#: ardour_ui.cc:1045
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "desconectado"
 
-#: ardour_ui.cc:1052
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1056
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1074 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 #, fuzzy
 msgid "File:"
 msgstr "Renomear"
 
-#: ardour_ui.cc:1078
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr ""
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr ""
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr ""
 
-#: ardour_ui.cc:1087 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr ""
 
-#: ardour_ui.cc:1090
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr ""
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr ""
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr ""
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr ""
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr ""
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr ""
 
-#: ardour_ui.cc:1129
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1148
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -886,66 +881,66 @@ msgid ""
 "\">%<PRIu32>%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1184
+#: ardour_ui.cc:1188
 #, fuzzy
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr "espaço: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1186
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr ""
 
-#: ardour_ui.cc:1204
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr ""
 
-#: ardour_ui.cc:1215
+#: ardour_ui.cc:1219
 #, fuzzy, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr "espaço: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1241
+#: ardour_ui.cc:1245
 #, fuzzy, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr "espaço: %02dh:%02dm:%02ds"
 
 #
-#: ardour_ui.cc:1358 ardour_ui.cc:1367 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 #, fuzzy
 msgid "Recent Sessions"
 msgstr "abrir sessão"
 
-#: ardour_ui.cc:1447
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
 msgstr ""
 
 #
-#: ardour_ui.cc:1474
+#: ardour_ui.cc:1478
 #, fuzzy
 msgid "Open Session"
 msgstr "abrir sessão"
 
-#: ardour_ui.cc:1492 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 #, fuzzy
 msgid "%1 sessions"
 msgstr "sessão"
 
-#: ardour_ui.cc:1529
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr ""
 "Você não pode adicionar uma trilha se uma sessão não estiver carregada."
 
-#: ardour_ui.cc:1537
+#: ardour_ui.cc:1548
 #, fuzzy
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] "não pôde criar uma nova trilha de áudio"
 msgstr[1] "não pôde criar uma nova trilha de áudio"
 
-#: ardour_ui.cc:1543 ardour_ui.cc:1604
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 #, fuzzy
 msgid ""
 "There are insufficient JACK ports available\n"
@@ -958,27 +953,27 @@ msgstr ""
 "Você deve salvar Ardour, sair e\n"
 "reiniciar o JACK com mais portas."
 
-#: ardour_ui.cc:1578
+#: ardour_ui.cc:1589
 #, fuzzy
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr ""
 "Você não pode adicionar uma trilha se uma sessão não estiver carregada."
 
-#: ardour_ui.cc:1587
+#: ardour_ui.cc:1598
 #, fuzzy
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] "não pôde criar uma nova trilha de áudio"
 msgstr[1] "não pôde criar uma nova trilha de áudio"
 
-#: ardour_ui.cc:1596
+#: ardour_ui.cc:1607
 #, fuzzy
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] "não pôde criar uma nova trilha de áudio"
 msgstr[1] "não pôde criar uma nova trilha de áudio"
 
-#: ardour_ui.cc:1713
+#: ardour_ui.cc:1724
 #, fuzzy
 msgid ""
 "Please create one or more tracks before trying to record.\n"
@@ -988,14 +983,14 @@ msgstr ""
 "antes de tentar gravar.\n"
 "Vir o menu de Sessão."
 
-#: ardour_ui.cc:2103
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
 "%1"
 msgstr ""
 
-#: ardour_ui.cc:2105
+#: ardour_ui.cc:2116
 #, fuzzy
 msgid ""
 "JACK has either been shutdown or it\n"
@@ -1009,81 +1004,81 @@ msgstr ""
 "A sessão corrente deverá ser salva e\n"
 "o serviço JACK reiniciado, tal como o Ardour."
 
-#: ardour_ui.cc:2131
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "Impossível iniciar a sessão"
 
-#: ardour_ui.cc:2211
+#: ardour_ui.cc:2222
 #, fuzzy
 msgid "Take Snapshot"
 msgstr "Capturar instantâneo"
 
-#: ardour_ui.cc:2212
+#: ardour_ui.cc:2223
 #, fuzzy
 msgid "Name of new snapshot"
 msgstr "Nome para a imagem capturada"
 
-#: ardour_ui.cc:2236
+#: ardour_ui.cc:2247
 msgid ""
 "To ensure compatibility with various systems\n"
 "snapshot names may not contain a '%1' character"
 msgstr ""
 
-#: ardour_ui.cc:2248
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr ""
 
-#: ardour_ui.cc:2249
+#: ardour_ui.cc:2260
 #, fuzzy
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr "já existe uma trilha com este nome"
 
-#: ardour_ui.cc:2252 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 msgid "Overwrite"
 msgstr ""
 
-#: ardour_ui.cc:2286
+#: ardour_ui.cc:2297
 #, fuzzy
 msgid "Rename Session"
 msgstr "inverter horizontalmente as regiões"
 
-#: ardour_ui.cc:2287
+#: ardour_ui.cc:2298
 #, fuzzy
 msgid "New session name"
 msgstr "Nome da sessão:"
 
-#: ardour_ui.cc:2301 ardour_ui.cc:2681 ardour_ui.cc:2726
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 msgid ""
 "To ensure compatibility with various systems\n"
 "session names may not contain a '%1' character"
 msgstr ""
 
-#: ardour_ui.cc:2309
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr ""
 
-#: ardour_ui.cc:2318
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
 msgstr ""
 
-#: ardour_ui.cc:2429
+#: ardour_ui.cc:2440
 #, fuzzy
 msgid "Save Template"
 msgstr "Salvar Esquema..."
 
-#: ardour_ui.cc:2430
+#: ardour_ui.cc:2441
 #, fuzzy
 msgid "Name for template:"
 msgstr "Nome para o esquema de mixer"
 
-#: ardour_ui.cc:2431
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-esquema/template"
 
-#: ardour_ui.cc:2469
+#: ardour_ui.cc:2480
 #, fuzzy
 msgid ""
 "This session\n"
@@ -1092,55 +1087,55 @@ msgid ""
 msgstr "Sessão %1 ainda existe à %2"
 
 #
-#: ardour_ui.cc:2479
+#: ardour_ui.cc:2490
 #, fuzzy
 msgid "Open Existing Session"
 msgstr "abrir sessão"
 
-#: ardour_ui.cc:2717
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr ""
 
-#: ardour_ui.cc:2804
+#: ardour_ui.cc:2815
 msgid "Please wait while %1 loads your session"
 msgstr ""
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr ""
 
-#: ardour_ui.cc:2820
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr ""
 
-#: ardour_ui.cc:2841
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "A sessão \"%1 (instantâneo %2)\" não pôde ser carregada"
 
-#: ardour_ui.cc:2847
+#: ardour_ui.cc:2858
 msgid "Loading Error"
 msgstr ""
 
-#: ardour_ui.cc:2848
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr ""
 
-#: ardour_ui.cc:2930
+#: ardour_ui.cc:2941
 #, fuzzy
 msgid "Could not create session in \"%1\""
 msgstr "não foi possível carregar a sessão da linha de comando \"%1\""
 
-#: ardour_ui.cc:3030
+#: ardour_ui.cc:3041
 msgid "No files were ready for clean-up"
 msgstr ""
 
-#: ardour_ui.cc:3034 ardour_ui.cc:3044 ardour_ui.cc:3177 ardour_ui.cc:3184
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 #, fuzzy
 msgid "Clean-up"
 msgstr "Limpar"
 
-#: ardour_ui.cc:3035
+#: ardour_ui.cc:3046
 #, fuzzy
 msgid ""
 "If this seems suprising, \n"
@@ -1153,19 +1148,19 @@ msgstr ""
 "Eles podem conter regiões que requeiram a existência\n"
 "de arquivos não utlizados."
 
-#: ardour_ui.cc:3094
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr ""
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr ""
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr ""
 
-#: ardour_ui.cc:3105
+#: ardour_ui.cc:3116
 #, fuzzy
 msgid ""
 "The following file was deleted from %2,\n"
@@ -1180,7 +1175,7 @@ msgstr[1] ""
 "Os seguintes %1 arquivo%2 foram deletados, liberando %3 %4bytes de espaço no "
 "disco rígido"
 
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3123
 #, fuzzy
 msgid ""
 "The following file was not in use and \n"
@@ -1211,11 +1206,11 @@ msgstr[1] ""
 "isto vai liberar %3 %4bytes\n"
 "de espaço no disco rígido"
 
-#: ardour_ui.cc:3172
+#: ardour_ui.cc:3183
 msgid "Are you sure you want to clean-up?"
 msgstr ""
 
-#: ardour_ui.cc:3179
+#: ardour_ui.cc:3190
 #, fuzzy
 msgid ""
 "Clean-up is a destructive operation.\n"
@@ -1227,82 +1222,82 @@ msgstr ""
 "você continuar. Arquivos de audio não usados serão movidos\n"
 "para \"dead sounds\""
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr "Limpar"
 
-#: ardour_ui.cc:3217
+#: ardour_ui.cc:3228
 #, fuzzy
 msgid "Cleaned Files"
 msgstr "arquivos limpos"
 
-#: ardour_ui.cc:3234
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr "arquivo removido"
 
-#: ardour_ui.cc:3326
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 
-#: ardour_ui.cc:3330
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr ""
 
-#: ardour_ui.cc:3331
+#: ardour_ui.cc:3342
 msgid "Do you really want to stop the Video Server?"
 msgstr ""
 
-#: ardour_ui.cc:3334
+#: ardour_ui.cc:3345
 #, fuzzy
 msgid "Yes, Stop It"
 msgstr "Sim, remova definitivamente isto."
 
-#: ardour_ui.cc:3360
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr ""
 
-#: ardour_ui.cc:3362
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
 msgstr ""
 
-#: ardour_ui.cc:3370 ardour_ui.cc:3455
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
 
-#: ardour_ui.cc:3394
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr ""
 
-#: ardour_ui.cc:3399
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr ""
 
-#: ardour_ui.cc:3432
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr ""
 
-#: ardour_ui.cc:3441
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3477 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "não foi possível abrir %1"
 
-#: ardour_ui.cc:3481
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
 msgstr ""
 
-#: ardour_ui.cc:3641
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr "A gravação foi encerrada porque seu sistema não consegue acompanhar"
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3702
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1311,7 +1306,7 @@ msgid ""
 "quickly enough to keep up with recording.\n"
 msgstr ""
 
-#: ardour_ui.cc:3689
+#: ardour_ui.cc:3721
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1320,11 +1315,11 @@ msgid ""
 "quickly enough to keep up with playback.\n"
 msgstr ""
 
-#: ardour_ui.cc:3729
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr ""
 
-#: ardour_ui.cc:3730
+#: ardour_ui.cc:3762
 msgid ""
 "This session appears to have been in the\n"
 "middle of recording when %1 or\n"
@@ -1335,45 +1330,45 @@ msgid ""
 "what you would like to do.\n"
 msgstr ""
 
-#: ardour_ui.cc:3742
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr ""
 
-#: ardour_ui.cc:3743
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr ""
 
-#: ardour_ui.cc:3763
+#: ardour_ui.cc:3795
 #, fuzzy
 msgid "Sample Rate Mismatch"
 msgstr "Separar Região"
 
-#: ardour_ui.cc:3764
+#: ardour_ui.cc:3796
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
 "%2 is currently running at %3 Hz.  If you load this session,\n"
 "audio may be played at the wrong sample rate.\n"
 msgstr ""
 
-#: ardour_ui.cc:3773
+#: ardour_ui.cc:3805
 #, fuzzy
 msgid "Do not load session"
 msgstr "Zoom na sessão"
 
-#: ardour_ui.cc:3774
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr ""
 
-#: ardour_ui.cc:3797
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "Não foi possível se desconectar ao servidor JACK"
 
-#: ardour_ui.cc:3810
+#: ardour_ui.cc:3842
 #, fuzzy
 msgid "Could not reconnect to JACK"
 msgstr "Não foi possível se conectar ao servidor JACK"
 
-#: ardour_ui.cc:4084
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1396,75 +1391,80 @@ msgstr "não foi possível iniciar o editor"
 msgid "UI: cannot setup mixer"
 msgstr "não foi possível iniciar o mixer"
 
-#: ardour_ui2.cc:125
+#: ardour_ui2.cc:82
+#, fuzzy
+msgid "UI: cannot setup meterbridge"
+msgstr "não foi possível iniciar o medidor volumétrico (VU)"
+
+#: ardour_ui2.cc:130
 msgid "Play from playhead"
 msgstr "Reproduzir a partir do início"
 
-#: ardour_ui2.cc:126
+#: ardour_ui2.cc:131
 msgid "Stop playback"
 msgstr "Parar reprodução"
 
-#: ardour_ui2.cc:127
+#: ardour_ui2.cc:132
 #, fuzzy
 msgid "Toggle record"
 msgstr "Gravar"
 
-#: ardour_ui2.cc:128
+#: ardour_ui2.cc:133
 msgid "Play range/selection"
 msgstr "Reproduzir intervalo/seleção"
 
-#: ardour_ui2.cc:129
+#: ardour_ui2.cc:134
 msgid "Go to start of session"
 msgstr "Ir para o início da sessão"
 
-#: ardour_ui2.cc:130
+#: ardour_ui2.cc:135
 msgid "Go to end of session"
 msgstr "Ir para o fim da sessão"
 
-#: ardour_ui2.cc:131
+#: ardour_ui2.cc:136
 msgid "Play loop range"
 msgstr "Reproduzir intervalo"
 
-#: ardour_ui2.cc:132
+#: ardour_ui2.cc:137
 msgid ""
 "MIDI Panic\n"
 "Send note off and reset controller messages on all MIDI channels"
 msgstr ""
 
-#: ardour_ui2.cc:133
+#: ardour_ui2.cc:138
 msgid "Return to last playback start when stopped"
 msgstr "Ir para o início da última reprodução quando parar"
 
-#: ardour_ui2.cc:134
+#: ardour_ui2.cc:139
 #, fuzzy
 msgid "Playhead follows Range Selections and Edits"
 msgstr "Reproduzir intervalo/seleção"
 
-#: ardour_ui2.cc:135
+#: ardour_ui2.cc:140
 msgid "Be sensible about input monitoring"
 msgstr "Sensível à monitoração na entrada"
 
-#: ardour_ui2.cc:136
+#: ardour_ui2.cc:141
 msgid "Enable/Disable audio click"
 msgstr "Habilitar/desabilitar metrônomo"
 
-#: ardour_ui2.cc:137 monitor_section.cc:101
+#: ardour_ui2.cc:142 monitor_section.cc:101
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
 msgstr ""
 
-#: ardour_ui2.cc:138
+#: ardour_ui2.cc:143
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
 msgstr ""
 
-#: ardour_ui2.cc:139
+#: ardour_ui2.cc:144
 msgid "When active, there is a feedback loop."
 msgstr ""
 
-#: ardour_ui2.cc:140
+#: ardour_ui2.cc:145
 msgid ""
 "<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1472,7 +1472,7 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:141
+#: ardour_ui2.cc:146
 msgid ""
 "<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1480,30 +1480,35 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:173
+#: ardour_ui2.cc:147
+#, fuzzy
+msgid "Reset Level Meter"
+msgstr "reiniciar todos"
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr ""
 
-#: ardour_ui2.cc:175
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr ""
 
-#: ardour_ui2.cc:177
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr ""
 
-#: ardour_ui2.cc:241 ardour_ui_ed.cc:376
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 #, fuzzy
 msgid "Auto Return"
 msgstr ""
 "retorno\n"
 "automático"
 
-#: ardour_ui2.cc:243 ardour_ui_ed.cc:379
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr ""
 
-#: ardour_ui2.cc:621 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1525,26 +1530,26 @@ msgstr "Cursor de Edição"
 msgid "Setup Mixer"
 msgstr "Mixer"
 
-#: ardour_ui_dependents.cc:84
+#: ardour_ui_dependents.cc:85
 msgid "Reload Session History"
 msgstr ""
 
-#: ardour_ui_dialogs.cc:206
+#: ardour_ui_dialogs.cc:242
 #, fuzzy
 msgid "Don't close"
 msgstr "Não %1"
 
-#: ardour_ui_dialogs.cc:207
+#: ardour_ui_dialogs.cc:243
 #, fuzzy
 msgid "Just close"
 msgstr "fechar"
 
-#: ardour_ui_dialogs.cc:208
+#: ardour_ui_dialogs.cc:244
 #, fuzzy
 msgid "Save and close"
 msgstr "Salvar e %1"
 
-#: ardour_ui_dialogs.cc:293
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr ""
 
@@ -1557,7 +1562,7 @@ msgstr "Sessão"
 msgid "Sync"
 msgstr "Sincronia"
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 #, fuzzy
 msgid "Options"
 msgstr "Preferências"
@@ -1590,16 +1595,16 @@ msgstr "Sistema de arquivos"
 msgid "Sample Format"
 msgstr "Separar Região"
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 #, fuzzy
 msgid "Control Surfaces"
 msgstr "Controle de Saídas"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "Entradas"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 #, fuzzy
 msgid "Metering"
 msgstr "VU (medidor volumétrico)"
@@ -1616,7 +1621,7 @@ msgstr ""
 msgid "Denormal Handling"
 msgstr ""
 
-#: ardour_ui_ed.cc:123 route_time_axis.cc:1475
+#: ardour_ui_ed.cc:123 route_time_axis.cc:1489
 msgid "New..."
 msgstr ""
 
@@ -1665,8 +1670,8 @@ msgstr "Capturar instantâneo"
 msgid "Save As..."
 msgstr "Salvar Esquema..."
 
-#: ardour_ui_ed.cc:153 editor_actions.cc:1710 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1464 route_time_axis.cc:1471
+#: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 #, fuzzy
 msgid "Rename..."
 msgstr "Renomear"
@@ -1699,7 +1704,7 @@ msgid "Stem export..."
 msgstr "Exportar"
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "Exportar"
 
@@ -1713,11 +1718,11 @@ msgstr "Limpar fontes não usadas"
 msgid "Flush Wastebasket"
 msgstr "Esvaziar lixeira"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr "JACK"
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr ""
 
@@ -1726,8 +1731,8 @@ msgstr ""
 msgid "Reconnect"
 msgstr "Conectar"
 
-#: ardour_ui_ed.cc:195 global_port_matrix.cc:198 io_selector.cc:210
-#: mixer_strip.cc:712 mixer_strip.cc:838
+#: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr "Desconectar"
 
@@ -1744,7 +1749,7 @@ msgstr ""
 msgid "Show Toolbars"
 msgstr "Por Posição da Região"
 
-#: ardour_ui_ed.cc:230 mixer_ui.cc:1863 mixer_ui.cc:1869
+#: ardour_ui_ed.cc:230 mixer_ui.cc:1865 mixer_ui.cc:1871
 #, fuzzy
 msgid "Window|Mixer"
 msgstr "Janelas"
@@ -1754,27 +1759,32 @@ msgstr "Janelas"
 msgid "Toggle Editor+Mixer"
 msgstr "Modo de edição"
 
-#: ardour_ui_ed.cc:233 midi_tracer.cc:39
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
+#, fuzzy
+msgid "Window|Meterbridge"
+msgstr "Janelas"
+
+#: ardour_ui_ed.cc:234 midi_tracer.cc:39
 msgid "MIDI Tracer"
 msgstr ""
 
-#: ardour_ui_ed.cc:235
+#: ardour_ui_ed.cc:236
 msgid "Chat"
 msgstr ""
 
-#: ardour_ui_ed.cc:237
+#: ardour_ui_ed.cc:238
 msgid "Help|Manual"
 msgstr ""
 
-#: ardour_ui_ed.cc:238
+#: ardour_ui_ed.cc:239
 msgid "Reference"
 msgstr ""
 
-#: ardour_ui_ed.cc:240 plugin_ui.cc:419
+#: ardour_ui_ed.cc:241 plugin_ui.cc:418
 msgid "Save"
 msgstr "Salvar"
 
-#: ardour_ui_ed.cc:248 rc_option_editor.cc:1114 rc_option_editor.cc:1125
+#: ardour_ui_ed.cc:249 rc_option_editor.cc:1114 rc_option_editor.cc:1125
 #: rc_option_editor.cc:1134 rc_option_editor.cc:1147 rc_option_editor.cc:1160
 #: rc_option_editor.cc:1169 rc_option_editor.cc:1179 rc_option_editor.cc:1181
 #: rc_option_editor.cc:1191 rc_option_editor.cc:1207 rc_option_editor.cc:1220
@@ -1785,109 +1795,109 @@ msgstr "Salvar"
 msgid "Transport"
 msgstr "Tradutores"
 
-#: ardour_ui_ed.cc:254 engine_dialog.cc:85 sfdb_ui.cc:559
+#: ardour_ui_ed.cc:255 engine_dialog.cc:85
 msgid "Stop"
 msgstr "Parar"
 
-#: ardour_ui_ed.cc:257
+#: ardour_ui_ed.cc:258
 msgid "Roll"
 msgstr ""
 
-#: ardour_ui_ed.cc:261
+#: ardour_ui_ed.cc:262
 #, fuzzy
 msgid "Start/Stop"
 msgstr "Inicio:"
 
-#: ardour_ui_ed.cc:264
+#: ardour_ui_ed.cc:265
 #, fuzzy
 msgid "Start/Continue/Stop"
 msgstr "Inicio:"
 
-#: ardour_ui_ed.cc:267
+#: ardour_ui_ed.cc:268
 msgid "Stop and Forget Capture"
 msgstr ""
 
-#: ardour_ui_ed.cc:277
+#: ardour_ui_ed.cc:278
 #, fuzzy
 msgid "Transition To Roll"
 msgstr "Tradicional"
 
-#: ardour_ui_ed.cc:281
+#: ardour_ui_ed.cc:282
 msgid "Transition To Reverse"
 msgstr ""
 
-#: ardour_ui_ed.cc:285
+#: ardour_ui_ed.cc:286
 #, fuzzy
 msgid "Play Loop Range"
 msgstr "Reproduzir intervalo"
 
-#: ardour_ui_ed.cc:288
+#: ardour_ui_ed.cc:289
 #, fuzzy
 msgid "Play Selected Range"
 msgstr "Separar intervalo"
 
-#: ardour_ui_ed.cc:291
+#: ardour_ui_ed.cc:292
 #, fuzzy
 msgid "Play Selection w/Preroll"
 msgstr "Reproduzir região selecionada"
 
-#: ardour_ui_ed.cc:295
+#: ardour_ui_ed.cc:296
 #, fuzzy
 msgid "Enable Record"
 msgstr "Gravar"
 
-#: ardour_ui_ed.cc:298
+#: ardour_ui_ed.cc:299
 #, fuzzy
 msgid "Start Recording"
 msgstr "Separar intervalo"
 
-#: ardour_ui_ed.cc:302
+#: ardour_ui_ed.cc:303
 #, fuzzy
 msgid "Rewind"
 msgstr "Região"
 
-#: ardour_ui_ed.cc:305
+#: ardour_ui_ed.cc:306
 msgid "Rewind (Slow)"
 msgstr ""
 
-#: ardour_ui_ed.cc:308
+#: ardour_ui_ed.cc:309
 msgid "Rewind (Fast)"
 msgstr ""
 
-#: ardour_ui_ed.cc:311 startup.cc:727
+#: ardour_ui_ed.cc:312 startup.cc:727
 msgid "Forward"
 msgstr ""
 
-#: ardour_ui_ed.cc:314
+#: ardour_ui_ed.cc:315
 msgid "Forward (Slow)"
 msgstr ""
 
-#: ardour_ui_ed.cc:317
+#: ardour_ui_ed.cc:318
 msgid "Forward (Fast)"
 msgstr ""
 
-#: ardour_ui_ed.cc:320
+#: ardour_ui_ed.cc:321
 msgid "Goto Zero"
 msgstr ""
 
-#: ardour_ui_ed.cc:323
+#: ardour_ui_ed.cc:324
 #, fuzzy
 msgid "Goto Start"
 msgstr "Inicio:"
 
-#: ardour_ui_ed.cc:326
+#: ardour_ui_ed.cc:327
 msgid "Goto End"
 msgstr ""
 
-#: ardour_ui_ed.cc:329
+#: ardour_ui_ed.cc:330
 msgid "Goto Wall Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:333
+#: ardour_ui_ed.cc:334
 msgid "Focus On Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:337 ardour_ui_ed.cc:346 audio_clock.cc:2046 editor.cc:237
+#: ardour_ui_ed.cc:338 ardour_ui_ed.cc:347 audio_clock.cc:2046 editor.cc:237
 #: editor_actions.cc:544 editor_actions.cc:553 export_timespan_selector.cc:88
 #: session_option_editor.cc:41 session_option_editor.cc:61
 #: session_option_editor.cc:80 session_option_editor.cc:96
@@ -1896,149 +1906,149 @@ msgstr ""
 msgid "Timecode"
 msgstr ""
 
-#: ardour_ui_ed.cc:339 ardour_ui_ed.cc:348 editor_actions.cc:542
+#: ardour_ui_ed.cc:340 ardour_ui_ed.cc:349 editor_actions.cc:542
 #, fuzzy
 msgid "Bars & Beats"
 msgstr "Compassos:Batimentos"
 
-#: ardour_ui_ed.cc:341 ardour_ui_ed.cc:350
+#: ardour_ui_ed.cc:342 ardour_ui_ed.cc:351
 #, fuzzy
 msgid "Minutes & Seconds"
 msgstr "Minutos:Segundos"
 
-#: ardour_ui_ed.cc:343 ardour_ui_ed.cc:352 audio_clock.cc:2050 editor.cc:238
+#: ardour_ui_ed.cc:344 ardour_ui_ed.cc:353 audio_clock.cc:2050 editor.cc:238
 #: editor_actions.cc:543
 #, fuzzy
 msgid "Samples"
 msgstr "Separar Região"
 
-#: ardour_ui_ed.cc:355
+#: ardour_ui_ed.cc:356
 #, fuzzy
 msgid "Punch In"
 msgstr "Inserção"
 
-#: ardour_ui_ed.cc:356 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr "Entrada"
 
-#: ardour_ui_ed.cc:359
+#: ardour_ui_ed.cc:360
 #, fuzzy
 msgid "Punch Out"
 msgstr ""
 "finalizar\n"
 "inserção"
 
-#: ardour_ui_ed.cc:360 time_info_box.cc:114
+#: ardour_ui_ed.cc:361 time_info_box.cc:114
 msgid "Out"
 msgstr "Saídas"
 
-#: ardour_ui_ed.cc:363
+#: ardour_ui_ed.cc:364
 #, fuzzy
 msgid "Punch In/Out"
 msgstr ""
 "finalizar\n"
 "inserção"
 
-#: ardour_ui_ed.cc:364
+#: ardour_ui_ed.cc:365
 #, fuzzy
 msgid "In/Out"
 msgstr ""
 "finalizar\n"
 "inserção"
 
-#: ardour_ui_ed.cc:367 rc_option_editor.cc:1071
+#: ardour_ui_ed.cc:368 rc_option_editor.cc:1071
 msgid "Click"
 msgstr "Metrônomo"
 
-#: ardour_ui_ed.cc:370
+#: ardour_ui_ed.cc:371
 #, fuzzy
 msgid "Auto Input"
 msgstr ""
 "entrada\n"
 "automática"
 
-#: ardour_ui_ed.cc:373
+#: ardour_ui_ed.cc:374
 #, fuzzy
 msgid "Auto Play"
 msgstr ""
 "reprodução\n"
 "automática"
 
-#: ardour_ui_ed.cc:384
+#: ardour_ui_ed.cc:385
 msgid "Sync Startup to Video"
 msgstr ""
 
-#: ardour_ui_ed.cc:386
+#: ardour_ui_ed.cc:387
 #, fuzzy
 msgid "Time Master"
 msgstr "Modo supervisor de tempo (JACK)"
 
-#: ardour_ui_ed.cc:393
+#: ardour_ui_ed.cc:394
 msgid "Toggle Record Enable Track %1"
 msgstr ""
 
-#: ardour_ui_ed.cc:400
+#: ardour_ui_ed.cc:401
 msgid "Percentage"
 msgstr "Percentual"
 
-#: ardour_ui_ed.cc:401 shuttle_control.cc:169
+#: ardour_ui_ed.cc:402 shuttle_control.cc:169
 msgid "Semitones"
 msgstr "Semitons"
 
-#: ardour_ui_ed.cc:405
+#: ardour_ui_ed.cc:406
 msgid "Send MTC"
 msgstr "Enviar MTC"
 
-#: ardour_ui_ed.cc:407
+#: ardour_ui_ed.cc:408
 msgid "Send MMC"
 msgstr "Enviar MMC"
 
-#: ardour_ui_ed.cc:409
+#: ardour_ui_ed.cc:410
 #, fuzzy
 msgid "Use MMC"
 msgstr "Enviar MMC"
 
-#: ardour_ui_ed.cc:411 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 #, fuzzy
 msgid "Send MIDI Clock"
 msgstr "Enviar MTC"
 
-#: ardour_ui_ed.cc:413
+#: ardour_ui_ed.cc:414
 msgid "Send MIDI Feedback"
 msgstr ""
 
-#: ardour_ui_ed.cc:419
+#: ardour_ui_ed.cc:420
 msgid "Panic"
 msgstr ""
 
-#: ardour_ui_ed.cc:559
+#: ardour_ui_ed.cc:560
 #, fuzzy
 msgid "Wall Clock"
 msgstr "Metrônomo"
 
-#: ardour_ui_ed.cc:560
+#: ardour_ui_ed.cc:561
 msgid "Disk Space"
 msgstr ""
 
-#: ardour_ui_ed.cc:561
+#: ardour_ui_ed.cc:562
 msgid "DSP"
 msgstr ""
 
-#: ardour_ui_ed.cc:562
+#: ardour_ui_ed.cc:563
 msgid "Buffers"
 msgstr ""
 
-#: ardour_ui_ed.cc:563
+#: ardour_ui_ed.cc:564
 msgid "JACK Sampling Rate and Latency"
 msgstr ""
 
-#: ardour_ui_ed.cc:564
+#: ardour_ui_ed.cc:565
 #, fuzzy
 msgid "Timecode Format"
 msgstr "Quadros de �udio"
 
-#: ardour_ui_ed.cc:565
+#: ardour_ui_ed.cc:566
 #, fuzzy
 msgid "File Format"
 msgstr "Quadros de �udio"
@@ -2054,12 +2064,12 @@ msgstr ""
 msgid "Internal"
 msgstr "interno"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 #, fuzzy
 msgid "Enable/Disable external positional sync"
 msgstr "Habilitar/desabilitar metrônomo"
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr ""
 
@@ -2090,7 +2100,7 @@ msgstr "Tempo"
 msgid "Meter"
 msgstr "VU (medidor volumétrico)"
 
-#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1030
+#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1039
 #: midi_region_view.cc:2991 session_metadata_dialog.cc:331
 #: session_metadata_dialog.cc:379 session_metadata_dialog.cc:435
 #: session_metadata_dialog.cc:716
@@ -2187,35 +2197,35 @@ msgid "hide track"
 msgstr "ocultar esta trilha"
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:196 generic_pluginui.cc:456
-#: generic_pluginui.cc:733 panner_ui.cc:150
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
+#: generic_pluginui.cc:746 panner_ui.cc:150
 #, fuzzy
 msgid "Automation|Manual"
 msgstr "Automação"
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1856 gain_meter.cc:199
-#: generic_pluginui.cc:459 generic_pluginui.cc:735 midi_time_axis.cc:1488
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
+#: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr "Reproduzir"
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:202 generic_pluginui.cc:462
-#: generic_pluginui.cc:737 panner_ui.cc:156
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
+#: generic_pluginui.cc:750 panner_ui.cc:156
 #, fuzzy
 msgid "Write"
 msgstr "escrever"
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:205 generic_pluginui.cc:465
-#: generic_pluginui.cc:739 panner_ui.cc:159
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
+#: generic_pluginui.cc:752 panner_ui.cc:159
 #, fuzzy
 msgid "Touch"
 msgstr "marca como novo"
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr ""
 
@@ -2224,7 +2234,7 @@ msgid "clear automation"
 msgstr "limpar automação"
 
 #: automation_time_axis.cc:485 editor_actions.cc:613 editor_markers.cc:857
-#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:699
+#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:708
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -2246,7 +2256,7 @@ msgstr "Desconectar"
 msgid "Linear"
 msgstr "Linear"
 
-#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:638
+#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:647
 #: shuttle_control.cc:188
 msgid "Mode"
 msgstr "Modo"
@@ -2265,14 +2275,14 @@ msgstr "Modo de edição"
 msgid "Direction:"
 msgstr "Reproduzir seleção"
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:156
-#: mixer_strip.cc:2132
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 #, fuzzy
 msgid "Input"
 msgstr "Entradas"
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:161 mixer_strip.cc:2135
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 #, fuzzy
 msgid "Output"
 msgstr "Saídas"
@@ -2283,8 +2293,8 @@ msgid "Edit"
 msgstr "Editar"
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:420 processor_box.cc:2227
-#: route_time_axis.cc:704
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
+#: route_time_axis.cc:713
 msgid "Delete"
 msgstr "Apagar"
 
@@ -2466,7 +2476,7 @@ msgstr ""
 
 #: edit_note_dialog.cc:98 editor_regions.cc:114
 #: export_timespan_selector.cc:359 export_timespan_selector.cc:421
-#: location_ui.cc:313 midi_list_editor.cc:114 time_info_box.cc:105
+#: location_ui.cc:317 midi_list_editor.cc:114 time_info_box.cc:105
 msgid "Length"
 msgstr ""
 
@@ -2738,18 +2748,18 @@ msgid "Ranges & Marks"
 msgstr "Marcas de Intervalos"
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 #, fuzzy
 msgid "Editor"
 msgstr "editor"
 
 #: editor.cc:1215 editor.cc:1225 editor.cc:4440 editor_actions.cc:130
-#: editor_actions.cc:1804
+#: editor_actions.cc:1813
 msgid "Loop"
 msgstr "Ciclo"
 
@@ -2774,8 +2784,8 @@ msgstr ""
 msgid "Slow"
 msgstr "Devegar"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1606
-#: sfdb_ui.cc:1715
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "Rapido"
 
@@ -2795,7 +2805,7 @@ msgstr "Ativar"
 msgid "Slowest"
 msgstr "Menor"
 
-#: editor.cc:1572 route_time_axis.cc:1863 selection.cc:1009 selection.cc:1064
+#: editor.cc:1572 route_time_axis.cc:1877 selection.cc:1009 selection.cc:1064
 msgid "programming error: "
 msgstr ""
 
@@ -2934,7 +2944,7 @@ msgid "Select All in Track"
 msgstr "Selecionar tudo na trilha"
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2235
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
@@ -2996,15 +3006,15 @@ msgstr ""
 msgid "Select"
 msgstr "Selecionar"
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2220
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr "Cortar"
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2223
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr "Copiar"
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2231
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr "Colar"
 
@@ -3178,7 +3188,7 @@ msgstr "Refazer"
 msgid "Redo (%1)"
 msgstr "Refazer (%1)"
 
-#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1785
+#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1794
 msgid "Duplicate"
 msgstr "Duplicar"
 
@@ -3208,8 +3218,8 @@ msgstr "Nome para a imagem capturada"
 msgid "Keep Playlist"
 msgstr "Nome para a imagem capturada"
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -3232,7 +3242,7 @@ msgstr "Nome para a imagem capturada"
 msgid "Please wait while %1 loads visual data."
 msgstr ""
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2251
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 #, fuzzy
 msgid "Edit..."
 msgstr "Editar"
@@ -3291,7 +3301,7 @@ msgstr "Camada"
 msgid "Position"
 msgstr "Audição"
 
-#: editor_actions.cc:101 gain_meter.cc:124 gain_meter.cc:755 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr "Cortar"
@@ -3305,7 +3315,7 @@ msgstr ""
 msgid "Ranges"
 msgstr "Intervalo"
 
-#: editor_actions.cc:104 editor_actions.cc:1781 session_option_editor.cc:145
+#: editor_actions.cc:104 editor_actions.cc:1790 session_option_editor.cc:145
 #: session_option_editor.cc:147 session_option_editor.cc:156
 #: session_option_editor.cc:163
 #, fuzzy
@@ -3349,7 +3359,7 @@ msgstr "Preferências"
 msgid "Misc Options"
 msgstr "Preferências"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 #, fuzzy
 msgid "Monitoring"
@@ -3396,8 +3406,8 @@ msgstr "Relógio secundário"
 msgid "Separate"
 msgstr "Separar Região"
 
-#: editor_actions.cc:132 mixer_strip.cc:1916 route_time_axis.cc:199
-#: route_time_axis.cc:2397
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
+#: route_time_axis.cc:2417
 msgid "Solo"
 msgstr "Solo"
 
@@ -3410,7 +3420,7 @@ msgstr "Quadros"
 msgid "Timecode fps"
 msgstr ""
 
-#: editor_actions.cc:137 route_time_axis.cc:421
+#: editor_actions.cc:137 route_time_axis.cc:430
 msgid "Height"
 msgstr "Altura"
 
@@ -3551,7 +3561,7 @@ msgstr ""
 msgid "Playhead to Range End"
 msgstr "Reproduzir intervalo"
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2237
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 #, fuzzy
 msgid "Deselect All"
 msgstr "Selecionar Tudo"
@@ -3872,9 +3882,9 @@ msgstr "Inserir região"
 msgid "Toggle Active"
 msgstr "ativo"
 
-#: editor_actions.cc:370 editor_actions.cc:1707 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1488
-#: route_time_axis.cc:701
+#: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
+#: route_time_axis.cc:710
 msgid "Remove"
 msgstr "Remover"
 
@@ -3883,19 +3893,19 @@ msgstr "Remover"
 msgid "Fit Selected Tracks"
 msgstr "Inserir seleção"
 
-#: editor_actions.cc:376 time_axis_view.cc:1298
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr "Enorme"
 
-#: editor_actions.cc:379 time_axis_view.cc:1299
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr "Maior"
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1300
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr "Grande"
 
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr "Pequeno"
 
@@ -4003,7 +4013,7 @@ msgstr "Reunir"
 msgid "Slide"
 msgstr "Deslizar"
 
-#: editor_actions.cc:478 editor_actions.cc:1728 editor_markers.cc:860
+#: editor_actions.cc:478 editor_actions.cc:1737 editor_markers.cc:860
 #: editor_rulers.cc:386 location_ui.cc:56
 msgid "Lock"
 msgstr "Trancar"
@@ -4214,7 +4224,7 @@ msgstr "Min:Segs"
 msgid "Video Monitor"
 msgstr "Usar Monitoração de Hardware"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr ""
 
@@ -4224,8 +4234,9 @@ msgid "Always on Top"
 msgstr "Trazer região para frente, primeira camada"
 
 #: editor_actions.cc:554
-msgid "Framenumber"
-msgstr ""
+#, fuzzy
+msgid "Frame number"
+msgstr "remover marca"
 
 #: editor_actions.cc:555
 #, fuzzy
@@ -4318,7 +4329,7 @@ msgstr "Remover"
 
 #: editor_actions.cc:652 editor_audio_import.cc:279
 #: session_import_dialog.cc:74 session_import_dialog.cc:94
-#: session_metadata_dialog.cc:297 editor_videotimeline.cc:107
+#: session_metadata_dialog.cc:297 editor_videotimeline.cc:108
 msgid "Import"
 msgstr "Importar"
 
@@ -4363,330 +4374,330 @@ msgstr ""
 msgid "Could not find editor.bindings in search path %1"
 msgstr ""
 
-#: editor_actions.cc:1019 editor_actions.cc:1415 editor_actions.cc:1426
-#: editor_actions.cc:1479 editor_actions.cc:1490 editor_actions.cc:1537
-#: editor_actions.cc:1547 editor_regions.cc:1561
+#: editor_actions.cc:1028 editor_actions.cc:1424 editor_actions.cc:1435
+#: editor_actions.cc:1488 editor_actions.cc:1499 editor_actions.cc:1546
+#: editor_actions.cc:1556 editor_regions.cc:1561
 msgid "programming error: %1: %2"
 msgstr ""
 
-#: editor_actions.cc:1713
+#: editor_actions.cc:1722
 msgid "Raise"
 msgstr ""
 
-#: editor_actions.cc:1716
+#: editor_actions.cc:1725
 #, fuzzy
 msgid "Raise to Top"
 msgstr "Trazer região para frente, primeira camada"
 
-#: editor_actions.cc:1719 gtk-custom-ruler.c:132
+#: editor_actions.cc:1728 gtk-custom-ruler.c:132
 #, fuzzy
 msgid "Lower"
 msgstr "Camada"
 
-#: editor_actions.cc:1722
+#: editor_actions.cc:1731
 #, fuzzy
 msgid "Lower to Bottom"
 msgstr "Enviar região para a trás, última camada"
 
-#: editor_actions.cc:1725
+#: editor_actions.cc:1734
 #, fuzzy
 msgid "Move to Original Position"
 msgstr "Posição original"
 
-#: editor_actions.cc:1730
+#: editor_actions.cc:1739
 msgid "Lock to Video"
 msgstr ""
 
-#: editor_actions.cc:1735 editor_markers.cc:867
+#: editor_actions.cc:1744 editor_markers.cc:867
 msgid "Glue to Bars and Beats"
 msgstr ""
 
-#: editor_actions.cc:1740
+#: editor_actions.cc:1749
 #, fuzzy
 msgid "Remove Sync"
 msgstr "Remover ponto de sincronia"
 
-#: editor_actions.cc:1743 mixer_strip.cc:1903 route_time_axis.cc:200
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr "Mutar"
 
-#: editor_actions.cc:1746
+#: editor_actions.cc:1755
 #, fuzzy
 msgid "Normalize..."
 msgstr "Normalizar"
 
-#: editor_actions.cc:1749
+#: editor_actions.cc:1758
 msgid "Reverse"
 msgstr "Inverter horizontalmente"
 
-#: editor_actions.cc:1752
+#: editor_actions.cc:1761
 #, fuzzy
 msgid "Make Mono Regions"
 msgstr "Criar regiões mono"
 
-#: editor_actions.cc:1755
+#: editor_actions.cc:1764
 msgid "Boost Gain"
 msgstr ""
 
-#: editor_actions.cc:1758
+#: editor_actions.cc:1767
 msgid "Cut Gain"
 msgstr ""
 
-#: editor_actions.cc:1761
+#: editor_actions.cc:1770
 msgid "Pitch Shift..."
 msgstr ""
 
-#: editor_actions.cc:1764
+#: editor_actions.cc:1773
 #, fuzzy
 msgid "Transpose..."
 msgstr "Tradutores"
 
-#: editor_actions.cc:1767
+#: editor_actions.cc:1776
 #, fuzzy
 msgid "Opaque"
 msgstr "opaco"
 
-#: editor_actions.cc:1771 editor_regions.cc:116
+#: editor_actions.cc:1780 editor_regions.cc:116
 msgid "Fade In"
 msgstr "Fade In"
 
-#: editor_actions.cc:1776 editor_regions.cc:117
+#: editor_actions.cc:1785 editor_regions.cc:117
 msgid "Fade Out"
 msgstr "Fade Out"
 
-#: editor_actions.cc:1791
+#: editor_actions.cc:1800
 #, fuzzy
 msgid "Multi-Duplicate..."
 msgstr "Duplicar"
 
-#: editor_actions.cc:1796
+#: editor_actions.cc:1805
 msgid "Fill Track"
 msgstr "Preencher Trilha"
 
-#: editor_actions.cc:1800 editor_markers.cc:955
+#: editor_actions.cc:1809 editor_markers.cc:955
 msgid "Set Loop Range"
 msgstr "Marcar um intervalo de loop"
 
-#: editor_actions.cc:1807
+#: editor_actions.cc:1816
 #, fuzzy
 msgid "Set Punch"
 msgstr "Fazer intervalo de inserção"
 
-#: editor_actions.cc:1811
+#: editor_actions.cc:1820
 #, fuzzy
 msgid "Add Single Range Marker"
 msgstr "Marcas de Intervalos"
 
-#: editor_actions.cc:1816
+#: editor_actions.cc:1825
 #, fuzzy
 msgid "Add Range Marker Per Region"
 msgstr "Marcas de Intervalos"
 
-#: editor_actions.cc:1820
+#: editor_actions.cc:1829
 #, fuzzy
 msgid "Snap Position To Grid"
 msgstr "Ajustar a"
 
-#: editor_actions.cc:1823
+#: editor_actions.cc:1832
 #, fuzzy
 msgid "Close Gaps"
 msgstr "Fechar"
 
-#: editor_actions.cc:1826
+#: editor_actions.cc:1835
 msgid "Rhythm Ferret..."
 msgstr ""
 
-#: editor_actions.cc:1829
+#: editor_actions.cc:1838
 #, fuzzy
 msgid "Export..."
 msgstr "Exportar"
 
-#: editor_actions.cc:1835
+#: editor_actions.cc:1844
 #, fuzzy
 msgid "Separate Under"
 msgstr "Separar intervalo"
 
-#: editor_actions.cc:1839
+#: editor_actions.cc:1848
 #, fuzzy
 msgid "Set Fade In Length"
 msgstr "fade in na edição"
 
-#: editor_actions.cc:1840
+#: editor_actions.cc:1849
 #, fuzzy
 msgid "Set Fade Out Length"
 msgstr "fade out na edição"
 
-#: editor_actions.cc:1841
+#: editor_actions.cc:1850
 #, fuzzy
 msgid "Set Tempo from Region = Bar"
 msgstr "Nova região a partir da seleção"
 
-#: editor_actions.cc:1846
+#: editor_actions.cc:1855
 #, fuzzy
 msgid "Split at Percussion Onsets"
 msgstr "Do início ao cursor de edição"
 
-#: editor_actions.cc:1851
+#: editor_actions.cc:1860
 #, fuzzy
 msgid "List Editor..."
 msgstr "Preferências"
 
-#: editor_actions.cc:1854
+#: editor_actions.cc:1863
 msgid "Properties..."
 msgstr ""
 
-#: editor_actions.cc:1858
+#: editor_actions.cc:1867
 msgid "Bounce (with processing)"
 msgstr ""
 
-#: editor_actions.cc:1859
+#: editor_actions.cc:1868
 msgid "Bounce (without processing)"
 msgstr ""
 
-#: editor_actions.cc:1860
+#: editor_actions.cc:1869
 msgid "Combine"
 msgstr ""
 
-#: editor_actions.cc:1861
+#: editor_actions.cc:1870
 msgid "Uncombine"
 msgstr ""
 
-#: editor_actions.cc:1863
+#: editor_actions.cc:1872
 msgid "Spectral Analysis..."
 msgstr ""
 
-#: editor_actions.cc:1865
+#: editor_actions.cc:1874
 #, fuzzy
 msgid "Reset Envelope"
 msgstr "reiniciar todos"
 
-#: editor_actions.cc:1867
+#: editor_actions.cc:1876
 #, fuzzy
 msgid "Reset Gain"
 msgstr "reiniciar todos"
 
-#: editor_actions.cc:1872
+#: editor_actions.cc:1881
 #, fuzzy
 msgid "Envelope Active"
 msgstr "ativo"
 
-#: editor_actions.cc:1876
+#: editor_actions.cc:1885
 #, fuzzy
 msgid "Quantize..."
 msgstr "Sistema de arquivos"
 
-#: editor_actions.cc:1877 editor_actions.cc:1878
+#: editor_actions.cc:1886 editor_actions.cc:1887
 msgid "Insert Patch Change..."
 msgstr ""
 
-#: editor_actions.cc:1879
+#: editor_actions.cc:1888
 msgid "Unlink from other copies"
 msgstr ""
 
-#: editor_actions.cc:1880
+#: editor_actions.cc:1889
 msgid "Strip Silence..."
 msgstr ""
 
-#: editor_actions.cc:1881
+#: editor_actions.cc:1890
 #, fuzzy
 msgid "Set Range Selection"
 msgstr "Reproduzir seleção"
 
-#: editor_actions.cc:1883
+#: editor_actions.cc:1892
 #, fuzzy
 msgid "Nudge Later"
 msgstr "Retocar"
 
-#: editor_actions.cc:1884
+#: editor_actions.cc:1893
 #, fuzzy
 msgid "Nudge Earlier"
 msgstr "Retocar"
 
-#: editor_actions.cc:1889
+#: editor_actions.cc:1898
 #, fuzzy
 msgid "Nudge Later by Capture Offset"
 msgstr "Retocar"
 
-#: editor_actions.cc:1896
+#: editor_actions.cc:1905
 #, fuzzy
 msgid "Nudge Earlier by Capture Offset"
 msgstr "Retocar"
 
-#: editor_actions.cc:1900
+#: editor_actions.cc:1909
 msgid "Trim to Loop"
 msgstr ""
 
-#: editor_actions.cc:1901
+#: editor_actions.cc:1910
 msgid "Trim to Punch"
 msgstr ""
 
-#: editor_actions.cc:1903
+#: editor_actions.cc:1912
 #, fuzzy
 msgid "Trim to Previous"
 msgstr "Do início ao cursor de edição"
 
-#: editor_actions.cc:1904
+#: editor_actions.cc:1913
 #, fuzzy
 msgid "Trim to Next"
 msgstr "Do início ao cursor de edição"
 
-#: editor_actions.cc:1911
+#: editor_actions.cc:1920
 #, fuzzy
 msgid "Insert Region From Region List"
 msgstr "Nova região a partir da seleção"
 
-#: editor_actions.cc:1917
+#: editor_actions.cc:1926
 #, fuzzy
 msgid "Set Sync Position"
 msgstr "Por Posição da Região"
 
-#: editor_actions.cc:1918
+#: editor_actions.cc:1927
 msgid "Place Transient"
 msgstr ""
 
-#: editor_actions.cc:1919
+#: editor_actions.cc:1928
 msgid "Split"
 msgstr "Separar"
 
-#: editor_actions.cc:1920
+#: editor_actions.cc:1929
 msgid "Trim Start at Edit Point"
 msgstr ""
 
-#: editor_actions.cc:1921
+#: editor_actions.cc:1930
 msgid "Trim End at Edit Point"
 msgstr ""
 
-#: editor_actions.cc:1926
+#: editor_actions.cc:1935
 #, fuzzy
 msgid "Align Start"
 msgstr "Começo de regiões"
 
-#: editor_actions.cc:1933
+#: editor_actions.cc:1942
 #, fuzzy
 msgid "Align Start Relative"
 msgstr "Alinhamento Relativo"
 
-#: editor_actions.cc:1937
+#: editor_actions.cc:1946
 #, fuzzy
 msgid "Align End"
 msgstr "Alinhamento"
 
-#: editor_actions.cc:1942
+#: editor_actions.cc:1951
 #, fuzzy
 msgid "Align End Relative"
 msgstr "Alinhamento Relativo"
 
-#: editor_actions.cc:1949
+#: editor_actions.cc:1958
 #, fuzzy
 msgid "Align Sync"
 msgstr "normalizar região"
 
-#: editor_actions.cc:1956
+#: editor_actions.cc:1965
 #, fuzzy
 msgid "Align Sync Relative"
 msgstr "Alinhamento Relativo"
 
-#: editor_actions.cc:1960 editor_actions.cc:1963
+#: editor_actions.cc:1969 editor_actions.cc:1972
 msgid "Choose Top..."
 msgstr ""
 
@@ -4713,36 +4724,36 @@ msgid ""
 "%2 as a new source, or skip it?"
 msgstr ""
 
-#: editor_audio_import.cc:279 editor_videotimeline.cc:107
+#: editor_audio_import.cc:279 editor_videotimeline.cc:108
 msgid "Cancel Import"
 msgstr "Cancelar importação"
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 #, fuzzy
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr "Editor: não foi possível abrir o arquivo \"%1\" (%2)"
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 #, fuzzy
 msgid "Cancel entire import"
 msgstr "Cancelar importação"
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 #, fuzzy
 msgid "Don't embed it"
 msgstr "Não %1"
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr ""
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 #, fuzzy
 msgid "Sample rate"
 msgstr "Separar Região"
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 #, fuzzy
 msgid ""
 "%1\n"
@@ -4750,7 +4761,7 @@ msgid ""
 msgstr ""
 "A freqüência de áudio deste arquivo não corresponde à freqüência da sessão!"
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 #, fuzzy
 msgid "Embed it anyway"
 msgstr "Embutir mesmo assim"
@@ -4793,35 +4804,35 @@ msgstr "remover marca"
 msgid "move tempo mark"
 msgstr "remover marca"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 #, fuzzy
 msgid "change fade in length"
 msgstr "fade in na edição"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 #, fuzzy
 msgid "change fade out length"
 msgstr "fade out na edição"
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 #, fuzzy
 msgid "move marker"
 msgstr "remover marca"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr ""
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 msgid "programming_error: %1"
 msgstr ""
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 #, fuzzy
 msgid "new range marker"
 msgstr "adicionar marca de intervalo"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 #, fuzzy
 msgid "rubberband selection"
 msgstr "Reproduzir seleção"
@@ -4901,7 +4912,7 @@ msgid "Sharing Solo?"
 msgstr ""
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 #, fuzzy
 msgid "Rec"
 msgstr "Rescanear"
@@ -4983,7 +4994,7 @@ msgid "end"
 msgstr "Segundos"
 
 #: editor_markers.cc:646 editor_ops.cc:1744 editor_ops.cc:1764
-#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1005
+#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1017
 msgid "add marker"
 msgstr "adicionar marca"
 
@@ -4992,7 +5003,7 @@ msgstr "adicionar marca"
 msgid "range"
 msgstr "intervalo"
 
-#: editor_markers.cc:713 location_ui.cc:840
+#: editor_markers.cc:713 location_ui.cc:852
 msgid "remove marker"
 msgstr "remover marca"
 
@@ -5085,8 +5096,8 @@ msgstr "Renomear"
 msgid "Rename Range"
 msgstr "Renomear"
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2233 route_time_axis.cc:968 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr "Renomear"
 
@@ -5242,7 +5253,7 @@ msgstr "Enviar região para a trás, última camada"
 msgid "Rename Region"
 msgstr "inverter horizontalmente as regiões"
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 #, fuzzy
 msgid "New name:"
 msgstr "novo nome: "
@@ -5431,7 +5442,7 @@ msgstr ""
 "(Isto não poderá ser desfeito)"
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr "Não, não faça nada."
 
@@ -5641,11 +5652,11 @@ msgstr "OU"
 msgid "close region gaps"
 msgstr "inverter horizontalmente as regiões"
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr ""
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5660,7 +5671,7 @@ msgstr ""
 msgid "tracks"
 msgstr "Trilhas"
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 #, fuzzy
 msgid "track"
 msgstr "Trilha"
@@ -5670,7 +5681,7 @@ msgstr "Trilha"
 msgid "busses"
 msgstr "Barramentos"
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 msgid "bus"
 msgstr ""
 
@@ -5711,7 +5722,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr "Sim, remova isto."
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr "Sim, remova isto."
 
@@ -5790,7 +5801,7 @@ msgstr ""
 msgid "Length of region fade-out (units: secondary clock), () if dsisabled"
 msgstr ""
 
-#: editor_regions.cc:118 mixer_strip.cc:1960 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr ""
@@ -5809,8 +5820,9 @@ msgstr "Ir"
 msgid "Region position glued to Bars|Beats time?"
 msgstr ""
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:723
-#: mixer_strip.cc:1934 panner_ui.cc:554 stereo_panner.cc:237
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
+#: stereo_panner.cc:237
 msgid "M"
 msgstr ""
 
@@ -5887,7 +5899,8 @@ msgstr "Trilhas/Barramentos"
 msgid "Track/Bus visible ?"
 msgstr "Trilhas/Barramentos"
 
-#: editor_routes.cc:204 mixer_strip.cc:1951 route_time_axis.cc:2387
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
+#: route_time_axis.cc:2407
 msgid "A"
 msgstr ""
 
@@ -5896,7 +5909,7 @@ msgstr ""
 msgid "Track/Bus active ?"
 msgstr "Trilhas/Barramentos"
 
-#: editor_routes.cc:205 mixer_strip.cc:1935
+#: editor_routes.cc:205 mixer_strip.cc:1932
 #, fuzzy
 msgid "I"
 msgstr "ENTRADA"
@@ -5906,7 +5919,7 @@ msgstr "ENTRADA"
 msgid "MIDI input enabled"
 msgstr "MIDI"
 
-#: editor_routes.cc:206 mixer_strip.cc:1933 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr ""
@@ -5921,7 +5934,7 @@ msgstr "Gravar"
 msgid "Muted"
 msgstr "Mutar"
 
-#: editor_routes.cc:208 mixer_strip.cc:1947
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr ""
 
@@ -5935,7 +5948,7 @@ msgstr "Solo"
 msgid "SI"
 msgstr "ENTRADA"
 
-#: editor_routes.cc:209 mixer_strip.cc:351 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 #, fuzzy
 msgid "Solo Isolated"
 msgstr "Solo"
@@ -6250,147 +6263,151 @@ msgid "192000Hz"
 msgstr ""
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr "Nenhum"
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr "Triangular"
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr "Retangular"
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 #, fuzzy
 msgid "Shaped"
 msgstr "Perfil de Ruído"
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr ""
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr ""
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr ""
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 #, fuzzy
 msgid "Recording only"
 msgstr "Suspender gravaçãoo em caso de falha sincrônica (XRUN)"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr ""
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 msgid "raw"
 msgstr ""
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr ""
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 #, fuzzy
 msgid "Audio Interface:"
 msgstr "interno"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:148 sfdb_ui.cc:261 sfdb_ui.cc:266
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 #, fuzzy
 msgid "Sample rate:"
 msgstr "Separar Região"
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr ""
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr ""
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr ""
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 #, fuzzy
 msgid "Audio mode:"
 msgstr "Quadros de �udio"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr ""
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr ""
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr ""
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr ""
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 msgid "Dither:"
 msgstr ""
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr ""
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr ""
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr ""
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 #, fuzzy
 msgid "Output device:"
 msgstr "Saídas"
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 msgid "Hardware input latency:"
 msgstr ""
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 #, fuzzy
 msgid "samples"
 msgstr "Separar Região"
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 msgid "Hardware output latency:"
 msgstr ""
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr ""
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 #, fuzzy
 msgid "Advanced"
 msgstr "Avançado ..."
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr ""
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 msgid ""
 "You do not have any audio devices capable of\n"
 "simultaneous playback and recording.\n"
@@ -6407,31 +6424,31 @@ msgid ""
 "%1 and choose the relevant device then."
 msgstr ""
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr ""
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr ""
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr ""
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr ""
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr ""
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:146
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 #, fuzzy
 msgid "Channels:"
 msgstr "cancelar"
@@ -6597,9 +6614,9 @@ msgid "Folder:"
 msgstr "Nome do diretório:"
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "Localizar"
 
@@ -6735,6 +6752,13 @@ msgstr "Localizações"
 msgid "Broadcast Wave options"
 msgstr "Broadcast WAVE/vírgula flutuante"
 
+#: export_format_selector.cc:136
+#, fuzzy
+msgid "Do you really want to remove the format?"
+msgstr ""
+"Tem certeza de que deseja remover a trilha \"%1\" ?\n"
+"(não será possível voltar)"
+
 #: export_preset_selector.cc:28
 #, fuzzy
 msgid "Preset"
@@ -6746,6 +6770,13 @@ msgid ""
 "Perhaps it references a format that has been removed?"
 msgstr ""
 
+#: export_preset_selector.cc:156
+#, fuzzy
+msgid "Do you really want to remove this preset?"
+msgstr ""
+"Tem certeza de que deseja remover a trilha \"%1\" ?\n"
+"(não será possível voltar)"
+
 #: export_timespan_selector.cc:46
 msgid "Show Times as:"
 msgstr ""
@@ -6759,40 +6790,51 @@ msgstr ""
 msgid "Range"
 msgstr "Intervalo"
 
-#: gain_meter.cc:109 gain_meter.cc:431 gain_meter.cc:820
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+msgid "curl error %1 (%2)"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+msgid "%1"
+msgstr ""
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 #, fuzzy
 msgid "-inf"
 msgstr "entrada"
 
-#: gain_meter.cc:115 gain_meter.cc:869
+#: gain_meter.cc:112 gain_meter.cc:913
 #, fuzzy
 msgid "Fader automation mode"
 msgstr "modo automático de pan"
 
-#: gain_meter.cc:116 gain_meter.cc:870
+#: gain_meter.cc:113 gain_meter.cc:914
 #, fuzzy
 msgid "Fader automation type"
 msgstr "Tipo do pan automático"
 
-#: gain_meter.cc:125 gain_meter.cc:759 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr ""
 
-#: gain_meter.cc:334
-#, fuzzy
-msgid "-Inf"
-msgstr "entrada"
-
-#: gain_meter.cc:726 mixer_strip.cc:1954 panner_ui.cc:557
-#: route_time_axis.cc:2391
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
+#: route_time_axis.cc:2411
 msgid "P"
 msgstr ""
 
-#: gain_meter.cc:729 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr ""
 
-#: gain_meter.cc:732 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr ""
 
@@ -6804,7 +6846,7 @@ msgstr ""
 msgid "Switches"
 msgstr ""
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2210
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 #, fuzzy
 msgid "Controls"
 msgstr "Controle de Saídas"
@@ -6838,72 +6880,72 @@ msgstr ""
 msgid "MIDI Connection Manager"
 msgstr "Conexões de entrada"
 
-#: global_port_matrix.cc:204 io_selector.cc:216
+#: global_port_matrix.cc:213 io_selector.cc:216
 msgid "port"
 msgstr "porta"
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 #, fuzzy
 msgid "Selection..."
 msgstr "Reproduzir região selecionada"
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr ""
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 #, fuzzy
 msgid "Soloed..."
 msgstr "Solo"
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 #, fuzzy
 msgid "Create New Group ..."
 msgstr "Sem grupo"
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr ""
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 #, fuzzy
 msgid "Edit Group..."
 msgstr "Sem grupo"
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 #, fuzzy
 msgid "Collect Group"
 msgstr "Selecionar"
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 #, fuzzy
 msgid "Remove Group"
 msgstr "Editar Grupo"
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 #, fuzzy
 msgid "Remove Subgroup Bus"
 msgstr "Sem grupo"
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 #, fuzzy
 msgid "Add New Subgroup Bus"
 msgstr "Sem grupo"
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr ""
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 #, fuzzy
 msgid "Add New Aux Bus (post-fader)"
 msgstr "Apagar meter"
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 msgid "Enable All Groups"
 msgstr ""
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 #, fuzzy
 msgid "Disable All Groups"
 msgstr "Desconectar"
@@ -7010,11 +7052,11 @@ msgstr ""
 msgid "I/O selector"
 msgstr "Saltar Seleção"
 
-#: io_selector.cc:266
+#: io_selector.cc:265
 msgid "%1 input"
 msgstr "%1 entrada"
 
-#: io_selector.cc:268
+#: io_selector.cc:267
 msgid "%1 output"
 msgstr "%1 saída"
 
@@ -7098,7 +7140,7 @@ msgstr[1] "Separar Região"
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1734
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 msgid "programming error: %1 (%2)"
 msgstr ""
 
@@ -7127,71 +7169,71 @@ msgstr ""
 msgid "Pre-Emphasis"
 msgstr ""
 
-#: location_ui.cc:310
+#: location_ui.cc:314
 #, fuzzy
 msgid "Remove this range"
 msgstr "Selecionar intervalo atual"
 
-#: location_ui.cc:311
+#: location_ui.cc:315
 msgid "Start time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:312
+#: location_ui.cc:316
 msgid "End time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:315
+#: location_ui.cc:319
 #, fuzzy
 msgid "Set range start from playhead location"
 msgstr "Marcar aqui"
 
-#: location_ui.cc:316
+#: location_ui.cc:320
 #, fuzzy
 msgid "Set range end from playhead location"
 msgstr "Reproduzir seleção"
 
-#: location_ui.cc:320
+#: location_ui.cc:324
 #, fuzzy
 msgid "Remove this marker"
 msgstr "remover marca"
 
-#: location_ui.cc:321
+#: location_ui.cc:325
 msgid "Position - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:323
+#: location_ui.cc:327
 #, fuzzy
 msgid "Set marker time from playhead location"
 msgstr "Reproduzir seleção"
 
-#: location_ui.cc:462
+#: location_ui.cc:494
 msgid "You cannot put a CD marker at the start of the session"
 msgstr ""
 
-#: location_ui.cc:708
+#: location_ui.cc:720
 #, fuzzy
 msgid "New Marker"
 msgstr "Marca"
 
-#: location_ui.cc:709
+#: location_ui.cc:721
 #, fuzzy
 msgid "New Range"
 msgstr "Adicionar Novo Intervalo"
 
-#: location_ui.cc:722
+#: location_ui.cc:734
 #, fuzzy
 msgid "<b>Loop/Punch Ranges</b>"
 msgstr "Intervalos Loop/Insersão"
 
-#: location_ui.cc:747
+#: location_ui.cc:759
 msgid "<b>Markers (Including CD Index)</b>"
 msgstr ""
 
-#: location_ui.cc:782
+#: location_ui.cc:794
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
 msgstr ""
 
-#: location_ui.cc:1024
+#: location_ui.cc:1036
 msgid "add range marker"
 msgstr "adicionar marca de intervalo"
 
@@ -7268,46 +7310,51 @@ msgid ""
 "session at this time, because we would lose your connection information.\n"
 msgstr ""
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr ""
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr ""
 
-#: main.cc:504
+#: main.cc:500
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr ""
 
-#: main.cc:505
+#: main.cc:501
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
 msgstr ""
 
-#: main.cc:507
+#: main.cc:503
 #, fuzzy
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr "Ardour não oferece ABSOLUTAMENTE NENHUMA GARANTIA"
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "Isto é um Software Livre. Fique à vontade para redistribuí-lo "
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr "com algumas condições; veja o fonte para mais detalhes"
 
-#: main.cc:519
+#: main.cc:513
+#, fuzzy
+msgid "could not initialize %1."
+msgstr "não foi possível iniciar o Ardour."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr ""
 
-#: main.cc:525
+#: main.cc:528
 #, fuzzy
 msgid "could not create %1 GUI"
 msgstr "não foi possível criar a INTERFACE ARDOUR"
@@ -7317,7 +7364,7 @@ msgstr "não foi possível criar a INTERFACE ARDOUR"
 msgid "Display delta to edit cursor"
 msgstr "Do início ao cursor de edição"
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 #, fuzzy
 msgid "MarkerText"
 msgstr "Marcas"
@@ -7857,7 +7904,7 @@ msgstr ""
 msgid "Missing Plugins"
 msgstr "Entradas"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr "OK"
 
@@ -7936,241 +7983,254 @@ msgstr ""
 msgid "Could not find mixer.bindings in search path %1"
 msgstr ""
 
-#: mixer_strip.cc:91 mixer_strip.cc:119 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr ""
 
-#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:352 mixer_strip.cc:1293
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 #, fuzzy
 msgid "Comments"
 msgstr "Centro"
 
-#: mixer_strip.cc:145
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr ""
 
-#: mixer_strip.cc:147
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
 msgstr ""
 
-#: mixer_strip.cc:154
+#: mixer_strip.cc:156
 #, fuzzy
 msgid "Hide this mixer strip"
 msgstr "Ocultar os painéis de mixer de todo os barramento de áudio"
 
-#: mixer_strip.cc:165
+#: mixer_strip.cc:167
 #, fuzzy
 msgid "Click to select metering point"
 msgstr "Loop região selecionada"
 
-#: mixer_strip.cc:171
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr ""
 
-#: mixer_strip.cc:190
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr ""
 
-#: mixer_strip.cc:199
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr ""
 
-#: mixer_strip.cc:201 mixer_strip.cc:1929
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 msgid "lock"
 msgstr "bloquear"
 
-#: mixer_strip.cc:202 mixer_strip.cc:1928
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 #, fuzzy
 msgid "iso"
 msgstr "entradas"
 
-#: mixer_strip.cc:256
+#: mixer_strip.cc:258
 #, fuzzy
 msgid "Mix group"
 msgstr "Sem grupo"
 
-#: mixer_strip.cc:349 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 #, fuzzy
 msgid "Phase Invert"
 msgstr "Inverter verticalmente"
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 #, fuzzy
 msgid "Solo Safe"
 msgstr "Solo"
 
-#: mixer_strip.cc:353 mixer_ui.cc:124 route_time_axis.cc:664
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 #, fuzzy
 msgid "Group"
 msgstr "Grupos de Mixer"
 
-#: mixer_strip.cc:354 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 #, fuzzy
 msgid "Meter Point"
 msgstr "VU (medidor volumétrico)"
 
-#: mixer_strip.cc:466
+#: mixer_strip.cc:470
 #, fuzzy
 msgid "Enable/Disable MIDI input"
 msgstr "Habilitar/desabilitar metrônomo"
 
-#: mixer_strip.cc:616
+#: mixer_strip.cc:622
 #, fuzzy
 msgid ""
 "Aux\n"
 "Sends"
 msgstr "Segundos"
 
-#: mixer_strip.cc:640
+#: mixer_strip.cc:646
 #, fuzzy
 msgid "Snd"
 msgstr "Segundos"
 
-#: mixer_strip.cc:694 mixer_strip.cc:822 processor_box.cc:2152
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr ""
 
-#: mixer_strip.cc:1089
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr ""
 
-#: mixer_strip.cc:1092
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr ""
 
-#: mixer_strip.cc:1167
+#: mixer_strip.cc:1174
 #, fuzzy
 msgid "Disconnected"
 msgstr "desconectado"
 
-#: mixer_strip.cc:1296
+#: mixer_strip.cc:1303
 #, fuzzy
 msgid "*Comments*"
 msgstr "Centro"
 
-#: mixer_strip.cc:1303
+#: mixer_strip.cc:1310
 #, fuzzy
 msgid "Cmt"
 msgstr "cortar"
 
-#: mixer_strip.cc:1306
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr ""
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr ""
 
-#: mixer_strip.cc:1351
+#: mixer_strip.cc:1358
 #, fuzzy
 msgid ": comment editor"
 msgstr "não foi possível iniciar o editor"
 
-#: mixer_strip.cc:1428
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr ""
 
-#: mixer_strip.cc:1431
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr ""
 
-#: mixer_strip.cc:1460
+#: mixer_strip.cc:1467
 msgid "Comments..."
 msgstr ""
 
-#: mixer_strip.cc:1462
+#: mixer_strip.cc:1469
 #, fuzzy
 msgid "Save As Template..."
 msgstr "Salvar Esquema..."
 
-#: mixer_strip.cc:1468 route_group_dialog.cc:39 route_time_axis.cc:687
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr "Ativar"
 
-#: mixer_strip.cc:1475
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr ""
 
-#: mixer_strip.cc:1478
+#: mixer_strip.cc:1485
 msgid "Protect Against Denormals"
 msgstr ""
 
-#: mixer_strip.cc:1484 route_time_axis.cc:426
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 #, fuzzy
 msgid "Remote Control ID..."
 msgstr "Remover ponto de controlo"
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 msgid "in"
 msgstr "entrada"
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 #, fuzzy
 msgid "post"
 msgstr "porta"
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 msgid "out"
 msgstr "saída"
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr ""
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 #, fuzzy
 msgid "pr"
 msgstr "porta"
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 #, fuzzy
 msgid "po"
 msgstr "porta"
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 #, fuzzy
 msgid "o"
 msgstr "mono"
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr ""
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr ""
 
-#: mixer_strip.cc:1920 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr ""
 
-#: mixer_strip.cc:1923 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr ""
 
-#: mixer_strip.cc:1936
+#: mixer_strip.cc:1933
 #, fuzzy
 msgid "D"
 msgstr "CD"
 
-#: mixer_strip.cc:1959
+#: mixer_strip.cc:1953
 #, fuzzy
 msgid "i"
 msgstr "entrada"
 
-#: mixer_strip.cc:2133
+#: mixer_strip.cc:2128
 #, fuzzy
 msgid "Pre-fader"
 msgstr "Pré Fade"
 
-#: mixer_strip.cc:2134
+#: mixer_strip.cc:2129
 #, fuzzy
 msgid "Post-fader"
 msgstr "Pós Fade"
 
+#: mixer_strip.cc:2166 meter_strip.cc:728
+msgid "Change all in Group to %1"
+msgstr ""
+
+#: mixer_strip.cc:2168 meter_strip.cc:730
+#, fuzzy
+msgid "Change all to %1"
+msgstr "cancelar"
+
+#: mixer_strip.cc:2170 meter_strip.cc:732
+msgid "Change same track-type to %1"
+msgstr ""
+
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr "não foi encontrada qualquer trilha para o painel de mixer"
@@ -8179,10 +8239,68 @@ msgstr "não foi encontrada qualquer trilha para o painel de mixer"
 msgid "-all-"
 msgstr "-tudo-"
 
-#: mixer_ui.cc:1792
+#: mixer_ui.cc:1794
 msgid "Strips"
 msgstr "Painéis"
 
+#: meter_strip.cc:764
+#, fuzzy
+msgid "Variable height"
+msgstr "Altura"
+
+#: meter_strip.cc:765
+#, fuzzy
+msgid "Short"
+msgstr "porta"
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr ""
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr ""
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+msgid "VU"
+msgstr ""
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr ""
@@ -8554,7 +8672,7 @@ msgstr ""
 msgid "Panner (2D)"
 msgstr ""
 
-#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:452
+#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:451
 msgid "Bypass"
 msgstr "Ignorar"
 
@@ -8747,7 +8865,7 @@ msgstr ""
 msgid "Eh? LADSPA plugins don't have editors!"
 msgstr ""
 
-#: plugin_ui.cc:125 plugin_ui.cc:228
+#: plugin_ui.cc:125 plugin_ui.cc:227
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
@@ -8763,7 +8881,7 @@ msgstr ""
 "tipo desconhecido do plugin fornecido para o editor (nota: sem suporte VST "
 "nesta versão do ardour)"
 
-#: plugin_ui.cc:258
+#: plugin_ui.cc:257
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no linuxVST support in this "
@@ -8772,76 +8890,88 @@ msgstr ""
 "tipo desconhecido do plugin fornecido para o editor (nota: sem suporte VST "
 "nesta versão do ardour)"
 
-#: plugin_ui.cc:330
+#: plugin_ui.cc:329
 msgid "create_lv2_editor called on non-LV2 plugin"
 msgstr ""
 
-#: plugin_ui.cc:418
+#: plugin_ui.cc:417
 msgid "Add"
 msgstr "Adicionar"
 
-#: plugin_ui.cc:422
+#: plugin_ui.cc:421
 #, fuzzy
 msgid "Description"
 msgstr "Reproduzir seleção"
 
-#: plugin_ui.cc:423
+#: plugin_ui.cc:422
 #, fuzzy
 msgid "Plugin analysis"
 msgstr "Entradas"
 
-#: plugin_ui.cc:430
+#: plugin_ui.cc:429
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
 msgstr ""
 
-#: plugin_ui.cc:431
+#: plugin_ui.cc:430
 #, fuzzy
 msgid "Save a new preset"
 msgstr "Nome para a nova conexão:"
 
-#: plugin_ui.cc:432
+#: plugin_ui.cc:431
 msgid "Save the current preset"
 msgstr ""
 
-#: plugin_ui.cc:433
+#: plugin_ui.cc:432
 msgid "Delete the current preset"
 msgstr ""
 
-#: plugin_ui.cc:434
+#: plugin_ui.cc:433
 msgid "Disable signal processing by the plugin"
 msgstr ""
 
-#: plugin_ui.cc:467 plugin_ui.cc:632
+#: plugin_ui.cc:466 plugin_ui.cc:662
 msgid ""
 "Click to allow the plugin to receive keyboard events that %1 would normally "
 "use as a shortcut"
 msgstr ""
 
-#: plugin_ui.cc:468
+#: plugin_ui.cc:467
 msgid "Click to enable/disable this plugin"
 msgstr ""
 
-#: plugin_ui.cc:507
+#: plugin_ui.cc:506
 msgid "latency (%1 sample)"
 msgid_plural "latency (%1 samples)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: plugin_ui.cc:509
+#: plugin_ui.cc:508
 msgid "latency (%1 ms)"
 msgstr ""
 
-#: plugin_ui.cc:520
+#: plugin_ui.cc:519
 msgid "Edit Latency"
 msgstr ""
 
-#: plugin_ui.cc:559
+#: plugin_ui.cc:558
 msgid "Plugin preset %1 not found"
 msgstr "Pré-seleção do plugin %1 não encontrada"
 
-#: plugin_ui.cc:639
+#: plugin_ui.cc:595
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin_ui.cc:615 plugin_ui.cc:630
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"newer version"
+msgstr ""
+
+#: plugin_ui.cc:669
 msgid "Click to allow normal use of %1 keyboard shortcuts"
 msgstr ""
 
@@ -8956,78 +9086,79 @@ msgstr ""
 msgid "Port Insert "
 msgstr "nova entrada"
 
-#: port_matrix.cc:323 port_matrix.cc:342
+#: port_matrix.cc:331 port_matrix.cc:357
 #, fuzzy
 msgid "<b>Sources</b>"
 msgstr "Avançado ..."
 
-#: port_matrix.cc:324 port_matrix.cc:343
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr ""
 
-#: port_matrix.cc:419 port_matrix.cc:427
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr ""
 
-#: port_matrix.cc:435
+#: port_matrix.cc:456
 #, fuzzy, c-format
 msgid "Rename '%s'..."
 msgstr "Renomear"
 
-#: port_matrix.cc:451
+#: port_matrix.cc:472
 #, fuzzy
 msgid "Remove all"
 msgstr "Remover Marca"
 
-#: port_matrix.cc:471 port_matrix.cc:483
+#: port_matrix.cc:492 port_matrix.cc:504
 #, fuzzy, c-format
 msgid "%s all"
 msgstr "reiniciar todos"
 
-#: port_matrix.cc:506
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr "Rescanear"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr ""
 
-#: port_matrix.cc:514
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr ""
 
-#: port_matrix.cc:702
+#: port_matrix.cc:723
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
 "or buss cannot support the new configuration."
 msgstr ""
 
-#: port_matrix.cc:705
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr ""
 
-#: port_matrix.cc:727
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr ""
 
-#: port_matrix.cc:728
+#: port_matrix.cc:749
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
 
-#: port_matrix.cc:945
+#: port_matrix.cc:966
 #, fuzzy, c-format
 msgid "Remove '%s'"
 msgstr "Remover"
 
-#: port_matrix.cc:960
+#: port_matrix.cc:981
 #, fuzzy, c-format
 msgid "%s all from '%s'"
 msgstr "Selecionar Tudo"
 
-#: port_matrix.cc:1026
+#: port_matrix.cc:1047
 #, fuzzy
 msgid "channel"
 msgstr "cancelar"
@@ -9040,66 +9171,66 @@ msgstr ""
 msgid "There are no %1 ports to connect."
 msgstr ""
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
 "Alt+double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 #, fuzzy
 msgid "Show All Controls"
 msgstr "Velocidade do controle"
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 #, fuzzy
 msgid "Hide All Controls"
 msgstr "Ocultar todos os barramentos de áudio"
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 #, fuzzy
 msgid "on"
 msgstr "mono"
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr "desligado"
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
 msgstr ""
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 msgid "Plugin Incompatibility"
 msgstr ""
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr ""
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
 msgstr ""
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 #, fuzzy
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
 msgstr[0] "%1 entrada"
 msgstr[1] "%1 entrada"
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 #, fuzzy
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
@@ -9110,64 +9241,64 @@ msgstr[1] ""
 "entrada\n"
 "automática"
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
 msgstr ""
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 #, fuzzy
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
 msgstr[0] "cancelar"
 msgstr[1] "cancelar"
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 #, fuzzy
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
 msgstr[0] "cancelar"
 msgstr[1] "cancelar"
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
 msgstr ""
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 msgid "Cannot set up new send: %1"
 msgstr ""
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
 "in that way because the inputs and\n"
 "outputs will not work correctly."
 msgstr ""
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 #, fuzzy
 msgid "Rename Processor"
 msgstr "Renomear"
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr ""
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr ""
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
 "could not match the configuration of this track."
 msgstr ""
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 #, fuzzy
 msgid ""
 "Do you really want to remove all processors from %1?\n"
@@ -9176,17 +9307,17 @@ msgstr ""
 "Tem certeza de que deseja remover a trilha \"%1\" ?\n"
 "(não será possível voltar)"
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 #, fuzzy
 msgid "Yes, remove them all"
 msgstr "Sim, remova isto."
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 #, fuzzy
 msgid "Remove processors"
 msgstr "Remover Marca"
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 #, fuzzy
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
@@ -9195,7 +9326,7 @@ msgstr ""
 "Tem certeza de que deseja remover a trilha \"%1\" ?\n"
 "(não será possível voltar)"
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 #, fuzzy
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
@@ -9204,59 +9335,59 @@ msgstr ""
 "Tem certeza de que deseja remover a trilha \"%1\" ?\n"
 "(não será possível voltar)"
 
-#: processor_box.cc:2198
+#: processor_box.cc:2200
 #, fuzzy
 msgid "New Plugin"
 msgstr "Entradas"
 
-#: processor_box.cc:2201
+#: processor_box.cc:2203
 #, fuzzy
 msgid "New Insert"
 msgstr "nova entrada"
 
-#: processor_box.cc:2204
+#: processor_box.cc:2206
 msgid "New External Send ..."
 msgstr ""
 
-#: processor_box.cc:2208
+#: processor_box.cc:2210
 msgid "New Aux Send ..."
 msgstr ""
 
-#: processor_box.cc:2212
+#: processor_box.cc:2214
 #, fuzzy
 msgid "Clear (all)"
 msgstr "Remover todos os intervalos"
 
-#: processor_box.cc:2214
+#: processor_box.cc:2216
 #, fuzzy
 msgid "Clear (pre-fader)"
 msgstr "Apagar meter"
 
-#: processor_box.cc:2216
+#: processor_box.cc:2218
 #, fuzzy
 msgid "Clear (post-fader)"
 msgstr "Apagar meter"
 
-#: processor_box.cc:2242
+#: processor_box.cc:2244
 #, fuzzy
 msgid "Activate All"
 msgstr "Ativar"
 
-#: processor_box.cc:2244
+#: processor_box.cc:2246
 #, fuzzy
 msgid "Deactivate All"
 msgstr "Desativar"
 
-#: processor_box.cc:2246
+#: processor_box.cc:2248
 #, fuzzy
 msgid "A/B Plugins"
 msgstr "Entradas"
 
-#: processor_box.cc:2255
+#: processor_box.cc:2257
 msgid "Edit with generic controls..."
 msgstr ""
 
-#: processor_box.cc:2531
+#: processor_box.cc:2557
 #, fuzzy
 msgid "%1: %2 (by %3)"
 msgstr "ardour: região"
@@ -9428,7 +9559,7 @@ msgstr ""
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
 
 #: rc_option_editor.cc:836
@@ -9523,7 +9654,7 @@ msgstr ""
 msgid "Click gain level"
 msgstr "Metrônomo no arquivo de áudio"
 
-#: rc_option_editor.cc:1083 route_time_axis.cc:206 route_time_axis.cc:667
+#: rc_option_editor.cc:1083 route_time_axis.cc:215 route_time_axis.cc:676
 msgid "Automation"
 msgstr "Automação"
 
@@ -9710,98 +9841,102 @@ msgstr ""
 msgid "Show meters on tracks in the editor"
 msgstr ""
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr ""
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr ""
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 msgid "whenever they overlap in time"
 msgstr ""
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr ""
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr ""
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 #, fuzzy
 msgid "Show waveforms in regions"
 msgstr "mostra toda a automação"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 #, fuzzy
 msgid "Show gain envelopes in audio regions"
 msgstr "mostra toda a automação"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr ""
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr ""
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 #, fuzzy
 msgid "Waveform scale"
 msgstr "Forma de onda"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "linear"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr ""
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 #, fuzzy
 msgid "Waveform shape"
 msgstr "Forma de onda"
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 #, fuzzy
 msgid "traditional"
 msgstr "Tradicional"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 #, fuzzy
 msgid "rectified"
 msgstr "Corrigido"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr ""
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr ""
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr ""
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr ""
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 msgid "Synchronise editor and mixer track order"
 msgstr ""
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 msgid "Synchronise editor and mixer selection"
 msgstr ""
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 #, fuzzy
 msgid "Name new markers"
 msgstr "remover marca"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9809,365 +9944,444 @@ msgid ""
 "You can always rename markers by right-clicking on them"
 msgstr ""
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr ""
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr ""
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 #, fuzzy
 msgid "Record monitoring handled by"
 msgstr "Usar Monitoração de Hardware"
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 #, fuzzy
 msgid "ardour"
 msgstr "ardour: relógio"
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 #, fuzzy
 msgid "audio hardware"
 msgstr "Quadros de �udio"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 #, fuzzy
 msgid "Tape machine mode"
 msgstr "modo automático de pan"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr ""
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr ""
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 #, fuzzy
 msgid "Connect track inputs"
 msgstr "Conectar novas faixas automaticamente"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 #, fuzzy
 msgid "automatically to physical inputs"
 msgstr "conectar automaticamente entradas das trilhas com as portas físicas"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr ""
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 #, fuzzy
 msgid "Connect track and bus outputs"
 msgstr "concetar automaticamente saídas das trilhas com as saídas master"
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 #, fuzzy
 msgid "automatically to physical outputs"
 msgstr "conectar manualmente saídas das trilhas"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 #, fuzzy
 msgid "automatically to master bus"
 msgstr "concetar automaticamente saídas das trilhas com as saídas master"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 #, fuzzy
 msgid "Denormals"
 msgstr "Normal"
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 msgid "Use DC bias to protect against denormals"
 msgstr ""
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr ""
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr ""
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 msgid "use FlushToZero"
 msgstr ""
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr ""
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr ""
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 #, fuzzy
 msgid "Silence plugins when the transport is stopped"
 msgstr "Suspender efeitos/plugins em transporte"
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr ""
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr ""
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 msgid "Replicate missing region channels"
 msgstr ""
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 msgid "Solo / mute"
 msgstr ""
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 #, fuzzy
 msgid "Solo-in-place mute cut (dB)"
 msgstr "Solo"
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr ""
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 #, fuzzy
 msgid "Listen Position"
 msgstr "Audição"
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 msgid "after-fader (AFL)"
 msgstr ""
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 #, fuzzy
 msgid "pre-fader (PFL)"
 msgstr "Pré Redirecionamentos"
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr ""
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 #, fuzzy
 msgid "before pre-fader processors"
 msgstr "Remover Marca"
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr ""
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr ""
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 #, fuzzy
 msgid "immediately post-fader"
 msgstr "Apagar meter"
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 #, fuzzy
 msgid "after post-fader processors (before pan)"
 msgstr "Remover Marca"
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr ""
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 #, fuzzy
 msgid "Show solo muting"
 msgstr "mostra toda a automação"
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr ""
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 #, fuzzy
 msgid "Default track / bus muting options"
 msgstr "Inspetador de Trilhas/Barramentos"
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr ""
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr ""
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 #, fuzzy
 msgid "Mute affects control outputs"
 msgstr "usar controles de saída"
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr ""
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 msgid "Send MIDI Time Code"
 msgstr ""
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr ""
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr ""
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 #, fuzzy
 msgid "Send MIDI control feedback"
 msgstr "Porta MMC"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr ""
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr ""
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr ""
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr ""
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr ""
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 #, fuzzy
 msgid "Sound MIDI notes as they are selected"
 msgstr "Inserir seleção"
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 #, fuzzy
 msgid "User interaction"
 msgstr "Regiões/criação"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
 "   <i>(if available for your language preferences)</i>"
 msgstr ""
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr ""
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 #, fuzzy
 msgid "Control surface remote ID"
 msgstr "Controle de Saídas"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 msgid "assigned by user"
 msgstr ""
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr ""
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr ""
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1925
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 msgid "Preferences|GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr ""
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr ""
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr ""
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 #, fuzzy
 msgid "Mixer Strip"
 msgstr "Mixer"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 #, fuzzy
 msgid "Use narrow strips in the mixer by default"
 msgstr "Estreitar painéis de mixer"
 
-#: rc_option_editor.cc:1898
+#: rc_option_editor.cc:1906
 #, fuzzy
-msgid "Meter hold time"
+msgid "Peak hold time"
 msgstr "VU (medidor volumétrico)"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 #, fuzzy
 msgid "short"
 msgstr "porta"
 
-#: rc_option_editor.cc:1905 rc_option_editor.cc:1920
+#: rc_option_editor.cc:1913
 msgid "medium"
 msgstr ""
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr ""
 
-#: rc_option_editor.cc:1912
-msgid "Meter fall-off"
+#: rc_option_editor.cc:1920
+msgid "DPM fall-off"
 msgstr ""
 
-#: rc_option_editor.cc:1918
-#, fuzzy
-msgid "slowest"
-msgstr "Menor"
+#: rc_option_editor.cc:1926
+msgid "slowest [6.6dB/sec]"
+msgstr ""
 
-#: rc_option_editor.cc:1919
-msgid "slow"
+#: rc_option_editor.cc:1927
+msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
 msgstr ""
 
-#: rc_option_editor.cc:1921
-#, fuzzy
-msgid "fast"
-msgstr "rapidamente"
+#: rc_option_editor.cc:1928
+msgid "slowish [12.0dB/sec] (DIN)"
+msgstr ""
 
-#: rc_option_editor.cc:1922
-#, fuzzy
-msgid "faster"
-msgstr "Fades"
+#: rc_option_editor.cc:1929
+msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
+msgstr ""
 
-#: rc_option_editor.cc:1923
-msgid "fastest"
-msgstr "rapidamente"
+#: rc_option_editor.cc:1930
+msgid "medium [20dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1931
+msgid "fast [32dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1932
+msgid "faster [46dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1933
+msgid "fastest [70dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1939
+msgid "Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
+
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+msgid "-20dBFS (SMPTE RP.0155)"
+msgstr ""
+
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+msgid "-18dBFS (EBU, BBC)"
+msgstr ""
+
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
+
+#: rc_option_editor.cc:1955
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
+msgstr ""
+
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
+msgstr ""
+
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
+msgstr ""
+
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
+
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
+
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1985
+msgid "Peak threshold [dBFS]"
+msgstr ""
+
+#: rc_option_editor.cc:1993
+msgid ""
+"Specify the audio signal level in dbFS at and above which the meter-peak "
+"indicator will flash red."
+msgstr ""
+
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
+msgstr ""
 
 #: region_editor.cc:79
 msgid "audition this region"
@@ -10178,11 +10392,11 @@ msgstr "ouvir esta região"
 msgid "Position:"
 msgstr "Audição"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr "Final:"
 
-#: region_editor.cc:92 sfdb_ui.cc:140
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr ""
 
@@ -10206,27 +10420,27 @@ msgstr ""
 msgid "Source:"
 msgstr ""
 
-#: region_editor.cc:167
+#: region_editor.cc:166
 #, fuzzy
 msgid "Region '%1'"
 msgstr "Região"
 
-#: region_editor.cc:274
+#: region_editor.cc:273
 #, fuzzy
 msgid "change region start position"
 msgstr "Regiões/posição"
 
-#: region_editor.cc:290
+#: region_editor.cc:289
 #, fuzzy
 msgid "change region end position"
 msgstr "Regiões/posição"
 
-#: region_editor.cc:310
+#: region_editor.cc:309
 #, fuzzy
 msgid "change region length"
 msgstr "fade in na edição"
 
-#: region_editor.cc:404 region_editor.cc:416
+#: region_editor.cc:403 region_editor.cc:415
 #, fuzzy
 msgid "change region sync point"
 msgstr "Regiões/posição"
@@ -10437,361 +10651,361 @@ msgid ""
 "A route group of this name already exists.  Please use a different name."
 msgstr ""
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 #, fuzzy
 msgid "Tracks/Busses"
 msgstr "Trilhas/Barramentos"
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr "Entradas"
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr "Saídas"
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr ""
 
-#: route_params_ui.cc:211
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr "não foi encontrada qualquer elemento para encaminhamento"
 
-#: route_params_ui.cc:258 route_params_ui.cc:286
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr ""
 
-#: route_params_ui.cc:478
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr "NENHUMA TRILHA"
 
-#: route_params_ui.cc:611 route_params_ui.cc:612
+#: route_params_ui.cc:613 route_params_ui.cc:614
 #, fuzzy
 msgid "No Track or Bus Selected"
 msgstr "Caminho não selecionado"
 
-#: route_time_axis.cc:96
+#: route_time_axis.cc:97
 msgid "g"
 msgstr ""
 
-#: route_time_axis.cc:97
+#: route_time_axis.cc:98
 msgid "p"
 msgstr ""
 
-#: route_time_axis.cc:98
+#: route_time_axis.cc:99
 msgid "a"
 msgstr ""
 
-#: route_time_axis.cc:168
+#: route_time_axis.cc:173
 msgid "Record (Right-click for Step Edit)"
 msgstr ""
 
-#: route_time_axis.cc:171
+#: route_time_axis.cc:176
 msgid "Record"
 msgstr "Gravar"
 
-#: route_time_axis.cc:201
+#: route_time_axis.cc:210
 #, fuzzy
 msgid "Route Group"
 msgstr "Editar Grupo"
 
-#: route_time_axis.cc:204
+#: route_time_axis.cc:213
 #, fuzzy
 msgid "MIDI Controllers and Automation"
 msgstr "Porta MMC"
 
-#: route_time_axis.cc:381
+#: route_time_axis.cc:390
 #, fuzzy
 msgid "Show All Automation"
 msgstr "mostra toda a automação"
 
-#: route_time_axis.cc:384
+#: route_time_axis.cc:393
 #, fuzzy
 msgid "Show Existing Automation"
 msgstr "mostra a automação existente"
 
-#: route_time_axis.cc:387
+#: route_time_axis.cc:396
 #, fuzzy
 msgid "Hide All Automation"
 msgstr "ocultar toda a automação"
 
-#: route_time_axis.cc:396
+#: route_time_axis.cc:405
 #, fuzzy
 msgid "Processor automation"
 msgstr "limpar automação"
 
-#: route_time_axis.cc:415
+#: route_time_axis.cc:424
 #, fuzzy
 msgid "Color..."
 msgstr "Cor"
 
-#: route_time_axis.cc:472
+#: route_time_axis.cc:481
 msgid "Overlaid"
 msgstr ""
 
-#: route_time_axis.cc:478
+#: route_time_axis.cc:487
 msgid "Stacked"
 msgstr ""
 
-#: route_time_axis.cc:486
+#: route_time_axis.cc:495
 #, fuzzy
 msgid "Layers"
 msgstr "Camada"
 
-#: route_time_axis.cc:555
+#: route_time_axis.cc:564
 #, fuzzy
 msgid "Automatic (based on I/O connections)"
 msgstr "conectar manualmente saídas das trilhas"
 
-#: route_time_axis.cc:564
+#: route_time_axis.cc:573
 #, fuzzy
 msgid "(Currently: Existing Material)"
 msgstr "Material existente"
 
-#: route_time_axis.cc:567
+#: route_time_axis.cc:576
 #, fuzzy
 msgid "(Currently: Capture Time)"
 msgstr "Tempo de captura"
 
-#: route_time_axis.cc:575
+#: route_time_axis.cc:584
 #, fuzzy
 msgid "Align With Existing Material"
 msgstr "Material existente"
 
-#: route_time_axis.cc:580
+#: route_time_axis.cc:589
 #, fuzzy
 msgid "Align With Capture Time"
 msgstr "Tempo de captura"
 
-#: route_time_axis.cc:585
+#: route_time_axis.cc:594
 #, fuzzy
 msgid "Alignment"
 msgstr "Alinhamento"
 
-#: route_time_axis.cc:620
+#: route_time_axis.cc:629
 #, fuzzy
 msgid "Normal Mode"
 msgstr "Normal"
 
-#: route_time_axis.cc:626
+#: route_time_axis.cc:635
 #, fuzzy
 msgid "Tape Mode"
 msgstr "Modo de Ajuste"
 
-#: route_time_axis.cc:632
+#: route_time_axis.cc:641
 #, fuzzy
 msgid "Non-Layered Mode"
 msgstr "Fim de regiões"
 
-#: route_time_axis.cc:645 route_time_axis.cc:1587
+#: route_time_axis.cc:654 route_time_axis.cc:1601
 msgid "Playlist"
 msgstr "Lista de reprodução"
 
-#: route_time_axis.cc:965
+#: route_time_axis.cc:979
 #, fuzzy
 msgid "Rename Playlist"
 msgstr "Nome para a lista de reprodução"
 
-#: route_time_axis.cc:966
+#: route_time_axis.cc:980
 #, fuzzy
 msgid "New name for playlist:"
 msgstr "Nome para a lista de reprodução"
 
-#: route_time_axis.cc:1051
+#: route_time_axis.cc:1065
 #, fuzzy
 msgid "New Copy Playlist"
 msgstr "Nome para a lista de reprodução"
 
-#: route_time_axis.cc:1052 route_time_axis.cc:1105
+#: route_time_axis.cc:1066 route_time_axis.cc:1119
 #, fuzzy
 msgid "Name for new playlist:"
 msgstr "Nome para a lista de reprodução"
 
-#: route_time_axis.cc:1104
+#: route_time_axis.cc:1118
 #, fuzzy
 msgid "New Playlist"
 msgstr "Lista de reprodução"
 
-#: route_time_axis.cc:1295
+#: route_time_axis.cc:1309
 #, fuzzy
 msgid "You cannot create a track with that name as it is reserved for %1"
 msgstr ""
 "Você não pode adicionar uma trilha se uma sessão não estiver carregada."
 
-#: route_time_axis.cc:1476
+#: route_time_axis.cc:1490
 #, fuzzy
 msgid "New Copy..."
 msgstr "Nova Cópia"
 
-#: route_time_axis.cc:1480
+#: route_time_axis.cc:1494
 #, fuzzy
 msgid "New Take"
 msgstr "Novo Andamento"
 
-#: route_time_axis.cc:1481
+#: route_time_axis.cc:1495
 #, fuzzy
 msgid "Copy Take"
 msgstr "Copiar"
 
-#: route_time_axis.cc:1486
+#: route_time_axis.cc:1500
 msgid "Clear Current"
 msgstr "Limpar Atual"
 
-#: route_time_axis.cc:1489
+#: route_time_axis.cc:1503
 #, fuzzy
 msgid "Select From All..."
 msgstr "Selecionar Tudo"
 
-#: route_time_axis.cc:1577
+#: route_time_axis.cc:1591
 msgid "Take: %1.%2"
 msgstr ""
 
-#: route_time_axis.cc:2267
+#: route_time_axis.cc:2291
 msgid "Underlays"
 msgstr ""
 
-#: route_time_axis.cc:2270
+#: route_time_axis.cc:2294
 #, fuzzy
 msgid "Remove \"%1\""
 msgstr "Remover"
 
-#: route_time_axis.cc:2320 route_time_axis.cc:2357
+#: route_time_axis.cc:2344 route_time_axis.cc:2381
 msgid "programming error: underlay reference pointer pairs are inconsistent!"
 msgstr ""
 
-#: route_time_axis.cc:2388
+#: route_time_axis.cc:2408
 msgid "After-fade listen (AFL)"
 msgstr ""
 
-#: route_time_axis.cc:2392
+#: route_time_axis.cc:2412
 #, fuzzy
 msgid "Pre-fade listen (PFL)"
 msgstr "Pré Redirecionamentos"
 
-#: route_time_axis.cc:2396
+#: route_time_axis.cc:2416
 msgid "s"
 msgstr ""
 
-#: route_time_axis.cc:2400
+#: route_time_axis.cc:2419
 msgid "m"
 msgstr ""
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 #, fuzzy
 msgid "Mute this track"
 msgstr "Ocultar esta trilha"
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr ""
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr ""
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr ""
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 #, fuzzy
 msgid "Monitor input"
 msgstr "Usar Monitoração de Hardware"
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 #, fuzzy
 msgid "Monitor playback"
 msgstr "Parar reprodução"
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 msgid "Not connected to JACK - cannot engage record"
 msgstr ""
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 #, fuzzy
 msgid "Step Entry"
 msgstr "Editar"
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr ""
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 #, fuzzy
 msgid "Assign all tracks and buses (prefader)"
 msgstr "Inserir seleção"
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr ""
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 #, fuzzy
 msgid "Assign all tracks and buses (postfader)"
 msgstr "Inserir seleção"
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 #, fuzzy
 msgid "Assign selected tracks (prefader)"
 msgstr "Inserir seleção"
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 #, fuzzy
 msgid "Assign selected tracks and buses (prefader)"
 msgstr "Inserir seleção"
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 #, fuzzy
 msgid "Assign selected tracks (postfader)"
 msgstr "Inserir seleção"
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 #, fuzzy
 msgid "Assign selected tracks and buses (postfader)"
 msgstr "Inserir seleção"
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 #, fuzzy
 msgid "Copy track/bus gains to sends"
 msgstr "ardour: adicionar trilhas/barramento"
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr ""
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr ""
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 #, fuzzy
 msgid "Solo Isolate"
 msgstr "Solo"
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr "Pré Fade"
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr "Pós Fade"
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr "Controle de Saídas"
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr "Saídas Principais"
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 #, fuzzy
 msgid "Color Selection"
 msgstr "Reproduzir região selecionada"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 #, fuzzy
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
@@ -10803,7 +11017,7 @@ msgstr ""
 "Tem certeza de que deseja remover a trilha \"%1\" ?\n"
 "(não será possível voltar)"
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 #, fuzzy
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
@@ -10813,70 +11027,70 @@ msgstr ""
 "Deseja realmente remover o barramento \"%1\" ?\n"
 "(esta operação não poderá ser desfeita)"
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 #, fuzzy
 msgid "Remove track"
 msgstr "Remover Marca"
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 #, fuzzy
 msgid "Remove bus"
 msgstr "Remover"
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
 msgstr ""
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 #, fuzzy
 msgid "Use the new name"
 msgstr "novo nome: "
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 msgid "Re-edit the name"
 msgstr ""
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 #, fuzzy
 msgid "Rename Track"
 msgstr "Renomear"
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 #, fuzzy
 msgid "Rename Bus"
 msgstr "Renomear"
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 msgid " latency"
 msgstr ""
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr ""
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 #, fuzzy
 msgid "Save As Template"
 msgstr "Salvar Esquema..."
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 #, fuzzy
 msgid "Template name:"
 msgstr "Nome do campo:"
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 #, fuzzy
 msgid "Remote Control ID"
 msgstr "Remover ponto de controlo"
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 #, fuzzy
 msgid "Remote control ID:"
 msgstr "Remover ponto de controlo"
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -10884,17 +11098,17 @@ msgid ""
 "The remote control ID of %3 cannot be changed."
 msgstr ""
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the master bus"
 msgstr "usar saída master"
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the monitor bus"
 msgstr "usar saída master"
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -10905,23 +11119,23 @@ msgid ""
 "change this%5"
 msgstr ""
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the mixer"
 msgstr "Mixer"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the editor"
 msgstr "editor"
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
 msgstr ""
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr ""
 
@@ -10939,7 +11153,7 @@ msgstr "Apagar todas as localizações"
 msgid "the session folder"
 msgstr "Loop região selecionada"
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 #, fuzzy
 msgid "Send "
 msgstr "Segundos"
@@ -11438,61 +11652,117 @@ msgstr ""
 msgid "Glue new regions to bars and beats"
 msgstr ""
 
-#: sfdb_ui.cc:87 sfdb_ui.cc:107 sfdb_ui.cc:116
+#: session_option_editor.cc:275 session_option_editor.cc:277
+#: session_option_editor.cc:284 session_option_editor.cc:291
+#: session_option_editor.cc:298 session_option_editor.cc:300
+#: session_option_editor.cc:307 session_option_editor.cc:314
+#: session_option_editor.cc:321 session_option_editor.cc:323
+#, fuzzy
+msgid "Meterbridge"
+msgstr "VU (medidor volumétrico)"
+
+#: session_option_editor.cc:275
+msgid "Route Display"
+msgstr ""
+
+#: session_option_editor.cc:279
+#, fuzzy
+msgid "Show Midi Tracks"
+msgstr "Mostrar todos os barramentos de áudio"
+
+#: session_option_editor.cc:286
+#, fuzzy
+msgid "Show Busses"
+msgstr "Barramentos"
+
+#: session_option_editor.cc:293
+#, fuzzy
+msgid "Include Master Bus"
+msgstr "usar saída master"
+
+#: session_option_editor.cc:298
+msgid "Button Area"
+msgstr ""
+
+#: session_option_editor.cc:302
+#, fuzzy
+msgid "Rec-enable Button"
+msgstr "Gravar"
+
+#: session_option_editor.cc:309
+#, fuzzy
+msgid "Mute Button"
+msgstr "+ button"
+
+#: session_option_editor.cc:316
+#, fuzzy
+msgid "Solo Button"
+msgstr "+ button"
+
+#: session_option_editor.cc:321
+msgid "Name Labels"
+msgstr ""
+
+#: session_option_editor.cc:325
+#, fuzzy
+msgid "Track Name"
+msgstr "Trilhas/Barramentos"
+
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 #, fuzzy
 msgid "as new tracks"
 msgstr "Trilhas"
 
-#: sfdb_ui.cc:89 sfdb_ui.cc:109
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 #, fuzzy
 msgid "to selected tracks"
 msgstr "Inserir seleção"
 
-#: sfdb_ui.cc:91 sfdb_ui.cc:111
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 #, fuzzy
 msgid "to region list"
 msgstr "Começo de regiões"
 
-#: sfdb_ui.cc:93 sfdb_ui.cc:113
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 #, fuzzy
 msgid "as new tape tracks"
 msgstr "Outras trilhas"
 
-#: sfdb_ui.cc:97
+#: sfdb_ui.cc:96
 msgid "programming error: unknown import mode string %1"
 msgstr ""
 
-#: sfdb_ui.cc:124
+#: sfdb_ui.cc:123
 #, fuzzy
 msgid "Auto-play"
 msgstr ""
 "reprodução\n"
 "automática"
 
-#: sfdb_ui.cc:130 sfdb_ui.cc:237
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 #, fuzzy
 msgid "<b>Sound File Information</b>"
 msgstr "Informação do arquivo de áudio"
 
-#: sfdb_ui.cc:142
+#: sfdb_ui.cc:141
 #, fuzzy
 msgid "Timestamp:"
 msgstr "Por tempo data/hora da Região"
 
-#: sfdb_ui.cc:144
+#: sfdb_ui.cc:143
 #, fuzzy
 msgid "Format:"
 msgstr "Normal"
 
-#: sfdb_ui.cc:183 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr ""
 
-#: sfdb_ui.cc:320
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr ""
 
-#: sfdb_ui.cc:327
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "Não foi possível ler o arquivo: %1 (%2)."
 
@@ -11523,12 +11793,12 @@ msgstr "Quadros de �udio"
 msgid "MIDI files"
 msgstr "MIDI"
 
-#: sfdb_ui.cc:458 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 #, fuzzy
 msgid "All files"
 msgstr "arquivos limpos"
 
-#: sfdb_ui.cc:477 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 #, fuzzy
 msgid "Browse Files"
 msgstr "Localizar"
@@ -11538,245 +11808,233 @@ msgstr "Localizar"
 msgid "Paths"
 msgstr "Diretórios/Arquivos"
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr ""
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 #, fuzzy
 msgid "Sort:"
 msgstr "porta"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 #, fuzzy
 msgid "Longest"
 msgstr "Enorme"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 #, fuzzy
 msgid "Shortest"
 msgstr "porta"
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 #, fuzzy
 msgid "Newest"
 msgstr "Menor"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr ""
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr ""
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 #, fuzzy
 msgid "Least downloaded"
 msgstr "Separar intervalo"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr ""
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr ""
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr ""
 
-#: sfdb_ui.cc:572
+#: sfdb_ui.cc:555
+msgid "Similar"
+msgstr ""
+
+#: sfdb_ui.cc:567
 #, fuzzy
 msgid "ID"
 msgstr "ENTRADA"
 
-#: sfdb_ui.cc:573 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 #, fuzzy
 msgid "Filename"
 msgstr "Renomear"
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:570
 #, fuzzy
 msgid "Duration"
 msgstr "normalizar região"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:571
 msgid "Size"
 msgstr ""
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:572
 #, fuzzy
 msgid "Samplerate"
 msgstr "Separar Região"
 
-#: sfdb_ui.cc:578
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr ""
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr ""
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr ""
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr ""
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr ""
 
-#: sfdb_ui.cc:846
-msgid "found %1 match"
-msgid_plural "found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:862
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr ""
 
-#: sfdb_ui.cc:960
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sfdb_ui.cc:965
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr ""
 
-#: sfdb_ui.cc:1029
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr ""
 
-#: sfdb_ui.cc:1031
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr ""
 
-#: sfdb_ui.cc:1033 sfdb_ui.cc:1035
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr ""
 
-#: sfdb_ui.cc:1037
+#: sfdb_ui.cc:1086
 #, fuzzy
 msgid "GB"
 msgstr "Ir"
 
-#: sfdb_ui.cc:1070
-msgid "Search returned no results."
-msgstr ""
-
-#: sfdb_ui.cc:1072
-msgid "Found %1 match"
-msgid_plural "Found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:1277 sfdb_ui.cc:1585 sfdb_ui.cc:1635 sfdb_ui.cc:1653
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr ""
 
-#: sfdb_ui.cc:1280 sfdb_ui.cc:1636 sfdb_ui.cc:1654
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 msgid "one track per channel"
 msgstr ""
 
-#: sfdb_ui.cc:1288 sfdb_ui.cc:1638 sfdb_ui.cc:1655
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 #, fuzzy
 msgid "sequence files"
 msgstr "arquivos limpos"
 
-#: sfdb_ui.cc:1291 sfdb_ui.cc:1643
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 msgid "all files in one track"
 msgstr ""
 
-#: sfdb_ui.cc:1292 sfdb_ui.cc:1637
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 #, fuzzy
 msgid "merge files"
 msgstr "arquivos limpos"
 
-#: sfdb_ui.cc:1298 sfdb_ui.cc:1640
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 #, fuzzy
 msgid "one region per file"
 msgstr "Saltar Seleção"
 
-#: sfdb_ui.cc:1301 sfdb_ui.cc:1641
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 #, fuzzy
 msgid "one region per channel"
 msgstr "Cortar região pela intervalo"
 
-#: sfdb_ui.cc:1306 sfdb_ui.cc:1642 sfdb_ui.cc:1656
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 #, fuzzy
 msgid "all files in one region"
 msgstr "normalizar região"
 
-#: sfdb_ui.cc:1373
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
 msgstr ""
 
-#: sfdb_ui.cc:1513
+#: sfdb_ui.cc:1534
 #, fuzzy
 msgid "Copy files to session"
 msgstr "Zoom na sessão"
 
-#: sfdb_ui.cc:1530 sfdb_ui.cc:1693
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 #, fuzzy
 msgid "file timestamp"
 msgstr "Por tempo data/hora da Região"
 
-#: sfdb_ui.cc:1531 sfdb_ui.cc:1695
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 #, fuzzy
 msgid "edit point"
 msgstr "editor"
 
-#: sfdb_ui.cc:1532 sfdb_ui.cc:1697
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 #, fuzzy
 msgid "playhead"
 msgstr "Início"
 
-#: sfdb_ui.cc:1533
+#: sfdb_ui.cc:1554
 #, fuzzy
 msgid "session start"
 msgstr "Começo de regiões"
 
-#: sfdb_ui.cc:1538
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1581
 #, fuzzy
 msgid "<b>Insert at</b>"
 msgstr "Inverter verticalmente"
 
-#: sfdb_ui.cc:1573
+#: sfdb_ui.cc:1594
 #, fuzzy
 msgid "<b>Mapping</b>"
 msgstr "Avançado ..."
 
-#: sfdb_ui.cc:1591
+#: sfdb_ui.cc:1612
 msgid "<b>Conversion quality</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1603 sfdb_ui.cc:1709
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr ""
 
-#: sfdb_ui.cc:1604 sfdb_ui.cc:1711
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr ""
 
-#: sfdb_ui.cc:1605 sfdb_ui.cc:1713
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr ""
 
-#: sfdb_ui.cc:1607
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "Rapidamente"
 
@@ -11872,21 +12130,21 @@ msgstr ""
 
 #: startup.cc:194
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -11995,10 +12253,6 @@ msgstr ""
 msgid "Click to open the program website in your web browser"
 msgstr ""
 
-#: startup.cc:594
-msgid "What would you like to do ?"
-msgstr ""
-
 #: startup.cc:729
 #, fuzzy
 msgid "Open"
@@ -12014,99 +12268,99 @@ msgstr "Nome da sessão:"
 msgid "Create session folder in:"
 msgstr "Loop região selecionada"
 
-#: startup.cc:813
+#: startup.cc:821
 #, fuzzy
 msgid "Select folder for session"
 msgstr "Loop região selecionada"
 
-#: startup.cc:845
+#: startup.cc:853
 #, fuzzy
 msgid "Use this template"
 msgstr "-esquema/template"
 
-#: startup.cc:848
+#: startup.cc:856
 #, fuzzy
 msgid "no template"
 msgstr "-esquema/template"
 
-#: startup.cc:876
+#: startup.cc:884
 #, fuzzy
 msgid "Use an existing session as a template:"
 msgstr "usar esquema existente"
 
-#: startup.cc:888
+#: startup.cc:896
 #, fuzzy
 msgid "Select template"
 msgstr "-esquema/template"
 
-#: startup.cc:914
+#: startup.cc:922
 #, fuzzy
 msgid "New Session"
 msgstr "Sessão"
 
-#: startup.cc:1068
+#: startup.cc:1077
 #, fuzzy
 msgid "Select session file"
 msgstr "Loop região selecionada"
 
-#: startup.cc:1084
+#: startup.cc:1093
 #, fuzzy
 msgid "Browse:"
 msgstr "Localizar"
 
-#: startup.cc:1093
+#: startup.cc:1102
 #, fuzzy
 msgid "Select a session"
 msgstr "Loop região selecionada"
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 #, fuzzy
 msgid "channels"
 msgstr "cancelar"
 
-#: startup.cc:1135
+#: startup.cc:1145
 #, fuzzy
 msgid "<b>Busses</b>"
 msgstr "Barramentos"
 
-#: startup.cc:1136
+#: startup.cc:1146
 #, fuzzy
 msgid "<b>Inputs</b>"
 msgstr "Inspetador de Trilhas/Barramentos"
 
-#: startup.cc:1137
+#: startup.cc:1147
 #, fuzzy
 msgid "<b>Outputs</b>"
 msgstr "Saídas"
 
-#: startup.cc:1145
+#: startup.cc:1155
 #, fuzzy
 msgid "Create master bus"
 msgstr "usar saída master"
 
-#: startup.cc:1155
+#: startup.cc:1165
 #, fuzzy
 msgid "Automatically connect to physical inputs"
 msgstr "conectar automaticamente entradas das trilhas com as portas físicas"
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr ""
 
-#: startup.cc:1215
+#: startup.cc:1225
 #, fuzzy
 msgid "Automatically connect outputs"
 msgstr "conectar manualmente saídas das trilhas"
 
-#: startup.cc:1237
+#: startup.cc:1247
 msgid "... to master bus"
 msgstr ""
 
-#: startup.cc:1247
+#: startup.cc:1257
 msgid "... to physical outputs"
 msgstr ""
 
-#: startup.cc:1297
+#: startup.cc:1307
 #, fuzzy
 msgid "Advanced Session Options"
 msgstr "Preferências"
@@ -12824,19 +13078,19 @@ msgstr ""
 msgid "bad XPM header %1"
 msgstr ""
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr ""
 
-#: utils.cc:544
+#: utils.cc:591
 msgid "cannot find XPM file for %1"
 msgstr ""
 
-#: utils.cc:570
+#: utils.cc:617
 msgid "cannot find icon image for %1 using %2"
 msgstr ""
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr ""
 
@@ -12844,84 +13098,86 @@ msgstr ""
 msgid "VerboseCanvasCursor"
 msgstr ""
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 #, fuzzy
 msgid "Set Video Track"
 msgstr "Adicionar Trilha/Barramento"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 #, fuzzy
 msgid "Launch External Video Monitor"
 msgstr "Usar Monitoração de Hardware"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr ""
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr ""
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 #, fuzzy
 msgid "Video files"
 msgstr "Quadros de �udio"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 #, fuzzy
 msgid "<b>Video Information</b>"
 msgstr "Informação do arquivo de áudio"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 #, fuzzy
 msgid "Start:"
 msgstr "Inicio:"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 #, fuzzy
 msgid "Frame rate:"
 msgstr "Separar Região"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr ""
 
-#: editor_videotimeline.cc:138
+#: editor_videotimeline.cc:146
 msgid "Export Successful: %1"
 msgstr ""
 
-#: video_timeline.cc:467
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:501
-msgid "Failed to set session-framerate: "
-msgstr ""
-
-#: video_timeline.cc:501
-msgid " does not have a corresponding option setting in Ardour."
+#: video_timeline.cc:507
+msgid ""
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:507
+#: video_timeline.cc:515
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:508
-msgid " vs "
+#: video_timeline.cc:588
+msgid ""
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:690
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12929,18 +13185,18 @@ msgid ""
 "xjadeo's remote-control interface 'xjremote')."
 msgstr ""
 
-#: video_monitor.cc:282
+#: video_monitor.cc:281
 #, fuzzy
 msgid "Video Monitor: File Not Found."
 msgstr "Usar Monitoração de Hardware"
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -12950,374 +13206,382 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 #, fuzzy
 msgid "Transcode/Import Video File "
 msgstr "Exportar sessão para arquivo de áudio"
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 #, fuzzy
 msgid "Output File:"
 msgstr "Saídas"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr ""
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 #, fuzzy
 msgid "Height = "
 msgstr "Altura"
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr ""
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 #, fuzzy
 msgid "<b>File Information</b>"
 msgstr "Informação do arquivo de áudio"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr ""
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 #, fuzzy
 msgid "Duration:"
 msgstr "normalizar região"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr ""
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr ""
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 msgid "??"
 msgstr ""
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 #, fuzzy
 msgid "<b>Import Settings</b>"
 msgstr "Preferências"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr ""
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr ""
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 #, fuzzy
 msgid "Import/Transcode Video to Session"
 msgstr "Exportar região"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr ""
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 msgid "Original Width"
 msgstr ""
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr ""
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 #, fuzzy
 msgid "Extract Audio:"
 msgstr "Exportar região"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 #, fuzzy
 msgid "Extracting Audio.."
 msgstr "Exportar região"
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr ""
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 msgid "Transcoding Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 #, fuzzy
 msgid "Save Transcoded Video File"
 msgstr "Exportar sessão para arquivo de áudio"
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr ""
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr ""
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 msgid "Server Docroot:"
 msgstr ""
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr ""
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 #, fuzzy
 msgid "Listen Port:"
 msgstr "Audição"
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 msgid "Cache Size:"
 msgstr ""
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr ""
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr ""
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 msgid "Confirm Overwrite"
 msgstr ""
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 #, fuzzy
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr "já existe uma trilha com este nome"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 #, fuzzy
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr "Não foi possível ler o arquivo: %1 (%2)."
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 #, fuzzy
 msgid "Export Video File "
 msgstr "Exportar sessão para arquivo de áudio"
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 #, fuzzy
 msgid "Video:"
 msgstr "Começo de regiões"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr ""
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr ""
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 #, fuzzy
 msgid "Normalize Audio"
 msgstr "Normalizar"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr ""
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr ""
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 #, fuzzy
 msgid "Deinterlace"
 msgstr "interno"
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr ""
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 #, fuzzy
 msgid "Include Session Metadata"
 msgstr "Importar seleção"
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr ""
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 #, fuzzy
 msgid "<b>Output:</b>"
 msgstr "Saídas"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 #, fuzzy
 msgid "<b>Input:</b>"
 msgstr "Inspetador de Trilhas/Barramentos"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 #, fuzzy
 msgid "Audio:"
 msgstr "Audição"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 #, fuzzy
 msgid "Master Bus"
 msgstr "usar saída master"
 
-#: export_video_dialog.cc:166
+#: export_video_dialog.cc:145
+msgid "from the %1 session's start to the session's end"
+msgstr ""
+
+#: export_video_dialog.cc:149
+msgid "from 00:00:00:00 to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:151
+msgid "from the video's start to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:184
 #, fuzzy
 msgid "<b>Settings:</b>"
 msgstr "Avançado ..."
 
-#: export_video_dialog.cc:174
+#: export_video_dialog.cc:192
 #, fuzzy
 msgid "Range:"
 msgstr "Intervalo"
 
-#: export_video_dialog.cc:177
+#: export_video_dialog.cc:195
 #, fuzzy
 msgid "Preset:"
 msgstr "Reiniciar"
 
-#: export_video_dialog.cc:180
+#: export_video_dialog.cc:198
 #, fuzzy
 msgid "Video Codec:"
 msgstr "Nome do diretório:"
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:201
 #, fuzzy
 msgid "Video KBit/s:"
 msgstr "Começo de regiões"
 
-#: export_video_dialog.cc:186
+#: export_video_dialog.cc:204
 #, fuzzy
 msgid "Audio Codec:"
 msgstr "Quadros de �udio"
 
-#: export_video_dialog.cc:189
+#: export_video_dialog.cc:207
 #, fuzzy
 msgid "Audio KBit/s:"
 msgstr "Quadros de �udio"
 
-#: export_video_dialog.cc:192
+#: export_video_dialog.cc:210
 #, fuzzy
 msgid "Audio Samplerate:"
 msgstr "Separar Região"
 
-#: export_video_dialog.cc:369
+#: export_video_dialog.cc:387
 #, fuzzy
 msgid "Normalizing audio"
 msgstr "Normalizar"
 
-#: export_video_dialog.cc:373
+#: export_video_dialog.cc:391
 #, fuzzy
 msgid "Exporting audio"
 msgstr "Exportar região"
 
-#: export_video_dialog.cc:419
+#: export_video_dialog.cc:437
 #, fuzzy
-msgid "Exporting Audio.."
+msgid "Exporting Audio..."
 msgstr "Exportar região"
 
-#: export_video_dialog.cc:476
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:505
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:544
-msgid "Encoding Video.."
+#: export_video_dialog.cc:562
+msgid "Encoding Video..."
 msgstr ""
 
-#: export_video_dialog.cc:563
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:661
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr ""
 
-#: export_video_dialog.cc:673
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr ""
 
-#: export_video_dialog.cc:761
+#: export_video_dialog.cc:779
 msgid "Transcoding failed."
 msgstr ""
 
-#: export_video_dialog.cc:930 export_video_dialog.cc:950
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 #, fuzzy
 msgid "Save Exported Video File"
 msgstr "Exportar sessão para arquivo de áudio"
@@ -13335,33 +13599,34 @@ msgstr ""
 msgid "<b>Video Export Info</b>"
 msgstr ""
 
-#: export_video_infobox.cc:46
+#: export_video_infobox.cc:48
 msgid ""
-"Ardour video export is not recommended for mastering!\n"
-"While 'ffmpeg' (which is used by ardour) can produce high-quality files, "
-"this export lacks the possibility to tweak many settings. We recommend to "
-"use 'winff', 'devede' or 'dvdauthor' to mux & master. Nevertheless this "
-"video-export comes in handy to do quick snapshots, intermediates, dailies or "
-"online videos.\n"
-"\n"
-"The soundtrack is created from the master-bus of the current Ardour "
-"session.\n"
-"\n"
-"The video soure defaults to the file used in the video timeline, which may "
-"not the best quality to start with, you should the original video file.\n"
+"Video encoding is a non-trivial task with many details.\n"
 "\n"
-"If the export-range is longer than the original video, black video frames "
-"are prefixed and/or appended. This process may fail with non-standard pixel-"
-"aspect-ratios.\n"
+"Please see the manual at %1/video-timeline/operations/#export.\n"
 "\n"
-"The file-format is determined by the extension that you choose for the "
-"output file (.avi, .mov, .flv, .ogv,...)\n"
-"Note: not all combinations of format+codec+settings produce files which are "
-"according so spec. e.g. flv files require sample-rates of 22.1kHz or "
-"44.1kHz, mpeg containers can not be used with ac3 audio-codec, etc. If in "
-"doubt, use one of the built-in presets."
+"Open Manual in Browser? "
 msgstr ""
 
+#, fuzzy
+#~ msgid "-Inf"
+#~ msgstr "entrada"
+
+#, fuzzy
+#~ msgid "slowest"
+#~ msgstr "Menor"
+
+#, fuzzy
+#~ msgid "fast"
+#~ msgstr "rapidamente"
+
+#, fuzzy
+#~ msgid "faster"
+#~ msgstr "Fades"
+
+#~ msgid "fastest"
+#~ msgstr "rapidamente"
+
 #~ msgid "Connect"
 #~ msgstr "Conectar"
 
@@ -14687,13 +14952,6 @@ msgstr ""
 #~ msgstr "Batimentos"
 
 #~ msgid ""
-#~ "Do you really want to remove track \"%1\" ?\n"
-#~ "(cannot be undone)"
-#~ msgstr ""
-#~ "Tem certeza de que deseja remover a trilha \"%1\" ?\n"
-#~ "(não será possível voltar)"
-
-#~ msgid ""
 #~ "You cannot record-enable\n"
 #~ "track %1\n"
 #~ "because it has no input connections.\n"
@@ -14821,9 +15079,6 @@ msgstr ""
 #~ msgid "rescan"
 #~ msgstr "rescanear"
 
-#~ msgid "UI: cannot setup meter_bridge"
-#~ msgstr "não foi possível iniciar o medidor volumétrico (VU)"
-
 #~ msgid "Enable/Disable follow playhead"
 #~ msgstr "Habilitar/desbilitar reprodução contínua"
 
@@ -14836,9 +15091,6 @@ msgstr ""
 #~ msgid "Audio Library"
 #~ msgstr "Biblioteca de �udio"
 
-#~ msgid "Meter Bridge"
-#~ msgstr "VU (medidor volumétrico)"
-
 #~ msgid "Output Connections"
 #~ msgstr "Conexões de saída"
 
diff --git a/gtk2_ardour/po/pt_PT.po b/gtk2_ardour/po/pt_PT.po
index f7f1590d15..380b1a71ac 100644
--- a/gtk2_ardour/po/pt_PT.po
+++ b/gtk2_ardour/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk2_ardour rev.1702\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2007-04-15 19:00+0100\n"
 "Last-Translator: Rui Nuno Capela <rncbc@rncbc.org>\n"
 "Language-Team: Portuguese\n"
@@ -367,7 +367,7 @@ msgstr ""
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr ""
 
-#: add_route_dialog.cc:53 route_params_ui.cc:503
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 #, fuzzy
 msgid "Add Track or Bus"
 msgstr "Acrescentar faixa/barramento"
@@ -410,8 +410,8 @@ msgstr "Barramentos"
 msgid "Add:"
 msgstr ""
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 #, fuzzy
 msgid "<b>Options</b>"
 msgstr "Opções"
@@ -428,22 +428,22 @@ msgid "Group:"
 msgstr "Grupo"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 #, fuzzy
 msgid "Audio"
 msgstr "Audição"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr ""
 
@@ -467,7 +467,7 @@ msgid ""
 msgstr ""
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1301
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr "Normal"
 
@@ -518,7 +518,7 @@ msgstr "Canais"
 msgid "12 Channel"
 msgstr "Canais"
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2136
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr ""
 
@@ -609,7 +609,7 @@ msgid "Track"
 msgstr "Faixa"
 
 #: analysis_window.cc:68 editor_actions.cc:616 mixer_ui.cc:125
-#: mixer_ui.cc:1793
+#: mixer_ui.cc:1795
 #, fuzzy
 msgid "Show"
 msgstr "Mostrar tudo"
@@ -618,101 +618,96 @@ msgstr "Mostrar tudo"
 msgid "Re-analyze data"
 msgstr ""
 
-#: ardour_button.cc:658
+#: ardour_button.cc:704
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr ""
 
-#: ardour_ui.cc:179
+#: ardour_ui.cc:180
 #, fuzzy
 msgid "audition"
 msgstr "Audição"
 
-#: ardour_ui.cc:180
+#: ardour_ui.cc:181
 #, fuzzy
 msgid "solo"
 msgstr "solo alterado"
 
-#: ardour_ui.cc:181
+#: ardour_ui.cc:182
 msgid "feedback"
 msgstr ""
 
-#: ardour_ui.cc:183 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 #, fuzzy
 msgid "Speaker Configuration"
 msgstr "Configuração de canal"
 
-#: ardour_ui.cc:184 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 #, fuzzy
 msgid "Theme Manager"
 msgstr "Remover marcador"
 
-#: ardour_ui.cc:185 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr ""
 
-#: ardour_ui.cc:186
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr ""
 
-#: ardour_ui.cc:187 ardour_ui.cc:192
+#: ardour_ui.cc:191 ardour_ui.cc:196
 #, fuzzy
 msgid "Add Tracks/Busses"
 msgstr "Faixas/barramentos"
 
-#: ardour_ui.cc:188
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "Acerca de"
 
-#: ardour_ui.cc:189 location_ui.cc:1134
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "Localizações"
 
-#: ardour_ui.cc:190 route_params_ui.cc:57 route_params_ui.cc:604
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 #, fuzzy
 msgid "Tracks and Busses"
 msgstr "Faixas/barramentos"
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr ""
 
-#: ardour_ui.cc:193 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr ""
 
-#: ardour_ui.cc:194 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "Cronómetro principal"
 
-#: ardour_ui.cc:195
+#: ardour_ui.cc:199
 #, fuzzy
 msgid "Audio Connections"
 msgstr "Ligações"
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:200
 #, fuzzy
 msgid "MIDI Connections"
 msgstr "Ligações"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr ""
 
-#: ardour_ui.cc:299
-#, fuzzy
-msgid "could not initialize %1."
-msgstr "não foi possível inicializar o Ardour"
-
-#: ardour_ui.cc:394
+#: ardour_ui.cc:388
 #, fuzzy
 msgid "Starting audio engine"
 msgstr "Iniciar intervalo"
 
-#: ardour_ui.cc:763 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 msgid "%1 is ready for use"
 msgstr ""
 
-#: ardour_ui.cc:811
+#: ardour_ui.cc:806
 msgid ""
 "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"
@@ -721,26 +716,26 @@ msgid ""
 "controlled by %2"
 msgstr ""
 
-#: ardour_ui.cc:828
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr ""
 
-#: ardour_ui.cc:870
+#: ardour_ui.cc:865
 #, fuzzy
 msgid "Don't quit"
 msgstr "Não %1"
 
-#: ardour_ui.cc:871
+#: ardour_ui.cc:866
 #, fuzzy
 msgid "Just quit"
 msgstr "Apenas %1"
 
-#: ardour_ui.cc:872
+#: ardour_ui.cc:867
 #, fuzzy
 msgid "Save and quit"
 msgstr "Guardar e %1"
 
-#: ardour_ui.cc:882
+#: ardour_ui.cc:877
 #, fuzzy
 msgid ""
 "%1 was unable to save your session.\n"
@@ -755,16 +750,16 @@ msgstr ""
 "\n"
 " a opção \"Apenas sair\""
 
-#: ardour_ui.cc:913
+#: ardour_ui.cc:908
 msgid "Please wait while %1 cleans up..."
 msgstr ""
 
-#: ardour_ui.cc:930
+#: ardour_ui.cc:925
 #, fuzzy
 msgid "Unsaved Session"
 msgstr "Nova sessão"
 
-#: ardour_ui.cc:951
+#: ardour_ui.cc:946
 #, fuzzy
 msgid ""
 "The session \"%1\"\n"
@@ -783,7 +778,7 @@ msgstr ""
 "\n"
 "O que pretende fazer?"
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:949
 #, fuzzy
 msgid ""
 "The snapshot \"%1\"\n"
@@ -802,75 +797,75 @@ msgstr ""
 "\n"
 "O que pretende fazer?"
 
-#: ardour_ui.cc:968
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr "Alerta"
 
-#: ardour_ui.cc:1045
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "desligado"
 
-#: ardour_ui.cc:1052
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1056
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1074 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 #, fuzzy
 msgid "File:"
 msgstr "Renomear"
 
-#: ardour_ui.cc:1078
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr ""
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr ""
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr ""
 
-#: ardour_ui.cc:1087 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr ""
 
-#: ardour_ui.cc:1090
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr ""
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr ""
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr ""
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr ""
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr ""
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr ""
 
-#: ardour_ui.cc:1129
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1148
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -878,63 +873,63 @@ msgid ""
 "\">%<PRIu32>%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1184
+#: ardour_ui.cc:1188
 #, fuzzy
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr "espaço: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1186
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr ""
 
-#: ardour_ui.cc:1204
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr ""
 
-#: ardour_ui.cc:1215
+#: ardour_ui.cc:1219
 #, fuzzy, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr "espaço: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1241
+#: ardour_ui.cc:1245
 #, fuzzy, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr "espaço: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1358 ardour_ui.cc:1367 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr "Sessões recentes"
 
-#: ardour_ui.cc:1447
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
 msgstr ""
 
-#: ardour_ui.cc:1474
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr "Abrir sessão"
 
-#: ardour_ui.cc:1492 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 #, fuzzy
 msgid "%1 sessions"
 msgstr "sessão"
 
-#: ardour_ui.cc:1529
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr ""
 "Não é possível acrescentar uma faixa sem que haja uma sessão esteja "
 "carregada."
 
-#: ardour_ui.cc:1537
+#: ardour_ui.cc:1548
 #, fuzzy
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] "não foi possível criar uma nova faixa audio"
 msgstr[1] "não foi possível criar uma nova faixa audio"
 
-#: ardour_ui.cc:1543 ardour_ui.cc:1604
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 #, fuzzy
 msgid ""
 "There are insufficient JACK ports available\n"
@@ -947,28 +942,28 @@ msgstr ""
 "Deverá salvaguardar a sessão, sair e\n"
 "reiniciar JACK com um maior número de portos."
 
-#: ardour_ui.cc:1578
+#: ardour_ui.cc:1589
 #, fuzzy
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr ""
 "Não é possível acrescentar uma faixa sem que haja uma sessão esteja "
 "carregada."
 
-#: ardour_ui.cc:1587
+#: ardour_ui.cc:1598
 #, fuzzy
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] "não foi possível criar uma nova faixa audio"
 msgstr[1] "não foi possível criar uma nova faixa audio"
 
-#: ardour_ui.cc:1596
+#: ardour_ui.cc:1607
 #, fuzzy
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] "não foi possível criar uma nova faixa audio"
 msgstr[1] "não foi possível criar uma nova faixa audio"
 
-#: ardour_ui.cc:1713
+#: ardour_ui.cc:1724
 #, fuzzy
 msgid ""
 "Please create one or more tracks before trying to record.\n"
@@ -978,14 +973,14 @@ msgstr ""
 "antes de tentar gravar.\n"
 "Verifique o menu de Sessão."
 
-#: ardour_ui.cc:2103
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
 "%1"
 msgstr ""
 
-#: ardour_ui.cc:2105
+#: ardour_ui.cc:2116
 #, fuzzy
 msgid ""
 "JACK has either been shutdown or it\n"
@@ -999,82 +994,82 @@ msgstr ""
 "A sessão corrente deverá ser salvaguardada\n"
 "e o serviço JACK devidamente reiniciado."
 
-#: ardour_ui.cc:2131
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "Não foi possível iniciar a sessão corrente"
 
-#: ardour_ui.cc:2211
+#: ardour_ui.cc:2222
 #, fuzzy
 msgid "Take Snapshot"
 msgstr "Capturar"
 
-#: ardour_ui.cc:2212
+#: ardour_ui.cc:2223
 #, fuzzy
 msgid "Name of new snapshot"
 msgstr "Nome para a nova captura"
 
-#: ardour_ui.cc:2236
+#: ardour_ui.cc:2247
 msgid ""
 "To ensure compatibility with various systems\n"
 "snapshot names may not contain a '%1' character"
 msgstr ""
 
-#: ardour_ui.cc:2248
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr ""
 
-#: ardour_ui.cc:2249
+#: ardour_ui.cc:2260
 #, fuzzy
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr "O ficheiro já existe, deseja reescrevê-lo ?"
 
-#: ardour_ui.cc:2252 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 #, fuzzy
 msgid "Overwrite"
 msgstr "aGrav"
 
-#: ardour_ui.cc:2286
+#: ardour_ui.cc:2297
 #, fuzzy
 msgid "Rename Session"
 msgstr "Inverter região"
 
-#: ardour_ui.cc:2287
+#: ardour_ui.cc:2298
 #, fuzzy
 msgid "New session name"
 msgstr "Novo nome de sessão:"
 
-#: ardour_ui.cc:2301 ardour_ui.cc:2681 ardour_ui.cc:2726
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 msgid ""
 "To ensure compatibility with various systems\n"
 "session names may not contain a '%1' character"
 msgstr ""
 
-#: ardour_ui.cc:2309
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr ""
 
-#: ardour_ui.cc:2318
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
 msgstr ""
 
-#: ardour_ui.cc:2429
+#: ardour_ui.cc:2440
 #, fuzzy
 msgid "Save Template"
 msgstr "Guardar modelo..."
 
-#: ardour_ui.cc:2430
+#: ardour_ui.cc:2441
 #, fuzzy
 msgid "Name for template:"
 msgstr "Nome para o modelo de mistura"
 
-#: ardour_ui.cc:2431
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-modelo"
 
-#: ardour_ui.cc:2469
+#: ardour_ui.cc:2480
 #, fuzzy
 msgid ""
 "This session\n"
@@ -1082,56 +1077,56 @@ msgid ""
 "already exists. Do you want to open it?"
 msgstr "O ficheiro já existe, deseja reescrevê-lo ?"
 
-#: ardour_ui.cc:2479
+#: ardour_ui.cc:2490
 #, fuzzy
 msgid "Open Existing Session"
 msgstr "Abrir sessão"
 
-#: ardour_ui.cc:2717
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr ""
 
-#: ardour_ui.cc:2804
+#: ardour_ui.cc:2815
 msgid "Please wait while %1 loads your session"
 msgstr ""
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr ""
 
-#: ardour_ui.cc:2820
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr ""
 
-#: ardour_ui.cc:2841
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "Não foi possível carregar a sessão \"%1 (captura %2)\" com sucesso"
 
-#: ardour_ui.cc:2847
+#: ardour_ui.cc:2858
 msgid "Loading Error"
 msgstr ""
 
-#: ardour_ui.cc:2848
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr ""
 
-#: ardour_ui.cc:2930
+#: ardour_ui.cc:2941
 #, fuzzy
 msgid "Could not create session in \"%1\""
 msgstr "não foi possível carregar a sessão de linha de comando \"%1\""
 
-#: ardour_ui.cc:3030
+#: ardour_ui.cc:3041
 #, fuzzy
 msgid "No files were ready for clean-up"
 msgstr "Não foram encontrados ficheiros audio para limpeza"
 
-#: ardour_ui.cc:3034 ardour_ui.cc:3044 ardour_ui.cc:3177 ardour_ui.cc:3184
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 #, fuzzy
 msgid "Clean-up"
 msgstr "Limpar"
 
-#: ardour_ui.cc:3035
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1143,19 +1138,19 @@ msgstr ""
 "Estas podem ainda incluir regiões que necessitem\n"
 "da existência de alguns ficheiros já em desuso."
 
-#: ardour_ui.cc:3094
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr ""
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr ""
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr ""
 
-#: ardour_ui.cc:3105
+#: ardour_ui.cc:3116
 #, fuzzy
 msgid ""
 "The following file was deleted from %2,\n"
@@ -1172,7 +1167,7 @@ msgstr[1] ""
 "%3,\n"
 "libertando %3 %4bytes de espaço em disco."
 
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3123
 #, fuzzy
 msgid ""
 "The following file was not in use and \n"
@@ -1205,12 +1200,12 @@ msgstr[1] ""
 "\n"
 "Serão libertados %3 %4bytes de espaço em disco.\n"
 
-#: ardour_ui.cc:3172
+#: ardour_ui.cc:3183
 #, fuzzy
 msgid "Are you sure you want to clean-up?"
 msgstr "Tem a certeza que pretende realizar a limpeza?"
 
-#: ardour_ui.cc:3179
+#: ardour_ui.cc:3190
 #, fuzzy
 msgid ""
 "Clean-up is a destructive operation.\n"
@@ -1222,84 +1217,84 @@ msgstr ""
 "limpeza, todos os ficheiros audio em desuso serão\n"
 "removidos para um \"arquivo morto\""
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr ""
 
-#: ardour_ui.cc:3217
+#: ardour_ui.cc:3228
 #, fuzzy
 msgid "Cleaned Files"
 msgstr "ficheiros limpos"
 
-#: ardour_ui.cc:3234
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr "ficheiro eliminado"
 
-#: ardour_ui.cc:3326
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 
-#: ardour_ui.cc:3330
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr ""
 
-#: ardour_ui.cc:3331
+#: ardour_ui.cc:3342
 msgid "Do you really want to stop the Video Server?"
 msgstr ""
 
-#: ardour_ui.cc:3334
+#: ardour_ui.cc:3345
 #, fuzzy
 msgid "Yes, Stop It"
 msgstr "Sim, elimine-a."
 
-#: ardour_ui.cc:3360
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr ""
 
-#: ardour_ui.cc:3362
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
 msgstr ""
 
-#: ardour_ui.cc:3370 ardour_ui.cc:3455
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
 
-#: ardour_ui.cc:3394
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr ""
 
-#: ardour_ui.cc:3399
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr ""
 
-#: ardour_ui.cc:3432
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr ""
 
-#: ardour_ui.cc:3441
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3477 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "não foi possível abrir %1"
 
-#: ardour_ui.cc:3481
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
 msgstr ""
 
-#: ardour_ui.cc:3641
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr ""
 "A gravação foi interrompida porque o seu sistema não foi capaz de a "
 "acompanhar adequadamente."
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3702
 #, fuzzy
 msgid ""
 "The disk system on your computer\n"
@@ -1314,7 +1309,7 @@ msgstr ""
 "Especificamente, a velocidade de escrita de dados em disco\n"
 "foi insuficiente para acompanhar o ritmo de gravação.\n"
 
-#: ardour_ui.cc:3689
+#: ardour_ui.cc:3721
 #, fuzzy
 msgid ""
 "The disk system on your computer\n"
@@ -1329,11 +1324,11 @@ msgstr ""
 "Especificamente, a velocidade de leitura de dados em disco\n"
 "foi insuficiente para acompanhar o ritmo de reprodução.\n"
 
-#: ardour_ui.cc:3729
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr ""
 
-#: ardour_ui.cc:3730
+#: ardour_ui.cc:3762
 #, fuzzy
 msgid ""
 "This session appears to have been in the\n"
@@ -1352,44 +1347,44 @@ msgstr ""
 "gravado até então ou simplesmente ignorá-lo.\n"
 "Por favor decida o que pretende fazer.\n"
 
-#: ardour_ui.cc:3742
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr "Ignorar"
 
-#: ardour_ui.cc:3743
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr "Recuperar"
 
-#: ardour_ui.cc:3763
+#: ardour_ui.cc:3795
 #, fuzzy
 msgid "Sample Rate Mismatch"
 msgstr "Frequência de amostragem"
 
-#: ardour_ui.cc:3764
+#: ardour_ui.cc:3796
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
 "%2 is currently running at %3 Hz.  If you load this session,\n"
 "audio may be played at the wrong sample rate.\n"
 msgstr ""
 
-#: ardour_ui.cc:3773
+#: ardour_ui.cc:3805
 #, fuzzy
 msgid "Do not load session"
 msgstr "Zoom (sessão)"
 
-#: ardour_ui.cc:3774
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr ""
 
-#: ardour_ui.cc:3797
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "Não foi possível desligar do serviço JACK"
 
-#: ardour_ui.cc:3810
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr "Não foi possível ligar ao serviço JACK"
 
-#: ardour_ui.cc:4084
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1412,75 +1407,80 @@ msgstr "Não foi possível iniciar o painel de edição"
 msgid "UI: cannot setup mixer"
 msgstr "Não foi posivel iniciar o painel de mistura"
 
-#: ardour_ui2.cc:125
+#: ardour_ui2.cc:82
+#, fuzzy
+msgid "UI: cannot setup meterbridge"
+msgstr "Não foi possível iniciar o monitor volumétrico (vuímetro)"
+
+#: ardour_ui2.cc:130
 msgid "Play from playhead"
 msgstr "Reproduzir desde o cursor de reprodução"
 
-#: ardour_ui2.cc:126
+#: ardour_ui2.cc:131
 msgid "Stop playback"
 msgstr "Parar reprodução"
 
-#: ardour_ui2.cc:127
+#: ardour_ui2.cc:132
 #, fuzzy
 msgid "Toggle record"
 msgstr "gravar"
 
-#: ardour_ui2.cc:128
+#: ardour_ui2.cc:133
 msgid "Play range/selection"
 msgstr "Reproduzir selecção"
 
-#: ardour_ui2.cc:129
+#: ardour_ui2.cc:134
 msgid "Go to start of session"
 msgstr "Ir para o início da sessão"
 
-#: ardour_ui2.cc:130
+#: ardour_ui2.cc:135
 msgid "Go to end of session"
 msgstr "Ir para o final da sessão"
 
-#: ardour_ui2.cc:131
+#: ardour_ui2.cc:136
 msgid "Play loop range"
 msgstr "Reproduzir intervalo cíclico"
 
-#: ardour_ui2.cc:132
+#: ardour_ui2.cc:137
 msgid ""
 "MIDI Panic\n"
 "Send note off and reset controller messages on all MIDI channels"
 msgstr ""
 
-#: ardour_ui2.cc:133
+#: ardour_ui2.cc:138
 msgid "Return to last playback start when stopped"
 msgstr "Ir para a última posição inicial do cursor de reprodução quando parar"
 
-#: ardour_ui2.cc:134
+#: ardour_ui2.cc:139
 #, fuzzy
 msgid "Playhead follows Range Selections and Edits"
 msgstr "Reprodução no início do intervalo"
 
-#: ardour_ui2.cc:135
+#: ardour_ui2.cc:140
 msgid "Be sensible about input monitoring"
 msgstr "Seja sensível acerca da monitorização de entradas"
 
-#: ardour_ui2.cc:136
+#: ardour_ui2.cc:141
 msgid "Enable/Disable audio click"
 msgstr "Ligar/Desligar o metrónomo"
 
-#: ardour_ui2.cc:137 monitor_section.cc:101
+#: ardour_ui2.cc:142 monitor_section.cc:101
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
 msgstr ""
 
-#: ardour_ui2.cc:138
+#: ardour_ui2.cc:143
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
 msgstr ""
 
-#: ardour_ui2.cc:139
+#: ardour_ui2.cc:144
 msgid "When active, there is a feedback loop."
 msgstr ""
 
-#: ardour_ui2.cc:140
+#: ardour_ui2.cc:145
 msgid ""
 "<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1488,7 +1488,7 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:141
+#: ardour_ui2.cc:146
 msgid ""
 "<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1496,30 +1496,35 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:173
+#: ardour_ui2.cc:147
+#, fuzzy
+msgid "Reset Level Meter"
+msgstr "Reiniciar tudo"
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr ""
 
-#: ardour_ui2.cc:175
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr ""
 
-#: ardour_ui2.cc:177
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr ""
 
-#: ardour_ui2.cc:241 ardour_ui_ed.cc:376
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 #, fuzzy
 msgid "Auto Return"
 msgstr ""
 "Retorno\n"
 "automático"
 
-#: ardour_ui2.cc:243 ardour_ui_ed.cc:379
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr ""
 
-#: ardour_ui2.cc:621 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1541,27 +1546,27 @@ msgstr "Estabelecer cursor de edição"
 msgid "Setup Mixer"
 msgstr "Mostrar painel de mistura"
 
-#: ardour_ui_dependents.cc:84
+#: ardour_ui_dependents.cc:85
 #, fuzzy
 msgid "Reload Session History"
 msgstr "Criar directório de sessão em :"
 
-#: ardour_ui_dialogs.cc:206
+#: ardour_ui_dialogs.cc:242
 #, fuzzy
 msgid "Don't close"
 msgstr "Não %1"
 
-#: ardour_ui_dialogs.cc:207
+#: ardour_ui_dialogs.cc:243
 #, fuzzy
 msgid "Just close"
 msgstr "fechar"
 
-#: ardour_ui_dialogs.cc:208
+#: ardour_ui_dialogs.cc:244
 #, fuzzy
 msgid "Save and close"
 msgstr "Guardar e %1"
 
-#: ardour_ui_dialogs.cc:293
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr ""
 
@@ -1574,7 +1579,7 @@ msgstr "Sessão"
 msgid "Sync"
 msgstr "Sincronia"
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr "Opções"
 
@@ -1603,15 +1608,15 @@ msgstr "Tipo de ficheiro"
 msgid "Sample Format"
 msgstr "Formato de amostra"
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr "Mesas de controlo"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "Efeitos/plug-ins"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr "VUímetro"
 
@@ -1628,7 +1633,7 @@ msgstr "Tempo de persistência"
 msgid "Denormal Handling"
 msgstr ""
 
-#: ardour_ui_ed.cc:123 route_time_axis.cc:1475
+#: ardour_ui_ed.cc:123 route_time_axis.cc:1489
 msgid "New..."
 msgstr ""
 
@@ -1676,8 +1681,8 @@ msgstr "Capturar"
 msgid "Save As..."
 msgstr "Guardar modelo..."
 
-#: ardour_ui_ed.cc:153 editor_actions.cc:1710 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1464 route_time_axis.cc:1471
+#: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 #, fuzzy
 msgid "Rename..."
 msgstr "Renomear"
@@ -1710,7 +1715,7 @@ msgid "Stem export..."
 msgstr "Exportar"
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "Exportar"
 
@@ -1724,11 +1729,11 @@ msgstr "Limpar originais em desuso"
 msgid "Flush Wastebasket"
 msgstr "Limpeza"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr ""
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr "Latência"
 
@@ -1736,8 +1741,8 @@ msgstr "Latência"
 msgid "Reconnect"
 msgstr "Religar"
 
-#: ardour_ui_ed.cc:195 global_port_matrix.cc:198 io_selector.cc:210
-#: mixer_strip.cc:712 mixer_strip.cc:838
+#: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr "Desligar"
 
@@ -1754,7 +1759,7 @@ msgstr "Maximizar o painel de edição"
 msgid "Show Toolbars"
 msgstr "Mostrar posição"
 
-#: ardour_ui_ed.cc:230 mixer_ui.cc:1863 mixer_ui.cc:1869
+#: ardour_ui_ed.cc:230 mixer_ui.cc:1865 mixer_ui.cc:1871
 #, fuzzy
 msgid "Window|Mixer"
 msgstr "Janelas"
@@ -1764,28 +1769,33 @@ msgstr "Janelas"
 msgid "Toggle Editor+Mixer"
 msgstr "Modo de edição"
 
-#: ardour_ui_ed.cc:233 midi_tracer.cc:39
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
+#, fuzzy
+msgid "Window|Meterbridge"
+msgstr "Janelas"
+
+#: ardour_ui_ed.cc:234 midi_tracer.cc:39
 #, fuzzy
 msgid "MIDI Tracer"
 msgstr "Porto parameterização MIDI"
 
-#: ardour_ui_ed.cc:235
+#: ardour_ui_ed.cc:236
 msgid "Chat"
 msgstr ""
 
-#: ardour_ui_ed.cc:237
+#: ardour_ui_ed.cc:238
 msgid "Help|Manual"
 msgstr ""
 
-#: ardour_ui_ed.cc:238
+#: ardour_ui_ed.cc:239
 msgid "Reference"
 msgstr ""
 
-#: ardour_ui_ed.cc:240 plugin_ui.cc:419
+#: ardour_ui_ed.cc:241 plugin_ui.cc:418
 msgid "Save"
 msgstr "Guardar"
 
-#: ardour_ui_ed.cc:248 rc_option_editor.cc:1114 rc_option_editor.cc:1125
+#: ardour_ui_ed.cc:249 rc_option_editor.cc:1114 rc_option_editor.cc:1125
 #: rc_option_editor.cc:1134 rc_option_editor.cc:1147 rc_option_editor.cc:1160
 #: rc_option_editor.cc:1169 rc_option_editor.cc:1179 rc_option_editor.cc:1181
 #: rc_option_editor.cc:1191 rc_option_editor.cc:1207 rc_option_editor.cc:1220
@@ -1795,105 +1805,105 @@ msgstr "Guardar"
 msgid "Transport"
 msgstr "Transporte"
 
-#: ardour_ui_ed.cc:254 engine_dialog.cc:85 sfdb_ui.cc:559
+#: ardour_ui_ed.cc:255 engine_dialog.cc:85
 msgid "Stop"
 msgstr "Parar"
 
-#: ardour_ui_ed.cc:257
+#: ardour_ui_ed.cc:258
 msgid "Roll"
 msgstr "Rolar"
 
-#: ardour_ui_ed.cc:261
+#: ardour_ui_ed.cc:262
 msgid "Start/Stop"
 msgstr "Iniciar/Parar"
 
-#: ardour_ui_ed.cc:264
+#: ardour_ui_ed.cc:265
 #, fuzzy
 msgid "Start/Continue/Stop"
 msgstr "Iniciar/Parar"
 
-#: ardour_ui_ed.cc:267
+#: ardour_ui_ed.cc:268
 #, fuzzy
 msgid "Stop and Forget Capture"
 msgstr "Parar + esquecer gravação"
 
-#: ardour_ui_ed.cc:277
+#: ardour_ui_ed.cc:278
 #, fuzzy
 msgid "Transition To Roll"
 msgstr "Tradicional"
 
-#: ardour_ui_ed.cc:281
+#: ardour_ui_ed.cc:282
 msgid "Transition To Reverse"
 msgstr ""
 
-#: ardour_ui_ed.cc:285
+#: ardour_ui_ed.cc:286
 msgid "Play Loop Range"
 msgstr "Reproduzir intervalo cíclico"
 
-#: ardour_ui_ed.cc:288
+#: ardour_ui_ed.cc:289
 #, fuzzy
 msgid "Play Selected Range"
 msgstr "Estabelecer intervalo"
 
-#: ardour_ui_ed.cc:291
+#: ardour_ui_ed.cc:292
 #, fuzzy
 msgid "Play Selection w/Preroll"
 msgstr "Reproduzir região seleccionada"
 
-#: ardour_ui_ed.cc:295
+#: ardour_ui_ed.cc:296
 msgid "Enable Record"
 msgstr "Gravar"
 
-#: ardour_ui_ed.cc:298
+#: ardour_ui_ed.cc:299
 #, fuzzy
 msgid "Start Recording"
 msgstr "Iniciar intervalo"
 
-#: ardour_ui_ed.cc:302
+#: ardour_ui_ed.cc:303
 msgid "Rewind"
 msgstr "Rebobinar"
 
-#: ardour_ui_ed.cc:305
+#: ardour_ui_ed.cc:306
 msgid "Rewind (Slow)"
 msgstr "Rebobinar (devagar)"
 
-#: ardour_ui_ed.cc:308
+#: ardour_ui_ed.cc:309
 msgid "Rewind (Fast)"
 msgstr "Rebobinar (rápido)"
 
-#: ardour_ui_ed.cc:311 startup.cc:727
+#: ardour_ui_ed.cc:312 startup.cc:727
 msgid "Forward"
 msgstr "Avançar"
 
-#: ardour_ui_ed.cc:314
+#: ardour_ui_ed.cc:315
 msgid "Forward (Slow)"
 msgstr "Avançar (devagar)"
 
-#: ardour_ui_ed.cc:317
+#: ardour_ui_ed.cc:318
 msgid "Forward (Fast)"
 msgstr "Avançar (rápido)"
 
-#: ardour_ui_ed.cc:320
+#: ardour_ui_ed.cc:321
 msgid "Goto Zero"
 msgstr "Ir para o zero"
 
-#: ardour_ui_ed.cc:323
+#: ardour_ui_ed.cc:324
 msgid "Goto Start"
 msgstr "Ir para o início"
 
-#: ardour_ui_ed.cc:326
+#: ardour_ui_ed.cc:327
 msgid "Goto End"
 msgstr "Ir para o final"
 
-#: ardour_ui_ed.cc:329
+#: ardour_ui_ed.cc:330
 msgid "Goto Wall Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:333
+#: ardour_ui_ed.cc:334
 msgid "Focus On Clock"
 msgstr ""
 
-#: ardour_ui_ed.cc:337 ardour_ui_ed.cc:346 audio_clock.cc:2046 editor.cc:237
+#: ardour_ui_ed.cc:338 ardour_ui_ed.cc:347 audio_clock.cc:2046 editor.cc:237
 #: editor_actions.cc:544 editor_actions.cc:553 export_timespan_selector.cc:88
 #: session_option_editor.cc:41 session_option_editor.cc:61
 #: session_option_editor.cc:80 session_option_editor.cc:96
@@ -1902,152 +1912,152 @@ msgstr ""
 msgid "Timecode"
 msgstr ""
 
-#: ardour_ui_ed.cc:339 ardour_ui_ed.cc:348 editor_actions.cc:542
+#: ardour_ui_ed.cc:340 ardour_ui_ed.cc:349 editor_actions.cc:542
 #, fuzzy
 msgid "Bars & Beats"
 msgstr "Comp:Bat"
 
-#: ardour_ui_ed.cc:341 ardour_ui_ed.cc:350
+#: ardour_ui_ed.cc:342 ardour_ui_ed.cc:351
 #, fuzzy
 msgid "Minutes & Seconds"
 msgstr "Mins:Segs"
 
-#: ardour_ui_ed.cc:343 ardour_ui_ed.cc:352 audio_clock.cc:2050 editor.cc:238
+#: ardour_ui_ed.cc:344 ardour_ui_ed.cc:353 audio_clock.cc:2050 editor.cc:238
 #: editor_actions.cc:543
 #, fuzzy
 msgid "Samples"
 msgstr "Frequência de amostragem"
 
-#: ardour_ui_ed.cc:355
+#: ardour_ui_ed.cc:356
 #, fuzzy
 msgid "Punch In"
 msgstr "Inserção"
 
-#: ardour_ui_ed.cc:356 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr "Entrada"
 
-#: ardour_ui_ed.cc:359
+#: ardour_ui_ed.cc:360
 #, fuzzy
 msgid "Punch Out"
 msgstr ""
 "final de\n"
 "inserção"
 
-#: ardour_ui_ed.cc:360 time_info_box.cc:114
+#: ardour_ui_ed.cc:361 time_info_box.cc:114
 msgid "Out"
 msgstr "Saída"
 
-#: ardour_ui_ed.cc:363
+#: ardour_ui_ed.cc:364
 #, fuzzy
 msgid "Punch In/Out"
 msgstr ""
 "final de\n"
 "inserção"
 
-#: ardour_ui_ed.cc:364
+#: ardour_ui_ed.cc:365
 #, fuzzy
 msgid "In/Out"
 msgstr ""
 "final de\n"
 "inserção"
 
-#: ardour_ui_ed.cc:367 rc_option_editor.cc:1071
+#: ardour_ui_ed.cc:368 rc_option_editor.cc:1071
 msgid "Click"
 msgstr "Metrónomo"
 
-#: ardour_ui_ed.cc:370
+#: ardour_ui_ed.cc:371
 #, fuzzy
 msgid "Auto Input"
 msgstr ""
 "entrada\n"
 "automática"
 
-#: ardour_ui_ed.cc:373
+#: ardour_ui_ed.cc:374
 #, fuzzy
 msgid "Auto Play"
 msgstr ""
 "Reprodução\n"
 "automática"
 
-#: ardour_ui_ed.cc:384
+#: ardour_ui_ed.cc:385
 msgid "Sync Startup to Video"
 msgstr ""
 
-#: ardour_ui_ed.cc:386
+#: ardour_ui_ed.cc:387
 #, fuzzy
 msgid "Time Master"
 msgstr ""
 "Supervisão\n"
 "de tempo"
 
-#: ardour_ui_ed.cc:393
+#: ardour_ui_ed.cc:394
 #, fuzzy
 msgid "Toggle Record Enable Track %1"
 msgstr "Comutador de gravação Faixa 1"
 
-#: ardour_ui_ed.cc:400
+#: ardour_ui_ed.cc:401
 msgid "Percentage"
 msgstr "Percentagem"
 
-#: ardour_ui_ed.cc:401 shuttle_control.cc:169
+#: ardour_ui_ed.cc:402 shuttle_control.cc:169
 msgid "Semitones"
 msgstr "Semi-tons"
 
-#: ardour_ui_ed.cc:405
+#: ardour_ui_ed.cc:406
 msgid "Send MTC"
 msgstr "Enviar MTC"
 
-#: ardour_ui_ed.cc:407
+#: ardour_ui_ed.cc:408
 msgid "Send MMC"
 msgstr "Enviar MMC"
 
-#: ardour_ui_ed.cc:409
+#: ardour_ui_ed.cc:410
 msgid "Use MMC"
 msgstr "Usar MMC"
 
-#: ardour_ui_ed.cc:411 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 #, fuzzy
 msgid "Send MIDI Clock"
 msgstr "Enviar controlo MIDI"
 
-#: ardour_ui_ed.cc:413
+#: ardour_ui_ed.cc:414
 #, fuzzy
 msgid "Send MIDI Feedback"
 msgstr "Enviar controlo MIDI"
 
-#: ardour_ui_ed.cc:419
+#: ardour_ui_ed.cc:420
 msgid "Panic"
 msgstr ""
 
-#: ardour_ui_ed.cc:559
+#: ardour_ui_ed.cc:560
 #, fuzzy
 msgid "Wall Clock"
 msgstr "Cronómetro principal"
 
-#: ardour_ui_ed.cc:560
+#: ardour_ui_ed.cc:561
 msgid "Disk Space"
 msgstr ""
 
-#: ardour_ui_ed.cc:561
+#: ardour_ui_ed.cc:562
 msgid "DSP"
 msgstr ""
 
-#: ardour_ui_ed.cc:562
+#: ardour_ui_ed.cc:563
 msgid "Buffers"
 msgstr ""
 
-#: ardour_ui_ed.cc:563
+#: ardour_ui_ed.cc:564
 msgid "JACK Sampling Rate and Latency"
 msgstr ""
 
-#: ardour_ui_ed.cc:564
+#: ardour_ui_ed.cc:565
 #, fuzzy
 msgid "Timecode Format"
 msgstr "Quadros audio"
 
-#: ardour_ui_ed.cc:565
+#: ardour_ui_ed.cc:566
 #, fuzzy
 msgid "File Format"
 msgstr "Formato de ficheiro audio"
@@ -2062,12 +2072,12 @@ msgstr ""
 msgid "Internal"
 msgstr "Interno"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 #, fuzzy
 msgid "Enable/Disable external positional sync"
 msgstr "Ligar/Desligar o metrónomo"
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr ""
 
@@ -2098,7 +2108,7 @@ msgstr ""
 msgid "Meter"
 msgstr "VUímetro"
 
-#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1030
+#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1039
 #: midi_region_view.cc:2991 session_metadata_dialog.cc:331
 #: session_metadata_dialog.cc:379 session_metadata_dialog.cc:435
 #: session_metadata_dialog.cc:716
@@ -2192,33 +2202,33 @@ msgid "hide track"
 msgstr "esconder faixa"
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:196 generic_pluginui.cc:456
-#: generic_pluginui.cc:733 panner_ui.cc:150
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
+#: generic_pluginui.cc:746 panner_ui.cc:150
 #, fuzzy
 msgid "Automation|Manual"
 msgstr "Automatização"
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1856 gain_meter.cc:199
-#: generic_pluginui.cc:459 generic_pluginui.cc:735 midi_time_axis.cc:1488
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
+#: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr "Reprodução"
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:202 generic_pluginui.cc:462
-#: generic_pluginui.cc:737 panner_ui.cc:156
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
+#: generic_pluginui.cc:750 panner_ui.cc:156
 msgid "Write"
 msgstr "Escrita"
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:205 generic_pluginui.cc:465
-#: generic_pluginui.cc:739 panner_ui.cc:159
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
+#: generic_pluginui.cc:752 panner_ui.cc:159
 msgid "Touch"
 msgstr "Tocar"
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr ""
 
@@ -2227,7 +2237,7 @@ msgid "clear automation"
 msgstr "apagar automatizações"
 
 #: automation_time_axis.cc:485 editor_actions.cc:613 editor_markers.cc:857
-#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:699
+#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:708
 msgid "Hide"
 msgstr "Esconder"
 
@@ -2249,7 +2259,7 @@ msgstr "Desligar"
 msgid "Linear"
 msgstr ""
 
-#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:638
+#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:647
 #: shuttle_control.cc:188
 msgid "Mode"
 msgstr "Modo"
@@ -2268,13 +2278,13 @@ msgstr "Modo de edição"
 msgid "Direction:"
 msgstr "resolução"
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:156
-#: mixer_strip.cc:2132
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 msgid "Input"
 msgstr "Entradas"
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:161 mixer_strip.cc:2135
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 msgid "Output"
 msgstr "Saída"
 
@@ -2284,8 +2294,8 @@ msgid "Edit"
 msgstr "Editar"
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:420 processor_box.cc:2227
-#: route_time_axis.cc:704
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
+#: route_time_axis.cc:713
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -2464,7 +2474,7 @@ msgstr "Tempo de persistência"
 
 #: edit_note_dialog.cc:98 editor_regions.cc:114
 #: export_timespan_selector.cc:359 export_timespan_selector.cc:421
-#: location_ui.cc:313 midi_list_editor.cc:114 time_info_box.cc:105
+#: location_ui.cc:317 midi_list_editor.cc:114 time_info_box.cc:105
 msgid "Length"
 msgstr ""
 
@@ -2732,18 +2742,18 @@ msgid "Ranges & Marks"
 msgstr "Marcadores de intervalo"
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 #, fuzzy
 msgid "Editor"
 msgstr "Editar"
 
 #: editor.cc:1215 editor.cc:1225 editor.cc:4440 editor_actions.cc:130
-#: editor_actions.cc:1804
+#: editor_actions.cc:1813
 msgid "Loop"
 msgstr "Ciclo"
 
@@ -2768,8 +2778,8 @@ msgstr ""
 msgid "Slow"
 msgstr "Lento"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1606
-#: sfdb_ui.cc:1715
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "Rápido"
 
@@ -2789,7 +2799,7 @@ msgstr "Activar"
 msgid "Slowest"
 msgstr "Mais lento"
 
-#: editor.cc:1572 route_time_axis.cc:1863 selection.cc:1009 selection.cc:1064
+#: editor.cc:1572 route_time_axis.cc:1877 selection.cc:1009 selection.cc:1064
 msgid "programming error: "
 msgstr ""
 
@@ -2924,7 +2934,7 @@ msgid "Select All in Track"
 msgstr "Seleccionar tudo na faixa"
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2235
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr "Seleccionar tudo"
 
@@ -2984,15 +2994,15 @@ msgstr ""
 msgid "Select"
 msgstr "Seleccionar"
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2220
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr "Cortar"
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2223
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr "Copiar"
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2231
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr "Colar"
 
@@ -3163,7 +3173,7 @@ msgstr "Refazer"
 msgid "Redo (%1)"
 msgstr "Refazer (%1)"
 
-#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1785
+#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1794
 msgid "Duplicate"
 msgstr "Duplicar"
 
@@ -3199,8 +3209,8 @@ msgstr "Eliminar lista de reprodução"
 msgid "Keep Playlist"
 msgstr "Manter lista de reprodução"
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -3220,7 +3230,7 @@ msgstr "apagar lista de reprodução"
 msgid "Please wait while %1 loads visual data."
 msgstr ""
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2251
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 #, fuzzy
 msgid "Edit..."
 msgstr "Editar"
@@ -3275,7 +3285,7 @@ msgstr "Nivelar"
 msgid "Position"
 msgstr "Posição"
 
-#: editor_actions.cc:101 gain_meter.cc:124 gain_meter.cc:755 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr "Cortar"
@@ -3290,7 +3300,7 @@ msgstr "Ferramenta/ganho"
 msgid "Ranges"
 msgstr "Intervalo"
 
-#: editor_actions.cc:104 editor_actions.cc:1781 session_option_editor.cc:145
+#: editor_actions.cc:104 editor_actions.cc:1790 session_option_editor.cc:145
 #: session_option_editor.cc:147 session_option_editor.cc:156
 #: session_option_editor.cc:163
 #, fuzzy
@@ -3333,7 +3343,7 @@ msgstr "Opções"
 msgid "Misc Options"
 msgstr "Opções"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr "Monitorização"
@@ -3380,8 +3390,8 @@ msgstr "Cronómetro secundário"
 msgid "Separate"
 msgstr "separar"
 
-#: editor_actions.cc:132 mixer_strip.cc:1916 route_time_axis.cc:199
-#: route_time_axis.cc:2397
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
+#: route_time_axis.cc:2417
 msgid "Solo"
 msgstr ""
 
@@ -3394,7 +3404,7 @@ msgstr "Quadros"
 msgid "Timecode fps"
 msgstr ""
 
-#: editor_actions.cc:137 route_time_axis.cc:421
+#: editor_actions.cc:137 route_time_axis.cc:430
 msgid "Height"
 msgstr "Altura"
 
@@ -3535,7 +3545,7 @@ msgstr "Reprodução no início do intervalo"
 msgid "Playhead to Range End"
 msgstr "Reprodução no final do intervalo"
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2237
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 msgid "Deselect All"
 msgstr "Seleccionar nenhum"
 
@@ -3846,9 +3856,9 @@ msgstr "Inserir região"
 msgid "Toggle Active"
 msgstr "Comutar activação de envolvente"
 
-#: editor_actions.cc:370 editor_actions.cc:1707 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1488
-#: route_time_axis.cc:701
+#: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
+#: route_time_axis.cc:710
 msgid "Remove"
 msgstr "Remover"
 
@@ -3857,19 +3867,19 @@ msgstr "Remover"
 msgid "Fit Selected Tracks"
 msgstr "seleccionar visualização de faixa"
 
-#: editor_actions.cc:376 time_axis_view.cc:1298
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr "Enorme"
 
-#: editor_actions.cc:379 time_axis_view.cc:1299
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr "Maior"
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1300
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr "Grande"
 
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr "Pequeno"
 
@@ -3973,7 +3983,7 @@ msgstr "Reunir"
 msgid "Slide"
 msgstr "Deslizar"
 
-#: editor_actions.cc:478 editor_actions.cc:1728 editor_markers.cc:860
+#: editor_actions.cc:478 editor_actions.cc:1737 editor_markers.cc:860
 #: editor_rulers.cc:386 location_ui.cc:56
 msgid "Lock"
 msgstr "Bloquear"
@@ -4184,7 +4194,7 @@ msgstr "Min:Segs"
 msgid "Video Monitor"
 msgstr "Monitorização"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr ""
 
@@ -4194,8 +4204,9 @@ msgid "Always on Top"
 msgstr "Elevar região para o nível de topo"
 
 #: editor_actions.cc:554
-msgid "Framenumber"
-msgstr ""
+#, fuzzy
+msgid "Frame number"
+msgstr "remover marcador"
 
 #: editor_actions.cc:555
 #, fuzzy
@@ -4287,7 +4298,7 @@ msgstr "Remover"
 
 #: editor_actions.cc:652 editor_audio_import.cc:279
 #: session_import_dialog.cc:74 session_import_dialog.cc:94
-#: session_metadata_dialog.cc:297 editor_videotimeline.cc:107
+#: session_metadata_dialog.cc:297 editor_videotimeline.cc:108
 msgid "Import"
 msgstr "Importar"
 
@@ -4331,329 +4342,329 @@ msgstr ""
 msgid "Could not find editor.bindings in search path %1"
 msgstr ""
 
-#: editor_actions.cc:1019 editor_actions.cc:1415 editor_actions.cc:1426
-#: editor_actions.cc:1479 editor_actions.cc:1490 editor_actions.cc:1537
-#: editor_actions.cc:1547 editor_regions.cc:1561
+#: editor_actions.cc:1028 editor_actions.cc:1424 editor_actions.cc:1435
+#: editor_actions.cc:1488 editor_actions.cc:1499 editor_actions.cc:1546
+#: editor_actions.cc:1556 editor_regions.cc:1561
 msgid "programming error: %1: %2"
 msgstr ""
 
-#: editor_actions.cc:1713
+#: editor_actions.cc:1722
 msgid "Raise"
 msgstr ""
 
-#: editor_actions.cc:1716
+#: editor_actions.cc:1725
 #, fuzzy
 msgid "Raise to Top"
 msgstr "Elevar região para o nível de topo"
 
-#: editor_actions.cc:1719 gtk-custom-ruler.c:132
+#: editor_actions.cc:1728 gtk-custom-ruler.c:132
 msgid "Lower"
 msgstr "Inferior"
 
-#: editor_actions.cc:1722
+#: editor_actions.cc:1731
 #, fuzzy
 msgid "Lower to Bottom"
 msgstr "Descer região para o nível de fundo"
 
-#: editor_actions.cc:1725
+#: editor_actions.cc:1734
 #, fuzzy
 msgid "Move to Original Position"
 msgstr "Posição original"
 
-#: editor_actions.cc:1730
+#: editor_actions.cc:1739
 msgid "Lock to Video"
 msgstr ""
 
-#: editor_actions.cc:1735 editor_markers.cc:867
+#: editor_actions.cc:1744 editor_markers.cc:867
 msgid "Glue to Bars and Beats"
 msgstr ""
 
-#: editor_actions.cc:1740
+#: editor_actions.cc:1749
 #, fuzzy
 msgid "Remove Sync"
 msgstr "remover sincronismo"
 
-#: editor_actions.cc:1743 mixer_strip.cc:1903 route_time_axis.cc:200
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr "Mudo"
 
-#: editor_actions.cc:1746
+#: editor_actions.cc:1755
 #, fuzzy
 msgid "Normalize..."
 msgstr "Normalizar"
 
-#: editor_actions.cc:1749
+#: editor_actions.cc:1758
 msgid "Reverse"
 msgstr "Inverter"
 
-#: editor_actions.cc:1752
+#: editor_actions.cc:1761
 #, fuzzy
 msgid "Make Mono Regions"
 msgstr "Criar regiões mono"
 
-#: editor_actions.cc:1755
+#: editor_actions.cc:1764
 msgid "Boost Gain"
 msgstr ""
 
-#: editor_actions.cc:1758
+#: editor_actions.cc:1767
 msgid "Cut Gain"
 msgstr ""
 
-#: editor_actions.cc:1761
+#: editor_actions.cc:1770
 msgid "Pitch Shift..."
 msgstr ""
 
-#: editor_actions.cc:1764
+#: editor_actions.cc:1773
 #, fuzzy
 msgid "Transpose..."
 msgstr "Transporte"
 
-#: editor_actions.cc:1767
+#: editor_actions.cc:1776
 #, fuzzy
 msgid "Opaque"
 msgstr "opaco"
 
-#: editor_actions.cc:1771 editor_regions.cc:116
+#: editor_actions.cc:1780 editor_regions.cc:116
 msgid "Fade In"
 msgstr "Evanescimento"
 
-#: editor_actions.cc:1776 editor_regions.cc:117
+#: editor_actions.cc:1785 editor_regions.cc:117
 msgid "Fade Out"
 msgstr "Desvanecimento"
 
-#: editor_actions.cc:1791
+#: editor_actions.cc:1800
 #, fuzzy
 msgid "Multi-Duplicate..."
 msgstr "Duplicar"
 
-#: editor_actions.cc:1796
+#: editor_actions.cc:1805
 msgid "Fill Track"
 msgstr "Preencher faixa"
 
-#: editor_actions.cc:1800 editor_markers.cc:955
+#: editor_actions.cc:1809 editor_markers.cc:955
 msgid "Set Loop Range"
 msgstr "Estabelecer intervalo cíclico"
 
-#: editor_actions.cc:1807
+#: editor_actions.cc:1816
 #, fuzzy
 msgid "Set Punch"
 msgstr "Estabelecer intervalo de inserção"
 
-#: editor_actions.cc:1811
+#: editor_actions.cc:1820
 #, fuzzy
 msgid "Add Single Range Marker"
 msgstr "Acrescentar marcadores de intervalo"
 
-#: editor_actions.cc:1816
+#: editor_actions.cc:1825
 #, fuzzy
 msgid "Add Range Marker Per Region"
 msgstr "Acrescentar marcadores de intervalo"
 
-#: editor_actions.cc:1820
+#: editor_actions.cc:1829
 #, fuzzy
 msgid "Snap Position To Grid"
 msgstr "Ajustar ao compasso"
 
-#: editor_actions.cc:1823
+#: editor_actions.cc:1832
 #, fuzzy
 msgid "Close Gaps"
 msgstr "Fechar"
 
-#: editor_actions.cc:1826
+#: editor_actions.cc:1835
 msgid "Rhythm Ferret..."
 msgstr ""
 
-#: editor_actions.cc:1829
+#: editor_actions.cc:1838
 #, fuzzy
 msgid "Export..."
 msgstr "Exportar"
 
-#: editor_actions.cc:1835
+#: editor_actions.cc:1844
 #, fuzzy
 msgid "Separate Under"
 msgstr "Separar intervalo em faixa"
 
-#: editor_actions.cc:1839
+#: editor_actions.cc:1848
 #, fuzzy
 msgid "Set Fade In Length"
 msgstr "alterar duração de evanescimento"
 
-#: editor_actions.cc:1840
+#: editor_actions.cc:1849
 #, fuzzy
 msgid "Set Fade Out Length"
 msgstr "alterar duração de desvanecimento"
 
-#: editor_actions.cc:1841
+#: editor_actions.cc:1850
 #, fuzzy
 msgid "Set Tempo from Region = Bar"
 msgstr "estabelecer selecção desde a região"
 
-#: editor_actions.cc:1846
+#: editor_actions.cc:1855
 #, fuzzy
 msgid "Split at Percussion Onsets"
 msgstr "Do início ao cursor de edição"
 
-#: editor_actions.cc:1851
+#: editor_actions.cc:1860
 #, fuzzy
 msgid "List Editor..."
 msgstr "Opções"
 
-#: editor_actions.cc:1854
+#: editor_actions.cc:1863
 msgid "Properties..."
 msgstr ""
 
-#: editor_actions.cc:1858
+#: editor_actions.cc:1867
 msgid "Bounce (with processing)"
 msgstr ""
 
-#: editor_actions.cc:1859
+#: editor_actions.cc:1868
 msgid "Bounce (without processing)"
 msgstr ""
 
-#: editor_actions.cc:1860
+#: editor_actions.cc:1869
 msgid "Combine"
 msgstr ""
 
-#: editor_actions.cc:1861
+#: editor_actions.cc:1870
 msgid "Uncombine"
 msgstr ""
 
-#: editor_actions.cc:1863
+#: editor_actions.cc:1872
 msgid "Spectral Analysis..."
 msgstr ""
 
-#: editor_actions.cc:1865
+#: editor_actions.cc:1874
 #, fuzzy
 msgid "Reset Envelope"
 msgstr "Reiniciar tudo"
 
-#: editor_actions.cc:1867
+#: editor_actions.cc:1876
 #, fuzzy
 msgid "Reset Gain"
 msgstr "Reiniciar tudo"
 
-#: editor_actions.cc:1872
+#: editor_actions.cc:1881
 #, fuzzy
 msgid "Envelope Active"
 msgstr "Comutar activação de envolvente"
 
-#: editor_actions.cc:1876
+#: editor_actions.cc:1885
 #, fuzzy
 msgid "Quantize..."
 msgstr "Tipo de ficheiro"
 
-#: editor_actions.cc:1877 editor_actions.cc:1878
+#: editor_actions.cc:1886 editor_actions.cc:1887
 msgid "Insert Patch Change..."
 msgstr ""
 
-#: editor_actions.cc:1879
+#: editor_actions.cc:1888
 msgid "Unlink from other copies"
 msgstr ""
 
-#: editor_actions.cc:1880
+#: editor_actions.cc:1889
 msgid "Strip Silence..."
 msgstr ""
 
-#: editor_actions.cc:1881
+#: editor_actions.cc:1890
 #, fuzzy
 msgid "Set Range Selection"
 msgstr "Estabelecer intervalo desde selecção de intervalo"
 
-#: editor_actions.cc:1883
+#: editor_actions.cc:1892
 #, fuzzy
 msgid "Nudge Later"
 msgstr "Retocar p/frente"
 
-#: editor_actions.cc:1884
+#: editor_actions.cc:1893
 #, fuzzy
 msgid "Nudge Earlier"
 msgstr "Retocar p/frente"
 
-#: editor_actions.cc:1889
+#: editor_actions.cc:1898
 #, fuzzy
 msgid "Nudge Later by Capture Offset"
 msgstr "Retocar p/frente (gravação)"
 
-#: editor_actions.cc:1896
+#: editor_actions.cc:1905
 #, fuzzy
 msgid "Nudge Earlier by Capture Offset"
 msgstr "Retocar p/frente (gravação)"
 
-#: editor_actions.cc:1900
+#: editor_actions.cc:1909
 msgid "Trim to Loop"
 msgstr ""
 
-#: editor_actions.cc:1901
+#: editor_actions.cc:1910
 msgid "Trim to Punch"
 msgstr ""
 
-#: editor_actions.cc:1903
+#: editor_actions.cc:1912
 #, fuzzy
 msgid "Trim to Previous"
 msgstr "cortar para edição"
 
-#: editor_actions.cc:1904
+#: editor_actions.cc:1913
 #, fuzzy
 msgid "Trim to Next"
 msgstr "cortar para edição"
 
-#: editor_actions.cc:1911
+#: editor_actions.cc:1920
 #, fuzzy
 msgid "Insert Region From Region List"
 msgstr "estabelecer selecção desde a região"
 
-#: editor_actions.cc:1917
+#: editor_actions.cc:1926
 #, fuzzy
 msgid "Set Sync Position"
 msgstr "Estabelecer posição de sincronia de região"
 
-#: editor_actions.cc:1918
+#: editor_actions.cc:1927
 msgid "Place Transient"
 msgstr ""
 
-#: editor_actions.cc:1919
+#: editor_actions.cc:1928
 msgid "Split"
 msgstr "Separar"
 
-#: editor_actions.cc:1920
+#: editor_actions.cc:1929
 msgid "Trim Start at Edit Point"
 msgstr ""
 
-#: editor_actions.cc:1921
+#: editor_actions.cc:1930
 msgid "Trim End at Edit Point"
 msgstr ""
 
-#: editor_actions.cc:1926
+#: editor_actions.cc:1935
 #, fuzzy
 msgid "Align Start"
 msgstr "Alinhar regiões pelo início"
 
-#: editor_actions.cc:1933
+#: editor_actions.cc:1942
 #, fuzzy
 msgid "Align Start Relative"
 msgstr "Alinhar regiões pelo início (relativamente)"
 
-#: editor_actions.cc:1937
+#: editor_actions.cc:1946
 #, fuzzy
 msgid "Align End"
 msgstr "Alinhar"
 
-#: editor_actions.cc:1942
+#: editor_actions.cc:1951
 #, fuzzy
 msgid "Align End Relative"
 msgstr "Alinhar relativamente"
 
-#: editor_actions.cc:1949
+#: editor_actions.cc:1958
 #, fuzzy
 msgid "Align Sync"
 msgstr "Alinhar regiões sincronizadas"
 
-#: editor_actions.cc:1956
+#: editor_actions.cc:1965
 #, fuzzy
 msgid "Align Sync Relative"
 msgstr "Alinhar relativamente"
 
-#: editor_actions.cc:1960 editor_actions.cc:1963
+#: editor_actions.cc:1969 editor_actions.cc:1972
 msgid "Choose Top..."
 msgstr ""
 
@@ -4679,33 +4690,33 @@ msgid ""
 "%2 as a new source, or skip it?"
 msgstr ""
 
-#: editor_audio_import.cc:279 editor_videotimeline.cc:107
+#: editor_audio_import.cc:279 editor_videotimeline.cc:108
 msgid "Cancel Import"
 msgstr "Cancelar importação"
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr "Editor: não foi possível abrir o ficheiro \"%1\", (%2)"
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 msgid "Cancel entire import"
 msgstr "Cancelar importação inteira"
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 msgid "Don't embed it"
 msgstr "Não acrescentar"
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr "Acrescentar sem qualquer questão"
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 #, fuzzy
 msgid "Sample rate"
 msgstr "Frequência de amostragem"
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
@@ -4713,7 +4724,7 @@ msgstr ""
 "%1\n"
 "A frequência de amostragem deste ficheiro audio não é igual à de sessão!"
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 msgid "Embed it anyway"
 msgstr "Acrescentar de qualquer forma"
 
@@ -4751,31 +4762,31 @@ msgstr "copiar marcador de tempo"
 msgid "move tempo mark"
 msgstr "mover marcador de tempo"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr "alterar duração de evanescimento"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr "alterar duração de desvanecimento"
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr "mover marcador"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr ""
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 msgid "programming_error: %1"
 msgstr ""
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr "novo marcador de região"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 #, fuzzy
 msgid "rubberband selection"
 msgstr "selecção de intervalo"
@@ -4855,7 +4866,7 @@ msgid "Sharing Solo?"
 msgstr ""
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 msgid "Rec"
 msgstr ""
 
@@ -4935,7 +4946,7 @@ msgid "end"
 msgstr "Envios"
 
 #: editor_markers.cc:646 editor_ops.cc:1744 editor_ops.cc:1764
-#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1005
+#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1017
 msgid "add marker"
 msgstr "acrescentar marcador"
 
@@ -4944,7 +4955,7 @@ msgstr "acrescentar marcador"
 msgid "range"
 msgstr " intervalo"
 
-#: editor_markers.cc:713 location_ui.cc:840
+#: editor_markers.cc:713 location_ui.cc:852
 msgid "remove marker"
 msgstr "remover marcador"
 
@@ -5031,8 +5042,8 @@ msgstr "Renomear marcador"
 msgid "Rename Range"
 msgstr "Renomear intervalo"
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2233 route_time_axis.cc:968 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr "Renomear"
 
@@ -5182,7 +5193,7 @@ msgstr "Descer região para o nível de fundo"
 msgid "Rename Region"
 msgstr "Inverter região"
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 #, fuzzy
 msgid "New name:"
 msgstr "Novo nome: "
@@ -5361,7 +5372,7 @@ msgstr ""
 "(esta operação é destrutiva e não pode ser desfeita)"
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr "Não, não fazer nada."
 
@@ -5571,11 +5582,11 @@ msgstr ""
 msgid "close region gaps"
 msgstr "estas regiões"
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr ""
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5590,7 +5601,7 @@ msgstr ""
 msgid "tracks"
 msgstr "Faixas"
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 #, fuzzy
 msgid "track"
 msgstr "Faixa"
@@ -5600,7 +5611,7 @@ msgstr "Faixa"
 msgid "busses"
 msgstr "Barramentos"
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 msgid "bus"
 msgstr ""
 
@@ -5645,7 +5656,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr "Sim, remover."
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr "Sim, remover."
 
@@ -5723,7 +5734,7 @@ msgstr ""
 msgid "Length of region fade-out (units: secondary clock), () if dsisabled"
 msgstr ""
 
-#: editor_regions.cc:118 mixer_strip.cc:1960 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr ""
@@ -5742,8 +5753,9 @@ msgstr "Ir"
 msgid "Region position glued to Bars|Beats time?"
 msgstr ""
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:723
-#: mixer_strip.cc:1934 panner_ui.cc:554 stereo_panner.cc:237
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
+#: stereo_panner.cc:237
 msgid "M"
 msgstr ""
 
@@ -5819,7 +5831,8 @@ msgstr "Faixas/barramentos"
 msgid "Track/Bus visible ?"
 msgstr "Faixas/barramentos"
 
-#: editor_routes.cc:204 mixer_strip.cc:1951 route_time_axis.cc:2387
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
+#: route_time_axis.cc:2407
 msgid "A"
 msgstr ""
 
@@ -5828,7 +5841,7 @@ msgstr ""
 msgid "Track/Bus active ?"
 msgstr "Faixas/barramentos"
 
-#: editor_routes.cc:205 mixer_strip.cc:1935
+#: editor_routes.cc:205 mixer_strip.cc:1932
 msgid "I"
 msgstr "E"
 
@@ -5837,7 +5850,7 @@ msgstr "E"
 msgid "MIDI input enabled"
 msgstr "Associação MIDI"
 
-#: editor_routes.cc:206 mixer_strip.cc:1933 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr ""
@@ -5852,7 +5865,7 @@ msgstr "Gravar"
 msgid "Muted"
 msgstr "Mudo"
 
-#: editor_routes.cc:208 mixer_strip.cc:1947
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr ""
 
@@ -5866,7 +5879,7 @@ msgstr "Solo livre"
 msgid "SI"
 msgstr "E"
 
-#: editor_routes.cc:209 mixer_strip.cc:351 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 #, fuzzy
 msgid "Solo Isolated"
 msgstr "Solo livre"
@@ -6164,151 +6177,155 @@ msgid "192000Hz"
 msgstr ""
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr "Nenhum"
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr ""
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr ""
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 #, fuzzy
 msgid "Shaped"
 msgstr "Forma de ruído"
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr ""
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr ""
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr ""
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 #, fuzzy
 msgid "Recording only"
 msgstr "Suspender gravação em caso de falha sincrónica (XRUN)"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr ""
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 #, fuzzy
 msgid "raw"
 msgstr "desenhar"
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr ""
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 #, fuzzy
 msgid "Audio Interface:"
 msgstr "Interno"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:148 sfdb_ui.cc:261 sfdb_ui.cc:266
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 #, fuzzy
 msgid "Sample rate:"
 msgstr "Frequência de amostragem"
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr ""
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr ""
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr ""
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 #, fuzzy
 msgid "Audio mode:"
 msgstr "Quadros audio"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr ""
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr ""
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr ""
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr ""
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 #, fuzzy
 msgid "Dither:"
 msgstr "Tipo de extrapolação"
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr ""
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr ""
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr ""
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 #, fuzzy
 msgid "Output device:"
 msgstr "Saída"
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 #, fuzzy
 msgid "Hardware input latency:"
 msgstr "Entradas Físicas: usar"
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 #, fuzzy
 msgid "samples"
 msgstr "freq.amostragem"
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 #, fuzzy
 msgid "Hardware output latency:"
 msgstr "Saídas Físicas: usar"
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr ""
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 #, fuzzy
 msgid "Advanced"
 msgstr "Avançado..."
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr ""
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 msgid ""
 "You do not have any audio devices capable of\n"
 "simultaneous playback and recording.\n"
@@ -6325,31 +6342,31 @@ msgid ""
 "%1 and choose the relevant device then."
 msgstr ""
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr ""
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr ""
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr ""
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr ""
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr ""
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:146
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 #, fuzzy
 msgid "Channels:"
 msgstr "Canais"
@@ -6513,9 +6530,9 @@ msgid "Folder:"
 msgstr "Nome do directório:"
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "Pesquisar"
 
@@ -6653,6 +6670,13 @@ msgstr "Localizações"
 msgid "Broadcast Wave options"
 msgstr "WAVE/vírgula flutuante (difusão)"
 
+#: export_format_selector.cc:136
+#, fuzzy
+msgid "Do you really want to remove the format?"
+msgstr ""
+"Deseja realmente remover o faixa \"%1\" ?\n"
+"(esta operação não pode ser desfeita)"
+
 #: export_preset_selector.cc:28
 #, fuzzy
 msgid "Preset"
@@ -6664,6 +6688,13 @@ msgid ""
 "Perhaps it references a format that has been removed?"
 msgstr ""
 
+#: export_preset_selector.cc:156
+#, fuzzy
+msgid "Do you really want to remove this preset?"
+msgstr ""
+"Deseja realmente remover o faixa \"%1\" ?\n"
+"(esta operação não pode ser desfeita)"
+
 #: export_timespan_selector.cc:46
 msgid "Show Times as:"
 msgstr ""
@@ -6677,36 +6708,48 @@ msgstr ""
 msgid "Range"
 msgstr "Intervalo"
 
-#: gain_meter.cc:109 gain_meter.cc:431 gain_meter.cc:820
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+msgid "curl error %1 (%2)"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+msgid "%1"
+msgstr ""
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr ""
 
-#: gain_meter.cc:115 gain_meter.cc:869
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr "Modo de automatizaçã"
 
-#: gain_meter.cc:116 gain_meter.cc:870
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr "Tipo de automatização"
 
-#: gain_meter.cc:125 gain_meter.cc:759 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr ""
 
-#: gain_meter.cc:334
-msgid "-Inf"
-msgstr ""
-
-#: gain_meter.cc:726 mixer_strip.cc:1954 panner_ui.cc:557
-#: route_time_axis.cc:2391
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
+#: route_time_axis.cc:2411
 msgid "P"
 msgstr ""
 
-#: gain_meter.cc:729 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr ""
 
-#: gain_meter.cc:732 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr ""
 
@@ -6718,7 +6761,7 @@ msgstr "<span size=\"large\">Parametrizações</span>"
 msgid "Switches"
 msgstr ""
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2210
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 msgid "Controls"
 msgstr "Controlos"
 
@@ -6750,71 +6793,71 @@ msgstr ""
 msgid "MIDI Connection Manager"
 msgstr "Ligações de entrada"
 
-#: global_port_matrix.cc:204 io_selector.cc:216
+#: global_port_matrix.cc:213 io_selector.cc:216
 msgid "port"
 msgstr "porto"
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 #, fuzzy
 msgid "Selection..."
 msgstr "Reproduzir região seleccionada"
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr ""
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 msgid "Soloed..."
 msgstr ""
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 #, fuzzy
 msgid "Create New Group ..."
 msgstr "Sem grupo"
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr ""
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 #, fuzzy
 msgid "Edit Group..."
 msgstr "Sem grupo"
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 #, fuzzy
 msgid "Collect Group"
 msgstr "Seleccionar"
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 #, fuzzy
 msgid "Remove Group"
 msgstr "Grupo"
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 #, fuzzy
 msgid "Remove Subgroup Bus"
 msgstr "Acrescentar grupo"
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 #, fuzzy
 msgid "Add New Subgroup Bus"
 msgstr "Acrescentar grupo"
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr ""
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 #, fuzzy
 msgid "Add New Aux Bus (post-fader)"
 msgstr "Apagar VUímetro"
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 msgid "Enable All Groups"
 msgstr ""
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 #, fuzzy
 msgid "Disable All Groups"
 msgstr "Desabilitar tudo"
@@ -6919,11 +6962,11 @@ msgstr ""
 msgid "I/O selector"
 msgstr "Inverter selecção"
 
-#: io_selector.cc:266
+#: io_selector.cc:265
 msgid "%1 input"
 msgstr "%1 entrada"
 
-#: io_selector.cc:268
+#: io_selector.cc:267
 msgid "%1 output"
 msgstr "%1 saída"
 
@@ -7007,7 +7050,7 @@ msgstr[1] "freq.amostragem"
 msgid "Reset"
 msgstr "Reiniciar"
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1734
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 msgid "programming error: %1 (%2)"
 msgstr ""
 
@@ -7036,71 +7079,71 @@ msgstr ""
 msgid "Pre-Emphasis"
 msgstr "Pré-êmfase"
 
-#: location_ui.cc:310
+#: location_ui.cc:314
 #, fuzzy
 msgid "Remove this range"
 msgstr "estabelecer intervalo de inserção"
 
-#: location_ui.cc:311
+#: location_ui.cc:315
 msgid "Start time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:312
+#: location_ui.cc:316
 msgid "End time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:315
+#: location_ui.cc:319
 #, fuzzy
 msgid "Set range start from playhead location"
 msgstr "Estabelecer marcador de intervalo desde cursor de reprodução"
 
-#: location_ui.cc:316
+#: location_ui.cc:320
 #, fuzzy
 msgid "Set range end from playhead location"
 msgstr "Estabelecer intervalo desde selecção de intervalo"
 
-#: location_ui.cc:320
+#: location_ui.cc:324
 #, fuzzy
 msgid "Remove this marker"
 msgstr "mover marcador"
 
-#: location_ui.cc:321
+#: location_ui.cc:325
 msgid "Position - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:323
+#: location_ui.cc:327
 #, fuzzy
 msgid "Set marker time from playhead location"
 msgstr "Estabelecer intervalo desde selecção de intervalo"
 
-#: location_ui.cc:462
+#: location_ui.cc:494
 msgid "You cannot put a CD marker at the start of the session"
 msgstr ""
 
-#: location_ui.cc:708
+#: location_ui.cc:720
 #, fuzzy
 msgid "New Marker"
 msgstr "Marcador"
 
-#: location_ui.cc:709
+#: location_ui.cc:721
 #, fuzzy
 msgid "New Range"
 msgstr "Adicionar novo intervalo"
 
-#: location_ui.cc:722
+#: location_ui.cc:734
 #, fuzzy
 msgid "<b>Loop/Punch Ranges</b>"
 msgstr "Ciclos/inserção"
 
-#: location_ui.cc:747
+#: location_ui.cc:759
 msgid "<b>Markers (Including CD Index)</b>"
 msgstr ""
 
-#: location_ui.cc:782
+#: location_ui.cc:794
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
 msgstr ""
 
-#: location_ui.cc:1024
+#: location_ui.cc:1036
 msgid "add range marker"
 msgstr "acrescentar marcador de região"
 
@@ -7177,19 +7220,19 @@ msgid ""
 "session at this time, because we would lose your connection information.\n"
 msgstr ""
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr " (compilado "
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr " e versão GCC "
 
-#: main.cc:504
+#: main.cc:500
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr ""
 
-#: main.cc:505
+#: main.cc:501
 #, fuzzy
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
@@ -7198,30 +7241,35 @@ msgstr ""
 "Algumas partes Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker"
 
-#: main.cc:507
+#: main.cc:503
 #, fuzzy
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr "Ardour é fornecido ABSOLUTAMENTE SEM QUALQUER GARANTIA"
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr "nem mesmo para COMERCIALIZAÇÃO ou INDICADO PARA UM FIM PARTICULAR."
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "Sendo software livre, é permitida e até encorajada a sua distribuição "
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr ""
 "desde que sejam respeitadas algumas condições; para mais informações, por "
 "favor leia o ficheiro COPYING."
 
-#: main.cc:519
+#: main.cc:513
+#, fuzzy
+msgid "could not initialize %1."
+msgstr "não foi possível inicializar o Ardour"
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr ""
 
-#: main.cc:525
+#: main.cc:528
 #, fuzzy
 msgid "could not create %1 GUI"
 msgstr "não foi possível criar o interface gráfico (GUI)"
@@ -7231,7 +7279,7 @@ msgstr "não foi possível criar o interface gráfico (GUI)"
 msgid "Display delta to edit cursor"
 msgstr "Do início ao cursor de edição"
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 msgid "MarkerText"
 msgstr "Marcadores"
 
@@ -7770,7 +7818,7 @@ msgstr ""
 msgid "Missing Plugins"
 msgstr "Efeitos/plug-ins"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr ""
 
@@ -7849,237 +7897,250 @@ msgstr ""
 msgid "Could not find mixer.bindings in search path %1"
 msgstr ""
 
-#: mixer_strip.cc:91 mixer_strip.cc:119 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr ""
 
-#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:352 mixer_strip.cc:1293
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 #, fuzzy
 msgid "Comments"
 msgstr "Comentários"
 
-#: mixer_strip.cc:145
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr ""
 
-#: mixer_strip.cc:147
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
 msgstr ""
 
-#: mixer_strip.cc:154
+#: mixer_strip.cc:156
 #, fuzzy
 msgid "Hide this mixer strip"
 msgstr "Esconder painéis de mistura de todos os barramentos audio"
 
-#: mixer_strip.cc:165
+#: mixer_strip.cc:167
 #, fuzzy
 msgid "Click to select metering point"
 msgstr "Seleccionar regiões"
 
-#: mixer_strip.cc:171
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr "adartne"
 
-#: mixer_strip.cc:190
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr ""
 
-#: mixer_strip.cc:199
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr ""
 
-#: mixer_strip.cc:201 mixer_strip.cc:1929
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 msgid "lock"
 msgstr "bloquear"
 
-#: mixer_strip.cc:202 mixer_strip.cc:1928
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 #, fuzzy
 msgid "iso"
 msgstr "entradas"
 
-#: mixer_strip.cc:256
+#: mixer_strip.cc:258
 #, fuzzy
 msgid "Mix group"
 msgstr "Sem grupo"
 
-#: mixer_strip.cc:349 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 #, fuzzy
 msgid "Phase Invert"
 msgstr "Inverter"
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 #, fuzzy
 msgid "Solo Safe"
 msgstr "Solo livre"
 
-#: mixer_strip.cc:353 mixer_ui.cc:124 route_time_axis.cc:664
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 msgid "Group"
 msgstr "Grupo"
 
-#: mixer_strip.cc:354 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 #, fuzzy
 msgid "Meter Point"
 msgstr "VUímetro"
 
-#: mixer_strip.cc:466
+#: mixer_strip.cc:470
 #, fuzzy
 msgid "Enable/Disable MIDI input"
 msgstr "Ligar/Desligar o metrónomo"
 
-#: mixer_strip.cc:616
+#: mixer_strip.cc:622
 #, fuzzy
 msgid ""
 "Aux\n"
 "Sends"
 msgstr "Envios"
 
-#: mixer_strip.cc:640
+#: mixer_strip.cc:646
 #, fuzzy
 msgid "Snd"
 msgstr "Envios"
 
-#: mixer_strip.cc:694 mixer_strip.cc:822 processor_box.cc:2152
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr "Desligado do JACK - não são possíveis alterações nas entradas/saídas"
 
-#: mixer_strip.cc:1089
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr ""
 
-#: mixer_strip.cc:1092
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr ""
 
-#: mixer_strip.cc:1167
+#: mixer_strip.cc:1174
 #, fuzzy
 msgid "Disconnected"
 msgstr "desligado"
 
-#: mixer_strip.cc:1296
+#: mixer_strip.cc:1303
 msgid "*Comments*"
 msgstr "*Comentários*"
 
-#: mixer_strip.cc:1303
+#: mixer_strip.cc:1310
 #, fuzzy
 msgid "Cmt"
 msgstr "Cortar"
 
-#: mixer_strip.cc:1306
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr ""
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr "Clicar para acrescentar/editar comentários"
 
-#: mixer_strip.cc:1351
+#: mixer_strip.cc:1358
 msgid ": comment editor"
 msgstr ": editor de comentários"
 
-#: mixer_strip.cc:1428
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr ""
 
-#: mixer_strip.cc:1431
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr ""
 
-#: mixer_strip.cc:1460
+#: mixer_strip.cc:1467
 #, fuzzy
 msgid "Comments..."
 msgstr "Comentários"
 
-#: mixer_strip.cc:1462
+#: mixer_strip.cc:1469
 #, fuzzy
 msgid "Save As Template..."
 msgstr "Guardar modelo..."
 
-#: mixer_strip.cc:1468 route_group_dialog.cc:39 route_time_axis.cc:687
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr "Activo"
 
-#: mixer_strip.cc:1475
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr ""
 
-#: mixer_strip.cc:1478
+#: mixer_strip.cc:1485
 msgid "Protect Against Denormals"
 msgstr ""
 
-#: mixer_strip.cc:1484 route_time_axis.cc:426
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 #, fuzzy
 msgid "Remote Control ID..."
 msgstr "ID controlo remoto"
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 msgid "in"
 msgstr "entrada"
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 msgid "post"
 msgstr "pós"
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 msgid "out"
 msgstr "saída"
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr ""
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 #, fuzzy
 msgid "pr"
 msgstr "porto"
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 #, fuzzy
 msgid "po"
 msgstr "porto"
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 #, fuzzy
 msgid "o"
 msgstr "pronto"
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr ""
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr ""
 
-#: mixer_strip.cc:1920 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr ""
 
-#: mixer_strip.cc:1923 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr ""
 
-#: mixer_strip.cc:1936
+#: mixer_strip.cc:1933
 msgid "D"
 msgstr ""
 
-#: mixer_strip.cc:1959
+#: mixer_strip.cc:1953
 #, fuzzy
 msgid "i"
 msgstr "entrada"
 
-#: mixer_strip.cc:2133
+#: mixer_strip.cc:2128
 #, fuzzy
 msgid "Pre-fader"
 msgstr "Pré-atenuador"
 
-#: mixer_strip.cc:2134
+#: mixer_strip.cc:2129
 #, fuzzy
 msgid "Post-fader"
 msgstr "Pós-atenuador"
 
+#: mixer_strip.cc:2166 meter_strip.cc:728
+msgid "Change all in Group to %1"
+msgstr ""
+
+#: mixer_strip.cc:2168 meter_strip.cc:730
+#, fuzzy
+msgid "Change all to %1"
+msgstr "Canais"
+
+#: mixer_strip.cc:2170 meter_strip.cc:732
+msgid "Change same track-type to %1"
+msgstr ""
+
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr "não foi encontrada qualquer faixa para o painel de mistura"
@@ -8088,10 +8149,68 @@ msgstr "não foi encontrada qualquer faixa para o painel de mistura"
 msgid "-all-"
 msgstr "-tudo-"
 
-#: mixer_ui.cc:1792
+#: mixer_ui.cc:1794
 msgid "Strips"
 msgstr "Painéis"
 
+#: meter_strip.cc:764
+#, fuzzy
+msgid "Variable height"
+msgstr "altura da faixa"
+
+#: meter_strip.cc:765
+#, fuzzy
+msgid "Short"
+msgstr "Curto"
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr ""
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr ""
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+msgid "VU"
+msgstr ""
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr ""
@@ -8474,7 +8593,7 @@ msgstr ""
 msgid "Panner (2D)"
 msgstr ""
 
-#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:452
+#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:451
 msgid "Bypass"
 msgstr "Ignorar"
 
@@ -8668,7 +8787,7 @@ msgstr ""
 msgid "Eh? LADSPA plugins don't have editors!"
 msgstr ""
 
-#: plugin_ui.cc:125 plugin_ui.cc:228
+#: plugin_ui.cc:125 plugin_ui.cc:227
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
@@ -8684,7 +8803,7 @@ msgstr ""
 "tipo desconhecido de editor de efeito/plug-in (nota: esta versão do ardour "
 "não suporta VST)"
 
-#: plugin_ui.cc:258
+#: plugin_ui.cc:257
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no linuxVST support in this "
@@ -8693,79 +8812,91 @@ msgstr ""
 "tipo desconhecido de editor de efeito/plug-in (nota: esta versão do ardour "
 "não suporta VST)"
 
-#: plugin_ui.cc:330
+#: plugin_ui.cc:329
 msgid "create_lv2_editor called on non-LV2 plugin"
 msgstr ""
 
-#: plugin_ui.cc:418
+#: plugin_ui.cc:417
 msgid "Add"
 msgstr "Acrescentar"
 
-#: plugin_ui.cc:422
+#: plugin_ui.cc:421
 #, fuzzy
 msgid "Description"
 msgstr "resolução"
 
-#: plugin_ui.cc:423
+#: plugin_ui.cc:422
 #, fuzzy
 msgid "Plugin analysis"
 msgstr "Efeitos/plug-ins"
 
-#: plugin_ui.cc:430
+#: plugin_ui.cc:429
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
 msgstr ""
 
-#: plugin_ui.cc:431
+#: plugin_ui.cc:430
 #, fuzzy
 msgid "Save a new preset"
 msgstr "Nome para a nova parametrização:"
 
-#: plugin_ui.cc:432
+#: plugin_ui.cc:431
 msgid "Save the current preset"
 msgstr ""
 
-#: plugin_ui.cc:433
+#: plugin_ui.cc:432
 msgid "Delete the current preset"
 msgstr ""
 
-#: plugin_ui.cc:434
+#: plugin_ui.cc:433
 msgid "Disable signal processing by the plugin"
 msgstr ""
 
-#: plugin_ui.cc:467 plugin_ui.cc:632
+#: plugin_ui.cc:466 plugin_ui.cc:662
 msgid ""
 "Click to allow the plugin to receive keyboard events that %1 would normally "
 "use as a shortcut"
 msgstr ""
 
-#: plugin_ui.cc:468
+#: plugin_ui.cc:467
 msgid "Click to enable/disable this plugin"
 msgstr ""
 
-#: plugin_ui.cc:507
+#: plugin_ui.cc:506
 #, fuzzy
 msgid "latency (%1 sample)"
 msgid_plural "latency (%1 samples)"
 msgstr[0] "Latência"
 msgstr[1] "Latência"
 
-#: plugin_ui.cc:509
+#: plugin_ui.cc:508
 #, fuzzy
 msgid "latency (%1 ms)"
 msgstr "Latência"
 
-#: plugin_ui.cc:520
+#: plugin_ui.cc:519
 #, fuzzy
 msgid "Edit Latency"
 msgstr "Latência"
 
-#: plugin_ui.cc:559
+#: plugin_ui.cc:558
 msgid "Plugin preset %1 not found"
 msgstr "Parametrização de efeito/plug-in %1 inexistente"
 
-#: plugin_ui.cc:639
+#: plugin_ui.cc:595
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin_ui.cc:615 plugin_ui.cc:630
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"newer version"
+msgstr ""
+
+#: plugin_ui.cc:669
 msgid "Click to allow normal use of %1 keyboard shortcuts"
 msgstr ""
 
@@ -8881,78 +9012,79 @@ msgstr ""
 msgid "Port Insert "
 msgstr "Nova inserção"
 
-#: port_matrix.cc:323 port_matrix.cc:342
+#: port_matrix.cc:331 port_matrix.cc:357
 #, fuzzy
 msgid "<b>Sources</b>"
 msgstr "Avançado..."
 
-#: port_matrix.cc:324 port_matrix.cc:343
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr ""
 
-#: port_matrix.cc:419 port_matrix.cc:427
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr ""
 
-#: port_matrix.cc:435
+#: port_matrix.cc:456
 #, fuzzy, c-format
 msgid "Rename '%s'..."
 msgstr "Renomear"
 
-#: port_matrix.cc:451
+#: port_matrix.cc:472
 #, fuzzy
 msgid "Remove all"
 msgstr "Remover marcador"
 
-#: port_matrix.cc:471 port_matrix.cc:483
+#: port_matrix.cc:492 port_matrix.cc:504
 #, fuzzy, c-format
 msgid "%s all"
 msgstr "Reiniciar tudo"
 
-#: port_matrix.cc:506
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr "Refrescar"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr ""
 
-#: port_matrix.cc:514
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr ""
 
-#: port_matrix.cc:702
+#: port_matrix.cc:723
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
 "or buss cannot support the new configuration."
 msgstr ""
 
-#: port_matrix.cc:705
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr ""
 
-#: port_matrix.cc:727
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr ""
 
-#: port_matrix.cc:728
+#: port_matrix.cc:749
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
 
-#: port_matrix.cc:945
+#: port_matrix.cc:966
 #, fuzzy, c-format
 msgid "Remove '%s'"
 msgstr "Remover"
 
-#: port_matrix.cc:960
+#: port_matrix.cc:981
 #, fuzzy, c-format
 msgid "%s all from '%s'"
 msgstr "seleccionar tudo desde o ciclo"
 
-#: port_matrix.cc:1026
+#: port_matrix.cc:1047
 #, fuzzy
 msgid "channel"
 msgstr "canais"
@@ -8967,66 +9099,66 @@ msgstr "Não existem portos JACK disponíveis"
 msgid "There are no %1 ports to connect."
 msgstr "Não existem portos JACK disponíveis"
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
 "Alt+double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 #, fuzzy
 msgid "Show All Controls"
 msgstr "Mostrar controlos de envio"
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 #, fuzzy
 msgid "Hide All Controls"
 msgstr "Esconder todos os desvanecimentos cruzados"
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 #, fuzzy
 msgid "on"
 msgstr "pronto"
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr "desligado"
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
 msgstr ""
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 msgid "Plugin Incompatibility"
 msgstr ""
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr ""
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
 msgstr ""
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 #, fuzzy
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
 msgstr[0] "%1 entrada"
 msgstr[1] "%1 entrada"
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 #, fuzzy
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
@@ -9037,38 +9169,38 @@ msgstr[1] ""
 "entrada\n"
 "automática"
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
 msgstr ""
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 #, fuzzy
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
 msgstr[0] "canais"
 msgstr[1] "canais"
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 #, fuzzy
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
 msgstr[0] "canais"
 msgstr[1] "canais"
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
 msgstr ""
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 #, fuzzy
 msgid "Cannot set up new send: %1"
 msgstr "não foi possível estabelecer receptor de sinal %1"
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 #, fuzzy
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
@@ -9079,20 +9211,20 @@ msgstr ""
 "na forma pretendida porque as entradas e saídas\n"
 "não podem ser combinadas correctamente."
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 #, fuzzy
 msgid "Rename Processor"
 msgstr "Renomear faixa"
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr ""
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr ""
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 #, fuzzy
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
@@ -9104,7 +9236,7 @@ msgstr ""
 "para os efeitos/plug-ins não combinam correctamente\n"
 "com a configuração desta faixa."
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 #, fuzzy
 msgid ""
 "Do you really want to remove all processors from %1?\n"
@@ -9113,16 +9245,16 @@ msgstr ""
 "Deseja realmente remover todos os redireccionamentos para este barramento?\n"
 "(esta operação não pode ser desfeita)"
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 msgid "Yes, remove them all"
 msgstr "Sim, remover todos"
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 #, fuzzy
 msgid "Remove processors"
 msgstr "Remover marcador"
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 #, fuzzy
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
@@ -9131,7 +9263,7 @@ msgstr ""
 "Deseja realmente remover todos os redireccionamentos para este barramento?\n"
 "(esta operação não pode ser desfeita)"
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 #, fuzzy
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
@@ -9140,59 +9272,59 @@ msgstr ""
 "Deseja realmente remover todos os redireccionamentos para este barramento?\n"
 "(esta operação não pode ser desfeita)"
 
-#: processor_box.cc:2198
+#: processor_box.cc:2200
 #, fuzzy
 msgid "New Plugin"
 msgstr "Novo efeito/plug-in..."
 
-#: processor_box.cc:2201
+#: processor_box.cc:2203
 msgid "New Insert"
 msgstr "Nova inserção"
 
-#: processor_box.cc:2204
+#: processor_box.cc:2206
 #, fuzzy
 msgid "New External Send ..."
 msgstr "Novo envio..."
 
-#: processor_box.cc:2208
+#: processor_box.cc:2210
 #, fuzzy
 msgid "New Aux Send ..."
 msgstr "Novo envio..."
 
-#: processor_box.cc:2212
+#: processor_box.cc:2214
 #, fuzzy
 msgid "Clear (all)"
 msgstr "Apagar todos os intervalos"
 
-#: processor_box.cc:2214
+#: processor_box.cc:2216
 #, fuzzy
 msgid "Clear (pre-fader)"
 msgstr "Apagar VUímetro"
 
-#: processor_box.cc:2216
+#: processor_box.cc:2218
 #, fuzzy
 msgid "Clear (post-fader)"
 msgstr "Apagar VUímetro"
 
-#: processor_box.cc:2242
+#: processor_box.cc:2244
 msgid "Activate All"
 msgstr "Activar tudo"
 
-#: processor_box.cc:2244
+#: processor_box.cc:2246
 #, fuzzy
 msgid "Deactivate All"
 msgstr "Desactivar todos"
 
-#: processor_box.cc:2246
+#: processor_box.cc:2248
 #, fuzzy
 msgid "A/B Plugins"
 msgstr "Efeitos/plug-ins"
 
-#: processor_box.cc:2255
+#: processor_box.cc:2257
 msgid "Edit with generic controls..."
 msgstr ""
 
-#: processor_box.cc:2531
+#: processor_box.cc:2557
 #, fuzzy
 msgid "%1: %2 (by %3)"
 msgstr "ardour: %1: %2 (por %3)"
@@ -9364,7 +9496,7 @@ msgstr ""
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
 
 #: rc_option_editor.cc:836
@@ -9459,7 +9591,7 @@ msgstr ""
 msgid "Click gain level"
 msgstr "Ficheiro audio para metrónomo"
 
-#: rc_option_editor.cc:1083 route_time_axis.cc:206 route_time_axis.cc:667
+#: rc_option_editor.cc:1083 route_time_axis.cc:215 route_time_axis.cc:676
 msgid "Automation"
 msgstr "Automatização"
 
@@ -9648,98 +9780,102 @@ msgstr ""
 msgid "Show meters on tracks in the editor"
 msgstr ""
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr ""
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr ""
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 msgid "whenever they overlap in time"
 msgstr ""
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr ""
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr ""
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 #, fuzzy
 msgid "Show waveforms in regions"
 msgstr "Mostrar regiões de automatização"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 #, fuzzy
 msgid "Show gain envelopes in audio regions"
 msgstr "Mostrar regiões de automatização"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr ""
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr ""
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 #, fuzzy
 msgid "Waveform scale"
 msgstr "Forma de onda"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "linear"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr ""
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 #, fuzzy
 msgid "Waveform shape"
 msgstr "Forma de onda"
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 #, fuzzy
 msgid "traditional"
 msgstr "Tradicional"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 #, fuzzy
 msgid "rectified"
 msgstr "Rectificado"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr ""
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr ""
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr ""
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr ""
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 msgid "Synchronise editor and mixer track order"
 msgstr ""
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 msgid "Synchronise editor and mixer selection"
 msgstr ""
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 #, fuzzy
 msgid "Name new markers"
 msgstr "remover marcador"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9747,370 +9883,449 @@ msgid ""
 "You can always rename markers by right-clicking on them"
 msgstr ""
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr ""
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr ""
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 #, fuzzy
 msgid "Record monitoring handled by"
 msgstr "Monitorização"
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 #, fuzzy
 msgid "ardour"
 msgstr "ardour: cronómetro"
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 #, fuzzy
 msgid "audio hardware"
 msgstr "Quadros audio"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 #, fuzzy
 msgid "Tape machine mode"
 msgstr "Modo de automatizaçã"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr ""
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr ""
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 #, fuzzy
 msgid "Connect track inputs"
 msgstr "Ligar entradas de faixas novas automaticamente"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 #, fuzzy
 msgid "automatically to physical inputs"
 msgstr "Ligar entradas automaticamente"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr ""
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 #, fuzzy
 msgid "Connect track and bus outputs"
 msgstr "Ligar saídas principais de faixas novas a  automaticamente"
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 #, fuzzy
 msgid "automatically to physical outputs"
 msgstr "Ligar saídas automaticamente"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 #, fuzzy
 msgid "automatically to master bus"
 msgstr "ligar saídas principais automaticamente"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 #, fuzzy
 msgid "Denormals"
 msgstr "normal"
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 msgid "Use DC bias to protect against denormals"
 msgstr ""
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr ""
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr ""
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 msgid "use FlushToZero"
 msgstr ""
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr ""
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr ""
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 #, fuzzy
 msgid "Silence plugins when the transport is stopped"
 msgstr "Suspender efeitos/plug-ins com transporte"
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr ""
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr ""
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 #, fuzzy
 msgid "Replicate missing region channels"
 msgstr "Criar uma região para cada canal"
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 #, fuzzy
 msgid "Solo / mute"
 msgstr "Solo via barramento"
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 msgid "Solo-in-place mute cut (dB)"
 msgstr ""
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr ""
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 #, fuzzy
 msgid "Listen Position"
 msgstr "Posição"
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 msgid "after-fader (AFL)"
 msgstr ""
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 #, fuzzy
 msgid "pre-fader (PFL)"
 msgstr "Encaminhamentos pré-atenuador"
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr ""
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 #, fuzzy
 msgid "before pre-fader processors"
 msgstr "Remover marcador"
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr ""
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr ""
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 #, fuzzy
 msgid "immediately post-fader"
 msgstr "Apagar VUímetro"
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 #, fuzzy
 msgid "after post-fader processors (before pan)"
 msgstr "Remover marcador"
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr ""
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 #, fuzzy
 msgid "Show solo muting"
 msgstr "Mostrar todas as automatizações"
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr ""
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 #, fuzzy
 msgid "Default track / bus muting options"
 msgstr "Faixas/barramentos"
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr ""
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr ""
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 #, fuzzy
 msgid "Mute affects control outputs"
 msgstr "usar saídas de controlo"
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr ""
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 #, fuzzy
 msgid "Send MIDI Time Code"
 msgstr "Enviar controlo MIDI"
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr ""
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr ""
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 #, fuzzy
 msgid "Send MIDI control feedback"
 msgstr "Enviar controlo MIDI"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr ""
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr ""
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr ""
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr ""
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr ""
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 #, fuzzy
 msgid "Sound MIDI notes as they are selected"
 msgstr "Inserir selecção"
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 #, fuzzy
 msgid "User interaction"
 msgstr "Operações em regiões"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
 "   <i>(if available for your language preferences)</i>"
 msgstr ""
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr ""
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 #, fuzzy
 msgid "Control surface remote ID"
 msgstr "Mesas de controlo"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 #, fuzzy
 msgid "assigned by user"
 msgstr "não atribuidas"
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr ""
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr ""
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1925
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 msgid "Preferences|GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr ""
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr ""
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr ""
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 #, fuzzy
 msgid "Mixer Strip"
 msgstr "Mostrar painel de mistura"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 #, fuzzy
 msgid "Use narrow strips in the mixer by default"
 msgstr "Estreitar painéis de mistura"
 
-#: rc_option_editor.cc:1898
+#: rc_option_editor.cc:1906
 #, fuzzy
-msgid "Meter hold time"
+msgid "Peak hold time"
 msgstr "VUímetro (persistência)"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 #, fuzzy
 msgid "short"
 msgstr "Curto"
 
-#: rc_option_editor.cc:1905 rc_option_editor.cc:1920
+#: rc_option_editor.cc:1913
 #, fuzzy
 msgid "medium"
 msgstr "Médio"
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr ""
 
-#: rc_option_editor.cc:1912
+#: rc_option_editor.cc:1920
 #, fuzzy
-msgid "Meter fall-off"
+msgid "DPM fall-off"
 msgstr "VUímetro (decaimento)"
 
-#: rc_option_editor.cc:1918
-#, fuzzy
-msgid "slowest"
-msgstr "Mais lento"
+#: rc_option_editor.cc:1926
+msgid "slowest [6.6dB/sec]"
+msgstr ""
 
-#: rc_option_editor.cc:1919
-msgid "slow"
+#: rc_option_editor.cc:1927
+msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
 msgstr ""
 
-#: rc_option_editor.cc:1921
-#, fuzzy
-msgid "fast"
-msgstr "rápido"
+#: rc_option_editor.cc:1928
+msgid "slowish [12.0dB/sec] (DIN)"
+msgstr ""
 
-#: rc_option_editor.cc:1922
-#, fuzzy
-msgid "faster"
-msgstr "Rápido"
+#: rc_option_editor.cc:1929
+msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
+msgstr ""
+
+#: rc_option_editor.cc:1930
+msgid "medium [20dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1931
+msgid "fast [32dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1932
+msgid "faster [46dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1933
+msgid "fastest [70dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1939
+msgid "Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
+
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+msgid "-20dBFS (SMPTE RP.0155)"
+msgstr ""
+
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+msgid "-18dBFS (EBU, BBC)"
+msgstr ""
+
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
+
+#: rc_option_editor.cc:1955
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
+msgstr ""
+
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
+msgstr ""
+
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
+msgstr ""
+
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
 
-#: rc_option_editor.cc:1923
-msgid "fastest"
-msgstr "rápido"
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
+
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1985
+msgid "Peak threshold [dBFS]"
+msgstr ""
+
+#: rc_option_editor.cc:1993
+msgid ""
+"Specify the audio signal level in dbFS at and above which the meter-peak "
+"indicator will flash red."
+msgstr ""
+
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
+msgstr ""
 
 #: region_editor.cc:79
 msgid "audition this region"
@@ -10121,11 +10336,11 @@ msgstr "ouvir esta região"
 msgid "Position:"
 msgstr "Posição"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr "Final:"
 
-#: region_editor.cc:92 sfdb_ui.cc:140
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr ""
 
@@ -10149,27 +10364,27 @@ msgstr ""
 msgid "Source:"
 msgstr ""
 
-#: region_editor.cc:167
+#: region_editor.cc:166
 #, fuzzy
 msgid "Region '%1'"
 msgstr "Regiões"
 
-#: region_editor.cc:274
+#: region_editor.cc:273
 #, fuzzy
 msgid "change region start position"
 msgstr "estabelecer posição de sincronismo na região"
 
-#: region_editor.cc:290
+#: region_editor.cc:289
 #, fuzzy
 msgid "change region end position"
 msgstr "estabelecer posição de sincronismo na região"
 
-#: region_editor.cc:310
+#: region_editor.cc:309
 #, fuzzy
 msgid "change region length"
 msgstr "alterar duração de evanescimento"
 
-#: region_editor.cc:404 region_editor.cc:416
+#: region_editor.cc:403 region_editor.cc:415
 #, fuzzy
 msgid "change region sync point"
 msgstr "estabelecer posição de sincronismo na região"
@@ -10379,361 +10594,361 @@ msgid ""
 "A route group of this name already exists.  Please use a different name."
 msgstr ""
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 msgid "Tracks/Busses"
 msgstr "Faixas/barramentos"
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr "Entradas"
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr "Saídas"
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr ""
 
-#: route_params_ui.cc:211
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr "não foi encontrado qualquer encaminhamento"
 
-#: route_params_ui.cc:258 route_params_ui.cc:286
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr ""
 
-#: route_params_ui.cc:478
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr "Nenhuma faixa"
 
-#: route_params_ui.cc:611 route_params_ui.cc:612
+#: route_params_ui.cc:613 route_params_ui.cc:614
 #, fuzzy
 msgid "No Track or Bus Selected"
 msgstr "Nenhum saminho seleccionado"
 
-#: route_time_axis.cc:96
+#: route_time_axis.cc:97
 msgid "g"
 msgstr ""
 
-#: route_time_axis.cc:97
+#: route_time_axis.cc:98
 msgid "p"
 msgstr ""
 
-#: route_time_axis.cc:98
+#: route_time_axis.cc:99
 msgid "a"
 msgstr ""
 
-#: route_time_axis.cc:168
+#: route_time_axis.cc:173
 msgid "Record (Right-click for Step Edit)"
 msgstr ""
 
-#: route_time_axis.cc:171
+#: route_time_axis.cc:176
 msgid "Record"
 msgstr "Gravar"
 
-#: route_time_axis.cc:201
+#: route_time_axis.cc:210
 #, fuzzy
 msgid "Route Group"
 msgstr "Grupo"
 
-#: route_time_axis.cc:204
+#: route_time_axis.cc:213
 #, fuzzy
 msgid "MIDI Controllers and Automation"
 msgstr "Usar controlo MIDI"
 
-#: route_time_axis.cc:381
+#: route_time_axis.cc:390
 #, fuzzy
 msgid "Show All Automation"
 msgstr "Mostrar todas as automatizações"
 
-#: route_time_axis.cc:384
+#: route_time_axis.cc:393
 #, fuzzy
 msgid "Show Existing Automation"
 msgstr "Mostrar automatizações existentes"
 
-#: route_time_axis.cc:387
+#: route_time_axis.cc:396
 #, fuzzy
 msgid "Hide All Automation"
 msgstr "Esconder todas as automatizações"
 
-#: route_time_axis.cc:396
+#: route_time_axis.cc:405
 #, fuzzy
 msgid "Processor automation"
 msgstr "apagar automatizações"
 
-#: route_time_axis.cc:415
+#: route_time_axis.cc:424
 #, fuzzy
 msgid "Color..."
 msgstr "Cor"
 
-#: route_time_axis.cc:472
+#: route_time_axis.cc:481
 msgid "Overlaid"
 msgstr ""
 
-#: route_time_axis.cc:478
+#: route_time_axis.cc:487
 msgid "Stacked"
 msgstr ""
 
-#: route_time_axis.cc:486
+#: route_time_axis.cc:495
 #, fuzzy
 msgid "Layers"
 msgstr "Nível"
 
-#: route_time_axis.cc:555
+#: route_time_axis.cc:564
 #, fuzzy
 msgid "Automatic (based on I/O connections)"
 msgstr "Ligar saídas automaticamente"
 
-#: route_time_axis.cc:564
+#: route_time_axis.cc:573
 #, fuzzy
 msgid "(Currently: Existing Material)"
 msgstr "Alinhar com material existente"
 
-#: route_time_axis.cc:567
+#: route_time_axis.cc:576
 #, fuzzy
 msgid "(Currently: Capture Time)"
 msgstr "Alinhar com tempo de gravação"
 
-#: route_time_axis.cc:575
+#: route_time_axis.cc:584
 #, fuzzy
 msgid "Align With Existing Material"
 msgstr "Alinhar com material existente"
 
-#: route_time_axis.cc:580
+#: route_time_axis.cc:589
 #, fuzzy
 msgid "Align With Capture Time"
 msgstr "Alinhar com tempo de gravação"
 
-#: route_time_axis.cc:585
+#: route_time_axis.cc:594
 msgid "Alignment"
 msgstr "Alinhamento"
 
-#: route_time_axis.cc:620
+#: route_time_axis.cc:629
 #, fuzzy
 msgid "Normal Mode"
 msgstr "Normal"
 
-#: route_time_axis.cc:626
+#: route_time_axis.cc:635
 #, fuzzy
 msgid "Tape Mode"
 msgstr "Modo de ajuste"
 
-#: route_time_axis.cc:632
+#: route_time_axis.cc:641
 #, fuzzy
 msgid "Non-Layered Mode"
 msgstr "Níveis de região"
 
-#: route_time_axis.cc:645 route_time_axis.cc:1587
+#: route_time_axis.cc:654 route_time_axis.cc:1601
 msgid "Playlist"
 msgstr "Lista de reprodução"
 
-#: route_time_axis.cc:965
+#: route_time_axis.cc:979
 #, fuzzy
 msgid "Rename Playlist"
 msgstr "Nome para lista de reprodução"
 
-#: route_time_axis.cc:966
+#: route_time_axis.cc:980
 #, fuzzy
 msgid "New name for playlist:"
 msgstr "Nome para lista de reprodução"
 
-#: route_time_axis.cc:1051
+#: route_time_axis.cc:1065
 #, fuzzy
 msgid "New Copy Playlist"
 msgstr "Nome para lista de reprodução"
 
-#: route_time_axis.cc:1052 route_time_axis.cc:1105
+#: route_time_axis.cc:1066 route_time_axis.cc:1119
 #, fuzzy
 msgid "Name for new playlist:"
 msgstr "Nome para lista de reprodução"
 
-#: route_time_axis.cc:1104
+#: route_time_axis.cc:1118
 #, fuzzy
 msgid "New Playlist"
 msgstr "Lista de reprodução"
 
-#: route_time_axis.cc:1295
+#: route_time_axis.cc:1309
 #, fuzzy
 msgid "You cannot create a track with that name as it is reserved for %1"
 msgstr ""
 "Não é possível acrescentar uma faixa sem que haja uma sessão esteja "
 "carregada."
 
-#: route_time_axis.cc:1476
+#: route_time_axis.cc:1490
 #, fuzzy
 msgid "New Copy..."
 msgstr "Nova cópia"
 
-#: route_time_axis.cc:1480
+#: route_time_axis.cc:1494
 #, fuzzy
 msgid "New Take"
 msgstr "Novo tempo"
 
-#: route_time_axis.cc:1481
+#: route_time_axis.cc:1495
 #, fuzzy
 msgid "Copy Take"
 msgstr "Copiar"
 
-#: route_time_axis.cc:1486
+#: route_time_axis.cc:1500
 msgid "Clear Current"
 msgstr "Apagar actual"
 
-#: route_time_axis.cc:1489
+#: route_time_axis.cc:1503
 #, fuzzy
 msgid "Select From All..."
 msgstr "Seleccionar tudo..."
 
-#: route_time_axis.cc:1577
+#: route_time_axis.cc:1591
 msgid "Take: %1.%2"
 msgstr ""
 
-#: route_time_axis.cc:2267
+#: route_time_axis.cc:2291
 msgid "Underlays"
 msgstr ""
 
-#: route_time_axis.cc:2270
+#: route_time_axis.cc:2294
 #, fuzzy
 msgid "Remove \"%1\""
 msgstr "Remover"
 
-#: route_time_axis.cc:2320 route_time_axis.cc:2357
+#: route_time_axis.cc:2344 route_time_axis.cc:2381
 msgid "programming error: underlay reference pointer pairs are inconsistent!"
 msgstr ""
 
-#: route_time_axis.cc:2388
+#: route_time_axis.cc:2408
 msgid "After-fade listen (AFL)"
 msgstr ""
 
-#: route_time_axis.cc:2392
+#: route_time_axis.cc:2412
 #, fuzzy
 msgid "Pre-fade listen (PFL)"
 msgstr "Encaminhamentos pré-atenuador"
 
-#: route_time_axis.cc:2396
+#: route_time_axis.cc:2416
 msgid "s"
 msgstr ""
 
-#: route_time_axis.cc:2400
+#: route_time_axis.cc:2419
 msgid "m"
 msgstr ""
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 #, fuzzy
 msgid "Mute this track"
 msgstr "Esconder esta faixa"
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr ""
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr ""
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr ""
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 #, fuzzy
 msgid "Monitor input"
 msgstr "Monitorização"
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 #, fuzzy
 msgid "Monitor playback"
 msgstr "Parar reprodução"
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 #, fuzzy
 msgid "Not connected to JACK - cannot engage record"
 msgstr "Desligado do JACK - não são possíveis alterações nas entradas/saídas"
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 #, fuzzy
 msgid "Step Entry"
 msgstr "Editar"
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr ""
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 #, fuzzy
 msgid "Assign all tracks and buses (prefader)"
 msgstr "seleccionar visualização de faixa"
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr ""
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 #, fuzzy
 msgid "Assign all tracks and buses (postfader)"
 msgstr "seleccionar visualização de faixa"
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 #, fuzzy
 msgid "Assign selected tracks (prefader)"
 msgstr "seleccionar visualização de faixa"
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 #, fuzzy
 msgid "Assign selected tracks and buses (prefader)"
 msgstr "seleccionar visualização de faixa"
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 #, fuzzy
 msgid "Assign selected tracks (postfader)"
 msgstr "seleccionar visualização de faixa"
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 #, fuzzy
 msgid "Assign selected tracks and buses (postfader)"
 msgstr "seleccionar visualização de faixa"
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 #, fuzzy
 msgid "Copy track/bus gains to sends"
 msgstr "ardour: faixa/barramento: "
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr ""
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr ""
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 #, fuzzy
 msgid "Solo Isolate"
 msgstr "Solo livre"
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr "Pré-atenuador"
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr "Pós-atenuador"
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr "Saídas de controlo"
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr "Saídas principais"
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 #, fuzzy
 msgid "Color Selection"
 msgstr "Reproduzir região seleccionada"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 #, fuzzy
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
@@ -10747,7 +10962,7 @@ msgstr ""
 "A lista de reprodução em uso para esta faixa pode ficar perdida.\n"
 "(esta operação não pode ser desfeita)"
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 #, fuzzy
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
@@ -10757,69 +10972,69 @@ msgstr ""
 "Deseja realmente remover o barramento \"%1\" ?\n"
 "(esta operação não pode ser desfeita)"
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 #, fuzzy
 msgid "Remove track"
 msgstr "Remover marcador"
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 #, fuzzy
 msgid "Remove bus"
 msgstr "Remover"
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
 msgstr ""
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 #, fuzzy
 msgid "Use the new name"
 msgstr "novo nome: "
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 msgid "Re-edit the name"
 msgstr ""
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 msgid "Rename Track"
 msgstr "Renomear faixa"
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 #, fuzzy
 msgid "Rename Bus"
 msgstr "Renomear"
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 #, fuzzy
 msgid " latency"
 msgstr "Latência"
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr ""
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 #, fuzzy
 msgid "Save As Template"
 msgstr "Guardar modelo..."
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 #, fuzzy
 msgid "Template name:"
 msgstr "Nome para o campo:"
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 msgid "Remote Control ID"
 msgstr "ID controlo remoto"
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 #, fuzzy
 msgid "Remote control ID:"
 msgstr "ID controlo remoto"
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -10827,17 +11042,17 @@ msgid ""
 "The remote control ID of %3 cannot be changed."
 msgstr ""
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the master bus"
 msgstr "Criar barramento para VUímetro"
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the monitor bus"
 msgstr "Criar barramento para VUímetro"
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -10848,25 +11063,25 @@ msgid ""
 "change this%5"
 msgstr ""
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the mixer"
 msgstr ""
 "edição\n"
 "mistura"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the editor"
 msgstr "a altura"
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
 msgstr ""
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr ""
 
@@ -10884,7 +11099,7 @@ msgstr "Apagar todas as localizações"
 msgid "the session folder"
 msgstr "Copiar ficheiro para o directório de sessão"
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 #, fuzzy
 msgid "Send "
 msgstr "Envios"
@@ -11390,61 +11605,117 @@ msgstr ""
 msgid "Glue new regions to bars and beats"
 msgstr ""
 
-#: sfdb_ui.cc:87 sfdb_ui.cc:107 sfdb_ui.cc:116
+#: session_option_editor.cc:275 session_option_editor.cc:277
+#: session_option_editor.cc:284 session_option_editor.cc:291
+#: session_option_editor.cc:298 session_option_editor.cc:300
+#: session_option_editor.cc:307 session_option_editor.cc:314
+#: session_option_editor.cc:321 session_option_editor.cc:323
+#, fuzzy
+msgid "Meterbridge"
+msgstr "VUímetro"
+
+#: session_option_editor.cc:275
+msgid "Route Display"
+msgstr ""
+
+#: session_option_editor.cc:279
+#, fuzzy
+msgid "Show Midi Tracks"
+msgstr "Mostrar todos as faixas audio"
+
+#: session_option_editor.cc:286
+#, fuzzy
+msgid "Show Busses"
+msgstr "Barramentos"
+
+#: session_option_editor.cc:293
+#, fuzzy
+msgid "Include Master Bus"
+msgstr "Criar barramento para VUímetro"
+
+#: session_option_editor.cc:298
+msgid "Button Area"
+msgstr ""
+
+#: session_option_editor.cc:302
+#, fuzzy
+msgid "Rec-enable Button"
+msgstr "gravar alterado"
+
+#: session_option_editor.cc:309
+#, fuzzy
+msgid "Mute Button"
+msgstr "+ botão"
+
+#: session_option_editor.cc:316
+#, fuzzy
+msgid "Solo Button"
+msgstr "Solo via barramento"
+
+#: session_option_editor.cc:321
+msgid "Name Labels"
+msgstr ""
+
+#: session_option_editor.cc:325
+#, fuzzy
+msgid "Track Name"
+msgstr "Faixas/barramentos"
+
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 #, fuzzy
 msgid "as new tracks"
 msgstr "... como faixa nova"
 
-#: sfdb_ui.cc:89 sfdb_ui.cc:109
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 #, fuzzy
 msgid "to selected tracks"
 msgstr "seleccionar visualização de faixa"
 
-#: sfdb_ui.cc:91 sfdb_ui.cc:111
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 #, fuzzy
 msgid "to region list"
 msgstr "Ajustar ao início de região"
 
-#: sfdb_ui.cc:93 sfdb_ui.cc:113
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 #, fuzzy
 msgid "as new tape tracks"
 msgstr "... como faixa nova"
 
-#: sfdb_ui.cc:97
+#: sfdb_ui.cc:96
 msgid "programming error: unknown import mode string %1"
 msgstr ""
 
-#: sfdb_ui.cc:124
+#: sfdb_ui.cc:123
 #, fuzzy
 msgid "Auto-play"
 msgstr ""
 "Reprodução\n"
 "automática"
 
-#: sfdb_ui.cc:130 sfdb_ui.cc:237
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 #, fuzzy
 msgid "<b>Sound File Information</b>"
 msgstr "Informações"
 
-#: sfdb_ui.cc:142
+#: sfdb_ui.cc:141
 #, fuzzy
 msgid "Timestamp:"
 msgstr "Por instante de região"
 
-#: sfdb_ui.cc:144
+#: sfdb_ui.cc:143
 #, fuzzy
 msgid "Format:"
 msgstr "Formato"
 
-#: sfdb_ui.cc:183 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr ""
 
-#: sfdb_ui.cc:320
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr ""
 
-#: sfdb_ui.cc:327
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "Não foi possível ler o ficheiro: %1 (%2)."
 
@@ -11475,12 +11746,12 @@ msgstr "Quadros audio"
 msgid "MIDI files"
 msgstr "Associação MIDI"
 
-#: sfdb_ui.cc:458 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 #, fuzzy
 msgid "All files"
 msgstr "ficheiros limpos"
 
-#: sfdb_ui.cc:477 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 #, fuzzy
 msgid "Browse Files"
 msgstr "Pesquisar"
@@ -11489,248 +11760,236 @@ msgstr "Pesquisar"
 msgid "Paths"
 msgstr "Directórios"
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr ""
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 #, fuzzy
 msgid "Sort:"
 msgstr "Ordenar"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 #, fuzzy
 msgid "Longest"
 msgstr "Enorme"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 #, fuzzy
 msgid "Shortest"
 msgstr "Curto"
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 #, fuzzy
 msgid "Newest"
 msgstr "Mais lento"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr ""
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr ""
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 #, fuzzy
 msgid "Least downloaded"
 msgstr "Iniciar intervalo"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr ""
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr ""
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr ""
 
-#: sfdb_ui.cc:572
+#: sfdb_ui.cc:555
+msgid "Similar"
+msgstr ""
+
+#: sfdb_ui.cc:567
 #, fuzzy
 msgid "ID"
 msgstr "E"
 
-#: sfdb_ui.cc:573 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 #, fuzzy
 msgid "Filename"
 msgstr "Renomear"
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:570
 #, fuzzy
 msgid "Duration"
 msgstr "Duração (seg)"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:571
 #, fuzzy
 msgid "Size"
 msgstr "Tamanho máximo"
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:572
 #, fuzzy
 msgid "Samplerate"
 msgstr "Frequência de amostragem"
 
-#: sfdb_ui.cc:578
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr ""
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr ""
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr ""
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr ""
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr ""
 
-#: sfdb_ui.cc:846
-msgid "found %1 match"
-msgid_plural "found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:862
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr ""
 
-#: sfdb_ui.cc:960
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sfdb_ui.cc:965
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr ""
 
-#: sfdb_ui.cc:1029
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr ""
 
-#: sfdb_ui.cc:1031
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr ""
 
-#: sfdb_ui.cc:1033 sfdb_ui.cc:1035
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr ""
 
-#: sfdb_ui.cc:1037
+#: sfdb_ui.cc:1086
 #, fuzzy
 msgid "GB"
 msgstr "Ir"
 
-#: sfdb_ui.cc:1070
-msgid "Search returned no results."
-msgstr ""
-
-#: sfdb_ui.cc:1072
-msgid "Found %1 match"
-msgid_plural "Found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:1277 sfdb_ui.cc:1585 sfdb_ui.cc:1635 sfdb_ui.cc:1653
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr ""
 
-#: sfdb_ui.cc:1280 sfdb_ui.cc:1636 sfdb_ui.cc:1654
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 #, fuzzy
 msgid "one track per channel"
 msgstr "panorama para o canal %u"
 
-#: sfdb_ui.cc:1288 sfdb_ui.cc:1638 sfdb_ui.cc:1655
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 #, fuzzy
 msgid "sequence files"
 msgstr "ficheiros limpos"
 
-#: sfdb_ui.cc:1291 sfdb_ui.cc:1643
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 msgid "all files in one track"
 msgstr ""
 
-#: sfdb_ui.cc:1292 sfdb_ui.cc:1637
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 #, fuzzy
 msgid "merge files"
 msgstr "ficheiros limpos"
 
-#: sfdb_ui.cc:1298 sfdb_ui.cc:1640
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 #, fuzzy
 msgid "one region per file"
 msgstr "preencher região"
 
-#: sfdb_ui.cc:1301 sfdb_ui.cc:1641
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 #, fuzzy
 msgid "one region per channel"
 msgstr "Criar uma região para cada canal"
 
-#: sfdb_ui.cc:1306 sfdb_ui.cc:1642 sfdb_ui.cc:1656
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 #, fuzzy
 msgid "all files in one region"
 msgstr "alinhar região"
 
-#: sfdb_ui.cc:1373
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
 msgstr ""
 
-#: sfdb_ui.cc:1513
+#: sfdb_ui.cc:1534
 #, fuzzy
 msgid "Copy files to session"
 msgstr "Copiar ficheiro para o directório de sessão"
 
-#: sfdb_ui.cc:1530 sfdb_ui.cc:1693
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 #, fuzzy
 msgid "file timestamp"
 msgstr "Por instante de região"
 
-#: sfdb_ui.cc:1531 sfdb_ui.cc:1695
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 #, fuzzy
 msgid "edit point"
 msgstr "Editar com"
 
-#: sfdb_ui.cc:1532 sfdb_ui.cc:1697
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 #, fuzzy
 msgid "playhead"
 msgstr "Cursor de reprodução"
 
-#: sfdb_ui.cc:1533
+#: sfdb_ui.cc:1554
 #, fuzzy
 msgid "session start"
 msgstr "Inícios de região"
 
-#: sfdb_ui.cc:1538
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1581
 #, fuzzy
 msgid "<b>Insert at</b>"
 msgstr "Inverte"
 
-#: sfdb_ui.cc:1573
+#: sfdb_ui.cc:1594
 #, fuzzy
 msgid "<b>Mapping</b>"
 msgstr "Avançado..."
 
-#: sfdb_ui.cc:1591
+#: sfdb_ui.cc:1612
 #, fuzzy
 msgid "<b>Conversion quality</b>"
 msgstr "Qualidade de conversão"
 
-#: sfdb_ui.cc:1603 sfdb_ui.cc:1709
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr ""
 
-#: sfdb_ui.cc:1604 sfdb_ui.cc:1711
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr ""
 
-#: sfdb_ui.cc:1605 sfdb_ui.cc:1713
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr ""
 
-#: sfdb_ui.cc:1607
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "Mais rápido"
 
@@ -11824,21 +12083,21 @@ msgstr ""
 
 #: startup.cc:194
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -11947,10 +12206,6 @@ msgstr ""
 msgid "Click to open the program website in your web browser"
 msgstr ""
 
-#: startup.cc:594
-msgid "What would you like to do ?"
-msgstr ""
-
 #: startup.cc:729
 #, fuzzy
 msgid "Open"
@@ -11966,99 +12221,99 @@ msgstr "Novo nome de sessão:"
 msgid "Create session folder in:"
 msgstr "Criar directório de sessão em :"
 
-#: startup.cc:813
+#: startup.cc:821
 #, fuzzy
 msgid "Select folder for session"
 msgstr "Seleccionar regiões"
 
-#: startup.cc:845
+#: startup.cc:853
 #, fuzzy
 msgid "Use this template"
 msgstr "seleccionar modelo"
 
-#: startup.cc:848
+#: startup.cc:856
 #, fuzzy
 msgid "no template"
 msgstr "-modelo"
 
-#: startup.cc:876
+#: startup.cc:884
 #, fuzzy
 msgid "Use an existing session as a template:"
 msgstr "Usar modelo de sessão"
 
-#: startup.cc:888
+#: startup.cc:896
 #, fuzzy
 msgid "Select template"
 msgstr "seleccionar modelo"
 
-#: startup.cc:914
+#: startup.cc:922
 msgid "New Session"
 msgstr "Nova sessão"
 
-#: startup.cc:1068
+#: startup.cc:1077
 #, fuzzy
 msgid "Select session file"
 msgstr "seleccionar sessão"
 
-#: startup.cc:1084
+#: startup.cc:1093
 #, fuzzy
 msgid "Browse:"
 msgstr "Pesquisar"
 
-#: startup.cc:1093
+#: startup.cc:1102
 #, fuzzy
 msgid "Select a session"
 msgstr "seleccionar sessão"
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 msgid "channels"
 msgstr "canais"
 
-#: startup.cc:1135
+#: startup.cc:1145
 #, fuzzy
 msgid "<b>Busses</b>"
 msgstr "Barramentos"
 
-#: startup.cc:1136
+#: startup.cc:1146
 #, fuzzy
 msgid "<b>Inputs</b>"
 msgstr "<b>Faixas/Barramentos de entrada</b>"
 
-#: startup.cc:1137
+#: startup.cc:1147
 #, fuzzy
 msgid "<b>Outputs</b>"
 msgstr "<b>Faixas/Barramentos de saída</b>"
 
-#: startup.cc:1145
+#: startup.cc:1155
 #, fuzzy
 msgid "Create master bus"
 msgstr "Criar barramento para VUímetro"
 
-#: startup.cc:1155
+#: startup.cc:1165
 #, fuzzy
 msgid "Automatically connect to physical inputs"
 msgstr "Ligar entradas automaticamente"
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr ""
 
-#: startup.cc:1215
+#: startup.cc:1225
 #, fuzzy
 msgid "Automatically connect outputs"
 msgstr "Ligar saídas automaticamente"
 
-#: startup.cc:1237
+#: startup.cc:1247
 #, fuzzy
 msgid "... to master bus"
 msgstr "Ligar ao barramento principal"
 
-#: startup.cc:1247
+#: startup.cc:1257
 #, fuzzy
 msgid "... to physical outputs"
 msgstr "Ligar às saídas físicas"
 
-#: startup.cc:1297
+#: startup.cc:1307
 #, fuzzy
 msgid "Advanced Session Options"
 msgstr "Opções avançadas"
@@ -12775,20 +13030,20 @@ msgstr ""
 msgid "bad XPM header %1"
 msgstr ""
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr ""
 
-#: utils.cc:544
+#: utils.cc:591
 msgid "cannot find XPM file for %1"
 msgstr ""
 
-#: utils.cc:570
+#: utils.cc:617
 #, fuzzy
 msgid "cannot find icon image for %1 using %2"
 msgstr "não foi possível estabelecer receptor de sinal %1"
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr ""
 
@@ -12796,84 +13051,86 @@ msgstr ""
 msgid "VerboseCanvasCursor"
 msgstr ""
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 #, fuzzy
 msgid "Set Video Track"
 msgstr "Acrescentar faixa/barramento audio"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 #, fuzzy
 msgid "Launch External Video Monitor"
 msgstr "Monitorização externa"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr ""
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr ""
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 #, fuzzy
 msgid "Video files"
 msgstr "Quadros audio"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 #, fuzzy
 msgid "<b>Video Information</b>"
 msgstr "Informações"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 #, fuzzy
 msgid "Start:"
 msgstr "Início:"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 #, fuzzy
 msgid "Frame rate:"
 msgstr "Frequência de amostragem"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr ""
 
-#: editor_videotimeline.cc:138
+#: editor_videotimeline.cc:146
 msgid "Export Successful: %1"
 msgstr ""
 
-#: video_timeline.cc:467
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:501
-msgid "Failed to set session-framerate: "
-msgstr ""
-
-#: video_timeline.cc:501
-msgid " does not have a corresponding option setting in Ardour."
+#: video_timeline.cc:507
+msgid ""
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:507
+#: video_timeline.cc:515
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:508
-msgid " vs "
+#: video_timeline.cc:588
+msgid ""
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:690
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12881,18 +13138,18 @@ msgid ""
 "xjadeo's remote-control interface 'xjremote')."
 msgstr ""
 
-#: video_monitor.cc:282
+#: video_monitor.cc:281
 #, fuzzy
 msgid "Video Monitor: File Not Found."
 msgstr "Monitorização"
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -12902,376 +13159,384 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 #, fuzzy
 msgid "Transcode/Import Video File "
 msgstr "Exportar sessão para ficheiro audio..."
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 #, fuzzy
 msgid "Output File:"
 msgstr "Saída"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr ""
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 #, fuzzy
 msgid "Height = "
 msgstr "Altura"
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr ""
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 #, fuzzy
 msgid "<b>File Information</b>"
 msgstr "Informações"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr ""
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 #, fuzzy
 msgid "Duration:"
 msgstr "Duração (seg)"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr ""
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr ""
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 msgid "??"
 msgstr ""
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 #, fuzzy
 msgid "<b>Import Settings</b>"
 msgstr "Opções"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr ""
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr ""
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 #, fuzzy
 msgid "Import/Transcode Video to Session"
 msgstr "Exportar região"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr ""
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 msgid "Original Width"
 msgstr ""
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr ""
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 #, fuzzy
 msgid "Extract Audio:"
 msgstr "Exportar região"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 #, fuzzy
 msgid "Extracting Audio.."
 msgstr "Exportar região"
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr ""
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 msgid "Transcoding Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 #, fuzzy
 msgid "Save Transcoded Video File"
 msgstr "Exportar sessão para ficheiro audio..."
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr ""
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr ""
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 msgid "Server Docroot:"
 msgstr ""
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr ""
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 #, fuzzy
 msgid "Listen Port:"
 msgstr "Posição"
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 #, fuzzy
 msgid "Cache Size:"
 msgstr "Tamanho máximo"
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr ""
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr ""
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 #, fuzzy
 msgid "Confirm Overwrite"
 msgstr "aGrav"
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 #, fuzzy
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr "O ficheiro já existe, deseja reescrevê-lo ?"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 #, fuzzy
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr "não foi possível estabelecer-se como processo principal de grupo (%1)"
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 #, fuzzy
 msgid "Export Video File "
 msgstr "Exportar sessão para ficheiro audio..."
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 #, fuzzy
 msgid "Video:"
 msgstr "Alinhar regiões pelo início"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr ""
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr ""
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 #, fuzzy
 msgid "Normalize Audio"
 msgstr "Normalizar"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr ""
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr ""
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 #, fuzzy
 msgid "Deinterlace"
 msgstr "interno"
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr ""
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 #, fuzzy
 msgid "Include Session Metadata"
 msgstr "Importar selecção"
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr ""
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 #, fuzzy
 msgid "<b>Output:</b>"
 msgstr "<b>Faixas/Barramentos de saída</b>"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 #, fuzzy
 msgid "<b>Input:</b>"
 msgstr "<b>Faixas/Barramentos de entrada</b>"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 #, fuzzy
 msgid "Audio:"
 msgstr "Audição"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 #, fuzzy
 msgid "Master Bus"
 msgstr "Criar barramento para VUímetro"
 
-#: export_video_dialog.cc:166
+#: export_video_dialog.cc:145
+msgid "from the %1 session's start to the session's end"
+msgstr ""
+
+#: export_video_dialog.cc:149
+msgid "from 00:00:00:00 to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:151
+msgid "from the video's start to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:184
 #, fuzzy
 msgid "<b>Settings:</b>"
 msgstr "Avançado..."
 
-#: export_video_dialog.cc:174
+#: export_video_dialog.cc:192
 #, fuzzy
 msgid "Range:"
 msgstr "Intervalo"
 
-#: export_video_dialog.cc:177
+#: export_video_dialog.cc:195
 #, fuzzy
 msgid "Preset:"
 msgstr "Reiniciar"
 
-#: export_video_dialog.cc:180
+#: export_video_dialog.cc:198
 #, fuzzy
 msgid "Video Codec:"
 msgstr "Nome do directório:"
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:201
 #, fuzzy
 msgid "Video KBit/s:"
 msgstr "Alinhar regiões pelo início"
 
-#: export_video_dialog.cc:186
+#: export_video_dialog.cc:204
 #, fuzzy
 msgid "Audio Codec:"
 msgstr "Quadros audio"
 
-#: export_video_dialog.cc:189
+#: export_video_dialog.cc:207
 #, fuzzy
 msgid "Audio KBit/s:"
 msgstr "Quadros audio"
 
-#: export_video_dialog.cc:192
+#: export_video_dialog.cc:210
 #, fuzzy
 msgid "Audio Samplerate:"
 msgstr "Frequência de amostragem"
 
-#: export_video_dialog.cc:369
+#: export_video_dialog.cc:387
 #, fuzzy
 msgid "Normalizing audio"
 msgstr "Normalizar"
 
-#: export_video_dialog.cc:373
+#: export_video_dialog.cc:391
 #, fuzzy
 msgid "Exporting audio"
 msgstr "Exportar região"
 
-#: export_video_dialog.cc:419
+#: export_video_dialog.cc:437
 #, fuzzy
-msgid "Exporting Audio.."
+msgid "Exporting Audio..."
 msgstr "Exportar região"
 
-#: export_video_dialog.cc:476
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:505
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:544
-msgid "Encoding Video.."
+#: export_video_dialog.cc:562
+msgid "Encoding Video..."
 msgstr ""
 
-#: export_video_dialog.cc:563
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:661
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr ""
 
-#: export_video_dialog.cc:673
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr ""
 
-#: export_video_dialog.cc:761
+#: export_video_dialog.cc:779
 msgid "Transcoding failed."
 msgstr ""
 
-#: export_video_dialog.cc:930 export_video_dialog.cc:950
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 #, fuzzy
 msgid "Save Exported Video File"
 msgstr "Exportar sessão para ficheiro audio..."
@@ -13289,33 +13554,30 @@ msgstr ""
 msgid "<b>Video Export Info</b>"
 msgstr ""
 
-#: export_video_infobox.cc:46
+#: export_video_infobox.cc:48
 msgid ""
-"Ardour video export is not recommended for mastering!\n"
-"While 'ffmpeg' (which is used by ardour) can produce high-quality files, "
-"this export lacks the possibility to tweak many settings. We recommend to "
-"use 'winff', 'devede' or 'dvdauthor' to mux & master. Nevertheless this "
-"video-export comes in handy to do quick snapshots, intermediates, dailies or "
-"online videos.\n"
+"Video encoding is a non-trivial task with many details.\n"
 "\n"
-"The soundtrack is created from the master-bus of the current Ardour "
-"session.\n"
+"Please see the manual at %1/video-timeline/operations/#export.\n"
 "\n"
-"The video soure defaults to the file used in the video timeline, which may "
-"not the best quality to start with, you should the original video file.\n"
-"\n"
-"If the export-range is longer than the original video, black video frames "
-"are prefixed and/or appended. This process may fail with non-standard pixel-"
-"aspect-ratios.\n"
-"\n"
-"The file-format is determined by the extension that you choose for the "
-"output file (.avi, .mov, .flv, .ogv,...)\n"
-"Note: not all combinations of format+codec+settings produce files which are "
-"according so spec. e.g. flv files require sample-rates of 22.1kHz or "
-"44.1kHz, mpeg containers can not be used with ac3 audio-codec, etc. If in "
-"doubt, use one of the built-in presets."
+"Open Manual in Browser? "
 msgstr ""
 
+#, fuzzy
+#~ msgid "slowest"
+#~ msgstr "Mais lento"
+
+#, fuzzy
+#~ msgid "fast"
+#~ msgstr "rápido"
+
+#, fuzzy
+#~ msgid "faster"
+#~ msgstr "Rápido"
+
+#~ msgid "fastest"
+#~ msgstr "rápido"
+
 #~ msgid "Connect"
 #~ msgstr "Ligar"
 
@@ -14172,9 +14434,6 @@ msgstr ""
 #~ msgid "Current: %1"
 #~ msgstr "Actual: %1"
 
-#~ msgid "track height"
-#~ msgstr "altura da faixa"
-
 #~ msgid "clear track"
 #~ msgstr "apagar faixa"
 
@@ -14890,9 +15149,6 @@ msgstr ""
 #~ msgid "ardour: track/bus/inspector: no route selected"
 #~ msgstr "ardour: faixa/baramento: nenhum caminho seleccionado"
 
-#~ msgid "rec-enable change"
-#~ msgstr "gravar alterado"
-
 #~ msgid "mix group solo  change"
 #~ msgstr "grupo solo alterado"
 
@@ -14926,13 +15182,6 @@ msgstr ""
 #~ msgid "Beat"
 #~ msgstr "Batimento"
 
-#~ msgid ""
-#~ "Do you really want to remove track \"%1\" ?\n"
-#~ "(cannot be undone)"
-#~ msgstr ""
-#~ "Deseja realmente remover o faixa \"%1\" ?\n"
-#~ "(esta operação não pode ser desfeita)"
-
 #~ msgid "set selected regionview"
 #~ msgstr "seleccionar visualização de região"
 
@@ -15060,9 +15309,6 @@ msgstr ""
 #~ msgid "Session %1 already exists at %2"
 #~ msgstr "Sessão %1 já existe em %2"
 
-#~ msgid "UI: cannot setup meter_bridge"
-#~ msgstr "Não foi possível iniciar o monitor volumétrico (vuímetro)"
-
 #~ msgid "Enable/Disable follow playhead"
 #~ msgstr "Ligar/Desligar acompanhamento ao cursor de reprodução"
 
@@ -15075,9 +15321,6 @@ msgstr ""
 #~ msgid "Audio Library"
 #~ msgstr "Audioteca"
 
-#~ msgid "Meter Bridge"
-#~ msgstr "VUímetro"
-
 #~ msgid "Output Connections"
 #~ msgstr "Ligações de saída"
 
diff --git a/gtk2_ardour/po/ru.po b/gtk2_ardour/po/ru.po
index 3c81be6c62..1891a32bf1 100644
--- a/gtk2_ardour/po/ru.po
+++ b/gtk2_ardour/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ardour 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-14 15:01+0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2013-07-14 18:04+0300\n"
 "Last-Translator: �лек�андр Прокудин <alexandre.prokoudine@gmail.com>\n"
 "Language-Team: ру��кий <>\n"
@@ -413,7 +413,7 @@ msgstr "%1 menu definition file not found"
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr "%1 will not work without a valid ardour.menus file"
 
-#: add_route_dialog.cc:53 route_params_ui.cc:499
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 msgid "Add Track or Bus"
 msgstr "Добавить дорожку или шину"
 
@@ -449,8 +449,8 @@ msgstr "Шины"
 msgid "Add:"
 msgstr "Добавить:"
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 msgid "<b>Options</b>"
 msgstr "<b>Параметры</b>"
 
@@ -464,21 +464,21 @@ msgid "Group:"
 msgstr "Группа:"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 msgid "Audio"
 msgstr "Audio"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -506,7 +506,7 @@ msgstr ""
 "звуковые и MIDI-дорожки."
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1304
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr "�ормальна�"
 
@@ -550,7 +550,7 @@ msgstr "8 каналов"
 msgid "12 Channel"
 msgstr "3 канала"
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2130
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr "�а заказ"
 
@@ -662,75 +662,71 @@ msgstr "�олирование"
 msgid "feedback"
 msgstr "отклик"
 
-#: ardour_ui.cc:184 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 msgid "Speaker Configuration"
 msgstr "Конфигураци� громкоговорителей"
 
-#: ardour_ui.cc:185 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 msgid "Theme Manager"
 msgstr "Стиль оформлени�"
 
-#: ardour_ui.cc:186 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr "Клавиатурные комбинации"
 
-#: ardour_ui.cc:187
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr "Параметры"
 
-#: ardour_ui.cc:188 ardour_ui.cc:193
+#: ardour_ui.cc:191 ardour_ui.cc:196
 msgid "Add Tracks/Busses"
 msgstr "Добавить дорожки/шины"
 
-#: ardour_ui.cc:189
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "О программе"
 
-#: ardour_ui.cc:190 location_ui.cc:1146
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "Позиции"
 
-#: ardour_ui.cc:191 route_params_ui.cc:57 route_params_ui.cc:600
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 msgid "Tracks and Busses"
 msgstr "Дорожки и шины"
 
-#: ardour_ui.cc:192
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr "Свой�тва"
 
-#: ardour_ui.cc:194 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr "Управление пакетами"
 
-#: ardour_ui.cc:195 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "Большой �чётчик"
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:199
 msgid "Audio Connections"
 msgstr "Звуковые �оединени�"
 
-#: ardour_ui.cc:197
+#: ardour_ui.cc:200
 msgid "MIDI Connections"
 msgstr "Соединени� MIDI"
 
-#: ardour_ui.cc:199
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr "Ошибки"
 
-#: ardour_ui.cc:301
-msgid "could not initialize %1."
-msgstr "�е удало�ь инициализировать %1."
-
-#: ardour_ui.cc:396
+#: ardour_ui.cc:388
 msgid "Starting audio engine"
 msgstr "Запу�кает�� звуковой движок"
 
-#: ardour_ui.cc:766 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 msgid "%1 is ready for use"
 msgstr "%1 готов к работе"
 
-#: ardour_ui.cc:814
+#: ardour_ui.cc:806
 msgid ""
 "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"
@@ -745,23 +741,23 @@ msgstr ""
 "Вы можете узнать у�тановленный предел при помощи команды 'ulimit -l'. Обычно "
 "�то контролирует�� в %2."
 
-#: ardour_ui.cc:831
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr "Больше не показывать �то окно"
 
-#: ardour_ui.cc:873
+#: ardour_ui.cc:865
 msgid "Don't quit"
 msgstr "�е выходить"
 
-#: ardour_ui.cc:874
+#: ardour_ui.cc:866
 msgid "Just quit"
 msgstr "Про�то выйти"
 
-#: ardour_ui.cc:875
+#: ardour_ui.cc:867
 msgid "Save and quit"
 msgstr "Сохранить и выйти"
 
-#: ardour_ui.cc:885
+#: ardour_ui.cc:877
 msgid ""
 "%1 was unable to save your session.\n"
 "\n"
@@ -776,15 +772,15 @@ msgstr ""
 "\n"
 "«Про�то выйти»."
 
-#: ardour_ui.cc:916
+#: ardour_ui.cc:908
 msgid "Please wait while %1 cleans up..."
 msgstr "Дождите�ь завершени� подчи�тки �еан�а в %1..."
 
-#: ardour_ui.cc:933
+#: ardour_ui.cc:925
 msgid "Unsaved Session"
 msgstr "Сеан� не �охранён"
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:946
 msgid ""
 "The session \"%1\"\n"
 "has not been saved.\n"
@@ -802,7 +798,7 @@ msgstr ""
 "\n"
 "Что вы хотите �делать?"
 
-#: ardour_ui.cc:957
+#: ardour_ui.cc:949
 msgid ""
 "The snapshot \"%1\"\n"
 "has not been saved.\n"
@@ -820,74 +816,74 @@ msgstr ""
 "\n"
 "Что вы хотите �делать?"
 
-#: ardour_ui.cc:971
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr ""
 
-#: ardour_ui.cc:1048
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "от�оединено"
 
-#: ardour_ui.cc:1055
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr "JACK: <span foreground=\"green\">%.1f КГц / %4.1f м�</span>"
 
-#: ardour_ui.cc:1059
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr "JACK: <span foreground=\"green\">%<PRId64> КГц / %4.1f м�</span>"
 
-#: ardour_ui.cc:1077 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 msgid "File:"
 msgstr "Файл:"
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr "BWF"
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr "WAV"
 
-#: ardour_ui.cc:1087
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr "WAV64"
 
-#: ardour_ui.cc:1090 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr "CAF"
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr "AIFF"
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr "iXML"
 
-#: ardour_ui.cc:1099
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr "RF64"
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr "32-float"
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr "24-int"
 
-#: ardour_ui.cc:1113
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr "16-int"
 
-#: ardour_ui.cc:1132
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr "ЦП: <span foreground=\"%s\">%5.1f%%</span>"
 
-#: ardour_ui.cc:1151
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -898,33 +894,33 @@ msgstr ""
 "%%</span> <span foreground=\"green\">c:</span><span foreground=\"%s\">"
 "%<PRIu32>%%</span>"
 
-#: ardour_ui.cc:1187
+#: ardour_ui.cc:1188
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr "�а ди�ке: <span foreground=\"green\">неизве�тно</span>"
 
-#: ardour_ui.cc:1189
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr "�а ди�ке: <span foreground=\"green\">24ч+</span>"
 
-#: ardour_ui.cc:1207
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr "�а ди�ке: <span foreground=\"green\">&gt;24ч</span>"
 
-#: ardour_ui.cc:1218
+#: ardour_ui.cc:1219
 #, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr "�а ди�ке:  <span foreground=\"%s\">%02dч:%02dм:%02d�</span>"
 
-#: ardour_ui.cc:1244
+#: ardour_ui.cc:1245
 #, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr "ТК: <span foreground=\"%s\">%s</span>"
 
-#: ardour_ui.cc:1361 ardour_ui.cc:1370 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr "�едавние �еан�ы"
 
-#: ardour_ui.cc:1450
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
@@ -932,27 +928,27 @@ msgstr ""
 "%1 не �оединен � JACK.\n"
 "Открытие и закрытие �еан�ов невозможно."
 
-#: ardour_ui.cc:1477
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr "Открыть �еан�"
 
-#: ardour_ui.cc:1495 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 msgid "%1 sessions"
 msgstr "Cеан�ы %1"
 
-#: ardour_ui.cc:1532
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr "Вы не можете добавить дорожку без загруженного �еан�а."
 
-#: ardour_ui.cc:1540
+#: ardour_ui.cc:1548
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] "�е удало�ь �оздать %1 новую �мешанную дорожку"
 msgstr[1] "�е удало�ь �оздать %1 новых �мешанных дорожки"
 msgstr[2] "�е удало�ь �оздать %1 новых �мешанных дорожек"
 
-#: ardour_ui.cc:1546 ardour_ui.cc:1607
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 msgid ""
 "There are insufficient JACK ports available\n"
 "to create a new track or bus.\n"
@@ -964,25 +960,25 @@ msgstr ""
 "�еобходимо �охранить %1, выйти и запу�тить\n"
 "JACK � увеличенным количе�твом портов."
 
-#: ardour_ui.cc:1581
+#: ardour_ui.cc:1589
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr "Вы не можете добавить дорожку или шину без открытого �еан�а."
 
-#: ardour_ui.cc:1590
+#: ardour_ui.cc:1598
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] "�е удало�ь �оздать %1 новую звуковую дорожку"
 msgstr[1] "�е удало�ь �оздать %2 новых звуковых дорожки"
 msgstr[2] "�е удало�ь �оздать %2 новых звуковых дорожек"
 
-#: ardour_ui.cc:1599
+#: ardour_ui.cc:1607
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] "�е удало�ь �оздать %1 новую звуковую шину"
 msgstr[1] "�е удало�ь �оздать %1 новых звуковых шины"
 msgstr[2] "�е удало�ь �оздать %1 новых звуковых шин"
 
-#: ardour_ui.cc:1716
+#: ardour_ui.cc:1724
 msgid ""
 "Please create one or more tracks before trying to record.\n"
 "You can do this with the \"Add Track or Bus\" option in the Session menu."
@@ -991,14 +987,14 @@ msgstr ""
 "как пытать�� что-либо запи�ать.\n"
 "И�пользуйте меню «Сеан� > Добавить дорожку/шину»."
 
-#: ardour_ui.cc:2106
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
 "%1"
 msgstr ""
 
-#: ardour_ui.cc:2108
+#: ardour_ui.cc:2116
 msgid ""
 "JACK has either been shutdown or it\n"
 "disconnected %1 because %1\n"
@@ -1009,19 +1005,19 @@ msgstr ""
 "� %1 и от�оединил его. �еобходимо перезапу�тить \n"
 "JACK, во��тановить �оединение и �охранить �еан�."
 
-#: ardour_ui.cc:2134
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "�евозможно запу�тить уже выполн�емый �еан�"
 
-#: ardour_ui.cc:2214
+#: ardour_ui.cc:2222
 msgid "Take Snapshot"
 msgstr "Создать �нимок"
 
-#: ardour_ui.cc:2215
+#: ardour_ui.cc:2223
 msgid "Name of new snapshot"
 msgstr "�азвание нового �нимка"
 
-#: ardour_ui.cc:2239
+#: ardour_ui.cc:2247
 msgid ""
 "To ensure compatibility with various systems\n"
 "snapshot names may not contain a '%1' character"
@@ -1029,27 +1025,27 @@ msgstr ""
 "Дл� обе�печени� �овме�тимо�ти � различными �и�темами\n"
 "названи� �нимков не могут �одержать �имвол '%1'."
 
-#: ardour_ui.cc:2251
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr "Подтвердите перезапи�ь �нимка"
 
-#: ardour_ui.cc:2252
+#: ardour_ui.cc:2260
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr "Снимок � таким названием уже е�ть. Перезапи�ать его?"
 
-#: ardour_ui.cc:2255 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 msgid "Overwrite"
 msgstr "Перезапи�ать"
 
-#: ardour_ui.cc:2289
+#: ardour_ui.cc:2297
 msgid "Rename Session"
 msgstr "Переименовать �еан�"
 
-#: ardour_ui.cc:2290
+#: ardour_ui.cc:2298
 msgid "New session name"
 msgstr "�овое название �еан�а"
 
-#: ardour_ui.cc:2304 ardour_ui.cc:2684 ardour_ui.cc:2729
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 msgid ""
 "To ensure compatibility with various systems\n"
 "session names may not contain a '%1' character"
@@ -1057,12 +1053,12 @@ msgstr ""
 "Дл� обе�печени� �овме�тимо�ти � различными �и�темами\n"
 "названи� �еан�ов не могут �одержать �имвол '%1'."
 
-#: ardour_ui.cc:2312
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr ""
 
-#: ardour_ui.cc:2321
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
@@ -1070,19 +1066,19 @@ msgstr ""
 "�е удало�ь переименовать �тот �еан�.\n"
 "Очень может быть, что в�ё и�портило�ь."
 
-#: ardour_ui.cc:2432
+#: ardour_ui.cc:2440
 msgid "Save Template"
 msgstr "Сохранить шаблон"
 
-#: ardour_ui.cc:2433
+#: ardour_ui.cc:2441
 msgid "Name for template:"
 msgstr "�азвание шаблона:"
 
-#: ardour_ui.cc:2434
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-шаблон"
 
-#: ardour_ui.cc:2472
+#: ardour_ui.cc:2480
 msgid ""
 "This session\n"
 "%1\n"
@@ -1092,52 +1088,52 @@ msgstr ""
 "%1\n"
 "уже �уще�твует. Открыть его?"
 
-#: ardour_ui.cc:2482
+#: ardour_ui.cc:2490
 msgid "Open Existing Session"
 msgstr "Открыть �уще�твующий �еан�"
 
-#: ardour_ui.cc:2720
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr "По адре�у \"%1\" не �уще�твующего �еан�а"
 
-#: ardour_ui.cc:2807
+#: ardour_ui.cc:2815
 msgid "Please wait while %1 loads your session"
 msgstr "Дождите�ь завершени� загрузки �еан�а в %1"
 
-#: ardour_ui.cc:2822
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr "Ошибка реги�трации порта"
 
-#: ardour_ui.cc:2823
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr "Щелкните кнопку «Закрыть» дл� возврата к предыдущему диалогу."
 
-#: ardour_ui.cc:2844
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "�е удало�ь загрузить �еан� \"%1 (�нимок %2)\""
 
-#: ardour_ui.cc:2850
+#: ardour_ui.cc:2858
 msgid "Loading Error"
 msgstr "Ошибка при загрузке"
 
-#: ardour_ui.cc:2851
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr "Щёлкните кнопку «Обновить» дл� повторной попытки."
 
-#: ardour_ui.cc:2933
+#: ardour_ui.cc:2941
 msgid "Could not create session in \"%1\""
 msgstr "�е удало�ь �оздать �еан� «%1»"
 
-#: ardour_ui.cc:3033
+#: ardour_ui.cc:3041
 msgid "No files were ready for clean-up"
 msgstr "�ет готовых к удалению звуковых файлов"
 
-#: ardour_ui.cc:3037 ardour_ui.cc:3047 ardour_ui.cc:3180 ardour_ui.cc:3187
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 msgid "Clean-up"
 msgstr "Очи�тить"
 
-#: ardour_ui.cc:3038
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1149,19 +1145,19 @@ msgstr ""
 "Они могут включать обла�ти, которым\n"
 "нужны неи�пользуемые файлы."
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr "кило"
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr "мега"
 
-#: ardour_ui.cc:3103
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr "гига"
 
-#: ardour_ui.cc:3108
+#: ardour_ui.cc:3116
 msgid ""
 "The following file was deleted from %2,\n"
 "releasing %3 %4bytes of disk space"
@@ -1181,7 +1177,7 @@ msgstr[2] ""
 "о�вободив при �том %3 %4байт\n"
 "ди�кового про�тран�тва."
 
-#: ardour_ui.cc:3115
+#: ardour_ui.cc:3123
 msgid ""
 "The following file was not in use and \n"
 "has been moved to: %2\n"
@@ -1228,11 +1224,11 @@ msgstr[2] ""
 "\n"
 "дополнительно о�вободит %3 %4байт ди�кового про�тран�тва.\n"
 
-#: ardour_ui.cc:3175
+#: ardour_ui.cc:3183
 msgid "Are you sure you want to clean-up?"
 msgstr "Вы уверены, что хотите выполнить очи�тку?"
 
-#: ardour_ui.cc:3182
+#: ardour_ui.cc:3190
 msgid ""
 "Clean-up is a destructive operation.\n"
 "ALL undo/redo information will be lost if you clean-up.\n"
@@ -1243,80 +1239,80 @@ msgstr ""
 "неи�пользуемые звуковые файлы\n"
 "будут перемещены в «мертвую» зону."
 
-#: ardour_ui.cc:3190
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr "Очи�тка"
 
-#: ardour_ui.cc:3220
+#: ardour_ui.cc:3228
 msgid "Cleaned Files"
 msgstr "Очищенные файлы"
 
-#: ardour_ui.cc:3237
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr "удалён файл"
 
-#: ardour_ui.cc:3329
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 
-#: ardour_ui.cc:3333
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr ""
 
-#: ardour_ui.cc:3334
+#: ardour_ui.cc:3342
 msgid "Do you really want to stop the Video Server?"
 msgstr "Вы дей�твительно хотите о�тановить видео�ервер?"
 
-#: ardour_ui.cc:3337
+#: ardour_ui.cc:3345
 msgid "Yes, Stop It"
 msgstr "Да, о�тановить"
 
-#: ardour_ui.cc:3363
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr ""
 
-#: ardour_ui.cc:3365
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
 msgstr ""
 
-#: ardour_ui.cc:3373 ardour_ui.cc:3463
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
 
-#: ardour_ui.cc:3397
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr ""
 
-#: ardour_ui.cc:3402
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr ""
 
-#: ardour_ui.cc:3435
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr "�е удало�ь запу�тить видео�ервер"
 
-#: ardour_ui.cc:3444
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3489 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "не удало�ь открыть %1"
 
-#: ardour_ui.cc:3493
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
 msgstr ""
 
-#: ardour_ui.cc:3658
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr "Запи�ь о�тановлена из-за недо�таточного бы�тродей�тви� �и�темы"
 
-#: ardour_ui.cc:3687
+#: ardour_ui.cc:3702
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1330,7 +1326,7 @@ msgstr ""
 "В ча�тно�ти ей не удало�ь запи�ать данные на ди�к\n"
 "до�таточно бы�тро дл� фик�ации захваченных данных.\n"
 
-#: ardour_ui.cc:3706
+#: ardour_ui.cc:3721
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1344,11 +1340,11 @@ msgstr ""
 "В ча�тно�ти ей не удало�ь прочитать данные\n"
 "� ди�ка до�таточно бы�тро дл� во�произведени�.\n"
 
-#: ardour_ui.cc:3746
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr "Во��тановление данных"
 
-#: ardour_ui.cc:3747
+#: ardour_ui.cc:3762
 msgid ""
 "This session appears to have been in the\n"
 "middle of recording when %1 or\n"
@@ -1364,19 +1360,19 @@ msgstr ""
 "%1 может во��тановить запи�анные данные,\n"
 "либо проигнорировать их. Примите решение.\n"
 
-#: ardour_ui.cc:3759
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr "Проигнорировать"
 
-#: ardour_ui.cc:3760
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr "Во��тановить данные"
 
-#: ardour_ui.cc:3780
+#: ardour_ui.cc:3795
 msgid "Sample Rate Mismatch"
 msgstr "�е�овпадение ча�тот ��мплировани�"
 
-#: ardour_ui.cc:3781
+#: ardour_ui.cc:3796
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
 "%2 is currently running at %3 Hz.  If you load this session,\n"
@@ -1388,23 +1384,23 @@ msgstr ""
 "Е�ли вы загрузите �тот �еан�, звуковые данные могут быть\n"
 "во�произведены � некорректной ча�тотой ��мплировани�.\n"
 
-#: ardour_ui.cc:3790
+#: ardour_ui.cc:3805
 msgid "Do not load session"
 msgstr "�е загружать �еан�"
 
-#: ardour_ui.cc:3791
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr "В�е равно загрузить"
 
-#: ardour_ui.cc:3814
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "�е удало�ь от�оединить�� от �ервера JACK"
 
-#: ardour_ui.cc:3827
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr "�е удало�ь �оединить�� � �ервером JACK"
 
-#: ardour_ui.cc:4101
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1527,27 +1523,32 @@ msgstr ""
 "Пр�мой ввод: <tt>Esc</tt>: отмена; <tt>Enter</tt>: подтверждение; по�тфик� "
 "'+' или '-' вводит разницу во времени.\n"
 
-#: ardour_ui2.cc:178
+#: ardour_ui2.cc:147
+#, fuzzy
+msgid "Reset Level Meter"
+msgstr "Сбро�ить огибающую"
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr "[ОШИБК�]: "
 
-#: ardour_ui2.cc:180
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr "[ПРЕДУПРЕЖДЕ�ИЕ]:"
 
-#: ardour_ui2.cc:182
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr "[СПР�ВК�]:"
 
-#: ardour_ui2.cc:246 ardour_ui_ed.cc:377
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 msgid "Auto Return"
 msgstr "�втовозврат"
 
-#: ardour_ui2.cc:248 ardour_ui_ed.cc:380
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr "Следовать правкам"
 
-#: ardour_ui2.cc:626 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1571,19 +1572,19 @@ msgstr "�а�тройка микшера"
 msgid "Reload Session History"
 msgstr "Повторна� загрузка и�тории �еан�ов"
 
-#: ardour_ui_dialogs.cc:200
+#: ardour_ui_dialogs.cc:242
 msgid "Don't close"
 msgstr "�е закрывать"
 
-#: ardour_ui_dialogs.cc:201
+#: ardour_ui_dialogs.cc:243
 msgid "Just close"
 msgstr "Про�то закрыть"
 
-#: ardour_ui_dialogs.cc:202
+#: ardour_ui_dialogs.cc:244
 msgid "Save and close"
 msgstr "Сохранить и закрыть"
 
-#: ardour_ui_dialogs.cc:291
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr "Размеров �крана недо�таточно, чтобы показать окно микшера"
 
@@ -1596,7 +1597,7 @@ msgstr "Сеан�"
 msgid "Sync"
 msgstr "Синхронизаци�"
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr "Параметры"
 
@@ -1624,15 +1625,15 @@ msgstr "Тип файла"
 msgid "Sample Format"
 msgstr "Формат ��мпла"
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr "У�трой�тва управлени�"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "Модули"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr "Индикаторы"
 
@@ -1689,7 +1690,7 @@ msgid "Save As..."
 msgstr "Сохранить как..."
 
 #: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1470 route_time_axis.cc:1485
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 msgid "Rename..."
 msgstr "Переименовать..."
 
@@ -1718,7 +1719,7 @@ msgid "Stem export..."
 msgstr "Каждую дорожку в �вой файл..."
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "Эк�портировать"
 
@@ -1730,11 +1731,11 @@ msgstr "Очи�тить неи�пользуемые и�точники..."
 msgid "Flush Wastebasket"
 msgstr "Очи�тить корзину"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr "JACK"
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr "Задержка отклика"
 
@@ -1743,7 +1744,7 @@ msgid "Reconnect"
 msgstr "Пере�оединить"
 
 #: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
-#: mixer_strip.cc:718 mixer_strip.cc:844
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr "От�оединить"
 
@@ -1767,7 +1768,7 @@ msgstr "Микшер"
 msgid "Toggle Editor+Mixer"
 msgstr "Редактор или микшер на переднем плане"
 
-#: ardour_ui_ed.cc:232 meterbridge.cc:224 meterbridge.cc:230
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
 msgid "Window|Meterbridge"
 msgstr "Панель индикаторов"
 
@@ -1919,7 +1920,7 @@ msgstr "С�мплы"
 msgid "Punch In"
 msgstr "�ачало врезки"
 
-#: ardour_ui_ed.cc:357 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr "Вход"
@@ -1984,7 +1985,7 @@ msgstr "Передавать MMC"
 msgid "Use MMC"
 msgstr "И�пользовать MMC"
 
-#: ardour_ui_ed.cc:412 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 msgid "Send MIDI Clock"
 msgstr "Отправл�ть MIDI Clock"
 
@@ -2034,11 +2035,11 @@ msgstr ""
 msgid "Internal"
 msgstr "Внутр. �инхронизаци�"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 msgid "Enable/Disable external positional sync"
 msgstr "Включить или выключить внешнюю �инхронизацию позиционировани�"
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr ""
 
@@ -2157,32 +2158,32 @@ msgid "hide track"
 msgstr "Скрыть дорожку"
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:194 generic_pluginui.cc:456
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
 #: generic_pluginui.cc:746 panner_ui.cc:150
 msgid "Automation|Manual"
 msgstr "Вручную"
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:197
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
 #: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr "Во�пр."
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:200 generic_pluginui.cc:462
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
 #: generic_pluginui.cc:750 panner_ui.cc:156
 msgid "Write"
 msgstr "Запи�ь"
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:203 generic_pluginui.cc:465
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
 #: generic_pluginui.cc:752 panner_ui.cc:159
 msgid "Touch"
 msgstr "Ка�ание"
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr "???"
 
@@ -2229,13 +2230,13 @@ msgstr "Изменение пакета"
 msgid "Direction:"
 msgstr "�аправление:"
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:157
-#: mixer_strip.cc:2126
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 msgid "Input"
 msgstr "Вход"
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:162 mixer_strip.cc:2129
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 msgid "Output"
 msgstr "Выход"
 
@@ -2245,7 +2246,7 @@ msgid "Edit"
 msgstr "Правка"
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2216
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
 #: route_time_axis.cc:713
 msgid "Delete"
 msgstr "Удалить"
@@ -2660,12 +2661,12 @@ msgid "Ranges & Marks"
 msgstr "Обла�ти и маркеры"
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 msgid "Editor"
 msgstr "Редактор"
 
@@ -2695,8 +2696,8 @@ msgstr "Симметрично"
 msgid "Slow"
 msgstr "Медленно"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1633
-#: sfdb_ui.cc:1742
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "Бы�тро"
 
@@ -2833,7 +2834,7 @@ msgid "Select All in Track"
 msgstr "Выделить в�ё на дорожке"
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2224
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr "Выделить в�ё"
 
@@ -2885,15 +2886,15 @@ msgstr "Создать выделение между указателем и кÑ
 msgid "Select"
 msgstr "Выделить"
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2209
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr "Вырезать"
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2212
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr "Копировать"
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2220
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr "В�тавить"
 
@@ -3077,8 +3078,8 @@ msgstr "Удалить �пи�ок"
 msgid "Keep Playlist"
 msgstr "Сохранить �пи�ок"
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -3098,7 +3099,7 @@ msgstr "Очи�тить �пи�ки во�произведени�"
 msgid "Please wait while %1 loads visual data."
 msgstr "Дождите�ь загрузки визуальных данных в %1."
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2240
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 msgid "Edit..."
 msgstr "Изменить"
 
@@ -3147,7 +3148,7 @@ msgstr "Слои"
 msgid "Position"
 msgstr "Положение"
 
-#: editor_actions.cc:101 gain_meter.cc:120 gain_meter.cc:787 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr "Обрезать"
@@ -3198,7 +3199,7 @@ msgstr "Параметры MIDI"
 msgid "Misc Options"
 msgstr "Прочие параметры"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr "Мониторинг"
@@ -3239,7 +3240,7 @@ msgstr "Дополнительный �чётчик"
 msgid "Separate"
 msgstr "Разделить"
 
-#: editor_actions.cc:132 mixer_strip.cc:1913 route_time_axis.cc:208
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
 #: route_time_axis.cc:2417
 msgid "Solo"
 msgstr "Соло"
@@ -3376,7 +3377,7 @@ msgstr "К началу обла�ти"
 msgid "Playhead to Range End"
 msgstr "К концу обла�ти"
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2226
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 msgid "Deselect All"
 msgstr "Сн�ть в�е выделени�"
 
@@ -3645,7 +3646,7 @@ msgid "Toggle Active"
 msgstr "Переключить активно�ть"
 
 #: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1494
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
 #: route_time_axis.cc:710
 msgid "Remove"
 msgstr "Удалить"
@@ -3654,19 +3655,19 @@ msgstr "Удалить"
 msgid "Fit Selected Tracks"
 msgstr "Только выделенные дорожки"
 
-#: editor_actions.cc:376 time_axis_view.cc:1301
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr "Огромна�"
 
-#: editor_actions.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr "Больше"
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1303
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr "Больша�"
 
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1305
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr "Маленька�"
 
@@ -3935,7 +3936,7 @@ msgstr "Мин:С"
 msgid "Video Monitor"
 msgstr "Видеомонитор"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr "Видео"
 
@@ -4111,7 +4112,7 @@ msgstr "Приклеить к тактам и дол�м"
 msgid "Remove Sync"
 msgstr "Удалить �инхронизатор"
 
-#: editor_actions.cc:1752 mixer_strip.cc:1903 route_time_axis.cc:209
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr "Молча"
 
@@ -4388,28 +4389,28 @@ msgstr ""
 msgid "Cancel Import"
 msgstr "Отменить импорт"
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr "Редактор: не удаёт�� открыть файл \"%1\", (%2)"
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 msgid "Cancel entire import"
 msgstr "Отменить ве�ь импорт"
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 msgid "Don't embed it"
 msgstr "�е в�траивать"
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr "В�троить без лишних вопро�ов"
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 msgid "Sample rate"
 msgstr "Ча�тота ��мплировани�"
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
@@ -4418,7 +4419,7 @@ msgstr ""
 "Выбранный звуковой файл имеет ча�тоту ��мплировани�,\n"
 "отличную от ча�тоты активного �еан�а!"
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 msgid "Embed it anyway"
 msgstr "В�ё равно в�троить"
 
@@ -4454,31 +4455,31 @@ msgstr "�копировать маркер темпа"
 msgid "move tempo mark"
 msgstr "переме�тить маркер темпа"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr "�мена длительно�ти фейда нара�тани�"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr "�мена длительно�ти фейда затухани�"
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr "�мещение маркера"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr ""
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 msgid "programming_error: %1"
 msgstr "Ошибка в программе: %1"
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr "новый маркер выделени�"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 msgid "rubberband selection"
 msgstr "пр�моугольное выделение"
 
@@ -4547,7 +4548,7 @@ msgid "Sharing Solo?"
 msgstr "Раздел�ет�� ли �олирование"
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 msgid "Rec"
 msgstr "Зап"
 
@@ -4702,8 +4703,8 @@ msgstr "Переименовать маркер"
 msgid "Rename Range"
 msgstr "Переименовать выделение"
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2222 route_time_axis.cc:982 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr "Переименовать"
 
@@ -4839,7 +4840,7 @@ msgstr "опу�кание обла�тей вниз"
 msgid "Rename Region"
 msgstr "Переименовать обла�ть..."
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 msgid "New name:"
 msgstr "�овое название:"
 
@@ -5002,7 +5003,7 @@ msgstr ""
 "(отмена операции невозможна)"
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr "�ет"
 
@@ -5191,11 +5192,11 @@ msgstr "ОК"
 msgid "close region gaps"
 msgstr ""
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr ""
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5215,7 +5216,7 @@ msgstr ""
 msgid "tracks"
 msgstr "дорожек"
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 msgid "track"
 msgstr "дорожка"
 
@@ -5223,7 +5224,7 @@ msgstr "дорожка"
 msgid "busses"
 msgstr "шин"
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 msgid "bus"
 msgstr "шина"
 
@@ -5265,7 +5266,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr "Да, удалить их."
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr "Да, удалить"
 
@@ -5334,7 +5335,7 @@ msgstr ""
 msgid "Length of region fade-out (units: secondary clock), () if dsisabled"
 msgstr ""
 
-#: editor_regions.cc:118 mixer_strip.cc:1953 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr "Л"
@@ -5351,8 +5352,8 @@ msgstr ""
 msgid "Region position glued to Bars|Beats time?"
 msgstr ""
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:755
-#: mixer_strip.cc:1930 meter_strip.cc:272 panner_ui.cc:554
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
 #: stereo_panner.cc:237
 msgid "M"
 msgstr "Ð’"
@@ -5422,7 +5423,7 @@ msgstr "�азвание дорожи/шины"
 msgid "Track/Bus visible ?"
 msgstr "Дорожка или шина видима?"
 
-#: editor_routes.cc:204 mixer_strip.cc:1944 meter_strip.cc:286
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
 #: route_time_axis.cc:2407
 msgid "A"
 msgstr "A"
@@ -5431,7 +5432,7 @@ msgstr "A"
 msgid "Track/Bus active ?"
 msgstr "Дорожка или шина активна?"
 
-#: editor_routes.cc:205 mixer_strip.cc:1931
+#: editor_routes.cc:205 mixer_strip.cc:1932
 msgid "I"
 msgstr "Ð’Ð¥"
 
@@ -5439,7 +5440,7 @@ msgstr "Ð’Ð¥"
 msgid "MIDI input enabled"
 msgstr "Вход MIDI включен"
 
-#: editor_routes.cc:206 mixer_strip.cc:1929 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr "П"
@@ -5452,7 +5453,7 @@ msgstr "Готовно�ть к запи�и"
 msgid "Muted"
 msgstr ""
 
-#: editor_routes.cc:208 mixer_strip.cc:1940 meter_strip.cc:282
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr "S"
 
@@ -5464,7 +5465,7 @@ msgstr "..."
 msgid "SI"
 msgstr ""
 
-#: editor_routes.cc:209 mixer_strip.cc:352 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 msgid "Solo Isolated"
 msgstr "Изолирование �оло"
 
@@ -5744,139 +5745,143 @@ msgid "192000Hz"
 msgstr "192КГц"
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:541
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr "�ет"
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr "Треугольное"
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr "Пр�моугольное"
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 msgid "Shaped"
 msgstr "По очертани�м"
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr "Во�произведение и запи�ь на 1 у�трой�тве"
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr "Во�произведение и запи�ь на 2 у�трой�твах"
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr "Только во�произведение"
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 msgid "Recording only"
 msgstr "Только запи�ь"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr ""
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 msgid "raw"
 msgstr ""
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr "Драйвер:"
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 msgid "Audio Interface:"
 msgstr "Звуковой интерфей�:"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:149 sfdb_ui.cc:262 sfdb_ui.cc:267
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 msgid "Sample rate:"
 msgstr "Ча�тота ��мплировани�:"
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr "Размер буфера:"
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr "Чи�ло буферов:"
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr "Примерна� задержка:"
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 msgid "Audio mode:"
 msgstr "Звуковой режим:"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr "Игнорировать"
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr "Ошибка времени ожидани� клиента"
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr "Чи�ло портов:"
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr "Драйвер MIDI:"
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 msgid "Dither:"
 msgstr "Подмешивание шума:"
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr "Сервер JACK в �и�теме не обнаружен. У�тановить его и попробуйте �нова."
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr "Сервер:"
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr "У�трой�тво входа:"
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 msgid "Output device:"
 msgstr "У�трой�тво выхода:"
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 msgid "Hardware input latency:"
 msgstr "Задержка аппаратных входов:"
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 msgid "samples"
 msgstr "��мплов"
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 msgid "Hardware output latency:"
 msgstr "Задержка аппаратных выходов:"
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr "У�трой�тво"
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr ""
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 msgid ""
 "You do not have any audio devices capable of\n"
 "simultaneous playback and recording.\n"
@@ -5893,31 +5898,31 @@ msgid ""
 "%1 and choose the relevant device then."
 msgstr ""
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr "�ет подход�щих звуковых у�трой�тв"
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr "JACK от�ут�твует в по�тавке %1"
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr "Дл� начала нужно выбрать звуковое у�трой�тво."
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr "Звуковое у�трой�тво \"%1\" в �том компьютере не обнаружено."
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr "Значению AudioSetup дл� %1 не хватает данных"
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:147
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 msgid "Channels:"
 msgstr "Каналов:"
 
@@ -6067,9 +6072,9 @@ msgid "Folder:"
 msgstr "Папка:"
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "Указать"
 
@@ -6224,32 +6229,50 @@ msgstr " до "
 msgid "Range"
 msgstr "Диапазон"
 
-#: gain_meter.cc:105 gain_meter.cc:356 gain_meter.cc:461 gain_meter.cc:852
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+#, fuzzy
+msgid "curl error %1 (%2)"
+msgstr "Ошибка в программе: %1 (%2)"
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+#, fuzzy
+msgid "%1"
+msgstr "%"
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr "-inf"
 
-#: gain_meter.cc:111 gain_meter.cc:909
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr "Режим автоматизации фейдера"
 
-#: gain_meter.cc:112 gain_meter.cc:910
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr "Тип автоматизации фейдера"
 
-#: gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr "�б�"
 
-#: gain_meter.cc:758 mixer_strip.cc:1947 meter_strip.cc:289 panner_ui.cc:557
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
 #: route_time_axis.cc:2411
 msgid "P"
 msgstr "P"
 
-#: gain_meter.cc:761 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr "К"
 
-#: gain_meter.cc:764 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr "З"
 
@@ -6261,7 +6284,7 @@ msgstr "<span size=\"large\">Профили</span>"
 msgid "Switches"
 msgstr "Переключатели"
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2199
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 msgid "Controls"
 msgstr "Управление"
 
@@ -6293,59 +6316,59 @@ msgstr "Управление MIDI-�оединени�ми"
 msgid "port"
 msgstr "порт"
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 msgid "Selection..."
 msgstr "Выделени�..."
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr "Готовых к запи�и..."
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 msgid "Soloed..."
 msgstr "Солирующих..."
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 msgid "Create New Group ..."
 msgstr "Создать группу..."
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr "Создать группу из"
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 msgid "Edit Group..."
 msgstr "Изменить группу..."
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 msgid "Collect Group"
 msgstr "Собрать группу"
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 msgid "Remove Subgroup Bus"
 msgstr "Удалить шину подгруппы"
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 msgid "Add New Subgroup Bus"
 msgstr "Добавить новую шину подгруппы"
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr "Добавить новую внешнюю шину (до фейдера)"
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 msgid "Add New Aux Bus (post-fader)"
 msgstr "Добавить новую внешнюю шину (по�ле фейдера)"
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 msgid "Enable All Groups"
 msgstr "Включить в�е группы"
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 msgid "Disable All Groups"
 msgstr "Отключить в�е группы"
 
@@ -6521,7 +6544,7 @@ msgstr[2] "%1 ��мплов"
 msgid "Reset"
 msgstr "Сбро�ить"
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1761
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 msgid "programming error: %1 (%2)"
 msgstr "Ошибка в программе: %1 (%2)"
 
@@ -6678,19 +6701,19 @@ msgid ""
 "session at this time, because we would lose your connection information.\n"
 msgstr ""
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr ""
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr ", при помощи GCC вер�ии "
 
-#: main.cc:504
+#: main.cc:500
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr "�втор�кие права © 1999-2012 Paul Davis"
 
-#: main.cc:505
+#: main.cc:501
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
@@ -6698,27 +6721,31 @@ msgstr ""
 "Ча�тичные автор�кие права © Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
 
-#: main.cc:507
+#: main.cc:503
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr "%1 ра�про�тран�ет�� БЕЗО ВСЯКИХ Г�Р��ТИЙ"
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "Это �вободное программное обе�печение, Вы можете ра�про�тран�ть его"
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr "на определённых у�лови�х; подробнее об �том читайте в файле COPYING."
 
-#: main.cc:519
+#: main.cc:513
+msgid "could not initialize %1."
+msgstr "�е удало�ь инициализировать %1."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr ""
 
-#: main.cc:525
+#: main.cc:528
 msgid "could not create %1 GUI"
 msgstr "не удало�ь �оздать графиче�кий интерфей� дл� %1"
 
@@ -6726,7 +6753,7 @@ msgstr "не удало�ь �оздать графиче�кий интерфе
 msgid "Display delta to edit cursor"
 msgstr "Показывать разницу � кур�ором редактора"
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 msgid "MarkerText"
 msgstr ""
 
@@ -7205,7 +7232,7 @@ msgstr "Выберите дополнительную папку:"
 msgid "Missing Plugins"
 msgstr "От�ут�твующие модули"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr "ОК"
 
@@ -7277,248 +7304,231 @@ msgstr ""
 msgid "Could not find mixer.bindings in search path %1"
 msgstr ""
 
-#: mixer_strip.cc:92 mixer_strip.cc:120 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr "lj"
 
-#: mixer_strip.cc:94 mixer_strip.cc:122 mixer_strip.cc:353 mixer_strip.cc:1299
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 msgid "Comments"
 msgstr "Комментарии"
 
-#: mixer_strip.cc:146
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr "Щёлкните дл� переключени� ширины поло�ки микшера"
 
-#: mixer_strip.cc:148
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
 msgstr ""
 
-#: mixer_strip.cc:155
+#: mixer_strip.cc:156
 msgid "Hide this mixer strip"
 msgstr "Скрыть поло�ку микшера"
 
-#: mixer_strip.cc:166
+#: mixer_strip.cc:167
 msgid "Click to select metering point"
 msgstr "Щёлкните дл� выбора точка замера"
 
-#: mixer_strip.cc:172
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr ""
 
-#: mixer_strip.cc:191
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr "Изолировать �оло"
 
-#: mixer_strip.cc:200
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr "Стату� блокировки �олировани�"
 
-#: mixer_strip.cc:202 mixer_strip.cc:1925
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 msgid "lock"
 msgstr "Блок"
 
-#: mixer_strip.cc:203 mixer_strip.cc:1924
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 msgid "iso"
 msgstr "Изол"
 
-#: mixer_strip.cc:257
+#: mixer_strip.cc:258
 msgid "Mix group"
 msgstr "Группа мик�а"
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 msgid "Phase Invert"
 msgstr "Инвер�и� фазы"
 
-#: mixer_strip.cc:351 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 msgid "Solo Safe"
 msgstr "Блокировка �олировани�"
 
-#: mixer_strip.cc:354 mixer_ui.cc:124 route_time_axis.cc:673
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 msgid "Group"
 msgstr "Группа"
 
-#: mixer_strip.cc:355 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 msgid "Meter Point"
 msgstr "Точка измерени�"
 
-#: mixer_strip.cc:469
+#: mixer_strip.cc:470
 msgid "Enable/Disable MIDI input"
 msgstr "Включить или выключить MIDI-вход"
 
-#: mixer_strip.cc:621
+#: mixer_strip.cc:622
 msgid ""
 "Aux\n"
 "Sends"
 msgstr ""
 
-#: mixer_strip.cc:645
+#: mixer_strip.cc:646
 msgid "Snd"
 msgstr "П�л"
 
-#: mixer_strip.cc:700 mixer_strip.cc:828 processor_box.cc:2141
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr "�ет �оединени� � JACK, любые изменени� входа-выхода невозможны"
 
-#: mixer_strip.cc:1095
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr "<b>ВХОД</b> в %1"
 
-#: mixer_strip.cc:1098
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr "<b>ВЫХОД</b> из %1"
 
-#: mixer_strip.cc:1173
+#: mixer_strip.cc:1174
 msgid "Disconnected"
 msgstr "�ет �оединени�"
 
-#: mixer_strip.cc:1302
+#: mixer_strip.cc:1303
 msgid "*Comments*"
 msgstr "*Кмт*"
 
-#: mixer_strip.cc:1309
+#: mixer_strip.cc:1310
 msgid "Cmt"
 msgstr "Кмт"
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr "*Кмт*"
 
-#: mixer_strip.cc:1318
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr "�ажмите дл� добавлени�/правки комментариев"
 
-#: mixer_strip.cc:1357
+#: mixer_strip.cc:1358
 msgid ": comment editor"
 msgstr ": редактор комментариев"
 
-#: mixer_strip.cc:1434
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr "Грп"
 
-#: mixer_strip.cc:1437
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr "нГр"
 
-#: mixer_strip.cc:1466
+#: mixer_strip.cc:1467
 msgid "Comments..."
 msgstr "Комментарии..."
 
-#: mixer_strip.cc:1468
+#: mixer_strip.cc:1469
 msgid "Save As Template..."
 msgstr "Сохранить как шаблон..."
 
-#: mixer_strip.cc:1474 route_group_dialog.cc:39 route_time_axis.cc:696
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr "�ктивно�ть"
 
-#: mixer_strip.cc:1481
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr "Скорректировать задержку..."
 
-#: mixer_strip.cc:1484
+#: mixer_strip.cc:1485
 msgid "Protect Against Denormals"
 msgstr "Защищать от отклонений"
 
-#: mixer_strip.cc:1490 route_time_axis.cc:435
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 msgid "Remote Control ID..."
 msgstr "ID дл� удалённого управлени�..."
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 msgid "in"
 msgstr "вх"
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 msgid "post"
 msgstr "по�ле"
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 msgid "out"
 msgstr "вых"
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr ""
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 msgid "pr"
 msgstr ""
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 msgid "po"
 msgstr ""
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 msgid "o"
 msgstr ""
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr ""
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr "Ди�к"
 
-#: mixer_strip.cc:1917 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr "AFL"
 
-#: mixer_strip.cc:1920 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr "PFL"
 
-#: mixer_strip.cc:1932
+#: mixer_strip.cc:1933
 msgid "D"
 msgstr ""
 
-#: mixer_strip.cc:1952
+#: mixer_strip.cc:1953
 #, fuzzy
 msgid "i"
 msgstr "вх"
 
-#: mixer_strip.cc:2127
+#: mixer_strip.cc:2128
 msgid "Pre-fader"
 msgstr "До фейдера"
 
-#: mixer_strip.cc:2128
+#: mixer_strip.cc:2129
 msgid "Post-fader"
 msgstr "По�ле фейдера"
 
-#: mixer_strip.cc:2135 meter_strip.cc:575
-msgid "Peak"
-msgstr "Пиковое значение"
-
-#: mixer_strip.cc:2136 meter_strip.cc:576
-msgid "RMS + Peak"
-msgstr "Среднеквадратичное + пиковое значение"
-
-#: mixer_strip.cc:2155 meter_strip.cc:579
-msgid "Change all in Group to Peak"
+#: mixer_strip.cc:2166 meter_strip.cc:728
+#, fuzzy
+msgid "Change all in Group to %1"
 msgstr "Помен�ть в�е в группе на пиковое"
 
-#: mixer_strip.cc:2156 meter_strip.cc:580
-msgid "Change all in Group to RMS + Peak"
-msgstr "Помен�ть в�е в группе на �реднеквадратичное + пиковое"
-
-#: mixer_strip.cc:2157 meter_strip.cc:581
-msgid "Change all to Peak"
+#: mixer_strip.cc:2168 meter_strip.cc:730
+#, fuzzy
+msgid "Change all to %1"
 msgstr "Помен�ть в�е на пиковое"
 
-#: mixer_strip.cc:2158 meter_strip.cc:582
-msgid "Change all to RMS + Peak"
-msgstr "Помен�ть в�е на �реднеквадратичное + пиковое"
-
-#: mixer_strip.cc:2159 meter_strip.cc:583
-msgid "Change same track-type to Peak"
+#: mixer_strip.cc:2170 meter_strip.cc:732
+#, fuzzy
+msgid "Change same track-type to %1"
 msgstr "Помен�ть дорожки одного типа на пиковое"
 
-#: mixer_strip.cc:2160 meter_strip.cc:584
-msgid "Change same track-type to RMS + Peak"
-msgstr "Помен�ть дорожки одного типа на �реднеквадратичное + пиковое"
-
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr ""
@@ -7531,6 +7541,64 @@ msgstr "-в�е-"
 msgid "Strips"
 msgstr "Каналы"
 
+#: meter_strip.cc:764
+#, fuzzy
+msgid "Variable height"
+msgstr "Вы�ота видеолинейки"
+
+#: meter_strip.cc:765
+#, fuzzy
+msgid "Short"
+msgstr "Короткое"
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr "Пиковое значение"
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr "Среднеквадратичное + пиковое значение"
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+msgid "VU"
+msgstr ""
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr ""
@@ -8286,46 +8354,46 @@ msgstr "Выполн�ет�� определение..."
 msgid "Port Insert "
 msgstr "В�тавка порта"
 
-#: port_matrix.cc:325 port_matrix.cc:344
+#: port_matrix.cc:331 port_matrix.cc:357
 msgid "<b>Sources</b>"
 msgstr "<b>И�точники</b>"
 
-#: port_matrix.cc:326 port_matrix.cc:345
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr "<b>�азначени�</b>"
 
-#: port_matrix.cc:421 port_matrix.cc:429
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr "Добавить %s %s"
 
-#: port_matrix.cc:437
+#: port_matrix.cc:456
 #, c-format
 msgid "Rename '%s'..."
 msgstr "Переименовать '%s'..."
 
-#: port_matrix.cc:453
+#: port_matrix.cc:472
 msgid "Remove all"
 msgstr "Удалить в�е"
 
-#: port_matrix.cc:473 port_matrix.cc:485
+#: port_matrix.cc:492 port_matrix.cc:504
 #, c-format
 msgid "%s all"
 msgstr "%s в�е"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr "Про�канировать заново"
 
-#: port_matrix.cc:510
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr "Показывать порты раздельно"
 
-#: port_matrix.cc:516
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr "Повернуть матрицу"
 
-#: port_matrix.cc:704
+#: port_matrix.cc:723
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
 "or buss cannot support the new configuration."
@@ -8333,31 +8401,32 @@ msgstr ""
 "�евозможно добавить �юда порт, по�кольку первый обработчик дорожки или шины "
 "не может поддерживать новую конфигурацию."
 
-#: port_matrix.cc:707
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr "�евозможно добавить порт"
 
-#: port_matrix.cc:729
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr "Удаление портов не разрешено"
 
-#: port_matrix.cc:730
+#: port_matrix.cc:749
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
 
-#: port_matrix.cc:947
+#: port_matrix.cc:966
 #, c-format
 msgid "Remove '%s'"
 msgstr "Удалить '%s'"
 
-#: port_matrix.cc:962
+#: port_matrix.cc:981
 #, c-format
 msgid "%s all from '%s'"
 msgstr "%s в�е из '%s'"
 
-#: port_matrix.cc:1028
+#: port_matrix.cc:1047
 msgid "channel"
 msgstr "канал"
 
@@ -8369,7 +8438,7 @@ msgstr "�ет до�тупных портов."
 msgid "There are no %1 ports to connect."
 msgstr "нет �оедин�емых портов %1."
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
@@ -8379,7 +8448,7 @@ msgstr ""
 "Двойной щелчок вызывает �об�твенный диалог модул�.\n"
 "Alt+ двойной щелчок вызывает генерируемый хо�том диалог � параметрами."
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
@@ -8387,23 +8456,23 @@ msgstr ""
 "<b>%1</b>\n"
 "Двойной щелчок вызывает генерируемый хо�том диалог � параметрами."
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 msgid "Show All Controls"
 msgstr "Показать в�е регул�торы"
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 msgid "Hide All Controls"
 msgstr "Скрыть в�е регул�торы"
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 msgid "on"
 msgstr "Вкл"
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr "Выкл"
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
@@ -8411,15 +8480,15 @@ msgstr ""
 "Щелчком правой клавишей мыши можно добавл�ть, \n"
 "измен�ть и удал�ть модули, по�ылы, возвраты и прочее."
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 msgid "Plugin Incompatibility"
 msgstr "�е�овме�тимо�ть модулей"
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr "Вы пытали�ь добавить модуль \"%1\" в �лот %2.\n"
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
@@ -8427,21 +8496,21 @@ msgstr ""
 "\n"
 "У �того модул�:\n"
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
 msgstr[0] "\t%1 MIDI-вход\n"
 msgstr[1] "\t%1 MIDI-входа\n"
 msgstr[2] "\t%1 MIDI-входов\n"
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
 msgstr[0] "\t%1 звуковой вход\n"
 msgstr[1] "\t%1 звуковых входа\n"
 msgstr[2] "\t%1 звуковых входов\n"
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
@@ -8449,21 +8518,21 @@ msgstr ""
 "\n"
 "но в точке в�тавки �ейча�:\n"
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
 msgstr[0] "\t%1 MIDI-канал\n"
 msgstr[1] "\t%1 MIDI-канала\n"
 msgstr[2] "\t%1 MIDI-каналов\n"
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
 msgstr[0] "\t%1 звуковой канал\n"
 msgstr[1] "\t%1 звуковых канала\n"
 msgstr[2] "\t%1 звуковых каналов\n"
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
@@ -8471,11 +8540,11 @@ msgstr ""
 "\n"
 "%1 не может в�тавить �юда �тот модуль.\n"
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 msgid "Cannot set up new send: %1"
 msgstr "�евозможно на�троить новый по�ыл: %1"
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
 "in that way because the inputs and\n"
@@ -8485,19 +8554,19 @@ msgstr ""
 "по�ылы и возвраты подобным образом, по�кольку \n"
 "входы и выходы пере�танут корректно работать."
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 msgid "Rename Processor"
 msgstr "Переименовать обработчик"
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr ""
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr ""
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
@@ -8507,7 +8576,7 @@ msgstr ""
 "буфер обмена. Веро�тно, конфигураци� входа и выхода\n"
 "модулей не �овпала � конфигурацией �той дорожки."
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 msgid ""
 "Do you really want to remove all processors from %1?\n"
 "(this cannot be undone)"
@@ -8516,15 +8585,15 @@ msgstr ""
 "обработчики из \"%1\" ?\n"
 "(отмена невозможна)"
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 msgid "Yes, remove them all"
 msgstr "Да, удалить их в�е"
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 msgid "Remove processors"
 msgstr "Удалить обработчики"
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
 "(this cannot be undone)"
@@ -8533,7 +8602,7 @@ msgstr ""
 "предфейдерные обработчики из \"%1\" ?\n"
 "(отмена невозможна)"
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
 "(this cannot be undone)"
@@ -8542,51 +8611,51 @@ msgstr ""
 "по�лефейдерные обработчики из \"%1\" ?\n"
 "(отмена невозможна)"
 
-#: processor_box.cc:2187
+#: processor_box.cc:2200
 msgid "New Plugin"
 msgstr "Добавить модуль"
 
-#: processor_box.cc:2190
+#: processor_box.cc:2203
 msgid "New Insert"
 msgstr "Добавить возврат"
 
-#: processor_box.cc:2193
+#: processor_box.cc:2206
 msgid "New External Send ..."
 msgstr "Добавить внешний по�ыл � портом JACK..."
 
-#: processor_box.cc:2197
+#: processor_box.cc:2210
 msgid "New Aux Send ..."
 msgstr "Добавить внешний по�ыл без порта JACK..."
 
-#: processor_box.cc:2201
+#: processor_box.cc:2214
 msgid "Clear (all)"
 msgstr "Очи�тить (в�ё)"
 
-#: processor_box.cc:2203
+#: processor_box.cc:2216
 msgid "Clear (pre-fader)"
 msgstr "Очи�тить (до фейдера)"
 
-#: processor_box.cc:2205
+#: processor_box.cc:2218
 msgid "Clear (post-fader)"
 msgstr "Очи�тить (по�ле фейдера)"
 
-#: processor_box.cc:2231
+#: processor_box.cc:2244
 msgid "Activate All"
 msgstr "�ктивировать в�е"
 
-#: processor_box.cc:2233
+#: processor_box.cc:2246
 msgid "Deactivate All"
 msgstr "Деактивировать в�е"
 
-#: processor_box.cc:2235
+#: processor_box.cc:2248
 msgid "A/B Plugins"
 msgstr "Отключить в�е"
 
-#: processor_box.cc:2244
+#: processor_box.cc:2257
 msgid "Edit with generic controls..."
 msgstr "Изменить � интерфей�ом хо�та..."
 
-#: processor_box.cc:2544
+#: processor_box.cc:2557
 msgid "%1: %2 (by %3)"
 msgstr "%1: %2 (автор — %3)"
 
@@ -8746,7 +8815,7 @@ msgstr "URL видео�ервера:"
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
 
 #: rc_option_editor.cc:836
@@ -9035,91 +9104,95 @@ msgstr "Перемещать автоматизацию вме�те � обла
 msgid "Show meters on tracks in the editor"
 msgstr "Показывать индикаторы громко�ти в дорожках"
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr ""
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr "Обла�ти в активных редактируемых группах мен�ют�� вме�те"
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 msgid "whenever they overlap in time"
 msgstr "Когда пере�екают�� по времени"
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr "При одинаковой длительно�ти, позиции и прои�хождении"
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr "Пр�моугольное выделение прилипает к �етке"
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 msgid "Show waveforms in regions"
 msgstr "Показывать форму волны в обла�т�х"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 msgid "Show gain envelopes in audio regions"
 msgstr "Показывать огибающие у�илени�"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr "Во в�ех режимах"
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr "Только в режиме правки огибающей"
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 msgid "Waveform scale"
 msgstr "Ма�штаб �игнала"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "Линейный"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr "Логарифмиче�кий"
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 msgid "Waveform shape"
 msgstr "Форма �игнала"
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 msgid "traditional"
 msgstr "Обычна�"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 msgid "rectified"
 msgstr "От низа"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr "Показывать форму �игнала при запи�и"
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr "Показывать панель дл� управлени� ма�штабом"
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr "Ра�крашивать обла�ти цветом дорожки"
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr "Обновл�ть окно редактора при изменени�х в панели �водки"
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 msgid "Synchronise editor and mixer track order"
 msgstr "Синхронизировать пор�док дорожек в редакторе и микшере"
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 msgid "Synchronise editor and mixer selection"
 msgstr "Синхронизировать выделение в редакторе и микшере"
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 msgid "Name new markers"
 msgstr "Спрашивать об имени каждого нового маркера"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9127,240 +9200,240 @@ msgid ""
 "You can always rename markers by right-clicking on them"
 msgstr ""
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr ""
 "�втоматиче�ки прокручивать окно редактора при перета�кивании близко к кра�м"
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr "Буферизаци�"
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 msgid "Record monitoring handled by"
 msgstr "Мониторинг запи�и выполн�ет"
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 msgid "ardour"
 msgstr "Ardour"
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 msgid "audio hardware"
 msgstr "�ппаратное обе�печение"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 msgid "Tape machine mode"
 msgstr "Режим плёночного магнитофона"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr "Соединение дорожек и шин"
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr "�втоматиче�ки �оедин�ть шины master/monitor"
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 msgid "Connect track inputs"
 msgstr "Соедин�ть входы дорожек"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 msgid "automatically to physical inputs"
 msgstr "�втоматиче�ки � физиче�кими входами"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr "Вручную"
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 msgid "Connect track and bus outputs"
 msgstr "Соедин�ть выходы дорожек и шин"
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 msgid "automatically to physical outputs"
 msgstr "�втоматиче�ки � физиче�кими выходами"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 msgid "automatically to master bus"
 msgstr "�втоматиче�ки � общей шиной"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 msgid "Denormals"
 msgstr "Отклонени� �игнала"
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 msgid "Use DC bias to protect against denormals"
 msgstr ""
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr ""
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr ""
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 msgid "use FlushToZero"
 msgstr "И�пользовать FlushToZero"
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr "И�пользовать DenormalsAreZero"
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr "И�пользовать FlushToZero и DenormalsAreZero"
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 msgid "Silence plugins when the transport is stopped"
 msgstr "Приглушать модули при о�тановке тран�порта"
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr "Делать новые �ффекты/ин�трументы активными"
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr "Включить автоматиче�кий анализ звука"
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 msgid "Replicate missing region channels"
 msgstr "Во��оздавать от�ут�твующие каналы обла�ти"
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 msgid "Solo / mute"
 msgstr "Соло/Приглушение"
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 msgid "Solo-in-place mute cut (dB)"
 msgstr "Приглушение �игнала при �олировании (dB)"
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr "Управление �олированием работает как управление про�лушиванием"
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 msgid "Listen Position"
 msgstr "Положение про�лушивани�"
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 msgid "after-fader (AFL)"
 msgstr "По�ле фейдера (AFL)"
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 msgid "pre-fader (PFL)"
 msgstr "До фейдера (PFL)"
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr "И�точник �игнала PFL"
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 msgid "before pre-fader processors"
 msgstr "До по�лефейдерных обработчиков"
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr "До фейдера, но по�ле предфейдерных обработчиков"
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr "И�точник �игнала AFL"
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 msgid "immediately post-fader"
 msgstr "Сразу по�ле фейдера"
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 msgid "after post-fader processors (before pan)"
 msgstr "За по�лефейдерными обработчиками и до панорамировани�"
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr "Эк�клюзивное �олирование"
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 msgid "Show solo muting"
 msgstr "Показывать приглушение при �олировании"
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr "Солирование приоритетнее приглушени�"
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 msgid "Default track / bus muting options"
 msgstr "Приглушение дорожек и шин по умолчанию затрагивает"
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr "Предфейдерные по�ылы"
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr "По�лефейдерные по�ылы"
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 msgid "Mute affects control outputs"
 msgstr "Выходы мониторинга"
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr "О�новные выходы"
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 msgid "Send MIDI Time Code"
 msgstr "Передавать MIDI Time Code"
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr "Выполн�ть команды MIDI Machine Control"
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr "Отправл�ть команды MIDI Machine Control"
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 msgid "Send MIDI control feedback"
 msgstr "Отправл�ть отклик на контрольные �обыти� MIDI"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr "Идентификатор вход�щего у�трой�тва MMC"
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr ""
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr "И�ходна� �мена программы"
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr "Показывать первый банк/программу MIDI как 0"
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr "�икогда не показывать периодиче�кие �ообщени� MIDI (MTC, MIDI Clock)"
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 msgid "Sound MIDI notes as they are selected"
 msgstr "Во�производить ноты MIDI при их выделении"
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 msgid "User interaction"
 msgstr "Взаимодей�твие � пользователем"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
@@ -9370,143 +9443,182 @@ msgstr ""
 "   <i>(в�тупает в �илу по�ле перезапу�ка %1)</i>\n"
 "   <i>(е�ли локализаци� дл� вашего �зыка до�тупна)</i>"
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr "Клавиатура"
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 msgid "Control surface remote ID"
 msgstr "ID дл� удалённого управлени�"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 msgid "assigned by user"
 msgstr "�азначенные пользователем"
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr "Следуют пор�дку микшера"
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr "Следуют пор�дку редактора"
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1927 rc_option_editor.cc:1943
-#: rc_option_editor.cc:1957
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 msgid "Preferences|GUI"
 msgstr "Интерфей�"
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr "Под�вечивать �лементы интерфей�а под указателем мыши"
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr "Показывать в�плывающие под�казки к �лементам интерфей�а"
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr "Интерфей�"
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr "Обновл�ть �чётчик тран�порта каждые 40м� вме�то каждых 100м�"
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 msgid "Mixer Strip"
 msgstr "Поло�а микшера"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 msgid "Use narrow strips in the mixer by default"
 msgstr "И�пользовать тонкие поло�ки в микшере по умолчанию"
 
-#: rc_option_editor.cc:1898
+#: rc_option_editor.cc:1906
 msgid "Peak hold time"
 msgstr "Удерживание пика"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 msgid "short"
 msgstr "Короткое"
 
-#: rc_option_editor.cc:1905
+#: rc_option_editor.cc:1913
 msgid "medium"
 msgstr "Среднее"
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr "Долгое"
 
-#: rc_option_editor.cc:1912
+#: rc_option_editor.cc:1920
 msgid "DPM fall-off"
 msgstr "Скоро�ть �падани�"
 
-#: rc_option_editor.cc:1918
+#: rc_option_editor.cc:1926
 msgid "slowest [6.6dB/sec]"
 msgstr "Самое медленное [6,6 Дб/�]"
 
-#: rc_option_editor.cc:1919
+#: rc_option_editor.cc:1927
 msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
 msgstr "Медленное [8,6 Дб/�] (BBC PPM, EBU PPM)"
 
-#: rc_option_editor.cc:1920
+#: rc_option_editor.cc:1928
 msgid "slowish [12.0dB/sec] (DIN)"
 msgstr "�еторопливое [12  Дб/�] (DIN)"
 
-#: rc_option_editor.cc:1921
+#: rc_option_editor.cc:1929
 msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
 msgstr "Умеренное [13,3 Дб/�] (EBU Digi PPM, IRT Digi PPM)"
 
-#: rc_option_editor.cc:1922
+#: rc_option_editor.cc:1930
 msgid "medium [20dB/sec]"
 msgstr "Среднее [20  Дб/�]"
 
-#: rc_option_editor.cc:1923
+#: rc_option_editor.cc:1931
 msgid "fast [32dB/sec]"
 msgstr "Бы�трое [32 Дб/�]"
 
-#: rc_option_editor.cc:1924
+#: rc_option_editor.cc:1932
 msgid "faster [46dB/sec]"
 msgstr "Ещё бы�трее [46 Дб/�]"
 
-#: rc_option_editor.cc:1925
+#: rc_option_editor.cc:1933
 msgid "fastest [70dB/sec]"
 msgstr "Самое бы�трое [70 Дб/�]"
 
-#: rc_option_editor.cc:1931
-msgid "Meter line-up level"
+#: rc_option_editor.cc:1939
+#, fuzzy
+msgid "Meter line-up level; 0dBu"
 msgstr "Уровень выравнивани�"
 
-#: rc_option_editor.cc:1936
-msgid "-24dB"
-msgstr "-24 Дб"
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
 
-#: rc_option_editor.cc:1937
-msgid "-20dB (SMPTE)"
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+#, fuzzy
+msgid "-20dBFS (SMPTE RP.0155)"
 msgstr "-20 Дб (SMPTE)"
 
-#: rc_option_editor.cc:1938
-msgid "-18dB (EBU)"
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+#, fuzzy
+msgid "-18dBFS (EBU, BBC)"
 msgstr "-18 Дб (EBU)"
 
-#: rc_option_editor.cc:1939
-msgid "-15dB"
-msgstr "-15 Дб"
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
 
-#: rc_option_editor.cc:1941
-msgid "Configure meter-ticks and color-knee point."
+#: rc_option_editor.cc:1955
+#, fuzzy
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr "Уровень выравнивани�"
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
 msgstr ""
 
-#: rc_option_editor.cc:1947
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
+msgstr ""
+
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
+msgstr ""
+
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
+
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
+
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1985
 msgid "Peak threshold [dBFS]"
 msgstr "Порог пика (dbFS)"
 
-#: rc_option_editor.cc:1955
+#: rc_option_editor.cc:1993
 msgid ""
 "Specify the audio signal level in dbFS at and above which the meter-peak "
 "indicator will flash red."
 msgstr ""
 
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
+msgstr ""
+
 #: region_editor.cc:79
 msgid "audition this region"
 msgstr "про�лушать обла�ть"
@@ -9515,11 +9627,11 @@ msgstr "про�лушать обла�ть"
 msgid "Position:"
 msgstr "Позици�:"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr "Конец:"
 
-#: region_editor.cc:92 sfdb_ui.cc:141
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr "Длительно�ть:"
 
@@ -9751,36 +9863,36 @@ msgid ""
 "A route group of this name already exists.  Please use a different name."
 msgstr ""
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 msgid "Tracks/Busses"
 msgstr "Дорожки/Шины"
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr "Входы"
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr "Выходы"
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr "Модули, возвраты и по�ылы"
 
-#: route_params_ui.cc:207
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr ""
 
-#: route_params_ui.cc:254 route_params_ui.cc:282
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr "Задержка во�произведени�: %<PRId64> ��мплов"
 
-#: route_params_ui.cc:474
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr "�ЕТ ДОРОЖЕК"
 
-#: route_params_ui.cc:607 route_params_ui.cc:608
+#: route_params_ui.cc:613 route_params_ui.cc:614
 msgid "No Track or Bus Selected"
 msgstr "�ет выбранных дорожек или шин"
 
@@ -9961,107 +10073,107 @@ msgstr "�"
 msgid "m"
 msgstr "м"
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 msgid "Mute this track"
 msgstr "Приглушить �ту дорожку"
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr "Приглушить другие (не �олирующие) дорожки"
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr "Включить запи�ываемо�ть �той дорожки"
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr ""
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 msgid "Monitor input"
 msgstr "Следить за входом"
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 msgid "Monitor playback"
 msgstr "Следить за во�произведением"
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 msgid "Not connected to JACK - cannot engage record"
 msgstr ""
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 msgid "Step Entry"
 msgstr "Пошаговый ввод"
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr "�азначить в�ем дорожкам (до фейдера)"
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 msgid "Assign all tracks and buses (prefader)"
 msgstr "�азначить в�ем дорожкам и шинам (до фейдера)"
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr "�азначить в�ем дорожкам (по�ле фейдера)"
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 msgid "Assign all tracks and buses (postfader)"
 msgstr "�азначить в�ем дорожкам и шинам (по�ле фейдера)"
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 msgid "Assign selected tracks (prefader)"
 msgstr "�азначить выбранным дорожкам (до фейдера)"
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 msgid "Assign selected tracks and buses (prefader)"
 msgstr "�азначить выбранным дорожкам и шинам (до фейдера)"
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 msgid "Assign selected tracks (postfader)"
 msgstr "�азначить выбранным дорожкам (по�ле фейдера)"
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 msgid "Assign selected tracks and buses (postfader)"
 msgstr "�азначить выбранным дорожкам и шинам (по�ле фейдера)"
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 msgid "Copy track/bus gains to sends"
 msgstr ""
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr ""
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr ""
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 msgid "Solo Isolate"
 msgstr ""
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr "Предфейдер"
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr "По�лефейдер"
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr "Контрольные выходы"
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr "Главные выходы"
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 msgid "Color Selection"
 msgstr "Выбор цвета"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "\n"
@@ -10075,7 +10187,7 @@ msgstr ""
 "\n"
 "Это дей�твие невозможно отменить, файл �еан�а будет перезапи�ан."
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
 "\n"
@@ -10085,15 +10197,15 @@ msgstr ""
 "\n"
 "Это дей�твие невозможно отменить, файл �еан�а будет перезапи�ан."
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 msgid "Remove track"
 msgstr "Удаление дорожки"
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 msgid "Remove bus"
 msgstr "Удаление шины"
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
@@ -10101,47 +10213,47 @@ msgstr ""
 "И�пользование двоеточи� в названи�х дорожек и шин не поощр�ет��.\n"
 "Вы точно хотите о�тавить двоеточие?"
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 msgid "Use the new name"
 msgstr "И�пользовать новое им�"
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 msgid "Re-edit the name"
 msgstr "Повторно изменить название"
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 msgid "Rename Track"
 msgstr "Переименование дорожки"
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 msgid "Rename Bus"
 msgstr "Переименование шины"
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 msgid " latency"
 msgstr " задержка"
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr "�е удало�ь �оздать папку � шаблонами маршрутизации %1"
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 msgid "Save As Template"
 msgstr "Сохранить как шаблон"
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 msgid "Template name:"
 msgstr "�азвание шаблона:"
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 msgid "Remote Control ID"
 msgstr "ID дл� удалённого управлени�"
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 msgid "Remote control ID:"
 msgstr "ID дл� удалённого управлени�:"
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -10153,15 +10265,15 @@ msgstr ""
 "\n"
 "%3 не может получить другой ID."
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 msgid "the master bus"
 msgstr "Ма�тер-шина"
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 msgid "the monitor bus"
 msgstr "Шина мониторинга"
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -10179,15 +10291,15 @@ msgstr ""
 "%4Вы можете на�троить �то в диалоге «Параметры» на вкладке «Взаимодей�твие � "
 "пользователем»%5"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 msgid "the mixer"
 msgstr "микшер"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 msgid "the editor"
 msgstr "the editor"
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
@@ -10195,7 +10307,7 @@ msgstr ""
 "Щелчком левой клавиши мыши инвертирует�� (инвер�и� фазы) \n"
 "канал %1 �той дорожки. По правой клавише вызывает�� меню."
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr " "
 
@@ -10211,7 +10323,7 @@ msgstr "Щёлкните дл� добавлени� нового ра�поло
 msgid "the session folder"
 msgstr "в папке �еан�а"
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 msgid "Send "
 msgstr "По�ыл"
 
@@ -10740,243 +10852,243 @@ msgstr "Показывать в метках имён"
 msgid "Track Name"
 msgstr "�азвание дорожи"
 
-#: sfdb_ui.cc:88 sfdb_ui.cc:108 sfdb_ui.cc:117
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 msgid "as new tracks"
 msgstr "как новые дорожки"
 
-#: sfdb_ui.cc:90 sfdb_ui.cc:110
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 msgid "to selected tracks"
 msgstr "в выделенные дорожки"
 
-#: sfdb_ui.cc:92 sfdb_ui.cc:112
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 msgid "to region list"
 msgstr "в �пи�ок обла�тей"
 
-#: sfdb_ui.cc:94 sfdb_ui.cc:114
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 msgid "as new tape tracks"
 msgstr "как новые плёночные дорожки"
 
-#: sfdb_ui.cc:98
+#: sfdb_ui.cc:96
 msgid "programming error: unknown import mode string %1"
 msgstr "Ошибка в программе: неизве�тна� �трока режима импорта %1"
 
-#: sfdb_ui.cc:125
+#: sfdb_ui.cc:123
 msgid "Auto-play"
 msgstr "�втово�пр."
 
-#: sfdb_ui.cc:131 sfdb_ui.cc:238
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 msgid "<b>Sound File Information</b>"
 msgstr "<b>Информаци� о файле</b>"
 
-#: sfdb_ui.cc:143
+#: sfdb_ui.cc:141
 msgid "Timestamp:"
 msgstr "Отметка времени:"
 
-#: sfdb_ui.cc:145
+#: sfdb_ui.cc:143
 msgid "Format:"
 msgstr "Формат:"
 
-#: sfdb_ui.cc:184 sfdb_ui.cc:529
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr "Метки:"
 
-#: sfdb_ui.cc:321
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr "Про�лушивание файлов MIDI пока что не реализовано"
 
-#: sfdb_ui.cc:328
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "�е удало�ь прочитать файл: %1 (%2)"
 
-#: sfdb_ui.cc:350
+#: sfdb_ui.cc:349
 msgid "Could not access soundfile: "
 msgstr "Файл недо�тупен: "
 
-#: sfdb_ui.cc:404
+#: sfdb_ui.cc:403
 msgid "SoundFileBox: Could not tokenize string: "
 msgstr ""
 
-#: sfdb_ui.cc:424 sfdb_ui.cc:426
+#: sfdb_ui.cc:423 sfdb_ui.cc:425
 msgid "Search"
 msgstr "И�кать"
 
-#: sfdb_ui.cc:450
+#: sfdb_ui.cc:449
 msgid "Audio and MIDI files"
 msgstr "Звуковые и MIDI-файлы"
 
-#: sfdb_ui.cc:453
+#: sfdb_ui.cc:452
 msgid "Audio files"
 msgstr "Звуковые файлы"
 
-#: sfdb_ui.cc:456
+#: sfdb_ui.cc:455
 msgid "MIDI files"
 msgstr "Файлы MIDI"
 
-#: sfdb_ui.cc:459 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 msgid "All files"
 msgstr "В�е файлы"
 
-#: sfdb_ui.cc:478 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 msgid "Browse Files"
 msgstr "Обзор файлов"
 
-#: sfdb_ui.cc:507
+#: sfdb_ui.cc:506
 msgid "Paths"
 msgstr "Ра�положени�"
 
-#: sfdb_ui.cc:516
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr "Пои�к по меткам"
 
-#: sfdb_ui.cc:534
+#: sfdb_ui.cc:531
 msgid "Sort:"
 msgstr "Критерий �ортировки:"
 
-#: sfdb_ui.cc:542
+#: sfdb_ui.cc:539
 msgid "Longest"
 msgstr "Более длинные"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:540
 msgid "Shortest"
 msgstr "Более короткие"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:541
 msgid "Newest"
 msgstr "Более новые"
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr "Более �тарые"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr "Чаще �качиваемые"
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:544
 msgid "Least downloaded"
 msgstr "Реже �качиваемые"
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr "Выше оценённые"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr "�иже оценённые"
 
-#: sfdb_ui.cc:554
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr ""
 
-#: sfdb_ui.cc:558
+#: sfdb_ui.cc:555
 msgid "Similar"
 msgstr ""
 
-#: sfdb_ui.cc:570
+#: sfdb_ui.cc:567
 msgid "ID"
 msgstr "ID"
 
-#: sfdb_ui.cc:571 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 msgid "Filename"
 msgstr "Им� файла"
 
-#: sfdb_ui.cc:573
+#: sfdb_ui.cc:570
 msgid "Duration"
 msgstr "Длительно�ть"
 
-#: sfdb_ui.cc:574
+#: sfdb_ui.cc:571
 msgid "Size"
 msgstr "Размер"
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:572
 msgid "Samplerate"
 msgstr "Ча�тота ��мплировани�"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr "Лицензи�"
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr "Пои�к по Freesound"
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr "�ажмите, чтобы импортировать выбранные файлы и закрыть �то окно"
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr ""
 "�ажмите, чтобы импортировать выбранные файлы и о�тавить �то окно открытым"
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr "�ажмите, чтобы закрыть �то окно, ничего не импортиру�"
 
-#: sfdb_ui.cc:813
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr ""
 
-#: sfdb_ui.cc:1013
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] "Ещё %1 �траница из 100 до�тупных"
 msgstr[1] "Ещё %1 �траницы из 100 до�тупных"
 msgstr[2] "Ещё %1 �траниц из 100 до�тупных"
 
-#: sfdb_ui.cc:1018
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr "Больше результатов нет"
 
-#: sfdb_ui.cc:1082
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr "Б"
 
-#: sfdb_ui.cc:1084
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr "КБ"
 
-#: sfdb_ui.cc:1086 sfdb_ui.cc:1088
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr "МБ"
 
-#: sfdb_ui.cc:1090
+#: sfdb_ui.cc:1086
 msgid "GB"
 msgstr "ГБ"
 
-#: sfdb_ui.cc:1304 sfdb_ui.cc:1612 sfdb_ui.cc:1662 sfdb_ui.cc:1680
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr "Одна дорожка на файл"
 
-#: sfdb_ui.cc:1307 sfdb_ui.cc:1663 sfdb_ui.cc:1681
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 msgid "one track per channel"
 msgstr "Одна дорожка на канал"
 
-#: sfdb_ui.cc:1315 sfdb_ui.cc:1665 sfdb_ui.cc:1682
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 msgid "sequence files"
 msgstr ""
 
-#: sfdb_ui.cc:1318 sfdb_ui.cc:1670
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 msgid "all files in one track"
 msgstr "В�е файлы в одну дорожку"
 
-#: sfdb_ui.cc:1319 sfdb_ui.cc:1664
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 msgid "merge files"
 msgstr "Объединить файлы"
 
-#: sfdb_ui.cc:1325 sfdb_ui.cc:1667
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 msgid "one region per file"
 msgstr "Одна обла�ть на файл"
 
-#: sfdb_ui.cc:1328 sfdb_ui.cc:1668
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 msgid "one region per channel"
 msgstr "Одна обла�ть на канал"
 
-#: sfdb_ui.cc:1333 sfdb_ui.cc:1669 sfdb_ui.cc:1683
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 msgid "all files in one region"
 msgstr "В�е файлы в одной обла�ти"
 
-#: sfdb_ui.cc:1400
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
@@ -10984,55 +11096,55 @@ msgstr ""
 "Один или более выбранных файлов\n"
 "не могут быть и�пользованы в %1"
 
-#: sfdb_ui.cc:1540
+#: sfdb_ui.cc:1534
 msgid "Copy files to session"
 msgstr "Скопировать файлы в �еан�"
 
-#: sfdb_ui.cc:1557 sfdb_ui.cc:1720
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 msgid "file timestamp"
 msgstr "По отметке времени файла"
 
-#: sfdb_ui.cc:1558 sfdb_ui.cc:1722
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 msgid "edit point"
 msgstr "По кур�ору редактора"
 
-#: sfdb_ui.cc:1559 sfdb_ui.cc:1724
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 msgid "playhead"
 msgstr "По указателю во�пр."
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1554
 msgid "session start"
 msgstr "В начало �еан�а"
 
-#: sfdb_ui.cc:1565
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr "<b>Добавить файлы как...</b>"
 
-#: sfdb_ui.cc:1587
+#: sfdb_ui.cc:1581
 msgid "<b>Insert at</b>"
 msgstr "<b>Куда в�тавить</b>"
 
-#: sfdb_ui.cc:1600
+#: sfdb_ui.cc:1594
 msgid "<b>Mapping</b>"
 msgstr "<b>Спо�об в�тавки</b>"
 
-#: sfdb_ui.cc:1618
+#: sfdb_ui.cc:1612
 msgid "<b>Conversion quality</b>"
 msgstr "<b>Каче�тво преобразовани�:</b>"
 
-#: sfdb_ui.cc:1630 sfdb_ui.cc:1736
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr "�аилучшее"
 
-#: sfdb_ui.cc:1631 sfdb_ui.cc:1738
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr "Хорошее"
 
-#: sfdb_ui.cc:1632 sfdb_ui.cc:1740
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr "Бы�трое"
 
-#: sfdb_ui.cc:1634
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "Бы�трее в�его"
 
@@ -11119,22 +11231,23 @@ msgid "I'd like more options for this session"
 msgstr "Указать дополнительные параметры дл� �того �еан�а"
 
 #: startup.cc:194
+#, fuzzy
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -11310,83 +11423,83 @@ msgstr "�азвание �еан�а:"
 msgid "Create session folder in:"
 msgstr "Создать папку �еан�а в:"
 
-#: startup.cc:813
+#: startup.cc:821
 msgid "Select folder for session"
 msgstr "Выберите папку дл� �еан�а"
 
-#: startup.cc:845
+#: startup.cc:853
 msgid "Use this template"
 msgstr "И�пользовать �тот шаблон"
 
-#: startup.cc:848
+#: startup.cc:856
 msgid "no template"
 msgstr "Без шаблона"
 
-#: startup.cc:876
+#: startup.cc:884
 msgid "Use an existing session as a template:"
 msgstr "И�пользовать �уще�твующий �еан� как шаблон:"
 
-#: startup.cc:888
+#: startup.cc:896
 msgid "Select template"
 msgstr "Выберите шаблон"
 
-#: startup.cc:914
+#: startup.cc:922
 msgid "New Session"
 msgstr "Создать �еан�"
 
-#: startup.cc:1068
+#: startup.cc:1077
 msgid "Select session file"
 msgstr "Выберите файл �еан�а"
 
-#: startup.cc:1084
+#: startup.cc:1093
 msgid "Browse:"
 msgstr "Обзор:"
 
-#: startup.cc:1093
+#: startup.cc:1102
 msgid "Select a session"
 msgstr "Выберите �еан�"
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 msgid "channels"
 msgstr "канал(-ов)"
 
-#: startup.cc:1135
+#: startup.cc:1145
 msgid "<b>Busses</b>"
 msgstr "<b>Шины</b>"
 
-#: startup.cc:1136
+#: startup.cc:1146
 msgid "<b>Inputs</b>"
 msgstr "<b>Входы</b>"
 
-#: startup.cc:1137
+#: startup.cc:1147
 msgid "<b>Outputs</b>"
 msgstr "<b>Выходы</b>"
 
-#: startup.cc:1145
+#: startup.cc:1155
 msgid "Create master bus"
 msgstr "Создать ма�тер-шину"
 
-#: startup.cc:1155
+#: startup.cc:1165
 msgid "Automatically connect to physical inputs"
 msgstr "�втоматиче�ки подключить к физиче�ким входам"
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr "И�пользовать только"
 
-#: startup.cc:1215
+#: startup.cc:1225
 msgid "Automatically connect outputs"
 msgstr "�втоматиче�ки подключить выходы"
 
-#: startup.cc:1237
+#: startup.cc:1247
 msgid "... to master bus"
 msgstr "... к ма�тер-шине"
 
-#: startup.cc:1247
+#: startup.cc:1257
 msgid "... to physical outputs"
 msgstr "... к физиче�ким выходам"
 
-#: startup.cc:1297
+#: startup.cc:1307
 msgid "Advanced Session Options"
 msgstr "Дополнительные параметры �еан�а"
 
@@ -12059,19 +12172,19 @@ msgstr "Config file %1 not saved"
 msgid "bad XPM header %1"
 msgstr "bad XPM header %1"
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr "missing RGBA style for \"%1\""
 
-#: utils.cc:544
+#: utils.cc:591
 msgid "cannot find XPM file for %1"
 msgstr "cannot find XPM file for %1"
 
-#: utils.cc:570
+#: utils.cc:617
 msgid "cannot find icon image for %1 using %2"
 msgstr "cannot find icon image for %1 using %2"
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr ""
 
@@ -12079,47 +12192,47 @@ msgstr ""
 msgid "VerboseCanvasCursor"
 msgstr "VerboseCanvasCursor"
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 msgid "Set Video Track"
 msgstr "У�тановка видеодорожки"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 msgid "Launch External Video Monitor"
 msgstr "Запу�тить внешний видеомонитор"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr "Подогнать ча�тоту кадров �еан�а к ча�тоте кадров видео"
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr ""
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 msgid "Video files"
 msgstr "Видеофайлы"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 msgid "<b>Video Information</b>"
 msgstr "<b>Информаци� о видеофайле</b>"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 msgid "Start:"
 msgstr "�ачало:"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 msgid "Frame rate:"
 msgstr "Ча�тота кадров::"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr "Соотношение �торон:"
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr " %1 к/�"
 
@@ -12127,37 +12240,32 @@ msgstr " %1 к/�"
 msgid "Export Successful: %1"
 msgstr "Эк�порт у�пешно завершён: %1"
 
-#: video_timeline.cc:468
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:505
-msgid "Failed to set session-framerate: "
-msgstr ""
-
-#: video_timeline.cc:505
-msgid " does not have a corresponding option setting in Ardour."
-msgstr ""
-
-#: video_timeline.cc:511
+#: video_timeline.cc:507
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:512
-msgid " vs "
+#: video_timeline.cc:515
+msgid ""
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:583
+#: video_timeline.cc:588
 msgid ""
-"Video-server docroot mismatch. Ardour: '%1', video-server: '%2'. This "
-"usually means that the video server was not started by ardour and uses a "
-"different document-root."
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:732
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12169,13 +12277,13 @@ msgstr ""
 msgid "Video Monitor: File Not Found."
 msgstr "Видеомонитор: файл не найден"
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -12185,353 +12293,350 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 msgid "Transcode/Import Video File "
 msgstr "Импортировать/перекодировать видеофайл"
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 msgid "Output File:"
 msgstr "Файл вывода:"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr "Прервать"
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 msgid "Height = "
 msgstr "Вы�ота = "
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+#, fuzzy
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr "Режим отладки: вывод команд ffmpeg в stdout"
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 msgid "<b>File Information</b>"
 msgstr "<b>Информаци� о файле</b>"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr "К/�:"
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 msgid "Duration:"
 msgstr "Длительно�ть:"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr "Кодек:"
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr "Геометри�:"
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 msgid "??"
 msgstr ""
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 msgid "<b>Import Settings</b>"
 msgstr "<b>Параметры импорта</b>"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr "�е импортировать видео"
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr "И�пользовать и�ходный видеофайл"
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 msgid "Import/Transcode Video to Session"
 msgstr "Импортировать/перекодировать видео в �еан�"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr "Ма�штаб видео: Ширина = "
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 msgid "Original Width"
 msgstr "И�ходна� ширина"
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr "Скоро�ть потока (Кбит/�):"
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 msgid "Extract Audio:"
 msgstr "Извлечь звук:"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 msgid "Extracting Audio.."
 msgstr "Извлекает�� звук..."
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr "�е удало�ь извлечь звуковую дорожку."
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr "Перекодирование видео..."
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 msgid "Transcoding Failed."
 msgstr "�е удало�ь выполнить перекодирование."
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 msgid "Save Transcoded Video File"
 msgstr "Сохранить перекодированный видеофайл"
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr "Запу�тить видео�ервер"
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr "И�полн�емый файл �ервера:"
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 msgid "Server Docroot:"
 msgstr ""
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr "Больше не показывать �тот диалог"
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr "Слушать адре�:"
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 msgid "Listen Port:"
 msgstr "Слушать порт:"
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 msgid "Cache Size:"
 msgstr "Размер к�ша:"
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr ""
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr "Дальше"
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 msgid "Confirm Overwrite"
 msgstr "Подтвердите перезапи�ь"
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr "Снимок � таким названием уже е�ть. Перезапи�ать его?"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr "�е удало�ь �оздать папку дл� видео: \"%1\" (%2)"
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 msgid "Export Video File "
 msgstr "Эк�портировать видеофайл"
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 msgid "Video:"
 msgstr "Видео:"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr "Ма�штабирование видео (В×Ш):"
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr "Указать �оотношение �торон:"
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 msgid "Normalize Audio"
 msgstr "�ормировать звук"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr "Кодирование в два прохода"
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr "Оптимизаци� кодека:"
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 msgid "Deinterlace"
 msgstr ""
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr "И�пользовать [2] B-кадры (только MPEG 2 или 4)"
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr "Принудительно указать �вою ча�тоту кадров:"
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 msgid "Include Session Metadata"
 msgstr "Включить метаданные �еан�а"
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr "Включить режим отладки: направл�ть вывод ffmpeg в stdout"
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 msgid "<b>Output:</b>"
 msgstr "<b>Выход:</b>"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 msgid "<b>Input:</b>"
 msgstr "<b>Вход:</b>"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 msgid "Audio:"
 msgstr "Звук:"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 msgid "Master Bus"
 msgstr "Ма�тер-шина"
 
-#: export_video_dialog.cc:144
+#: export_video_dialog.cc:145
 msgid "from the %1 session's start to the session's end"
 msgstr "от начала до конца �еан�а %1"
 
-#: export_video_dialog.cc:148
+#: export_video_dialog.cc:149
 msgid "from 00:00:00:00 to the video's end"
 msgstr "от 00:00:00:00 до конца видео"
 
-#: export_video_dialog.cc:150
+#: export_video_dialog.cc:151
 msgid "from the video's start to the video's end"
 msgstr "от начала до конца видео"
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:184
 msgid "<b>Settings:</b>"
 msgstr "<b>Параметры:</b>"
 
-#: export_video_dialog.cc:191
+#: export_video_dialog.cc:192
 msgid "Range:"
 msgstr "Диапазон:"
 
-#: export_video_dialog.cc:194
+#: export_video_dialog.cc:195
 msgid "Preset:"
 msgstr "Профиль:"
 
-#: export_video_dialog.cc:197
+#: export_video_dialog.cc:198
 msgid "Video Codec:"
 msgstr "Видеокодек:"
 
-#: export_video_dialog.cc:200
+#: export_video_dialog.cc:201
 msgid "Video KBit/s:"
 msgstr "Скоро�ть видеопотока (Кбит/�):"
 
-#: export_video_dialog.cc:203
+#: export_video_dialog.cc:204
 msgid "Audio Codec:"
 msgstr "Звуковой кодек:"
 
-#: export_video_dialog.cc:206
+#: export_video_dialog.cc:207
 msgid "Audio KBit/s:"
 msgstr "Скоро�ть звукового потока (Кбит/�):"
 
-#: export_video_dialog.cc:209
+#: export_video_dialog.cc:210
 msgid "Audio Samplerate:"
 msgstr "Ча�тота ��мплировани� звука:"
 
-#: export_video_dialog.cc:386
+#: export_video_dialog.cc:387
 msgid "Normalizing audio"
 msgstr "Выполн�ет�� нормировка звука"
 
-#: export_video_dialog.cc:390
+#: export_video_dialog.cc:391
 msgid "Exporting audio"
 msgstr "Эк�порт звука"
 
-#: export_video_dialog.cc:436
+#: export_video_dialog.cc:437
 msgid "Exporting Audio..."
 msgstr "Эк�портирует�� звук..."
 
-#: export_video_dialog.cc:493
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:522
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:561
+#: export_video_dialog.cc:562
 msgid "Encoding Video..."
 msgstr "Кодирует�� видео..."
 
-#: export_video_dialog.cc:580
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:678
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr "Выполн�ет�� кодирование видео. Проход 1/2."
 
-#: export_video_dialog.cc:690
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr "Выполн�ет�� кодирование видео. Проход 2/2."
 
-#: export_video_dialog.cc:778
+#: export_video_dialog.cc:779
 msgid "Transcoding failed."
 msgstr "�е удало�ь выполнить перекодировку."
 
-#: export_video_dialog.cc:947 export_video_dialog.cc:967
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 msgid "Save Exported Video File"
 msgstr "Сохранить �к�портированный видеофайл"
 
@@ -12556,6 +12661,24 @@ msgid ""
 "Open Manual in Browser? "
 msgstr ""
 
+#~ msgid "Change all in Group to RMS + Peak"
+#~ msgstr "Помен�ть в�е в группе на �реднеквадратичное + пиковое"
+
+#~ msgid "Change all to RMS + Peak"
+#~ msgstr "Помен�ть в�е на �реднеквадратичное + пиковое"
+
+#~ msgid "Change same track-type to RMS + Peak"
+#~ msgstr "Помен�ть дорожки одного типа на �реднеквадратичное + пиковое"
+
+#~ msgid "-24dB"
+#~ msgstr "-24 Дб"
+
+#~ msgid "-15dB"
+#~ msgstr "-15 Дб"
+
+#~ msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
+#~ msgstr "Включить режим отладки: направл�ть вывод ffmpeg в stdout"
+
 #~ msgid "-Inf"
 #~ msgstr "-Inf"
 
diff --git a/gtk2_ardour/po/sv.po b/gtk2_ardour/po/sv.po
index baca2feee0..03f7db506f 100644
--- a/gtk2_ardour/po/sv.po
+++ b/gtk2_ardour/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ardour-gtk 1.0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2006-06-26 23:57+GMT+1\n"
 "Last-Translator: Petter Sundlöf <petter.sundlof@findus.dhs.org>\n"
 "Language-Team: Svenska <sv@li.org>\n"
@@ -371,7 +371,7 @@ msgstr ""
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr ""
 
-#: add_route_dialog.cc:53 route_params_ui.cc:503
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 msgid "Add Track or Bus"
 msgstr "Lägg till spår eller buss"
 
@@ -410,8 +410,8 @@ msgstr "buss(ar)"
 msgid "Add:"
 msgstr "Lägg till"
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 msgid "<b>Options</b>"
 msgstr "<b>Alternativ</b>"
 
@@ -425,21 +425,21 @@ msgid "Group:"
 msgstr "Grupp:"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 msgid "Audio"
 msgstr "Ljudspår"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr ""
 
@@ -463,7 +463,7 @@ msgid ""
 msgstr ""
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1301
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr ""
 
@@ -507,7 +507,7 @@ msgstr "8 kanaler"
 msgid "12 Channel"
 msgstr "12 kanaler"
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2136
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr "Manuellt"
 
@@ -593,7 +593,7 @@ msgid "Track"
 msgstr "Spår"
 
 #: analysis_window.cc:68 editor_actions.cc:616 mixer_ui.cc:125
-#: mixer_ui.cc:1793
+#: mixer_ui.cc:1795
 msgid "Show"
 msgstr "Visa"
 
@@ -601,100 +601,95 @@ msgstr "Visa"
 msgid "Re-analyze data"
 msgstr "Ã…teranalysera data"
 
-#: ardour_button.cc:658
+#: ardour_button.cc:704
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr ""
 
-#: ardour_ui.cc:179
+#: ardour_ui.cc:180
 #, fuzzy
 msgid "audition"
 msgstr "Avlyssna"
 
-#: ardour_ui.cc:180
+#: ardour_ui.cc:181
 #, fuzzy
 msgid "solo"
 msgstr "Sololäge"
 
-#: ardour_ui.cc:181
+#: ardour_ui.cc:182
 #, fuzzy
 msgid "feedback"
 msgstr "Gensvar"
 
-#: ardour_ui.cc:183 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 #, fuzzy
 msgid "Speaker Configuration"
 msgstr "Kanalkonfiguration"
 
-#: ardour_ui.cc:184 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 msgid "Theme Manager"
 msgstr "Färgtema"
 
-#: ardour_ui.cc:185 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr "Kortkommandon"
 
-#: ardour_ui.cc:186
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ardour_ui.cc:187 ardour_ui.cc:192
+#: ardour_ui.cc:191 ardour_ui.cc:196
 #, fuzzy
 msgid "Add Tracks/Busses"
 msgstr "Spår/Bussar"
 
-#: ardour_ui.cc:188
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "Om"
 
-#: ardour_ui.cc:189 location_ui.cc:1134
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "Platser"
 
-#: ardour_ui.cc:190 route_params_ui.cc:57 route_params_ui.cc:604
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 msgid "Tracks and Busses"
 msgstr "Spår och bussar"
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr "Egenskaper"
 
-#: ardour_ui.cc:193 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr "Buntar"
 
-#: ardour_ui.cc:194 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "Stor klocka"
 
-#: ardour_ui.cc:195
+#: ardour_ui.cc:199
 #, fuzzy
 msgid "Audio Connections"
 msgstr "Anslutningar"
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:200
 #, fuzzy
 msgid "MIDI Connections"
 msgstr "Anslutningar"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr ""
 
-#: ardour_ui.cc:299
-#, fuzzy
-msgid "could not initialize %1."
-msgstr "kunde inte initialisera Ardour."
-
-#: ardour_ui.cc:394
+#: ardour_ui.cc:388
 msgid "Starting audio engine"
 msgstr "Startar ljudsystemet"
 
-#: ardour_ui.cc:763 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 #, fuzzy
 msgid "%1 is ready for use"
 msgstr "Ardour är redo att användas"
 
-#: ardour_ui.cc:811
+#: ardour_ui.cc:806
 msgid ""
 "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"
@@ -703,26 +698,26 @@ msgid ""
 "controlled by %2"
 msgstr ""
 
-#: ardour_ui.cc:828
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr ""
 
-#: ardour_ui.cc:870
+#: ardour_ui.cc:865
 #, fuzzy
 msgid "Don't quit"
 msgstr "Stäng inte"
 
-#: ardour_ui.cc:871
+#: ardour_ui.cc:866
 #, fuzzy
 msgid "Just quit"
 msgstr "Stäng utan att spara"
 
-#: ardour_ui.cc:872
+#: ardour_ui.cc:867
 #, fuzzy
 msgid "Save and quit"
 msgstr "Spara och stäng"
 
-#: ardour_ui.cc:882
+#: ardour_ui.cc:877
 #, fuzzy
 msgid ""
 "%1 was unable to save your session.\n"
@@ -737,17 +732,17 @@ msgstr ""
 "\n"
 "\"Avsluta bara\"-alternativet."
 
-#: ardour_ui.cc:913
+#: ardour_ui.cc:908
 #, fuzzy
 msgid "Please wait while %1 cleans up..."
 msgstr "Vänta medan Ardour laddar visuell data..."
 
-#: ardour_ui.cc:930
+#: ardour_ui.cc:925
 #, fuzzy
 msgid "Unsaved Session"
 msgstr "Ny session"
 
-#: ardour_ui.cc:951
+#: ardour_ui.cc:946
 #, fuzzy
 msgid ""
 "The session \"%1\"\n"
@@ -767,7 +762,7 @@ msgstr ""
 "\n"
 "Vad vill du göra?"
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:949
 #, fuzzy
 msgid ""
 "The snapshot \"%1\"\n"
@@ -787,75 +782,75 @@ msgstr ""
 "\n"
 "Vad vill du göra?"
 
-#: ardour_ui.cc:968
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr "Fråga"
 
-#: ardour_ui.cc:1045
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "frånkopplad"
 
-#: ardour_ui.cc:1052
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1056
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1074 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 #, fuzzy
 msgid "File:"
 msgstr "Filer"
 
-#: ardour_ui.cc:1078
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr ""
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1085
 msgid "WAV"
 msgstr ""
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr ""
 
-#: ardour_ui.cc:1087 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr ""
 
-#: ardour_ui.cc:1090
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr ""
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr ""
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr ""
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr ""
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr ""
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr ""
 
-#: ardour_ui.cc:1129
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1148
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -863,61 +858,61 @@ msgid ""
 "\">%<PRIu32>%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1184
+#: ardour_ui.cc:1188
 #, fuzzy
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr "Utrymme: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1186
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr ""
 
-#: ardour_ui.cc:1204
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr ""
 
-#: ardour_ui.cc:1215
+#: ardour_ui.cc:1219
 #, fuzzy, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr "Utrymme: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1241
+#: ardour_ui.cc:1245
 #, fuzzy, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr "Utrymme: %02dh:%02dm:%02ds"
 
-#: ardour_ui.cc:1358 ardour_ui.cc:1367 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr "Tidigare Sessioner"
 
-#: ardour_ui.cc:1447
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
 msgstr ""
 
-#: ardour_ui.cc:1474
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr "Öppna session"
 
-#: ardour_ui.cc:1492 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 #, fuzzy
 msgid "%1 sessions"
 msgstr "Sessionen"
 
-#: ardour_ui.cc:1529
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr "Du kan inte lägga till ett spår utan en session laddad."
 
-#: ardour_ui.cc:1537
+#: ardour_ui.cc:1548
 #, fuzzy
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] "kunde inte skapa nytt ljudspår"
 msgstr[1] "kunde inte skapa nytt ljudspår"
 
-#: ardour_ui.cc:1543 ardour_ui.cc:1604
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 #, fuzzy
 msgid ""
 "There are insufficient JACK ports available\n"
@@ -930,26 +925,26 @@ msgstr ""
 "Du bör spara, avsluta och\n"
 "starta om JACK med fler portar."
 
-#: ardour_ui.cc:1578
+#: ardour_ui.cc:1589
 #, fuzzy
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr "Du kan inte lägga till ett spår utan en session laddad."
 
-#: ardour_ui.cc:1587
+#: ardour_ui.cc:1598
 #, fuzzy
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] "kunde inte skapa nytt ljudspår"
 msgstr[1] "kunde inte skapa nytt ljudspår"
 
-#: ardour_ui.cc:1596
+#: ardour_ui.cc:1607
 #, fuzzy
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] "kunde inte skapa nytt ljudspår"
 msgstr[1] "kunde inte skapa nytt ljudspår"
 
-#: ardour_ui.cc:1713
+#: ardour_ui.cc:1724
 #, fuzzy
 msgid ""
 "Please create one or more tracks before trying to record.\n"
@@ -959,14 +954,14 @@ msgstr ""
 "innan du försöker spela in.\n"
 "Se Session-menyn."
 
-#: ardour_ui.cc:2103
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
 "%1"
 msgstr ""
 
-#: ardour_ui.cc:2105
+#: ardour_ui.cc:2116
 #, fuzzy
 msgid ""
 "JACK has either been shutdown or it\n"
@@ -979,79 +974,79 @@ msgstr ""
 "Ardour inte var snabb nog. Du kan spara\n"
 "och/eller försöka återansluta till JACK ."
 
-#: ardour_ui.cc:2131
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "Kan ej starta sessionen"
 
-#: ardour_ui.cc:2211
+#: ardour_ui.cc:2222
 msgid "Take Snapshot"
 msgstr "Gör ögonblickskopia"
 
-#: ardour_ui.cc:2212
+#: ardour_ui.cc:2223
 msgid "Name of new snapshot"
 msgstr "Namnge ny ögonblickskopia"
 
-#: ardour_ui.cc:2236
+#: ardour_ui.cc:2247
 msgid ""
 "To ensure compatibility with various systems\n"
 "snapshot names may not contain a '%1' character"
 msgstr ""
 
-#: ardour_ui.cc:2248
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr ""
 
-#: ardour_ui.cc:2249
+#: ardour_ui.cc:2260
 #, fuzzy
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr "Filen existerar redan, vill du skriva över den?"
 
-#: ardour_ui.cc:2252 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 msgid "Overwrite"
 msgstr ""
 
-#: ardour_ui.cc:2286
+#: ardour_ui.cc:2297
 #, fuzzy
 msgid "Rename Session"
 msgstr "Byt namn på region"
 
-#: ardour_ui.cc:2287
+#: ardour_ui.cc:2298
 #, fuzzy
 msgid "New session name"
 msgstr "Sessionens namn:"
 
-#: ardour_ui.cc:2301 ardour_ui.cc:2681 ardour_ui.cc:2726
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 msgid ""
 "To ensure compatibility with various systems\n"
 "session names may not contain a '%1' character"
 msgstr ""
 
-#: ardour_ui.cc:2309
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr ""
 
-#: ardour_ui.cc:2318
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
 msgstr ""
 
-#: ardour_ui.cc:2429
+#: ardour_ui.cc:2440
 #, fuzzy
 msgid "Save Template"
 msgstr "Spara mall..."
 
-#: ardour_ui.cc:2430
+#: ardour_ui.cc:2441
 #, fuzzy
 msgid "Name for template:"
 msgstr "Namn för mixmall: "
 
-#: ardour_ui.cc:2431
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-mall"
 
-#: ardour_ui.cc:2469
+#: ardour_ui.cc:2480
 #, fuzzy
 msgid ""
 "This session\n"
@@ -1059,59 +1054,59 @@ msgid ""
 "already exists. Do you want to open it?"
 msgstr "Filen existerar redan, vill du skriva över den?"
 
-#: ardour_ui.cc:2479
+#: ardour_ui.cc:2490
 #, fuzzy
 msgid "Open Existing Session"
 msgstr "Öppna en existerande session"
 
-#: ardour_ui.cc:2717
+#: ardour_ui.cc:2728
 #, fuzzy
 msgid "There is no existing session at \"%1\""
 msgstr "Öppna en existerande session"
 
-#: ardour_ui.cc:2804
+#: ardour_ui.cc:2815
 #, fuzzy
 msgid "Please wait while %1 loads your session"
 msgstr "Vänta medan Ardour laddar din session"
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr ""
 
-#: ardour_ui.cc:2820
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr ""
 
-#: ardour_ui.cc:2841
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "Session \"%1 (ögonblickskopia %2)\" kunde inte laddas"
 
-#: ardour_ui.cc:2847
+#: ardour_ui.cc:2858
 #, fuzzy
 msgid "Loading Error"
 msgstr "programmeringsfel: "
 
-#: ardour_ui.cc:2848
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr ""
 
-#: ardour_ui.cc:2930
+#: ardour_ui.cc:2941
 #, fuzzy
 msgid "Could not create session in \"%1\""
 msgstr "kunde inte ladda kommandopromptssessionen \"%1\""
 
-#: ardour_ui.cc:3030
+#: ardour_ui.cc:3041
 #, fuzzy
 msgid "No files were ready for clean-up"
 msgstr "Inga ljudfiler var redo för rensning"
 
-#: ardour_ui.cc:3034 ardour_ui.cc:3044 ardour_ui.cc:3177 ardour_ui.cc:3184
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 #, fuzzy
 msgid "Clean-up"
 msgstr "Upprensning"
 
-#: ardour_ui.cc:3035
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1122,19 +1117,19 @@ msgstr ""
 "ögonblickskopior. Dessa kan använda regioner som\n"
 "använder oanvända filer för att kunna fungera."
 
-#: ardour_ui.cc:3094
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr ""
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr ""
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr ""
 
-#: ardour_ui.cc:3105
+#: ardour_ui.cc:3116
 #, fuzzy
 msgid ""
 "The following file was deleted from %2,\n"
@@ -1151,7 +1146,7 @@ msgstr[1] ""
 "%3,\n"
 "vilket frigjorde %4 %5byte diskutrymme"
 
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3123
 #, fuzzy
 msgid ""
 "The following file was not in use and \n"
@@ -1188,12 +1183,12 @@ msgstr[1] ""
 "frigöra ytterligarel\n"
 "%4 %5byte diskutrymme.\n"
 
-#: ardour_ui.cc:3172
+#: ardour_ui.cc:3183
 #, fuzzy
 msgid "Are you sure you want to clean-up?"
 msgstr "Är du säker på att du vill rensa upp?"
 
-#: ardour_ui.cc:3179
+#: ardour_ui.cc:3190
 #, fuzzy
 msgid ""
 "Clean-up is a destructive operation.\n"
@@ -1204,83 +1199,83 @@ msgstr ""
 "ALL ångra-/gör om-information kommer att gå förlorad om du rensar.\n"
 "Oanvända filer kommer att flyttas till \"dead_sounds\" i sessionens mapp."
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr "Rensadialog"
 
-#: ardour_ui.cc:3217
+#: ardour_ui.cc:3228
 #, fuzzy
 msgid "Cleaned Files"
 msgstr "rensade filer"
 
-#: ardour_ui.cc:3234
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr "raderad fil"
 
-#: ardour_ui.cc:3326
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 
-#: ardour_ui.cc:3330
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr ""
 
-#: ardour_ui.cc:3331
+#: ardour_ui.cc:3342
 msgid "Do you really want to stop the Video Server?"
 msgstr ""
 
-#: ardour_ui.cc:3334
+#: ardour_ui.cc:3345
 #, fuzzy
 msgid "Yes, Stop It"
 msgstr "Ja, radera den."
 
-#: ardour_ui.cc:3360
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr ""
 
-#: ardour_ui.cc:3362
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
 msgstr ""
 
-#: ardour_ui.cc:3370 ardour_ui.cc:3455
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
 
-#: ardour_ui.cc:3394
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr ""
 
-#: ardour_ui.cc:3399
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr ""
 
-#: ardour_ui.cc:3432
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr ""
 
-#: ardour_ui.cc:3441
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3477 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "kunde inte öppna %1"
 
-#: ardour_ui.cc:3481
+#: ardour_ui.cc:3501
 #, fuzzy
 msgid "no video-file selected"
 msgstr "Ingen rutt vald"
 
-#: ardour_ui.cc:3641
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr "Inspelningen stoppades eftersom ditt system inte kunde hänga med."
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3702
 #, fuzzy
 msgid ""
 "The disk system on your computer\n"
@@ -1295,7 +1290,7 @@ msgstr ""
 "Närmare bestämt, det kunde inte skriva data till disk\n"
 "snabbt nog för att matcha inspelningen.\n"
 
-#: ardour_ui.cc:3689
+#: ardour_ui.cc:3721
 #, fuzzy
 msgid ""
 "The disk system on your computer\n"
@@ -1310,11 +1305,11 @@ msgstr ""
 "Närmare bestämt, det kunde inte läsa data från disk\n"
 "snabbt nog för att matcha uppspelningen.\n"
 
-#: ardour_ui.cc:3729
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr ""
 
-#: ardour_ui.cc:3730
+#: ardour_ui.cc:3762
 #, fuzzy
 msgid ""
 "This session appears to have been in the\n"
@@ -1333,45 +1328,45 @@ msgstr ""
 "dig, eller ignorera dem. Markera\n"
 "vad du vill göra.\n"
 
-#: ardour_ui.cc:3742
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr "Ignorera kraschdata"
 
-#: ardour_ui.cc:3743
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr "Återhämta från krasch"
 
-#: ardour_ui.cc:3763
+#: ardour_ui.cc:3795
 #, fuzzy
 msgid "Sample Rate Mismatch"
 msgstr "Samplingsfrekvens"
 
-#: ardour_ui.cc:3764
+#: ardour_ui.cc:3796
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
 "%2 is currently running at %3 Hz.  If you load this session,\n"
 "audio may be played at the wrong sample rate.\n"
 msgstr ""
 
-#: ardour_ui.cc:3773
+#: ardour_ui.cc:3805
 #, fuzzy
 msgid "Do not load session"
 msgstr "Zooma in/ut till hela sessionen"
 
-#: ardour_ui.cc:3774
+#: ardour_ui.cc:3806
 #, fuzzy
 msgid "Load session anyway"
 msgstr "vid början"
 
-#: ardour_ui.cc:3797
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "Kunde inte koppla loss från JACK"
 
-#: ardour_ui.cc:3810
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr "Kunde inte återansluta till JACK"
 
-#: ardour_ui.cc:4084
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1394,35 +1389,40 @@ msgstr "Gränssnitt: kan ej konfigurera editorn"
 msgid "UI: cannot setup mixer"
 msgstr "Gränssnitt: kan inte konfigurera mixern"
 
-#: ardour_ui2.cc:125
+#: ardour_ui2.cc:82
+#, fuzzy
+msgid "UI: cannot setup meterbridge"
+msgstr "Gränssnitt: kan inte konfigurera mixern"
+
+#: ardour_ui2.cc:130
 msgid "Play from playhead"
 msgstr "Spela från startmarkören"
 
-#: ardour_ui2.cc:126
+#: ardour_ui2.cc:131
 msgid "Stop playback"
 msgstr "Stanna uppspelning"
 
-#: ardour_ui2.cc:127
+#: ardour_ui2.cc:132
 msgid "Toggle record"
 msgstr "Växla inspelningläge"
 
-#: ardour_ui2.cc:128
+#: ardour_ui2.cc:133
 msgid "Play range/selection"
 msgstr "Spela omfång/markering"
 
-#: ardour_ui2.cc:129
+#: ardour_ui2.cc:134
 msgid "Go to start of session"
 msgstr "Gå till början av sessionen"
 
-#: ardour_ui2.cc:130
+#: ardour_ui2.cc:135
 msgid "Go to end of session"
 msgstr "GÃ¥ till slutet av sessionen"
 
-#: ardour_ui2.cc:131
+#: ardour_ui2.cc:136
 msgid "Play loop range"
 msgstr "Spela loop-omfång"
 
-#: ardour_ui2.cc:132
+#: ardour_ui2.cc:137
 #, fuzzy
 msgid ""
 "MIDI Panic\n"
@@ -1430,24 +1430,24 @@ msgid ""
 msgstr ""
 "Skicka 'note off' och nollställ kontrollmeddelanden på alla MIDI-kanaler"
 
-#: ardour_ui2.cc:133
+#: ardour_ui2.cc:138
 msgid "Return to last playback start when stopped"
 msgstr "Återvänd till senaste startmarkörpunkten vid stopp"
 
-#: ardour_ui2.cc:134
+#: ardour_ui2.cc:139
 #, fuzzy
 msgid "Playhead follows Range Selections and Edits"
 msgstr "Startmarkören till omfångstarten"
 
-#: ardour_ui2.cc:135
+#: ardour_ui2.cc:140
 msgid "Be sensible about input monitoring"
 msgstr "Rimlig inljudsmedhörning"
 
-#: ardour_ui2.cc:136
+#: ardour_ui2.cc:141
 msgid "Enable/Disable audio click"
 msgstr "Slå på/av audio-klick"
 
-#: ardour_ui2.cc:137 monitor_section.cc:101
+#: ardour_ui2.cc:142 monitor_section.cc:101
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
@@ -1455,7 +1455,7 @@ msgstr ""
 "I aktivt läge är valda kanaler i sololäge.\n"
 "Klicka för att stänga av"
 
-#: ardour_ui2.cc:138
+#: ardour_ui2.cc:143
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
@@ -1463,11 +1463,11 @@ msgstr ""
 "I aktivt läge avlyssnas något\n"
 "Klicka för att stoppa avlyssningen"
 
-#: ardour_ui2.cc:139
+#: ardour_ui2.cc:144
 msgid "When active, there is a feedback loop."
 msgstr ""
 
-#: ardour_ui2.cc:140
+#: ardour_ui2.cc:145
 msgid ""
 "<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1475,7 +1475,7 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:141
+#: ardour_ui2.cc:146
 msgid ""
 "<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1483,28 +1483,33 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:173
+#: ardour_ui2.cc:147
+#, fuzzy
+msgid "Reset Level Meter"
+msgstr "Nollställ konvolut"
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr ""
 
-#: ardour_ui2.cc:175
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr ""
 
-#: ardour_ui2.cc:177
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr ""
 
-#: ardour_ui2.cc:241 ardour_ui_ed.cc:376
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 msgid "Auto Return"
 msgstr "Autoåtervänd"
 
-#: ardour_ui2.cc:243 ardour_ui_ed.cc:379
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 #, fuzzy
 msgid "Follow Edits"
 msgstr "Fokus: redigeringspunkten"
 
-#: ardour_ui2.cc:621 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1524,26 +1529,26 @@ msgstr "Förbereder redigeraren..."
 msgid "Setup Mixer"
 msgstr "Förbereder mixern..."
 
-#: ardour_ui_dependents.cc:84
+#: ardour_ui_dependents.cc:85
 msgid "Reload Session History"
 msgstr "Laddar sessionshistoriken..."
 
-#: ardour_ui_dialogs.cc:206
+#: ardour_ui_dialogs.cc:242
 #, fuzzy
 msgid "Don't close"
 msgstr "Stäng inte"
 
-#: ardour_ui_dialogs.cc:207
+#: ardour_ui_dialogs.cc:243
 #, fuzzy
 msgid "Just close"
 msgstr "stäng"
 
-#: ardour_ui_dialogs.cc:208
+#: ardour_ui_dialogs.cc:244
 #, fuzzy
 msgid "Save and close"
 msgstr "Spara och stäng"
 
-#: ardour_ui_dialogs.cc:293
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr ""
 
@@ -1556,7 +1561,7 @@ msgstr ""
 msgid "Sync"
 msgstr "Synk."
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr "Inställningar"
 
@@ -1584,15 +1589,15 @@ msgstr "Filtyp"
 msgid "Sample Format"
 msgstr "Samplingsformat"
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr "Kontrollytor"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "Insticksprogram"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr "Nivåmätning"
 
@@ -1609,7 +1614,7 @@ msgstr "Hållningslängd"
 msgid "Denormal Handling"
 msgstr "Denormal-hantering"
 
-#: ardour_ui_ed.cc:123 route_time_axis.cc:1475
+#: ardour_ui_ed.cc:123 route_time_axis.cc:1489
 msgid "New..."
 msgstr "Ny..."
 
@@ -1652,8 +1657,8 @@ msgstr "Ögonblickskopia..."
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: ardour_ui_ed.cc:153 editor_actions.cc:1710 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1464 route_time_axis.cc:1471
+#: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 msgid "Rename..."
 msgstr "Byt namn..."
 
@@ -1684,7 +1689,7 @@ msgid "Stem export..."
 msgstr "Exportera..."
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "Exportera"
 
@@ -1697,11 +1702,11 @@ msgstr "Rensa oanvända källfiler..."
 msgid "Flush Wastebasket"
 msgstr "Töm papperskorgen"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr ""
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr "Fördröjning"
 
@@ -1709,8 +1714,8 @@ msgstr "Fördröjning"
 msgid "Reconnect"
 msgstr "Ã…teranslut"
 
-#: ardour_ui_ed.cc:195 global_port_matrix.cc:198 io_selector.cc:210
-#: mixer_strip.cc:712 mixer_strip.cc:838
+#: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr "Koppla från"
 
@@ -1727,7 +1732,7 @@ msgstr "Helskärmsläge"
 msgid "Show Toolbars"
 msgstr "Visa zoom-verktygsraden"
 
-#: ardour_ui_ed.cc:230 mixer_ui.cc:1863 mixer_ui.cc:1869
+#: ardour_ui_ed.cc:230 mixer_ui.cc:1865 mixer_ui.cc:1871
 #, fuzzy
 msgid "Window|Mixer"
 msgstr "Fönster"
@@ -1737,28 +1742,33 @@ msgstr "Fönster"
 msgid "Toggle Editor+Mixer"
 msgstr "Växla redigerare eller mixer överst"
 
-#: ardour_ui_ed.cc:233 midi_tracer.cc:39
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
+#, fuzzy
+msgid "Window|Meterbridge"
+msgstr "Fönster"
+
+#: ardour_ui_ed.cc:234 midi_tracer.cc:39
 msgid "MIDI Tracer"
 msgstr "MIDI-spårare"
 
-#: ardour_ui_ed.cc:235
+#: ardour_ui_ed.cc:236
 msgid "Chat"
 msgstr "Chatt"
 
-#: ardour_ui_ed.cc:237
+#: ardour_ui_ed.cc:238
 #, fuzzy
 msgid "Help|Manual"
 msgstr "Manuell"
 
-#: ardour_ui_ed.cc:238
+#: ardour_ui_ed.cc:239
 msgid "Reference"
 msgstr "Referens"
 
-#: ardour_ui_ed.cc:240 plugin_ui.cc:419
+#: ardour_ui_ed.cc:241 plugin_ui.cc:418
 msgid "Save"
 msgstr "Spara"
 
-#: ardour_ui_ed.cc:248 rc_option_editor.cc:1114 rc_option_editor.cc:1125
+#: ardour_ui_ed.cc:249 rc_option_editor.cc:1114 rc_option_editor.cc:1125
 #: rc_option_editor.cc:1134 rc_option_editor.cc:1147 rc_option_editor.cc:1160
 #: rc_option_editor.cc:1169 rc_option_editor.cc:1179 rc_option_editor.cc:1181
 #: rc_option_editor.cc:1191 rc_option_editor.cc:1207 rc_option_editor.cc:1220
@@ -1768,101 +1778,101 @@ msgstr "Spara"
 msgid "Transport"
 msgstr "Uppspelning"
 
-#: ardour_ui_ed.cc:254 engine_dialog.cc:85 sfdb_ui.cc:559
+#: ardour_ui_ed.cc:255 engine_dialog.cc:85
 msgid "Stop"
 msgstr "Stopp"
 
-#: ardour_ui_ed.cc:257
+#: ardour_ui_ed.cc:258
 msgid "Roll"
 msgstr ""
 
-#: ardour_ui_ed.cc:261
+#: ardour_ui_ed.cc:262
 msgid "Start/Stop"
 msgstr "Start/Stopp"
 
-#: ardour_ui_ed.cc:264
+#: ardour_ui_ed.cc:265
 msgid "Start/Continue/Stop"
 msgstr "Start/Fortsätt/Stopp"
 
-#: ardour_ui_ed.cc:267
+#: ardour_ui_ed.cc:268
 msgid "Stop and Forget Capture"
 msgstr "Stoppa och glöm inspelning"
 
-#: ardour_ui_ed.cc:277
+#: ardour_ui_ed.cc:278
 msgid "Transition To Roll"
 msgstr "Övergång till Rullning"
 
-#: ardour_ui_ed.cc:281
+#: ardour_ui_ed.cc:282
 msgid "Transition To Reverse"
 msgstr "Övergång till Motsatt riktning"
 
-#: ardour_ui_ed.cc:285
+#: ardour_ui_ed.cc:286
 msgid "Play Loop Range"
 msgstr "Spela loop-omfång"
 
-#: ardour_ui_ed.cc:288
+#: ardour_ui_ed.cc:289
 #, fuzzy
 msgid "Play Selected Range"
 msgstr "Markera omfång"
 
-#: ardour_ui_ed.cc:291
+#: ardour_ui_ed.cc:292
 #, fuzzy
 msgid "Play Selection w/Preroll"
 msgstr "Spela valda regioner"
 
-#: ardour_ui_ed.cc:295
+#: ardour_ui_ed.cc:296
 msgid "Enable Record"
 msgstr "Tillåt inspelning"
 
-#: ardour_ui_ed.cc:298
+#: ardour_ui_ed.cc:299
 msgid "Start Recording"
 msgstr "Börja inspelning"
 
-#: ardour_ui_ed.cc:302
+#: ardour_ui_ed.cc:303
 msgid "Rewind"
 msgstr "Bakåtspolning"
 
-#: ardour_ui_ed.cc:305
+#: ardour_ui_ed.cc:306
 msgid "Rewind (Slow)"
 msgstr "Bakåtspolning (långsam)"
 
-#: ardour_ui_ed.cc:308
+#: ardour_ui_ed.cc:309
 msgid "Rewind (Fast)"
 msgstr "Bakåtspolning (snabb)"
 
-#: ardour_ui_ed.cc:311 startup.cc:727
+#: ardour_ui_ed.cc:312 startup.cc:727
 msgid "Forward"
 msgstr "Framåtspolning"
 
-#: ardour_ui_ed.cc:314
+#: ardour_ui_ed.cc:315
 msgid "Forward (Slow)"
 msgstr "Framåtspolning (långsam)"
 
-#: ardour_ui_ed.cc:317
+#: ardour_ui_ed.cc:318
 msgid "Forward (Fast)"
 msgstr "Framåtspolning (snabb)"
 
-#: ardour_ui_ed.cc:320
+#: ardour_ui_ed.cc:321
 msgid "Goto Zero"
 msgstr "GÃ¥ till noll"
 
-#: ardour_ui_ed.cc:323
+#: ardour_ui_ed.cc:324
 msgid "Goto Start"
 msgstr "Gå till början"
 
-#: ardour_ui_ed.cc:326
+#: ardour_ui_ed.cc:327
 msgid "Goto End"
 msgstr "GÃ¥ till slutet"
 
-#: ardour_ui_ed.cc:329
+#: ardour_ui_ed.cc:330
 msgid "Goto Wall Clock"
 msgstr "Gå till väggklocka"
 
-#: ardour_ui_ed.cc:333
+#: ardour_ui_ed.cc:334
 msgid "Focus On Clock"
 msgstr "Fokus på klockan"
 
-#: ardour_ui_ed.cc:337 ardour_ui_ed.cc:346 audio_clock.cc:2046 editor.cc:237
+#: ardour_ui_ed.cc:338 ardour_ui_ed.cc:347 audio_clock.cc:2046 editor.cc:237
 #: editor_actions.cc:544 editor_actions.cc:553 export_timespan_selector.cc:88
 #: session_option_editor.cc:41 session_option_editor.cc:61
 #: session_option_editor.cc:80 session_option_editor.cc:96
@@ -1871,132 +1881,132 @@ msgstr "Fokus på klockan"
 msgid "Timecode"
 msgstr "Tidskod"
 
-#: ardour_ui_ed.cc:339 ardour_ui_ed.cc:348 editor_actions.cc:542
+#: ardour_ui_ed.cc:340 ardour_ui_ed.cc:349 editor_actions.cc:542
 msgid "Bars & Beats"
 msgstr "Takter & slag"
 
-#: ardour_ui_ed.cc:341 ardour_ui_ed.cc:350
+#: ardour_ui_ed.cc:342 ardour_ui_ed.cc:351
 msgid "Minutes & Seconds"
 msgstr "Minuter & sekunder"
 
-#: ardour_ui_ed.cc:343 ardour_ui_ed.cc:352 audio_clock.cc:2050 editor.cc:238
+#: ardour_ui_ed.cc:344 ardour_ui_ed.cc:353 audio_clock.cc:2050 editor.cc:238
 #: editor_actions.cc:543
 msgid "Samples"
 msgstr "Samplingar"
 
-#: ardour_ui_ed.cc:355
+#: ardour_ui_ed.cc:356
 msgid "Punch In"
 msgstr "Inslag"
 
-#: ardour_ui_ed.cc:356 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr ""
 
-#: ardour_ui_ed.cc:359
+#: ardour_ui_ed.cc:360
 msgid "Punch Out"
 msgstr "Utslag"
 
-#: ardour_ui_ed.cc:360 time_info_box.cc:114
+#: ardour_ui_ed.cc:361 time_info_box.cc:114
 msgid "Out"
 msgstr "Ut"
 
-#: ardour_ui_ed.cc:363
+#: ardour_ui_ed.cc:364
 msgid "Punch In/Out"
 msgstr "Inslag/utslag"
 
-#: ardour_ui_ed.cc:364
+#: ardour_ui_ed.cc:365
 #, fuzzy
 msgid "In/Out"
 msgstr "Inslag/utslag"
 
-#: ardour_ui_ed.cc:367 rc_option_editor.cc:1071
+#: ardour_ui_ed.cc:368 rc_option_editor.cc:1071
 msgid "Click"
 msgstr "Klick"
 
-#: ardour_ui_ed.cc:370
+#: ardour_ui_ed.cc:371
 msgid "Auto Input"
 msgstr "Autoinljud"
 
-#: ardour_ui_ed.cc:373
+#: ardour_ui_ed.cc:374
 msgid "Auto Play"
 msgstr "Autospela"
 
-#: ardour_ui_ed.cc:384
+#: ardour_ui_ed.cc:385
 #, fuzzy
 msgid "Sync Startup to Video"
 msgstr "Synka start till video"
 
-#: ardour_ui_ed.cc:386
+#: ardour_ui_ed.cc:387
 msgid "Time Master"
 msgstr "Huvudklocka"
 
-#: ardour_ui_ed.cc:393
+#: ardour_ui_ed.cc:394
 #, fuzzy
 msgid "Toggle Record Enable Track %1"
 msgstr "Ändra inspelningsläge för Spår1"
 
-#: ardour_ui_ed.cc:400
+#: ardour_ui_ed.cc:401
 msgid "Percentage"
 msgstr "Procent"
 
-#: ardour_ui_ed.cc:401 shuttle_control.cc:169
+#: ardour_ui_ed.cc:402 shuttle_control.cc:169
 msgid "Semitones"
 msgstr "Halvtoner"
 
-#: ardour_ui_ed.cc:405
+#: ardour_ui_ed.cc:406
 msgid "Send MTC"
 msgstr "Skicka MTC"
 
-#: ardour_ui_ed.cc:407
+#: ardour_ui_ed.cc:408
 msgid "Send MMC"
 msgstr "Skicka MMC"
 
-#: ardour_ui_ed.cc:409
+#: ardour_ui_ed.cc:410
 msgid "Use MMC"
 msgstr "Använd MMC"
 
-#: ardour_ui_ed.cc:411 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 msgid "Send MIDI Clock"
 msgstr "Skicka MIDI-klocka"
 
-#: ardour_ui_ed.cc:413
+#: ardour_ui_ed.cc:414
 #, fuzzy
 msgid "Send MIDI Feedback"
 msgstr "Skicka MIDI-gensvar"
 
-#: ardour_ui_ed.cc:419
+#: ardour_ui_ed.cc:420
 msgid "Panic"
 msgstr "Panik!"
 
-#: ardour_ui_ed.cc:559
+#: ardour_ui_ed.cc:560
 #, fuzzy
 msgid "Wall Clock"
 msgstr "Gå till väggklocka"
 
-#: ardour_ui_ed.cc:560
+#: ardour_ui_ed.cc:561
 msgid "Disk Space"
 msgstr ""
 
-#: ardour_ui_ed.cc:561
+#: ardour_ui_ed.cc:562
 msgid "DSP"
 msgstr ""
 
-#: ardour_ui_ed.cc:562
+#: ardour_ui_ed.cc:563
 #, fuzzy
 msgid "Buffers"
 msgstr "Buffertstorlek"
 
-#: ardour_ui_ed.cc:563
+#: ardour_ui_ed.cc:564
 msgid "JACK Sampling Rate and Latency"
 msgstr ""
 
-#: ardour_ui_ed.cc:564
+#: ardour_ui_ed.cc:565
 #, fuzzy
 msgid "Timecode Format"
 msgstr "Tidskod: rutor"
 
-#: ardour_ui_ed.cc:565
+#: ardour_ui_ed.cc:566
 #, fuzzy
 msgid "File Format"
 msgstr "Sampleformat"
@@ -2011,11 +2021,11 @@ msgstr ""
 msgid "Internal"
 msgstr "Intern"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 msgid "Enable/Disable external positional sync"
 msgstr "Välj extern positionssynkronisering"
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr ""
 
@@ -2047,7 +2057,7 @@ msgstr ""
 msgid "Meter"
 msgstr "Taktart"
 
-#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1030
+#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1039
 #: midi_region_view.cc:2991 session_metadata_dialog.cc:331
 #: session_metadata_dialog.cc:379 session_metadata_dialog.cc:435
 #: session_metadata_dialog.cc:716
@@ -2141,33 +2151,33 @@ msgid "hide track"
 msgstr "dölj spår"
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:196 generic_pluginui.cc:456
-#: generic_pluginui.cc:733 panner_ui.cc:150
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
+#: generic_pluginui.cc:746 panner_ui.cc:150
 #, fuzzy
 msgid "Automation|Manual"
 msgstr "Automatisering"
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1856 gain_meter.cc:199
-#: generic_pluginui.cc:459 generic_pluginui.cc:735 midi_time_axis.cc:1488
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
+#: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr "Uppspelning"
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:202 generic_pluginui.cc:462
-#: generic_pluginui.cc:737 panner_ui.cc:156
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
+#: generic_pluginui.cc:750 panner_ui.cc:156
 msgid "Write"
 msgstr "Skriv"
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:205 generic_pluginui.cc:465
-#: generic_pluginui.cc:739 panner_ui.cc:159
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
+#: generic_pluginui.cc:752 panner_ui.cc:159
 msgid "Touch"
 msgstr "Beröring"
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr ""
 
@@ -2176,7 +2186,7 @@ msgid "clear automation"
 msgstr "rensa automatisering"
 
 #: automation_time_axis.cc:485 editor_actions.cc:613 editor_markers.cc:857
-#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:699
+#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:708
 msgid "Hide"
 msgstr "Göm"
 
@@ -2198,7 +2208,7 @@ msgstr "Koppla från"
 msgid "Linear"
 msgstr "Linjär"
 
-#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:638
+#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:647
 #: shuttle_control.cc:188
 msgid "Mode"
 msgstr "Visningsläge"
@@ -2215,13 +2225,13 @@ msgstr "Redigera bunt"
 msgid "Direction:"
 msgstr "Riktning:"
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:156
-#: mixer_strip.cc:2132
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 msgid "Input"
 msgstr "Ingång"
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:161 mixer_strip.cc:2135
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 msgid "Output"
 msgstr "Utgång"
 
@@ -2231,8 +2241,8 @@ msgid "Edit"
 msgstr "Redigera"
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:420 processor_box.cc:2227
-#: route_time_axis.cc:704
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
+#: route_time_axis.cc:713
 msgid "Delete"
 msgstr "Radera"
 
@@ -2406,7 +2416,7 @@ msgstr "Tidskod"
 
 #: edit_note_dialog.cc:98 editor_regions.cc:114
 #: export_timespan_selector.cc:359 export_timespan_selector.cc:421
-#: location_ui.cc:313 midi_list_editor.cc:114 time_info_box.cc:105
+#: location_ui.cc:317 midi_list_editor.cc:114 time_info_box.cc:105
 msgid "Length"
 msgstr "Längd"
 
@@ -2654,17 +2664,17 @@ msgid "Ranges & Marks"
 msgstr "Omfång & markörer"
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 msgid "Editor"
 msgstr "Redigerare"
 
 #: editor.cc:1215 editor.cc:1225 editor.cc:4440 editor_actions.cc:130
-#: editor_actions.cc:1804
+#: editor_actions.cc:1813
 msgid "Loop"
 msgstr "Loop"
 
@@ -2689,8 +2699,8 @@ msgstr ""
 msgid "Slow"
 msgstr "LÃ¥ngsam"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1606
-#: sfdb_ui.cc:1715
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "Snabb"
 
@@ -2710,7 +2720,7 @@ msgstr "Aktivera"
 msgid "Slowest"
 msgstr "LÃ¥ngsammast"
 
-#: editor.cc:1572 route_time_axis.cc:1863 selection.cc:1009 selection.cc:1064
+#: editor.cc:1572 route_time_axis.cc:1877 selection.cc:1009 selection.cc:1064
 msgid "programming error: "
 msgstr "programmeringsfel: "
 
@@ -2840,7 +2850,7 @@ msgid "Select All in Track"
 msgstr "Välj allt i spåret"
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2235
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr "Markera allt"
 
@@ -2892,15 +2902,15 @@ msgstr "Markera omfång mellan startmarkören och redigeringspunkten"
 msgid "Select"
 msgstr "Markera"
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2220
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2223
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr "Kopiera"
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2231
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr "Klistra in"
 
@@ -3062,7 +3072,7 @@ msgstr "Gör om"
 msgid "Redo (%1)"
 msgstr "Gör om (%1)"
 
-#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1785
+#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1794
 msgid "Duplicate"
 msgstr "Duplicera"
 
@@ -3097,8 +3107,8 @@ msgstr "Radera spellista"
 msgid "Keep Playlist"
 msgstr "Behåll spellista"
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -3119,7 +3129,7 @@ msgstr "rensa spellistor"
 msgid "Please wait while %1 loads visual data."
 msgstr "Vänta medan Ardour laddar visuell data..."
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2251
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 msgid "Edit..."
 msgstr "Redigera..."
 
@@ -3173,7 +3183,7 @@ msgstr "Lager"
 msgid "Position"
 msgstr ""
 
-#: editor_actions.cc:101 gain_meter.cc:124 gain_meter.cc:755 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr "Beskär"
@@ -3186,7 +3196,7 @@ msgstr "Volym"
 msgid "Ranges"
 msgstr "Omfång"
 
-#: editor_actions.cc:104 editor_actions.cc:1781 session_option_editor.cc:145
+#: editor_actions.cc:104 editor_actions.cc:1790 session_option_editor.cc:145
 #: session_option_editor.cc:147 session_option_editor.cc:156
 #: session_option_editor.cc:163
 msgid "Fades"
@@ -3226,7 +3236,7 @@ msgstr "Diverse inställningar"
 msgid "Misc Options"
 msgstr "Diverse inställningar"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr "Medhörning"
@@ -3269,8 +3279,8 @@ msgstr "Sekundär klocka"
 msgid "Separate"
 msgstr "Separera"
 
-#: editor_actions.cc:132 mixer_strip.cc:1916 route_time_axis.cc:199
-#: route_time_axis.cc:2397
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
+#: route_time_axis.cc:2417
 msgid "Solo"
 msgstr ""
 
@@ -3282,7 +3292,7 @@ msgstr "Underrutor"
 msgid "Timecode fps"
 msgstr "Tidskod-FPS"
 
-#: editor_actions.cc:137 route_time_axis.cc:421
+#: editor_actions.cc:137 route_time_axis.cc:430
 msgid "Height"
 msgstr "Höjd"
 
@@ -3414,7 +3424,7 @@ msgstr "Startmarkören till omfångstarten"
 msgid "Playhead to Range End"
 msgstr "Startmarkören till omfångslutet"
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2237
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 msgid "Deselect All"
 msgstr "Avmarkera allt"
 
@@ -3699,9 +3709,9 @@ msgstr "Infoga tid"
 msgid "Toggle Active"
 msgstr "Växla aktiv"
 
-#: editor_actions.cc:370 editor_actions.cc:1707 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1488
-#: route_time_axis.cc:701
+#: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
+#: route_time_axis.cc:710
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -3709,19 +3719,19 @@ msgstr "Ta bort"
 msgid "Fit Selected Tracks"
 msgstr "Rym valda spår"
 
-#: editor_actions.cc:376 time_axis_view.cc:1298
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr "Störst"
 
-#: editor_actions.cc:379 time_axis_view.cc:1299
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr "Stor"
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1300
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr "Större"
 
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr "Liten"
 
@@ -3821,7 +3831,7 @@ msgstr "Skarv"
 msgid "Slide"
 msgstr "Glid"
 
-#: editor_actions.cc:478 editor_actions.cc:1728 editor_markers.cc:860
+#: editor_actions.cc:478 editor_actions.cc:1737 editor_markers.cc:860
 #: editor_rulers.cc:386 location_ui.cc:56
 msgid "Lock"
 msgstr "LÃ¥s"
@@ -4000,7 +4010,7 @@ msgstr "Min:sek"
 msgid "Video Monitor"
 msgstr "Medhörning"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr ""
 
@@ -4011,7 +4021,7 @@ msgstr "Placera överst"
 
 #: editor_actions.cc:554
 #, fuzzy
-msgid "Framenumber"
+msgid "Frame number"
 msgstr "Spårnummer"
 
 #: editor_actions.cc:555
@@ -4104,7 +4114,7 @@ msgstr "Ta bort '%s'"
 
 #: editor_actions.cc:652 editor_audio_import.cc:279
 #: session_import_dialog.cc:74 session_import_dialog.cc:94
-#: session_metadata_dialog.cc:297 editor_videotimeline.cc:107
+#: session_metadata_dialog.cc:297 editor_videotimeline.cc:108
 msgid "Import"
 msgstr "Importera"
 
@@ -4145,301 +4155,301 @@ msgstr ""
 msgid "Could not find editor.bindings in search path %1"
 msgstr ""
 
-#: editor_actions.cc:1019 editor_actions.cc:1415 editor_actions.cc:1426
-#: editor_actions.cc:1479 editor_actions.cc:1490 editor_actions.cc:1537
-#: editor_actions.cc:1547 editor_regions.cc:1561
+#: editor_actions.cc:1028 editor_actions.cc:1424 editor_actions.cc:1435
+#: editor_actions.cc:1488 editor_actions.cc:1499 editor_actions.cc:1546
+#: editor_actions.cc:1556 editor_regions.cc:1561
 #, fuzzy
 msgid "programming error: %1: %2"
 msgstr "programmeringsfel: "
 
-#: editor_actions.cc:1713
+#: editor_actions.cc:1722
 msgid "Raise"
 msgstr "Högre"
 
-#: editor_actions.cc:1716
+#: editor_actions.cc:1725
 msgid "Raise to Top"
 msgstr "Placera överst"
 
-#: editor_actions.cc:1719 gtk-custom-ruler.c:132
+#: editor_actions.cc:1728 gtk-custom-ruler.c:132
 msgid "Lower"
 msgstr "Lägre"
 
-#: editor_actions.cc:1722
+#: editor_actions.cc:1731
 msgid "Lower to Bottom"
 msgstr "Placera underst"
 
-#: editor_actions.cc:1725
+#: editor_actions.cc:1734
 msgid "Move to Original Position"
 msgstr "Flytta till ursprunglig position"
 
-#: editor_actions.cc:1730
+#: editor_actions.cc:1739
 msgid "Lock to Video"
 msgstr ""
 
-#: editor_actions.cc:1735 editor_markers.cc:867
+#: editor_actions.cc:1744 editor_markers.cc:867
 msgid "Glue to Bars and Beats"
 msgstr "Klistra mot takt & slag"
 
-#: editor_actions.cc:1740
+#: editor_actions.cc:1749
 msgid "Remove Sync"
 msgstr "Ta bort synk."
 
-#: editor_actions.cc:1743 mixer_strip.cc:1903 route_time_axis.cc:200
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr "Tysta"
 
-#: editor_actions.cc:1746
+#: editor_actions.cc:1755
 msgid "Normalize..."
 msgstr "Normalisera..."
 
-#: editor_actions.cc:1749
+#: editor_actions.cc:1758
 msgid "Reverse"
 msgstr "Motsatt riktning"
 
-#: editor_actions.cc:1752
+#: editor_actions.cc:1761
 msgid "Make Mono Regions"
 msgstr "Skapa monoregioner"
 
-#: editor_actions.cc:1755
+#: editor_actions.cc:1764
 msgid "Boost Gain"
 msgstr "Öka volym"
 
-#: editor_actions.cc:1758
+#: editor_actions.cc:1767
 msgid "Cut Gain"
 msgstr "Sänk volym"
 
-#: editor_actions.cc:1761
+#: editor_actions.cc:1770
 #, fuzzy
 msgid "Pitch Shift..."
 msgstr "Tonhöjdsändring"
 
-#: editor_actions.cc:1764
+#: editor_actions.cc:1773
 #, fuzzy
 msgid "Transpose..."
 msgstr "Transponera"
 
-#: editor_actions.cc:1767
+#: editor_actions.cc:1776
 msgid "Opaque"
 msgstr "Ogenomskinlig"
 
-#: editor_actions.cc:1771 editor_regions.cc:116
+#: editor_actions.cc:1780 editor_regions.cc:116
 msgid "Fade In"
 msgstr "Tona In"
 
-#: editor_actions.cc:1776 editor_regions.cc:117
+#: editor_actions.cc:1785 editor_regions.cc:117
 msgid "Fade Out"
 msgstr "Tona Ut"
 
-#: editor_actions.cc:1791
+#: editor_actions.cc:1800
 msgid "Multi-Duplicate..."
 msgstr "Multiduplicera..."
 
-#: editor_actions.cc:1796
+#: editor_actions.cc:1805
 msgid "Fill Track"
 msgstr "Fyll spåret"
 
-#: editor_actions.cc:1800 editor_markers.cc:955
+#: editor_actions.cc:1809 editor_markers.cc:955
 msgid "Set Loop Range"
 msgstr "Sätt loop-omfång här"
 
-#: editor_actions.cc:1807
+#: editor_actions.cc:1816
 msgid "Set Punch"
 msgstr "Ställ in inslag"
 
-#: editor_actions.cc:1811
+#: editor_actions.cc:1820
 #, fuzzy
 msgid "Add Single Range Marker"
 msgstr "Lägg till 1 omfångsmarkör"
 
-#: editor_actions.cc:1816
+#: editor_actions.cc:1825
 #, fuzzy
 msgid "Add Range Marker Per Region"
 msgstr "Lägg till omfångsmarkörer"
 
-#: editor_actions.cc:1820
+#: editor_actions.cc:1829
 #, fuzzy
 msgid "Snap Position To Grid"
 msgstr "Fäst mot rutnät"
 
-#: editor_actions.cc:1823
+#: editor_actions.cc:1832
 msgid "Close Gaps"
 msgstr "Stäng luckor"
 
-#: editor_actions.cc:1826
+#: editor_actions.cc:1835
 msgid "Rhythm Ferret..."
 msgstr ""
 
-#: editor_actions.cc:1829
+#: editor_actions.cc:1838
 msgid "Export..."
 msgstr "Exportera..."
 
-#: editor_actions.cc:1835
+#: editor_actions.cc:1844
 msgid "Separate Under"
 msgstr "Separera under"
 
-#: editor_actions.cc:1839
+#: editor_actions.cc:1848
 msgid "Set Fade In Length"
 msgstr "Välj intoningslängd"
 
-#: editor_actions.cc:1840
+#: editor_actions.cc:1849
 msgid "Set Fade Out Length"
 msgstr "Välj uttoningslängd"
 
-#: editor_actions.cc:1841
+#: editor_actions.cc:1850
 msgid "Set Tempo from Region = Bar"
 msgstr "Sätt tempo från region = takt"
 
-#: editor_actions.cc:1846
+#: editor_actions.cc:1855
 msgid "Split at Percussion Onsets"
 msgstr "Dela vid perkussiva anslag"
 
-#: editor_actions.cc:1851
+#: editor_actions.cc:1860
 msgid "List Editor..."
 msgstr "Listredigerare..."
 
-#: editor_actions.cc:1854
+#: editor_actions.cc:1863
 msgid "Properties..."
 msgstr "Egenskaper..."
 
-#: editor_actions.cc:1858
+#: editor_actions.cc:1867
 msgid "Bounce (with processing)"
 msgstr ""
 
-#: editor_actions.cc:1859
+#: editor_actions.cc:1868
 msgid "Bounce (without processing)"
 msgstr ""
 
-#: editor_actions.cc:1860
+#: editor_actions.cc:1869
 msgid "Combine"
 msgstr "Kombinera"
 
-#: editor_actions.cc:1861
+#: editor_actions.cc:1870
 msgid "Uncombine"
 msgstr "Okombinera"
 
-#: editor_actions.cc:1863
+#: editor_actions.cc:1872
 msgid "Spectral Analysis..."
 msgstr "Spektralanalys..."
 
-#: editor_actions.cc:1865
+#: editor_actions.cc:1874
 msgid "Reset Envelope"
 msgstr "Nollställ konvolut"
 
-#: editor_actions.cc:1867
+#: editor_actions.cc:1876
 #, fuzzy
 msgid "Reset Gain"
 msgstr "Nollställ alla"
 
-#: editor_actions.cc:1872
+#: editor_actions.cc:1881
 msgid "Envelope Active"
 msgstr "Konvolut aktivt"
 
-#: editor_actions.cc:1876
+#: editor_actions.cc:1885
 #, fuzzy
 msgid "Quantize..."
 msgstr "Kvantisera"
 
-#: editor_actions.cc:1877 editor_actions.cc:1878
+#: editor_actions.cc:1886 editor_actions.cc:1887
 msgid "Insert Patch Change..."
 msgstr "Infoga patchändring..."
 
-#: editor_actions.cc:1879
+#: editor_actions.cc:1888
 msgid "Unlink from other copies"
 msgstr ""
 
-#: editor_actions.cc:1880
+#: editor_actions.cc:1889
 msgid "Strip Silence..."
 msgstr "Klipp ut tystnad..."
 
-#: editor_actions.cc:1881
+#: editor_actions.cc:1890
 msgid "Set Range Selection"
 msgstr "Definiera omfångsmarkering"
 
-#: editor_actions.cc:1883
+#: editor_actions.cc:1892
 #, fuzzy
 msgid "Nudge Later"
 msgstr "Knuffa framåt"
 
-#: editor_actions.cc:1884
+#: editor_actions.cc:1893
 #, fuzzy
 msgid "Nudge Earlier"
 msgstr "Knuffa framåt"
 
-#: editor_actions.cc:1889
+#: editor_actions.cc:1898
 #, fuzzy
 msgid "Nudge Later by Capture Offset"
 msgstr "Knuffa framåt utifrån inspelningskompensation"
 
-#: editor_actions.cc:1896
+#: editor_actions.cc:1905
 #, fuzzy
 msgid "Nudge Earlier by Capture Offset"
 msgstr "Knuffa framåt utifrån inspelningskompensation"
 
-#: editor_actions.cc:1900
+#: editor_actions.cc:1909
 msgid "Trim to Loop"
 msgstr "Beskär till loop"
 
-#: editor_actions.cc:1901
+#: editor_actions.cc:1910
 msgid "Trim to Punch"
 msgstr "Beskär till inslag"
 
-#: editor_actions.cc:1903
+#: editor_actions.cc:1912
 msgid "Trim to Previous"
 msgstr "Beskär till föregående"
 
-#: editor_actions.cc:1904
+#: editor_actions.cc:1913
 msgid "Trim to Next"
 msgstr "Beskär till nästa"
 
-#: editor_actions.cc:1911
+#: editor_actions.cc:1920
 msgid "Insert Region From Region List"
 msgstr "Infoga region från regionlistan"
 
-#: editor_actions.cc:1917
+#: editor_actions.cc:1926
 msgid "Set Sync Position"
 msgstr "Ställ in synk.-position"
 
-#: editor_actions.cc:1918
+#: editor_actions.cc:1927
 msgid "Place Transient"
 msgstr "Placera transient"
 
-#: editor_actions.cc:1919
+#: editor_actions.cc:1928
 msgid "Split"
 msgstr "Dela"
 
-#: editor_actions.cc:1920
+#: editor_actions.cc:1929
 msgid "Trim Start at Edit Point"
 msgstr "Beskär början vid redigeringspunkten"
 
-#: editor_actions.cc:1921
+#: editor_actions.cc:1930
 msgid "Trim End at Edit Point"
 msgstr "Beskär slutet vid redigeringspunkten"
 
-#: editor_actions.cc:1926
+#: editor_actions.cc:1935
 msgid "Align Start"
 msgstr "Justera början"
 
-#: editor_actions.cc:1933
+#: editor_actions.cc:1942
 msgid "Align Start Relative"
 msgstr "Juster början relativt"
 
-#: editor_actions.cc:1937
+#: editor_actions.cc:1946
 msgid "Align End"
 msgstr "Justera slutet"
 
-#: editor_actions.cc:1942
+#: editor_actions.cc:1951
 msgid "Align End Relative"
 msgstr "Justa slutet relativt"
 
-#: editor_actions.cc:1949
+#: editor_actions.cc:1958
 msgid "Align Sync"
 msgstr "Justera synk."
 
-#: editor_actions.cc:1956
+#: editor_actions.cc:1965
 msgid "Align Sync Relative"
 msgstr "Justera synk. relativt"
 
-#: editor_actions.cc:1960 editor_actions.cc:1963
+#: editor_actions.cc:1969 editor_actions.cc:1972
 msgid "Choose Top..."
 msgstr ""
 
@@ -4463,33 +4473,33 @@ msgid ""
 "%2 as a new source, or skip it?"
 msgstr ""
 
-#: editor_audio_import.cc:279 editor_videotimeline.cc:107
+#: editor_audio_import.cc:279 editor_videotimeline.cc:108
 msgid "Cancel Import"
 msgstr "Avbryt importering"
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr "Redigerare: kan inte öppna filen \"%1\" (%2)"
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 msgid "Cancel entire import"
 msgstr "Avbryt hela importen"
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 msgid "Don't embed it"
 msgstr "Infoga inte"
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr "Infoga alla"
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 #, fuzzy
 msgid "Sample rate"
 msgstr "Samplingsfrekvens:"
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
@@ -4497,7 +4507,7 @@ msgstr ""
 "%1\n"
 "Denna ljudfils samplingsfrekvens matchar inte sessionens!"
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 msgid "Embed it anyway"
 msgstr "Infoga ändå"
 
@@ -4535,32 +4545,32 @@ msgstr "kopiera tempomarkör"
 msgid "move tempo mark"
 msgstr "flytta tempomarkör"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr "ändra intoningslängd"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr "ändra uttoningslängd"
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr "flytta markör"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr ""
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 #, fuzzy
 msgid "programming_error: %1"
 msgstr "programmeringsfel: "
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr "ny omfångsmarkör"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 #, fuzzy
 msgid "rubberband selection"
 msgstr "omfångsmarkering"
@@ -4640,7 +4650,7 @@ msgid "Sharing Solo?"
 msgstr ""
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 msgid "Rec"
 msgstr "Spela in"
 
@@ -4720,7 +4730,7 @@ msgid "end"
 msgstr "Slut"
 
 #: editor_markers.cc:646 editor_ops.cc:1744 editor_ops.cc:1764
-#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1005
+#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1017
 msgid "add marker"
 msgstr ""
 
@@ -4728,7 +4738,7 @@ msgstr ""
 msgid "range"
 msgstr "omfång"
 
-#: editor_markers.cc:713 location_ui.cc:840
+#: editor_markers.cc:713 location_ui.cc:852
 msgid "remove marker"
 msgstr "ta bort markör"
 
@@ -4813,8 +4823,8 @@ msgstr "Byt namn på markör"
 msgid "Rename Range"
 msgstr "Byt namn på omfång"
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2233 route_time_axis.cc:968 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr "Döp om"
 
@@ -4963,7 +4973,7 @@ msgstr "Placera underst"
 msgid "Rename Region"
 msgstr "Byt namn på region"
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 msgid "New name:"
 msgstr "Nytt namn:"
 
@@ -5140,7 +5150,7 @@ msgstr ""
 "(Detta är en destruktiv handling och kan ej ångras)"
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr "Nej, gör ingenting."
 
@@ -5357,11 +5367,11 @@ msgstr "A"
 msgid "close region gaps"
 msgstr "dessa regioner"
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr ""
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5375,7 +5385,7 @@ msgstr ""
 msgid "tracks"
 msgstr "spår"
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 #, fuzzy
 msgid "track"
 msgstr "spår"
@@ -5384,7 +5394,7 @@ msgstr "spår"
 msgid "busses"
 msgstr "buss(ar)"
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 #, fuzzy
 msgid "bus"
 msgstr "buss(ar)"
@@ -5428,7 +5438,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr "Ja, ta bort den."
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr "Ja, ta bort den."
 
@@ -5505,7 +5515,7 @@ msgstr ""
 msgid "Length of region fade-out (units: secondary clock), () if dsisabled"
 msgstr ""
 
-#: editor_regions.cc:118 mixer_strip.cc:1960 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr "V"
@@ -5524,8 +5534,9 @@ msgstr "GÃ¥ till"
 msgid "Region position glued to Bars|Beats time?"
 msgstr ""
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:723
-#: mixer_strip.cc:1934 panner_ui.cc:554 stereo_panner.cc:237
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
+#: stereo_panner.cc:237
 msgid "M"
 msgstr ""
 
@@ -5601,7 +5612,8 @@ msgstr "Spår/Bussar"
 msgid "Track/Bus visible ?"
 msgstr "Spår/Bussar"
 
-#: editor_routes.cc:204 mixer_strip.cc:1951 route_time_axis.cc:2387
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
+#: route_time_axis.cc:2407
 msgid "A"
 msgstr ""
 
@@ -5610,7 +5622,7 @@ msgstr ""
 msgid "Track/Bus active ?"
 msgstr "Spår/Bussar"
 
-#: editor_routes.cc:205 mixer_strip.cc:1935
+#: editor_routes.cc:205 mixer_strip.cc:1932
 msgid "I"
 msgstr ""
 
@@ -5619,7 +5631,7 @@ msgstr ""
 msgid "MIDI input enabled"
 msgstr "%1-ingång"
 
-#: editor_routes.cc:206 mixer_strip.cc:1933 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr "H"
@@ -5634,7 +5646,7 @@ msgstr "Inspelningsläge"
 msgid "Muted"
 msgstr "Tysta"
 
-#: editor_routes.cc:208 mixer_strip.cc:1947
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr ""
 
@@ -5647,7 +5659,7 @@ msgstr "Solad..."
 msgid "SI"
 msgstr ""
 
-#: editor_routes.cc:209 mixer_strip.cc:351 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 #, fuzzy
 msgid "Solo Isolated"
 msgstr "Solo-säker"
@@ -5940,141 +5952,145 @@ msgid "192000Hz"
 msgstr ""
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr "Ingen"
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr "Triangulär"
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr "Rektangulär"
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 msgid "Shaped"
 msgstr "Formad"
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr "Upp-/inspelning på 1 enhet"
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr "Upp-/inspelning på 2 enheter"
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr "Uppspelning endast"
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 msgid "Recording only"
 msgstr "Inspelning endast"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr ""
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 msgid "raw"
 msgstr ""
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr "Drivrutin:"
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 #, fuzzy
 msgid "Audio Interface:"
 msgstr "Enhet:"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:148 sfdb_ui.cc:261 sfdb_ui.cc:266
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 msgid "Sample rate:"
 msgstr "Samplingsfrekvens:"
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr "Buffertstorlek:"
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr "Antal buffertar:"
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr "Ungefärlig fördröjning:"
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 msgid "Audio mode:"
 msgstr "Ljudläge:"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr "Klient-timeout"
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr "Antal portar:"
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr "MIDI-drivrutin:"
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 #, fuzzy
 msgid "Dither:"
 msgstr "Dither-typ"
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr "Ingen JACK-server hittades. Installera JACK och starta om"
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr ""
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr "Ingångsenhet:"
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 msgid "Output device:"
 msgstr "Utgångsenhet:"
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 msgid "Hardware input latency:"
 msgstr "Hårdvarans ingångsfördröjning"
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 msgid "samples"
 msgstr "samplingar"
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 msgid "Hardware output latency:"
 msgstr "Hårdvarans utgångsfördröjning"
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr "Enhet"
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr "kan ej öppna JACKs rc-fil %1 för att lagra parametrar"
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 msgid ""
 "You do not have any audio devices capable of\n"
 "simultaneous playback and recording.\n"
@@ -6091,32 +6107,32 @@ msgid ""
 "%1 and choose the relevant device then."
 msgstr ""
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr ""
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 #, fuzzy
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr "JACK tycks saknas från Ardours bundle"
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr ""
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr ""
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr "AudioSetup-värde för %1 saknar data"
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr "konfigurationsfilerna anger en JACK-serversökväg som inte existerar"
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:146
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 msgid "Channels:"
 msgstr "Kanaler:"
 
@@ -6279,9 +6295,9 @@ msgid "Folder:"
 msgstr "Mapp:"
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "Bläddra"
 
@@ -6414,6 +6430,13 @@ msgstr "Platser"
 msgid "Broadcast Wave options"
 msgstr ""
 
+#: export_format_selector.cc:136
+#, fuzzy
+msgid "Do you really want to remove the format?"
+msgstr ""
+"Vill du verkligen ta bort spår \"%1\" ?\n"
+"(detta kan inte ångras)"
+
 #: export_preset_selector.cc:28
 #, fuzzy
 msgid "Preset"
@@ -6425,6 +6448,13 @@ msgid ""
 "Perhaps it references a format that has been removed?"
 msgstr ""
 
+#: export_preset_selector.cc:156
+#, fuzzy
+msgid "Do you really want to remove this preset?"
+msgstr ""
+"Vill du verkligen ta bort spår \"%1\" ?\n"
+"(detta kan inte ångras)"
+
 #: export_timespan_selector.cc:46
 msgid "Show Times as:"
 msgstr "Visa tider som:"
@@ -6437,36 +6467,49 @@ msgstr ""
 msgid "Range"
 msgstr "Omfång"
 
-#: gain_meter.cc:109 gain_meter.cc:431 gain_meter.cc:820
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+#, fuzzy
+msgid "curl error %1 (%2)"
+msgstr "programmeringsfel: "
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+msgid "%1"
+msgstr ""
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr ""
 
-#: gain_meter.cc:115 gain_meter.cc:869
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr "Automatiseringsläge för reglage"
 
-#: gain_meter.cc:116 gain_meter.cc:870
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr "Automatiseringstyp för reglage"
 
-#: gain_meter.cc:125 gain_meter.cc:759 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr ""
 
-#: gain_meter.cc:334
-msgid "-Inf"
-msgstr ""
-
-#: gain_meter.cc:726 mixer_strip.cc:1954 panner_ui.cc:557
-#: route_time_axis.cc:2391
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
+#: route_time_axis.cc:2411
 msgid "P"
 msgstr "U"
 
-#: gain_meter.cc:729 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr "B"
 
-#: gain_meter.cc:732 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr "S"
 
@@ -6479,7 +6522,7 @@ msgstr "<span size=\"large\">Förinställningar</span>"
 msgid "Switches"
 msgstr "Tonhöjdsändring"
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2210
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 msgid "Controls"
 msgstr "Kontroller"
 
@@ -6510,71 +6553,71 @@ msgstr "Ljudspårsanslutningar"
 msgid "MIDI Connection Manager"
 msgstr "MIDI-spåranslutningar"
 
-#: global_port_matrix.cc:204 io_selector.cc:216
+#: global_port_matrix.cc:213 io_selector.cc:216
 msgid "port"
 msgstr ""
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 msgid "Selection..."
 msgstr "Markering..."
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr "Inspelningsläge"
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 msgid "Soloed..."
 msgstr "Solad..."
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 #, fuzzy
 msgid "Create New Group ..."
 msgstr "Ny grupp..."
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr ""
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 #, fuzzy
 msgid "Edit Group..."
 msgstr "Redigera Grupp"
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 #, fuzzy
 msgid "Collect Group"
 msgstr "Samla"
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 #, fuzzy
 msgid "Remove Group"
 msgstr "Ruttgrupp"
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 #, fuzzy
 msgid "Remove Subgroup Bus"
 msgstr "Lägg till grupp"
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 #, fuzzy
 msgid "Add New Subgroup Bus"
 msgstr "Lägg till grupp"
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr ""
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 #, fuzzy
 msgid "Add New Aux Bus (post-fader)"
 msgstr "Rensa (efterreglage)"
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 #, fuzzy
 msgid "Enable All Groups"
 msgstr "Avaktivera alla insticksprogram"
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 #, fuzzy
 msgid "Disable All Groups"
 msgstr "Avaktivera alla"
@@ -6684,11 +6727,11 @@ msgstr ""
 msgid "I/O selector"
 msgstr "Invertera markeringen"
 
-#: io_selector.cc:266
+#: io_selector.cc:265
 msgid "%1 input"
 msgstr "%1-ingång"
 
-#: io_selector.cc:268
+#: io_selector.cc:267
 msgid "%1 output"
 msgstr "%1-utgång"
 
@@ -6766,7 +6809,7 @@ msgstr[1] "sampling"
 msgid "Reset"
 msgstr "Nollställ"
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1734
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 #, fuzzy
 msgid "programming error: %1 (%2)"
 msgstr "programmeringsfel: "
@@ -6797,68 +6840,68 @@ msgstr "Kompositör"
 msgid "Pre-Emphasis"
 msgstr ""
 
-#: location_ui.cc:310
+#: location_ui.cc:314
 #, fuzzy
 msgid "Remove this range"
 msgstr "ställ in inslagsomfång"
 
-#: location_ui.cc:311
+#: location_ui.cc:315
 msgid "Start time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:312
+#: location_ui.cc:316
 msgid "End time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:315
+#: location_ui.cc:319
 #, fuzzy
 msgid "Set range start from playhead location"
 msgstr "Placera omfångsmarkör från startmarkören"
 
-#: location_ui.cc:316
+#: location_ui.cc:320
 #, fuzzy
 msgid "Set range end from playhead location"
 msgstr "Sätt omfång från omfångsmarkering"
 
-#: location_ui.cc:320
+#: location_ui.cc:324
 #, fuzzy
 msgid "Remove this marker"
 msgstr "flytta markör"
 
-#: location_ui.cc:321
+#: location_ui.cc:325
 msgid "Position - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:323
+#: location_ui.cc:327
 #, fuzzy
 msgid "Set marker time from playhead location"
 msgstr "Placera markör från startmarkören"
 
-#: location_ui.cc:462
+#: location_ui.cc:494
 msgid "You cannot put a CD marker at the start of the session"
 msgstr ""
 
-#: location_ui.cc:708
+#: location_ui.cc:720
 msgid "New Marker"
 msgstr "Ny markör"
 
-#: location_ui.cc:709
+#: location_ui.cc:721
 msgid "New Range"
 msgstr "Nytt omfång"
 
-#: location_ui.cc:722
+#: location_ui.cc:734
 msgid "<b>Loop/Punch Ranges</b>"
 msgstr "<b>Loop-/inslagsomfång</b>"
 
-#: location_ui.cc:747
+#: location_ui.cc:759
 msgid "<b>Markers (Including CD Index)</b>"
 msgstr "<b>Markörer (inkl CD-index)</b>"
 
-#: location_ui.cc:782
+#: location_ui.cc:794
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
 msgstr "<b>Omfång (inkl CD-spårsomfång)</b>"
 
-#: location_ui.cc:1024
+#: location_ui.cc:1036
 msgid "add range marker"
 msgstr "lägg till omfångsmarkör"
 
@@ -6935,22 +6978,22 @@ msgid ""
 "session at this time, because we would lose your connection information.\n"
 msgstr ""
 
-#: main.cc:491
+#: main.cc:487
 #, fuzzy
 msgid " (built using "
 msgstr ""
 "\n"
 "   (kompilerat med "
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr " och GCC version "
 
-#: main.cc:504
+#: main.cc:500
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr ""
 
-#: main.cc:505
+#: main.cc:501
 #, fuzzy
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
@@ -6958,27 +7001,32 @@ msgid ""
 msgstr ""
 "Vissa delar Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker"
 
-#: main.cc:507
+#: main.cc:503
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr ""
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr ""
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr ""
 
-#: main.cc:519
+#: main.cc:513
+#, fuzzy
+msgid "could not initialize %1."
+msgstr "kunde inte initialisera Ardour."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr ""
 
-#: main.cc:525
+#: main.cc:528
 #, fuzzy
 msgid "could not create %1 GUI"
 msgstr "kunde inte skapa ARDOUR GUI"
@@ -6988,7 +7036,7 @@ msgstr "kunde inte skapa ARDOUR GUI"
 msgid "Display delta to edit cursor"
 msgstr "Primär klockdelta till redigeringspunkten"
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 msgid "MarkerText"
 msgstr "MarkörText"
 
@@ -7527,7 +7575,7 @@ msgstr "Klicka för att välja ingångar"
 msgid "Missing Plugins"
 msgstr "Insticksprogram"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr ""
 
@@ -7608,234 +7656,247 @@ msgstr ""
 msgid "Could not find mixer.bindings in search path %1"
 msgstr ""
 
-#: mixer_strip.cc:91 mixer_strip.cc:119 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr "pre"
 
-#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:352 mixer_strip.cc:1293
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 #, fuzzy
 msgid "Comments"
 msgstr "Kommentar"
 
-#: mixer_strip.cc:145
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr ""
 
-#: mixer_strip.cc:147
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
 msgstr ""
 
-#: mixer_strip.cc:154
+#: mixer_strip.cc:156
 #, fuzzy
 msgid "Hide this mixer strip"
 msgstr "Dölj detta spår"
 
-#: mixer_strip.cc:165
+#: mixer_strip.cc:167
 #, fuzzy
 msgid "Click to select metering point"
 msgstr "Välj nivåmätningskälla"
 
-#: mixer_strip.cc:171
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr "ni"
 
-#: mixer_strip.cc:190
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr ""
 
-#: mixer_strip.cc:199
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr ""
 
-#: mixer_strip.cc:201 mixer_strip.cc:1929
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 msgid "lock"
 msgstr "lås"
 
-#: mixer_strip.cc:202 mixer_strip.cc:1928
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 msgid "iso"
 msgstr ""
 
-#: mixer_strip.cc:256
+#: mixer_strip.cc:258
 msgid "Mix group"
 msgstr "Mixgrupp"
 
-#: mixer_strip.cc:349 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 #, fuzzy
 msgid "Phase Invert"
 msgstr "Invertera"
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 #, fuzzy
 msgid "Solo Safe"
 msgstr "Solo-säker"
 
-#: mixer_strip.cc:353 mixer_ui.cc:124 route_time_axis.cc:664
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 msgid "Group"
 msgstr "Grupp"
 
-#: mixer_strip.cc:354 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 #, fuzzy
 msgid "Meter Point"
 msgstr "Nivåmätning"
 
-#: mixer_strip.cc:466
+#: mixer_strip.cc:470
 #, fuzzy
 msgid "Enable/Disable MIDI input"
 msgstr "Slå på/av audio-klick"
 
-#: mixer_strip.cc:616
+#: mixer_strip.cc:622
 #, fuzzy
 msgid ""
 "Aux\n"
 "Sends"
 msgstr "Skicka MTC"
 
-#: mixer_strip.cc:640
+#: mixer_strip.cc:646
 #, fuzzy
 msgid "Snd"
 msgstr "Slut"
 
-#: mixer_strip.cc:694 mixer_strip.cc:822 processor_box.cc:2152
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr "Inte ansluten till JACK - in/ut-ändringar är inte möjliga"
 
-#: mixer_strip.cc:1089
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr ""
 
-#: mixer_strip.cc:1092
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr ""
 
-#: mixer_strip.cc:1167
+#: mixer_strip.cc:1174
 #, fuzzy
 msgid "Disconnected"
 msgstr "frånkopplad"
 
-#: mixer_strip.cc:1296
+#: mixer_strip.cc:1303
 msgid "*Comments*"
 msgstr "*Kommentarer"
 
-#: mixer_strip.cc:1303
+#: mixer_strip.cc:1310
 msgid "Cmt"
 msgstr "Kmt"
 
-#: mixer_strip.cc:1306
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr "*Kmt*"
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr "Klicka för att lägga till/redigera kommentarer"
 
-#: mixer_strip.cc:1351
+#: mixer_strip.cc:1358
 msgid ": comment editor"
 msgstr ": kommentar"
 
-#: mixer_strip.cc:1428
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr ""
 
-#: mixer_strip.cc:1431
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr ""
 
-#: mixer_strip.cc:1460
+#: mixer_strip.cc:1467
 #, fuzzy
 msgid "Comments..."
 msgstr "Kommentarer"
 
-#: mixer_strip.cc:1462
+#: mixer_strip.cc:1469
 msgid "Save As Template..."
 msgstr "Spara som spårmall..."
 
-#: mixer_strip.cc:1468 route_group_dialog.cc:39 route_time_axis.cc:687
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr "Aktiv"
 
-#: mixer_strip.cc:1475
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr "Justera fördröjning..."
 
-#: mixer_strip.cc:1478
+#: mixer_strip.cc:1485
 msgid "Protect Against Denormals"
 msgstr "Skydda mot denormals"
 
-#: mixer_strip.cc:1484 route_time_axis.cc:426
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 msgid "Remote Control ID..."
 msgstr "Fjärr-ID..."
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 #, fuzzy
 msgid "in"
 msgstr "volym"
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 msgid "post"
 msgstr "post"
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 #, fuzzy
 msgid "out"
 msgstr "Om"
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr "egen"
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 #, fuzzy
 msgid "pr"
 msgstr "pre"
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 #, fuzzy
 msgid "po"
 msgstr "post"
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 #, fuzzy
 msgid "o"
 msgstr "klar"
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr ""
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr ""
 
-#: mixer_strip.cc:1920 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr ""
 
-#: mixer_strip.cc:1923 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr ""
 
-#: mixer_strip.cc:1936
+#: mixer_strip.cc:1933
 msgid "D"
 msgstr ""
 
-#: mixer_strip.cc:1959
+#: mixer_strip.cc:1953
 #, fuzzy
 msgid "i"
 msgstr "volym"
 
-#: mixer_strip.cc:2133
+#: mixer_strip.cc:2128
 #, fuzzy
 msgid "Pre-fader"
 msgstr "Före-nivåreglage"
 
-#: mixer_strip.cc:2134
+#: mixer_strip.cc:2129
 #, fuzzy
 msgid "Post-fader"
 msgstr "Efter-nivåreglage"
 
+#: mixer_strip.cc:2166 meter_strip.cc:728
+msgid "Change all in Group to %1"
+msgstr ""
+
+#: mixer_strip.cc:2168 meter_strip.cc:730
+#, fuzzy
+msgid "Change all to %1"
+msgstr "Kanaler: %1"
+
+#: mixer_strip.cc:2170 meter_strip.cc:732
+msgid "Change same track-type to %1"
+msgstr ""
+
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr "hittade inte spårvisningslisteobjekt för omdöpt remsor!"
@@ -7844,10 +7905,68 @@ msgstr "hittade inte spårvisningslisteobjekt för omdöpt remsor!"
 msgid "-all-"
 msgstr "-alla-"
 
-#: mixer_ui.cc:1792
+#: mixer_ui.cc:1794
 msgid "Strips"
 msgstr "Remsor"
 
+#: meter_strip.cc:764
+#, fuzzy
+msgid "Variable height"
+msgstr "höjden"
+
+#: meter_strip.cc:765
+#, fuzzy
+msgid "Short"
+msgstr "kort"
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr ""
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr ""
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+msgid "VU"
+msgstr ""
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr ""
@@ -8231,7 +8350,7 @@ msgstr ""
 msgid "Panner (2D)"
 msgstr "Panorerare"
 
-#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:452
+#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:451
 msgid "Bypass"
 msgstr "Förbigå"
 
@@ -8410,7 +8529,7 @@ msgstr "Kategori"
 msgid "Eh? LADSPA plugins don't have editors!"
 msgstr ""
 
-#: plugin_ui.cc:125 plugin_ui.cc:228
+#: plugin_ui.cc:125 plugin_ui.cc:227
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
@@ -8426,7 +8545,7 @@ msgstr ""
 "okänd typ av editor-levererande insticksprogram (N.B.: inget VST-stöd i "
 "denna version av ardour)"
 
-#: plugin_ui.cc:258
+#: plugin_ui.cc:257
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no linuxVST support in this "
@@ -8435,47 +8554,47 @@ msgstr ""
 "okänd typ av editor-levererande insticksprogram (N.B.: inget VST-stöd i "
 "denna version av ardour)"
 
-#: plugin_ui.cc:330
+#: plugin_ui.cc:329
 msgid "create_lv2_editor called on non-LV2 plugin"
 msgstr ""
 
-#: plugin_ui.cc:418
+#: plugin_ui.cc:417
 msgid "Add"
 msgstr "Lägg till"
 
-#: plugin_ui.cc:422
+#: plugin_ui.cc:421
 #, fuzzy
 msgid "Description"
 msgstr "Riktning:"
 
-#: plugin_ui.cc:423
+#: plugin_ui.cc:422
 msgid "Plugin analysis"
 msgstr "Analys av insticksprogram"
 
-#: plugin_ui.cc:430
+#: plugin_ui.cc:429
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
 msgstr ""
 
-#: plugin_ui.cc:431
+#: plugin_ui.cc:430
 #, fuzzy
 msgid "Save a new preset"
 msgstr "Namnge ny förinställning"
 
-#: plugin_ui.cc:432
+#: plugin_ui.cc:431
 msgid "Save the current preset"
 msgstr ""
 
-#: plugin_ui.cc:433
+#: plugin_ui.cc:432
 msgid "Delete the current preset"
 msgstr ""
 
-#: plugin_ui.cc:434
+#: plugin_ui.cc:433
 msgid "Disable signal processing by the plugin"
 msgstr ""
 
-#: plugin_ui.cc:467 plugin_ui.cc:632
+#: plugin_ui.cc:466 plugin_ui.cc:662
 msgid ""
 "Click to allow the plugin to receive keyboard events that %1 would normally "
 "use as a shortcut"
@@ -8483,30 +8602,42 @@ msgstr ""
 "Tryck här för att tillåta att insticksprogrammet mottar tangentbordsgenvägar "
 "som %1 vanligtvis skulle använda"
 
-#: plugin_ui.cc:468
+#: plugin_ui.cc:467
 msgid "Click to enable/disable this plugin"
 msgstr "Tryck för att slå på/av insticksprogrammet"
 
-#: plugin_ui.cc:507
+#: plugin_ui.cc:506
 #, fuzzy
 msgid "latency (%1 sample)"
 msgid_plural "latency (%1 samples)"
 msgstr[0] "fördröjning (%1 samplingar)"
 msgstr[1] "fördröjning (%1 samplingar)"
 
-#: plugin_ui.cc:509
+#: plugin_ui.cc:508
 msgid "latency (%1 ms)"
 msgstr "fördröjning (%1 msek)"
 
-#: plugin_ui.cc:520
+#: plugin_ui.cc:519
 msgid "Edit Latency"
 msgstr "Ställ in fördröjning"
 
-#: plugin_ui.cc:559
+#: plugin_ui.cc:558
 msgid "Plugin preset %1 not found"
 msgstr "Förinställningen %1 hittades ej"
 
-#: plugin_ui.cc:639
+#: plugin_ui.cc:595
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin_ui.cc:615 plugin_ui.cc:630
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"newer version"
+msgstr ""
+
+#: plugin_ui.cc:669
 msgid "Click to allow normal use of %1 keyboard shortcuts"
 msgstr "Tryck här för att återställa normala tangentbordsgenvägar"
 
@@ -8622,77 +8753,78 @@ msgstr "Markering..."
 msgid "Port Insert "
 msgstr "Ny Anslutningspunkt"
 
-#: port_matrix.cc:323 port_matrix.cc:342
+#: port_matrix.cc:331 port_matrix.cc:357
 msgid "<b>Sources</b>"
 msgstr "<b>Källor</b>"
 
-#: port_matrix.cc:324 port_matrix.cc:343
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr "<b>Destinationer</b>"
 
-#: port_matrix.cc:419 port_matrix.cc:427
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr "Lägg till %s-%s"
 
 #
-#: port_matrix.cc:435
+#: port_matrix.cc:456
 #, c-format
 msgid "Rename '%s'..."
 msgstr "Byt namn på '%s'..."
 
-#: port_matrix.cc:451
+#: port_matrix.cc:472
 msgid "Remove all"
 msgstr "Ta bort alla"
 
-#: port_matrix.cc:471 port_matrix.cc:483
+#: port_matrix.cc:492 port_matrix.cc:504
 #, fuzzy, c-format
 msgid "%s all"
 msgstr "Nollställ alla"
 
-#: port_matrix.cc:506
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr "Uppdatera"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr "Visa enskilda portar"
 
-#: port_matrix.cc:514
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr ""
 
-#: port_matrix.cc:702
+#: port_matrix.cc:723
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
 "or buss cannot support the new configuration."
 msgstr ""
 
-#: port_matrix.cc:705
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr ""
 
-#: port_matrix.cc:727
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr ""
 
-#: port_matrix.cc:728
+#: port_matrix.cc:749
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr ""
 
-#: port_matrix.cc:945
+#: port_matrix.cc:966
 #, c-format
 msgid "Remove '%s'"
 msgstr "Ta bort '%s'"
 
-#: port_matrix.cc:960
+#: port_matrix.cc:981
 #, c-format
 msgid "%s all from '%s'"
 msgstr "%s alla från '%s'"
 
-#: port_matrix.cc:1026
+#: port_matrix.cc:1047
 msgid "channel"
 msgstr "kanal"
 
@@ -8706,103 +8838,103 @@ msgstr "Det finns inga fler JACK-portar tillgängliga"
 msgid "There are no %1 ports to connect."
 msgstr "Det finns inga fler JACK-portar tillgängliga"
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
 "Alt+double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 #, fuzzy
 msgid "Show All Controls"
 msgstr "msgstr Visa Sändkontroller"
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 #, fuzzy
 msgid "Hide All Controls"
 msgstr "Göm alla övertoningar"
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 #, fuzzy
 msgid "on"
 msgstr "klar"
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr "av"
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
 msgstr ""
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 #, fuzzy
 msgid "Plugin Incompatibility"
 msgstr "Kompatibilitet"
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr ""
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
 msgstr ""
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 #, fuzzy
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
 msgstr[0] "%1-ingång"
 msgstr[1] "%1-ingång"
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 #, fuzzy
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
 msgstr[0] "%1-ingång"
 msgstr[1] "%1-ingång"
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
 msgstr ""
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
 msgstr ""
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 #, fuzzy
 msgid "Cannot set up new send: %1"
 msgstr "kan ej konfigurera signalhantering för %1"
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 #, fuzzy
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
@@ -8813,20 +8945,20 @@ msgstr ""
 "på det sättet eftersom ingångar och\n"
 "utgångarna inte fungerar korrekt."
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 #, fuzzy
 msgid "Rename Processor"
 msgstr "Döp om spår"
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr ""
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr ""
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 #, fuzzy
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
@@ -8837,7 +8969,7 @@ msgstr ""
 "förmodligen på grund av att I/O-konfiguration av insticksprogrammen\n"
 "inte kunde matcha konfiurationen av detta spåret."
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 #, fuzzy
 msgid ""
 "Do you really want to remove all processors from %1?\n"
@@ -8846,16 +8978,16 @@ msgstr ""
 "Vill du verkligen radera alla omdirigeringar från denna bussen?\n"
 "(detta kan inte ångras)"
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 msgid "Yes, remove them all"
 msgstr "Ja, ta bort alla"
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 #, fuzzy
 msgid "Remove processors"
 msgstr "%1 processor(er)"
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 #, fuzzy
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
@@ -8864,7 +8996,7 @@ msgstr ""
 "Vill du verkligen radera alla omdirigeringar från denna bussen?\n"
 "(detta kan inte ångras)"
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 #, fuzzy
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
@@ -8873,53 +9005,53 @@ msgstr ""
 "Vill du verkligen radera alla omdirigeringar från denna bussen?\n"
 "(detta kan inte ångras)"
 
-#: processor_box.cc:2198
+#: processor_box.cc:2200
 msgid "New Plugin"
 msgstr "Nytt insticksprogram"
 
-#: processor_box.cc:2201
+#: processor_box.cc:2203
 msgid "New Insert"
 msgstr "Ny Anslutningspunkt"
 
-#: processor_box.cc:2204
+#: processor_box.cc:2206
 #, fuzzy
 msgid "New External Send ..."
 msgstr "Ny auxilliär sänd..."
 
-#: processor_box.cc:2208
+#: processor_box.cc:2210
 msgid "New Aux Send ..."
 msgstr "Ny auxilliär sänd..."
 
-#: processor_box.cc:2212
+#: processor_box.cc:2214
 msgid "Clear (all)"
 msgstr "Rensa (alla)"
 
-#: processor_box.cc:2214
+#: processor_box.cc:2216
 msgid "Clear (pre-fader)"
 msgstr "Rensa (förreglage)"
 
-#: processor_box.cc:2216
+#: processor_box.cc:2218
 msgid "Clear (post-fader)"
 msgstr "Rensa (efterreglage)"
 
-#: processor_box.cc:2242
+#: processor_box.cc:2244
 msgid "Activate All"
 msgstr "Aktivera alla"
 
-#: processor_box.cc:2244
+#: processor_box.cc:2246
 #, fuzzy
 msgid "Deactivate All"
 msgstr "Avaktivera alla"
 
-#: processor_box.cc:2246
+#: processor_box.cc:2248
 msgid "A/B Plugins"
 msgstr "A/B:a insticksprogram"
 
-#: processor_box.cc:2255
+#: processor_box.cc:2257
 msgid "Edit with generic controls..."
 msgstr ""
 
-#: processor_box.cc:2531
+#: processor_box.cc:2557
 #, fuzzy
 msgid "%1: %2 (by %3)"
 msgstr "ardour: %1: %2 (av %3)"
@@ -9083,7 +9215,7 @@ msgstr ""
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
 
 #: rc_option_editor.cc:836
@@ -9176,7 +9308,7 @@ msgstr ""
 msgid "Click gain level"
 msgstr "Klickljudfil"
 
-#: rc_option_editor.cc:1083 route_time_axis.cc:206 route_time_axis.cc:667
+#: rc_option_editor.cc:1083 route_time_axis.cc:215 route_time_axis.cc:676
 msgid "Automation"
 msgstr "Automatisering"
 
@@ -9359,96 +9491,100 @@ msgstr "Flytta automation tillsammans med regioner"
 msgid "Show meters on tracks in the editor"
 msgstr "Visa nivåmätning vid spåren i redigeraren"
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr ""
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr ""
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 #, fuzzy
 msgid "whenever they overlap in time"
 msgstr "förkorta den nya överlappande noten"
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr ""
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr "Gummibandsmarkeringen fäster mot rutnätet"
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 msgid "Show waveforms in regions"
 msgstr "Visa vågformer i regioner"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 #, fuzzy
 msgid "Show gain envelopes in audio regions"
 msgstr "Visa vågformer i regioner"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 #, fuzzy
 msgid "in all modes"
 msgstr "Normalt läge"
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr ""
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 msgid "Waveform scale"
 msgstr "VÃ¥gformsskala"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "linjär"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr "logaritmisk"
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 msgid "Waveform shape"
 msgstr "VÃ¥gformsutseende"
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 msgid "traditional"
 msgstr "traditionell"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 msgid "rectified"
 msgstr "korrigerad"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr "Visa vågformer vid inspelning"
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr "Visa zoom-verktygsraden"
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr "Färglägg regioner med spårets färg"
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr ""
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 #, fuzzy
 msgid "Synchronise editor and mixer track order"
 msgstr "Matcha redigerare och mixers spårordning"
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 #, fuzzy
 msgid "Synchronise editor and mixer selection"
 msgstr "Matcha redigerare och mixers spårordning"
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 msgid "Name new markers"
 msgstr "Namnge nya markörer"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9456,346 +9592,431 @@ msgid ""
 "You can always rename markers by right-clicking on them"
 msgstr ""
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr ""
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr "Buffertar"
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 #, fuzzy
 msgid "Record monitoring handled by"
 msgstr "Medhörning hanteras av"
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 msgid "ardour"
 msgstr ""
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 msgid "audio hardware"
 msgstr "ljudhårdvaran"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 msgid "Tape machine mode"
 msgstr "Bandmaskingläge"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr "Spår- och bussanslutning"
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr "Anslut master/medhörningsbussar automatiskt"
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 msgid "Connect track inputs"
 msgstr "Anslut spåringångar"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 msgid "automatically to physical inputs"
 msgstr "automatiskt till fysiska ingångar"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr "manuellt"
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 msgid "Connect track and bus outputs"
 msgstr "Anslut spår- och bussutgångar"
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 msgid "automatically to physical outputs"
 msgstr "automatiskt till fysiska utgångar"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 msgid "automatically to master bus"
 msgstr "automatiskt till master-bussen"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 msgid "Denormals"
 msgstr ""
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 msgid "Use DC bias to protect against denormals"
 msgstr "Använd DC-bias för att skydda mot denormals"
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr "Processorhantering"
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr "ingen processorhantering"
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 msgid "use FlushToZero"
 msgstr "använd FlushToZero"
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr "använd DenormalsAreZero"
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 #, fuzzy
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr "använd FlushToZero och DenormalsAreZerO"
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 #, fuzzy
 msgid "Silence plugins when the transport is stopped"
 msgstr "Stoppa insticksprogram vid stopp"
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr "Aktivera nya insticksprogram automatiskt"
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr "Analysera ljudfiler automatiskt"
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 msgid "Replicate missing region channels"
 msgstr "Ã…terskapa saknade regioners kanaler"
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 msgid "Solo / mute"
 msgstr "Solo / tysta"
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 #, fuzzy
 msgid "Solo-in-place mute cut (dB)"
 msgstr "Tystningströskel för solo (dB)"
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr "Solokontroller är avlyssningskontroller"
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 msgid "Listen Position"
 msgstr "Avlyssningsposition"
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 #, fuzzy
 msgid "after-fader (AFL)"
 msgstr "efter volymreglage"
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 #, fuzzy
 msgid "pre-fader (PFL)"
 msgstr "före volymreglare"
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr "PFL-signaler kommer från"
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 msgid "before pre-fader processors"
 msgstr "innan för-nivåreglageprocessorer"
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr "för-nivåreglage men efter för-nivåreglageprocessorer"
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr "AFL-signaler kommer från"
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 #, fuzzy
 msgid "immediately post-fader"
 msgstr "Rensa (efterreglage)"
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 #, fuzzy
 msgid "after post-fader processors (before pan)"
 msgstr "efter efter-nivåreglageprocessorer"
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr "Avskild solo"
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 msgid "Show solo muting"
 msgstr "Visa solotystning"
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr "Solo åsidosätter tystning"
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 msgid "Default track / bus muting options"
 msgstr "Standardinställningar för spår-/busstystning"
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr "Tystning påverkar för-reglagesändningar"
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr "Tystning påverkar efter-reglagesändningar"
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 msgid "Mute affects control outputs"
 msgstr "Tystning påverkar kontrollutgångar"
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr "Tystning påverkar huvudutgångarna"
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 msgid "Send MIDI Time Code"
 msgstr "Skicka MIDI-tidskod"
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr "Lyd MIDI Machine Control-kommandon"
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr "Skicka MIDI Machine Control-kommandon"
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 msgid "Send MIDI control feedback"
 msgstr "Skicka MIDI-kontrollgensvar"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr "Inkommande MMC-enhets-ID"
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr "Utgående MMC-enhets-ID"
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr "Initiell programändring"
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr ""
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr ""
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 msgid "Sound MIDI notes as they are selected"
 msgstr ""
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 #, fuzzy
 msgid "User interaction"
 msgstr "Regionsåtgärder"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
 "   <i>(if available for your language preferences)</i>"
 msgstr ""
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr "Tangentbord"
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 msgid "Control surface remote ID"
 msgstr "Kontrollytans fjärr-ID"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 msgid "assigned by user"
 msgstr "användardefinierat"
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr "följer mixerns ordning"
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr "följer redigerarens ordning"
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1925
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 #, fuzzy
 msgid "Preferences|GUI"
 msgstr "Inställningar"
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr ""
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr ""
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr ""
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 #, fuzzy
 msgid "Mixer Strip"
 msgstr "Mixer"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 #, fuzzy
 msgid "Use narrow strips in the mixer by default"
 msgstr "Använd smala mixerremsor"
 
-#: rc_option_editor.cc:1898
-msgid "Meter hold time"
+#: rc_option_editor.cc:1906
+#, fuzzy
+msgid "Peak hold time"
 msgstr "HÃ¥lltid"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 msgid "short"
 msgstr "kort"
 
-#: rc_option_editor.cc:1905 rc_option_editor.cc:1920
+#: rc_option_editor.cc:1913
 msgid "medium"
 msgstr ""
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr "lång"
 
-#: rc_option_editor.cc:1912
-msgid "Meter fall-off"
+#: rc_option_editor.cc:1920
+#, fuzzy
+msgid "DPM fall-off"
 msgstr "Nedfall"
 
-#: rc_option_editor.cc:1918
-msgid "slowest"
-msgstr "långsammast"
+#: rc_option_editor.cc:1926
+msgid "slowest [6.6dB/sec]"
+msgstr ""
 
-#: rc_option_editor.cc:1919
-msgid "slow"
-msgstr "långsam"
+#: rc_option_editor.cc:1927
+msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
+msgstr ""
 
-#: rc_option_editor.cc:1921
-msgid "fast"
-msgstr "snabb"
+#: rc_option_editor.cc:1928
+msgid "slowish [12.0dB/sec] (DIN)"
+msgstr ""
 
-#: rc_option_editor.cc:1922
-msgid "faster"
-msgstr "snabbare"
+#: rc_option_editor.cc:1929
+msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
+msgstr ""
 
-#: rc_option_editor.cc:1923
-msgid "fastest"
-msgstr "snabbast"
+#: rc_option_editor.cc:1930
+msgid "medium [20dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1931
+msgid "fast [32dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1932
+msgid "faster [46dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1933
+msgid "fastest [70dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1939
+msgid "Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
+
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+msgid "-20dBFS (SMPTE RP.0155)"
+msgstr ""
+
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+msgid "-18dBFS (EBU, BBC)"
+msgstr ""
+
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
+
+#: rc_option_editor.cc:1955
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
+msgstr ""
+
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
+msgstr ""
+
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
+msgstr ""
+
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
+
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
+
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1985
+#, fuzzy
+msgid "Peak threshold [dBFS]"
+msgstr "Topptröskel"
+
+#: rc_option_editor.cc:1993
+msgid ""
+"Specify the audio signal level in dbFS at and above which the meter-peak "
+"indicator will flash red."
+msgstr ""
+
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
+msgstr ""
 
 #: region_editor.cc:79
 msgid "audition this region"
@@ -9806,11 +10027,11 @@ msgstr "avlyssna denna region"
 msgid "Position:"
 msgstr "LÃ¥s position"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr "Slut:"
 
-#: region_editor.cc:92 sfdb_ui.cc:140
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr "Längd:"
 
@@ -9834,27 +10055,27 @@ msgstr "Källor:"
 msgid "Source:"
 msgstr "Källa:"
 
-#: region_editor.cc:167
+#: region_editor.cc:166
 #, fuzzy
 msgid "Region '%1'"
 msgstr "Regioner"
 
-#: region_editor.cc:274
+#: region_editor.cc:273
 #, fuzzy
 msgid "change region start position"
 msgstr "Ställ in regionssynk.-punkt"
 
-#: region_editor.cc:290
+#: region_editor.cc:289
 #, fuzzy
 msgid "change region end position"
 msgstr "Ställ in regionssynk.-punkt"
 
-#: region_editor.cc:310
+#: region_editor.cc:309
 #, fuzzy
 msgid "change region length"
 msgstr "ändra intoningslängd"
 
-#: region_editor.cc:404 region_editor.cc:416
+#: region_editor.cc:403 region_editor.cc:415
 #, fuzzy
 msgid "change region sync point"
 msgstr "Ställ in regionssynk.-punkt"
@@ -10056,340 +10277,340 @@ msgid ""
 "A route group of this name already exists.  Please use a different name."
 msgstr ""
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 msgid "Tracks/Busses"
 msgstr "Spår/Bussar"
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr "Ingångar"
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr "Utgångar"
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr "Insticksprogram, anslutningspunkter & sändningar"
 
-#: route_params_ui.cc:211
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr "ruttvisningslisteobjekt för omdöpt rutt hittades inte!"
 
-#: route_params_ui.cc:258 route_params_ui.cc:286
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr "Uppspelningsfördröjning: %<PRId64> samplingar"
 
-#: route_params_ui.cc:478
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr "INGET SPÃ…R"
 
-#: route_params_ui.cc:611 route_params_ui.cc:612
+#: route_params_ui.cc:613 route_params_ui.cc:614
 msgid "No Track or Bus Selected"
 msgstr "Inget spår eller buss vald"
 
-#: route_time_axis.cc:96
+#: route_time_axis.cc:97
 msgid "g"
 msgstr ""
 
-#: route_time_axis.cc:97
+#: route_time_axis.cc:98
 msgid "p"
 msgstr ""
 
-#: route_time_axis.cc:98
+#: route_time_axis.cc:99
 msgid "a"
 msgstr ""
 
-#: route_time_axis.cc:168
+#: route_time_axis.cc:173
 msgid "Record (Right-click for Step Edit)"
 msgstr ""
 
-#: route_time_axis.cc:171
+#: route_time_axis.cc:176
 msgid "Record"
 msgstr "Spela in"
 
-#: route_time_axis.cc:201
+#: route_time_axis.cc:210
 msgid "Route Group"
 msgstr "Ruttgrupp"
 
-#: route_time_axis.cc:204
+#: route_time_axis.cc:213
 #, fuzzy
 msgid "MIDI Controllers and Automation"
 msgstr "Rita volymautomatisering"
 
-#: route_time_axis.cc:381
+#: route_time_axis.cc:390
 msgid "Show All Automation"
 msgstr "Visa all automatisering"
 
-#: route_time_axis.cc:384
+#: route_time_axis.cc:393
 msgid "Show Existing Automation"
 msgstr "Visa existerande automatisering"
 
-#: route_time_axis.cc:387
+#: route_time_axis.cc:396
 msgid "Hide All Automation"
 msgstr "Göm all automatisering"
 
-#: route_time_axis.cc:396
+#: route_time_axis.cc:405
 #, fuzzy
 msgid "Processor automation"
 msgstr "rensa automatisering"
 
-#: route_time_axis.cc:415
+#: route_time_axis.cc:424
 msgid "Color..."
 msgstr "Färg..."
 
-#: route_time_axis.cc:472
+#: route_time_axis.cc:481
 msgid "Overlaid"
 msgstr "Överlappande"
 
-#: route_time_axis.cc:478
+#: route_time_axis.cc:487
 msgid "Stacked"
 msgstr "I trappa"
 
-#: route_time_axis.cc:486
+#: route_time_axis.cc:495
 msgid "Layers"
 msgstr "Lager"
 
-#: route_time_axis.cc:555
+#: route_time_axis.cc:564
 #, fuzzy
 msgid "Automatic (based on I/O connections)"
 msgstr "Anslut automatiskt utgångar"
 
-#: route_time_axis.cc:564
+#: route_time_axis.cc:573
 #, fuzzy
 msgid "(Currently: Existing Material)"
 msgstr "Efter existerande material"
 
-#: route_time_axis.cc:567
+#: route_time_axis.cc:576
 #, fuzzy
 msgid "(Currently: Capture Time)"
 msgstr "Efter inspelningstiden"
 
-#: route_time_axis.cc:575
+#: route_time_axis.cc:584
 msgid "Align With Existing Material"
 msgstr "Efter existerande material"
 
-#: route_time_axis.cc:580
+#: route_time_axis.cc:589
 msgid "Align With Capture Time"
 msgstr "Efter inspelningstiden"
 
-#: route_time_axis.cc:585
+#: route_time_axis.cc:594
 msgid "Alignment"
 msgstr "Justera"
 
-#: route_time_axis.cc:620
+#: route_time_axis.cc:629
 msgid "Normal Mode"
 msgstr "Normalt"
 
-#: route_time_axis.cc:626
+#: route_time_axis.cc:635
 msgid "Tape Mode"
 msgstr "Bandläge"
 
-#: route_time_axis.cc:632
+#: route_time_axis.cc:641
 msgid "Non-Layered Mode"
 msgstr "Ej i lager"
 
-#: route_time_axis.cc:645 route_time_axis.cc:1587
+#: route_time_axis.cc:654 route_time_axis.cc:1601
 msgid "Playlist"
 msgstr "Spellista"
 
-#: route_time_axis.cc:965
+#: route_time_axis.cc:979
 #, fuzzy
 msgid "Rename Playlist"
 msgstr "Spellistans namn"
 
-#: route_time_axis.cc:966
+#: route_time_axis.cc:980
 #, fuzzy
 msgid "New name for playlist:"
 msgstr "Spellistans namn"
 
-#: route_time_axis.cc:1051
+#: route_time_axis.cc:1065
 #, fuzzy
 msgid "New Copy Playlist"
 msgstr "Spellistans namn"
 
-#: route_time_axis.cc:1052 route_time_axis.cc:1105
+#: route_time_axis.cc:1066 route_time_axis.cc:1119
 #, fuzzy
 msgid "Name for new playlist:"
 msgstr "Spellistans namn"
 
-#: route_time_axis.cc:1104
+#: route_time_axis.cc:1118
 #, fuzzy
 msgid "New Playlist"
 msgstr "Spellista"
 
-#: route_time_axis.cc:1295
+#: route_time_axis.cc:1309
 #, fuzzy
 msgid "You cannot create a track with that name as it is reserved for %1"
 msgstr "Du kan inte lägga till ett spår utan en session laddad."
 
-#: route_time_axis.cc:1476
+#: route_time_axis.cc:1490
 msgid "New Copy..."
 msgstr "Ny kopia..."
 
-#: route_time_axis.cc:1480
+#: route_time_axis.cc:1494
 #, fuzzy
 msgid "New Take"
 msgstr "Ny markör"
 
-#: route_time_axis.cc:1481
+#: route_time_axis.cc:1495
 #, fuzzy
 msgid "Copy Take"
 msgstr "Kopiera"
 
-#: route_time_axis.cc:1486
+#: route_time_axis.cc:1500
 msgid "Clear Current"
 msgstr "Rensa aktuell"
 
-#: route_time_axis.cc:1489
+#: route_time_axis.cc:1503
 #, fuzzy
 msgid "Select From All..."
 msgstr "Välj från alla..."
 
-#: route_time_axis.cc:1577
+#: route_time_axis.cc:1591
 msgid "Take: %1.%2"
 msgstr ""
 
-#: route_time_axis.cc:2267
+#: route_time_axis.cc:2291
 msgid "Underlays"
 msgstr ""
 
-#: route_time_axis.cc:2270
+#: route_time_axis.cc:2294
 #, fuzzy
 msgid "Remove \"%1\""
 msgstr "Ta bort '%s'"
 
-#: route_time_axis.cc:2320 route_time_axis.cc:2357
+#: route_time_axis.cc:2344 route_time_axis.cc:2381
 msgid "programming error: underlay reference pointer pairs are inconsistent!"
 msgstr ""
 
-#: route_time_axis.cc:2388
+#: route_time_axis.cc:2408
 #, fuzzy
 msgid "After-fade listen (AFL)"
 msgstr "efter volymreglage"
 
-#: route_time_axis.cc:2392
+#: route_time_axis.cc:2412
 #, fuzzy
 msgid "Pre-fade listen (PFL)"
 msgstr "före volymreglare"
 
-#: route_time_axis.cc:2396
+#: route_time_axis.cc:2416
 msgid "s"
 msgstr ""
 
-#: route_time_axis.cc:2400
+#: route_time_axis.cc:2419
 msgid "m"
 msgstr ""
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 msgid "Mute this track"
 msgstr "Tysta detta spår"
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr "Tysta andra (icke-solade) spår"
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr ""
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr ""
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 #, fuzzy
 msgid "Monitor input"
 msgstr "Medhörning"
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 #, fuzzy
 msgid "Monitor playback"
 msgstr "Stanna uppspelning"
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 #, fuzzy
 msgid "Not connected to JACK - cannot engage record"
 msgstr "Inte ansluten till JACK - in/ut-ändringar är inte möjliga"
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 msgid "Step Entry"
 msgstr ""
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr ""
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 msgid "Assign all tracks and buses (prefader)"
 msgstr ""
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr ""
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 msgid "Assign all tracks and buses (postfader)"
 msgstr ""
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 #, fuzzy
 msgid "Assign selected tracks (prefader)"
 msgstr "till valda spår"
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 msgid "Assign selected tracks and buses (prefader)"
 msgstr ""
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 #, fuzzy
 msgid "Assign selected tracks (postfader)"
 msgstr "Lägg till i valt spår"
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 msgid "Assign selected tracks and buses (postfader)"
 msgstr ""
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 #, fuzzy
 msgid "Copy track/bus gains to sends"
 msgstr "ardour: spår/buss-inspektör"
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr ""
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr ""
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 #, fuzzy
 msgid "Solo Isolate"
 msgstr "Solo-säker"
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr "Före-nivåreglage"
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr "Efter-nivåreglage"
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr "Kontrollutgångar"
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr "Huvudutgångar"
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 msgid "Color Selection"
 msgstr "Färgval"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 #, fuzzy
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
@@ -10402,7 +10623,7 @@ msgstr ""
 "Du kanske också förlorar spellista använd av detta spår.\n"
 "(detta kan inte ångras)"
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 #, fuzzy
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
@@ -10412,65 +10633,65 @@ msgstr ""
 "Vill du verkligen ta bort buss \"%1\" ?\n"
 "(detta kan inte ångras)"
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 #, fuzzy
 msgid "Remove track"
 msgstr "Ta bort markör"
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 #, fuzzy
 msgid "Remove bus"
 msgstr "Ta bort '%s'"
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
 msgstr ""
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 #, fuzzy
 msgid "Use the new name"
 msgstr "nytt namn: "
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 #, fuzzy
 msgid "Re-edit the name"
 msgstr "ändra tempo"
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 msgid "Rename Track"
 msgstr "Döp om spår"
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 msgid "Rename Bus"
 msgstr "Byt namn på buss"
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 msgid " latency"
 msgstr "-fördröjning"
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr ""
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 msgid "Save As Template"
 msgstr "Spara som spårmall"
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 msgid "Template name:"
 msgstr "Namn på spårmall:"
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 msgid "Remote Control ID"
 msgstr "Fjärrstyrnings-ID"
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 msgid "Remote control ID:"
 msgstr "Fjärr-ID:"
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -10478,17 +10699,17 @@ msgid ""
 "The remote control ID of %3 cannot be changed."
 msgstr ""
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the master bus"
 msgstr "Skapa master-buss"
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the monitor bus"
 msgstr "Skapa medhörningsbuss"
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -10499,17 +10720,17 @@ msgid ""
 "change this%5"
 msgstr ""
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the mixer"
 msgstr "Remixare"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the editor"
 msgstr "redigerare"
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
@@ -10517,7 +10738,7 @@ msgstr ""
 "Vänsterklicka för att invertera (fasinvers) kanal %1 i detta spår. "
 "Högerklicka för att visa menyn"
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr ""
 
@@ -10536,7 +10757,7 @@ msgstr " Klicka här för att lägga till ett format"
 msgid "the session folder"
 msgstr "Skapa sessionsmappen i:"
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 #, fuzzy
 msgid "Send "
 msgstr "Skicka MTC"
@@ -11030,53 +11251,109 @@ msgstr "Klistra mot takt & slag"
 msgid "Glue new regions to bars and beats"
 msgstr "Klistra mot takt & slag"
 
-#: sfdb_ui.cc:87 sfdb_ui.cc:107 sfdb_ui.cc:116
+#: session_option_editor.cc:275 session_option_editor.cc:277
+#: session_option_editor.cc:284 session_option_editor.cc:291
+#: session_option_editor.cc:298 session_option_editor.cc:300
+#: session_option_editor.cc:307 session_option_editor.cc:314
+#: session_option_editor.cc:321 session_option_editor.cc:323
+#, fuzzy
+msgid "Meterbridge"
+msgstr "Nivåmätning"
+
+#: session_option_editor.cc:275
+msgid "Route Display"
+msgstr ""
+
+#: session_option_editor.cc:279
+#, fuzzy
+msgid "Show Midi Tracks"
+msgstr "Visa alla MIDI-spår"
+
+#: session_option_editor.cc:286
+#, fuzzy
+msgid "Show Busses"
+msgstr "buss(ar)"
+
+#: session_option_editor.cc:293
+#, fuzzy
+msgid "Include Master Bus"
+msgstr "Skapa master-buss"
+
+#: session_option_editor.cc:298
+msgid "Button Area"
+msgstr ""
+
+#: session_option_editor.cc:302
+#, fuzzy
+msgid "Rec-enable Button"
+msgstr "ändra inspelningsläge"
+
+#: session_option_editor.cc:309
+#, fuzzy
+msgid "Mute Button"
+msgstr "+ musknapp"
+
+#: session_option_editor.cc:316
+#, fuzzy
+msgid "Solo Button"
+msgstr "Solo / tysta"
+
+#: session_option_editor.cc:321
+msgid "Name Labels"
+msgstr ""
+
+#: session_option_editor.cc:325
+#, fuzzy
+msgid "Track Name"
+msgstr "Spår/Bussar"
+
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 msgid "as new tracks"
 msgstr "som nya spår"
 
-#: sfdb_ui.cc:89 sfdb_ui.cc:109
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 msgid "to selected tracks"
 msgstr "till valda spår"
 
-#: sfdb_ui.cc:91 sfdb_ui.cc:111
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 msgid "to region list"
 msgstr "till regionslistan"
 
-#: sfdb_ui.cc:93 sfdb_ui.cc:113
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 msgid "as new tape tracks"
 msgstr "som nya bandspår"
 
-#: sfdb_ui.cc:97
+#: sfdb_ui.cc:96
 #, fuzzy
 msgid "programming error: unknown import mode string %1"
 msgstr "programmeringsfel: omöjlig kontroll-metod"
 
-#: sfdb_ui.cc:124
+#: sfdb_ui.cc:123
 msgid "Auto-play"
 msgstr "Spela autom."
 
-#: sfdb_ui.cc:130 sfdb_ui.cc:237
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 #, fuzzy
 msgid "<b>Sound File Information</b>"
 msgstr "<b>Information</b>"
 
-#: sfdb_ui.cc:142
+#: sfdb_ui.cc:141
 msgid "Timestamp:"
 msgstr ""
 
-#: sfdb_ui.cc:144
+#: sfdb_ui.cc:143
 msgid "Format:"
 msgstr ""
 
-#: sfdb_ui.cc:183 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr "Taggar:"
 
-#: sfdb_ui.cc:320
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr ""
 
-#: sfdb_ui.cc:327
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "Kunde inte läsa fil: %1 (%2)."
 
@@ -11105,11 +11382,11 @@ msgstr "Ljudfiler"
 msgid "MIDI files"
 msgstr "MIDI-filer"
 
-#: sfdb_ui.cc:458 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 msgid "All files"
 msgstr "Alla filer"
 
-#: sfdb_ui.cc:477 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 msgid "Browse Files"
 msgstr "Bläddra"
 
@@ -11117,186 +11394,174 @@ msgstr "Bläddra"
 msgid "Paths"
 msgstr "Sökvägar"
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr "Sök taggar"
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 #, fuzzy
 msgid "Sort:"
 msgstr "Sortera"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 #, fuzzy
 msgid "Longest"
 msgstr "LÃ¥ng"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 #, fuzzy
 msgid "Shortest"
 msgstr "Kort"
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 #, fuzzy
 msgid "Newest"
 msgstr "LÃ¥ngsammast"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr ""
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr ""
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 #, fuzzy
 msgid "Least downloaded"
 msgstr "Ladda ner"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr ""
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr ""
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr ""
 
-#: sfdb_ui.cc:572
+#: sfdb_ui.cc:555
+msgid "Similar"
+msgstr ""
+
+#: sfdb_ui.cc:567
 msgid "ID"
 msgstr ""
 
-#: sfdb_ui.cc:573 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 #, fuzzy
 msgid "Filename"
 msgstr "Döp om"
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:570
 #, fuzzy
 msgid "Duration"
 msgstr "Varaktighet (sekunder)"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:571
 #, fuzzy
 msgid "Size"
 msgstr "Max storlek"
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:572
 #, fuzzy
 msgid "Samplerate"
 msgstr "Samplingsfrekvens:"
 
-#: sfdb_ui.cc:578
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr ""
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr "Sök i Freesound"
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr ""
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr ""
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr ""
 
-#: sfdb_ui.cc:846
-msgid "found %1 match"
-msgid_plural "found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:862
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr ""
 
-#: sfdb_ui.cc:960
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sfdb_ui.cc:965
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr ""
 
-#: sfdb_ui.cc:1029
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr ""
 
-#: sfdb_ui.cc:1031
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr ""
 
-#: sfdb_ui.cc:1033 sfdb_ui.cc:1035
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr ""
 
-#: sfdb_ui.cc:1037
+#: sfdb_ui.cc:1086
 #, fuzzy
 msgid "GB"
 msgstr "GÃ¥ till"
 
-#: sfdb_ui.cc:1070
-msgid "Search returned no results."
-msgstr ""
-
-#: sfdb_ui.cc:1072
-msgid "Found %1 match"
-msgid_plural "Found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:1277 sfdb_ui.cc:1585 sfdb_ui.cc:1635 sfdb_ui.cc:1653
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr "ett spår per fil"
 
-#: sfdb_ui.cc:1280 sfdb_ui.cc:1636 sfdb_ui.cc:1654
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 #, fuzzy
 msgid "one track per channel"
 msgstr "ett spår per fil"
 
-#: sfdb_ui.cc:1288 sfdb_ui.cc:1638 sfdb_ui.cc:1655
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 #, fuzzy
 msgid "sequence files"
 msgstr "rensade filer"
 
-#: sfdb_ui.cc:1291 sfdb_ui.cc:1643
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 #, fuzzy
 msgid "all files in one track"
 msgstr "som nya spår"
 
-#: sfdb_ui.cc:1292 sfdb_ui.cc:1637
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 #, fuzzy
 msgid "merge files"
 msgstr "rensade filer"
 
-#: sfdb_ui.cc:1298 sfdb_ui.cc:1640
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 #, fuzzy
 msgid "one region per file"
 msgstr "ett spår per fil"
 
-#: sfdb_ui.cc:1301 sfdb_ui.cc:1641
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 #, fuzzy
 msgid "one region per channel"
 msgstr "Skapa en region för varje kanal"
 
-#: sfdb_ui.cc:1306 sfdb_ui.cc:1642 sfdb_ui.cc:1656
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 #, fuzzy
 msgid "all files in one region"
 msgstr "justera region"
 
-#: sfdb_ui.cc:1373
+#: sfdb_ui.cc:1394
 #, fuzzy
 msgid ""
 "One or more of the selected files\n"
@@ -11305,58 +11570,58 @@ msgstr ""
 "En eller flera filer kunde\n"
 "inte användas av Ardour"
 
-#: sfdb_ui.cc:1513
+#: sfdb_ui.cc:1534
 msgid "Copy files to session"
 msgstr "Kopiera filer till sessionen"
 
-#: sfdb_ui.cc:1530 sfdb_ui.cc:1693
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 msgid "file timestamp"
 msgstr "filens timestamp"
 
-#: sfdb_ui.cc:1531 sfdb_ui.cc:1695
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 msgid "edit point"
 msgstr "redigeringspunkten"
 
-#: sfdb_ui.cc:1532 sfdb_ui.cc:1697
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 msgid "playhead"
 msgstr "startmarkören"
 
-#: sfdb_ui.cc:1533
+#: sfdb_ui.cc:1554
 msgid "session start"
 msgstr "sessionens start"
 
-#: sfdb_ui.cc:1538
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1581
 #, fuzzy
 msgid "<b>Insert at</b>"
 msgstr "Infoga vid:"
 
-#: sfdb_ui.cc:1573
+#: sfdb_ui.cc:1594
 #, fuzzy
 msgid "<b>Mapping</b>"
 msgstr "<b>Gemensamt</b>"
 
-#: sfdb_ui.cc:1591
+#: sfdb_ui.cc:1612
 #, fuzzy
 msgid "<b>Conversion quality</b>"
 msgstr "Konverteringskvalitet:"
 
-#: sfdb_ui.cc:1603 sfdb_ui.cc:1709
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr "Bäst"
 
-#: sfdb_ui.cc:1604 sfdb_ui.cc:1711
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr "Bra"
 
-#: sfdb_ui.cc:1605 sfdb_ui.cc:1713
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr "Snabb"
 
-#: sfdb_ui.cc:1607
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "Snabbast"
 
@@ -11455,21 +11720,21 @@ msgstr "Jag vill ha fler alternativ för sessionen"
 
 #: startup.cc:194
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -11603,10 +11868,6 @@ msgstr ""
 msgid "Click to open the program website in your web browser"
 msgstr ""
 
-#: startup.cc:594
-msgid "What would you like to do ?"
-msgstr "Vad vill du göra?"
-
 #: startup.cc:729
 msgid "Open"
 msgstr "Öppna"
@@ -11619,84 +11880,84 @@ msgstr "Sessionens namn:"
 msgid "Create session folder in:"
 msgstr "Skapa sessionsmappen i:"
 
-#: startup.cc:813
+#: startup.cc:821
 msgid "Select folder for session"
 msgstr "Välj mapp för sessionen"
 
-#: startup.cc:845
+#: startup.cc:853
 msgid "Use this template"
 msgstr "Använd denna mall"
 
-#: startup.cc:848
+#: startup.cc:856
 msgid "no template"
 msgstr "ingen mall"
 
-#: startup.cc:876
+#: startup.cc:884
 msgid "Use an existing session as a template:"
 msgstr "Använd en existerande session som mall:"
 
-#: startup.cc:888
+#: startup.cc:896
 msgid "Select template"
 msgstr "Välj mall"
 
-#: startup.cc:914
+#: startup.cc:922
 msgid "New Session"
 msgstr "Ny session"
 
-#: startup.cc:1068
+#: startup.cc:1077
 msgid "Select session file"
 msgstr "Välj sessionsfil"
 
-#: startup.cc:1084
+#: startup.cc:1093
 msgid "Browse:"
 msgstr "Bläddra:"
 
-#: startup.cc:1093
+#: startup.cc:1102
 msgid "Select a session"
 msgstr "Välj en session"
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 msgid "channels"
 msgstr "kanaler"
 
-#: startup.cc:1135
+#: startup.cc:1145
 msgid "<b>Busses</b>"
 msgstr "<b>Bussar</b>"
 
-#: startup.cc:1136
+#: startup.cc:1146
 msgid "<b>Inputs</b>"
 msgstr "<b>Ingångar</b>"
 
-#: startup.cc:1137
+#: startup.cc:1147
 msgid "<b>Outputs</b>"
 msgstr "<b>Utgångar</b>"
 
-#: startup.cc:1145
+#: startup.cc:1155
 msgid "Create master bus"
 msgstr "Skapa master-buss"
 
-#: startup.cc:1155
+#: startup.cc:1165
 #, fuzzy
 msgid "Automatically connect to physical inputs"
 msgstr "Anslut automatiskt till fysiska ingångar"
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr "Använd endast"
 
-#: startup.cc:1215
+#: startup.cc:1225
 msgid "Automatically connect outputs"
 msgstr "Anslut automatiskt utgångar"
 
-#: startup.cc:1237
+#: startup.cc:1247
 msgid "... to master bus"
 msgstr "...till master-bussen"
 
-#: startup.cc:1247
+#: startup.cc:1257
 msgid "... to physical outputs"
 msgstr "...till fysiska utgångar"
 
-#: startup.cc:1297
+#: startup.cc:1307
 msgid "Advanced Session Options"
 msgstr "Avancerade sessionsalternativ"
 
@@ -12424,21 +12685,21 @@ msgstr ""
 msgid "bad XPM header %1"
 msgstr ""
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr "saknar RGBA-stil för \"%1\""
 
-#: utils.cc:544
+#: utils.cc:591
 #, fuzzy
 msgid "cannot find XPM file for %1"
 msgstr "kan inte hitta bilder för reglageräcke"
 
-#: utils.cc:570
+#: utils.cc:617
 #, fuzzy
 msgid "cannot find icon image for %1 using %2"
 msgstr "kan inte hitta bilder för reglageräcke"
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr ""
 
@@ -12446,85 +12707,86 @@ msgstr ""
 msgid "VerboseCanvasCursor"
 msgstr ""
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 #, fuzzy
 msgid "Set Video Track"
 msgstr "Lägg till spår"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 #, fuzzy
 msgid "Launch External Video Monitor"
 msgstr "Extern medhörning"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr ""
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr ""
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 #, fuzzy
 msgid "Video files"
 msgstr "Ljudfiler"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 #, fuzzy
 msgid "<b>Video Information</b>"
 msgstr "<b>Information</b>"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 #, fuzzy
 msgid "Start:"
 msgstr "Början:"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 #, fuzzy
 msgid "Frame rate:"
 msgstr "Samplingsfrekvens:"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr ""
 
-#: editor_videotimeline.cc:138
+#: editor_videotimeline.cc:146
 msgid "Export Successful: %1"
 msgstr ""
 
-#: video_timeline.cc:467
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:501
-#, fuzzy
-msgid "Failed to set session-framerate: "
-msgstr "Kopiera en fil till sessionsmappen"
-
-#: video_timeline.cc:501
-msgid " does not have a corresponding option setting in Ardour."
+#: video_timeline.cc:507
+msgid ""
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:507
+#: video_timeline.cc:515
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:508
-msgid " vs "
+#: video_timeline.cc:588
+msgid ""
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:690
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12532,18 +12794,18 @@ msgid ""
 "xjadeo's remote-control interface 'xjremote')."
 msgstr ""
 
-#: video_monitor.cc:282
+#: video_monitor.cc:281
 #, fuzzy
 msgid "Video Monitor: File Not Found."
 msgstr "Medhörning"
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -12553,376 +12815,384 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 #, fuzzy
 msgid "Transcode/Import Video File "
 msgstr "Exportera till ljudfil(er)..."
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 #, fuzzy
 msgid "Output File:"
 msgstr "Utgångsenhet:"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr ""
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 #, fuzzy
 msgid "Height = "
 msgstr "Höjd"
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr ""
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 #, fuzzy
 msgid "<b>File Information</b>"
 msgstr "<b>Information</b>"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr ""
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 #, fuzzy
 msgid "Duration:"
 msgstr "Varaktighet (sekunder)"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr ""
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr ""
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 msgid "??"
 msgstr ""
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 #, fuzzy
 msgid "<b>Import Settings</b>"
 msgstr "<b>Alternativ</b>"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr ""
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr ""
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 #, fuzzy
 msgid "Import/Transcode Video to Session"
 msgstr "Importera från session"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr ""
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 #, fuzzy
 msgid "Original Width"
 msgstr "Ursprunglig position"
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr ""
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 #, fuzzy
 msgid "Extract Audio:"
 msgstr "Exportera session"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 #, fuzzy
 msgid "Extracting Audio.."
 msgstr "Lägg till ljudfil"
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr ""
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 msgid "Transcoding Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 #, fuzzy
 msgid "Save Transcoded Video File"
 msgstr "Exportera till ljudfil(er)..."
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr ""
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr ""
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 msgid "Server Docroot:"
 msgstr ""
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr ""
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 #, fuzzy
 msgid "Listen Port:"
 msgstr "Avlyssningsposition"
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 #, fuzzy
 msgid "Cache Size:"
 msgstr "Max storlek"
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr ""
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr ""
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 msgid "Confirm Overwrite"
 msgstr ""
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 #, fuzzy
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr "Filen existerar redan, vill du skriva över den?"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 #, fuzzy
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr "kan inte bli ny processgruppledare (%1)"
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 #, fuzzy
 msgid "Export Video File "
 msgstr "Exportera till ljudfil(er)..."
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 #, fuzzy
 msgid "Video:"
 msgstr "Filstart:"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr ""
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr ""
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 #, fuzzy
 msgid "Normalize Audio"
 msgstr "Normalisera till"
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr ""
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr ""
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 #, fuzzy
 msgid "Deinterlace"
 msgstr "intern"
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr ""
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 #, fuzzy
 msgid "Include Session Metadata"
 msgstr "Redigera sessionens metadata"
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr ""
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 #, fuzzy
 msgid "<b>Output:</b>"
 msgstr "<b>Utgångar</b>"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 #, fuzzy
 msgid "<b>Input:</b>"
 msgstr "<b>Ingångar</b>"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 #, fuzzy
 msgid "Audio:"
 msgstr "Ljudspår"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 #, fuzzy
 msgid "Master Bus"
 msgstr "Skapa master-buss"
 
-#: export_video_dialog.cc:166
+#: export_video_dialog.cc:145
+msgid "from the %1 session's start to the session's end"
+msgstr ""
+
+#: export_video_dialog.cc:149
+msgid "from 00:00:00:00 to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:151
+msgid "from the video's start to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:184
 #, fuzzy
 msgid "<b>Settings:</b>"
 msgstr "<b>Destinationer</b>"
 
-#: export_video_dialog.cc:174
+#: export_video_dialog.cc:192
 #, fuzzy
 msgid "Range:"
 msgstr "Omfång"
 
-#: export_video_dialog.cc:177
+#: export_video_dialog.cc:195
 #, fuzzy
 msgid "Preset:"
 msgstr "Ny förinställning"
 
-#: export_video_dialog.cc:180
+#: export_video_dialog.cc:198
 #, fuzzy
 msgid "Video Codec:"
 msgstr "Mapp:"
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:201
 #, fuzzy
 msgid "Video KBit/s:"
 msgstr "Filstart:"
 
-#: export_video_dialog.cc:186
+#: export_video_dialog.cc:204
 #, fuzzy
 msgid "Audio Codec:"
 msgstr "Ljudläge:"
 
-#: export_video_dialog.cc:189
+#: export_video_dialog.cc:207
 #, fuzzy
 msgid "Audio KBit/s:"
 msgstr "Ljudfiler"
 
-#: export_video_dialog.cc:192
+#: export_video_dialog.cc:210
 #, fuzzy
 msgid "Audio Samplerate:"
 msgstr "Samplingsfrekvens:"
 
-#: export_video_dialog.cc:369
+#: export_video_dialog.cc:387
 #, fuzzy
 msgid "Normalizing audio"
 msgstr "Normalisera värden"
 
-#: export_video_dialog.cc:373
+#: export_video_dialog.cc:391
 #, fuzzy
 msgid "Exporting audio"
 msgstr "Exportera session"
 
-#: export_video_dialog.cc:419
+#: export_video_dialog.cc:437
 #, fuzzy
-msgid "Exporting Audio.."
+msgid "Exporting Audio..."
 msgstr "Exportera session"
 
-#: export_video_dialog.cc:476
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:505
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:544
-msgid "Encoding Video.."
+#: export_video_dialog.cc:562
+msgid "Encoding Video..."
 msgstr ""
 
-#: export_video_dialog.cc:563
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:661
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr ""
 
-#: export_video_dialog.cc:673
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr ""
 
-#: export_video_dialog.cc:761
+#: export_video_dialog.cc:779
 msgid "Transcoding failed."
 msgstr ""
 
-#: export_video_dialog.cc:930 export_video_dialog.cc:950
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 #, fuzzy
 msgid "Save Exported Video File"
 msgstr "Exportera till ljudfil(er)..."
@@ -12940,33 +13210,37 @@ msgstr ""
 msgid "<b>Video Export Info</b>"
 msgstr ""
 
-#: export_video_infobox.cc:46
+#: export_video_infobox.cc:48
 msgid ""
-"Ardour video export is not recommended for mastering!\n"
-"While 'ffmpeg' (which is used by ardour) can produce high-quality files, "
-"this export lacks the possibility to tweak many settings. We recommend to "
-"use 'winff', 'devede' or 'dvdauthor' to mux & master. Nevertheless this "
-"video-export comes in handy to do quick snapshots, intermediates, dailies or "
-"online videos.\n"
-"\n"
-"The soundtrack is created from the master-bus of the current Ardour "
-"session.\n"
+"Video encoding is a non-trivial task with many details.\n"
 "\n"
-"The video soure defaults to the file used in the video timeline, which may "
-"not the best quality to start with, you should the original video file.\n"
+"Please see the manual at %1/video-timeline/operations/#export.\n"
 "\n"
-"If the export-range is longer than the original video, black video frames "
-"are prefixed and/or appended. This process may fail with non-standard pixel-"
-"aspect-ratios.\n"
-"\n"
-"The file-format is determined by the extension that you choose for the "
-"output file (.avi, .mov, .flv, .ogv,...)\n"
-"Note: not all combinations of format+codec+settings produce files which are "
-"according so spec. e.g. flv files require sample-rates of 22.1kHz or "
-"44.1kHz, mpeg containers can not be used with ac3 audio-codec, etc. If in "
-"doubt, use one of the built-in presets."
+"Open Manual in Browser? "
 msgstr ""
 
+#~ msgid "slowest"
+#~ msgstr "långsammast"
+
+#~ msgid "slow"
+#~ msgstr "långsam"
+
+#~ msgid "fast"
+#~ msgstr "snabb"
+
+#~ msgid "faster"
+#~ msgstr "snabbare"
+
+#~ msgid "fastest"
+#~ msgstr "snabbast"
+
+#~ msgid "What would you like to do ?"
+#~ msgstr "Vad vill du göra?"
+
+#, fuzzy
+#~ msgid "Failed to set session-framerate: "
+#~ msgstr "Kopiera en fil till sessionsmappen"
+
 #~ msgid "Connect"
 #~ msgstr "Anslut"
 
@@ -15078,9 +15352,6 @@ msgstr ""
 #~ msgid "solo change"
 #~ msgstr "ändra solo"
 
-#~ msgid "rec-enable change"
-#~ msgstr "ändra inspelningsläge"
-
 #~ msgid "mix group solo  change"
 #~ msgstr "mixgrupp-solo-ändring"
 
@@ -15135,13 +15406,6 @@ msgstr ""
 #~ msgid "Beats per bar"
 #~ msgstr "Slag per takt"
 
-#~ msgid ""
-#~ "Do you really want to remove track \"%1\" ?\n"
-#~ "(cannot be undone)"
-#~ msgstr ""
-#~ "Vill du verkligen ta bort spår \"%1\" ?\n"
-#~ "(detta kan inte ångras)"
-
 #~ msgid "Add to Region list"
 #~ msgstr "Lägg till i regionlistan"
 
diff --git a/gtk2_ardour/po/zh.po b/gtk2_ardour/po/zh.po
index 13686f0270..f03eaf1506 100644
--- a/gtk2_ardour/po/zh.po
+++ b/gtk2_ardour/po/zh.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ardour 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2013-01-03 08:29-0500\n"
 "Last-Translator: Rui-huai Zhang <zrhzrh>\n"
 "Language-Team: zrhzrh <zrhzrh@mail.ustc.edu.cn>\n"
@@ -373,7 +373,7 @@ msgstr "%1 ��定义文件未找到"
 msgid "%1 will not work without a valid ardour.menus file"
 msgstr ""
 
-#: add_route_dialog.cc:53 route_params_ui.cc:503
+#: add_route_dialog.cc:53 route_params_ui.cc:500
 msgid "Add Track or Bus"
 msgstr "添加音轨或总线"
 
@@ -413,8 +413,8 @@ msgstr "总线"
 msgid "Add:"
 msgstr "添加:"
 
-#: add_route_dialog.cc:114 startup.cc:833 time_fx_dialog.cc:91
-#: add_video_dialog.cc:149 video_server_dialog.cc:109
+#: add_route_dialog.cc:114 startup.cc:841 time_fx_dialog.cc:91
+#: add_video_dialog.cc:150 video_server_dialog.cc:112
 msgid "<b>Options</b>"
 msgstr "<b>选项</b>"
 
@@ -428,21 +428,21 @@ msgid "Group:"
 msgstr "分组:"
 
 #: add_route_dialog.cc:215 add_route_dialog.cc:224 add_route_dialog.cc:298
-#: rc_option_editor.cc:1448 rc_option_editor.cc:1450 rc_option_editor.cc:1452
-#: rc_option_editor.cc:1470 rc_option_editor.cc:1472 rc_option_editor.cc:1480
-#: rc_option_editor.cc:1482 rc_option_editor.cc:1500 rc_option_editor.cc:1513
-#: rc_option_editor.cc:1515 rc_option_editor.cc:1517 rc_option_editor.cc:1548
-#: rc_option_editor.cc:1550 rc_option_editor.cc:1552 rc_option_editor.cc:1560
-#: rc_option_editor.cc:1568 rc_option_editor.cc:1576
+#: rc_option_editor.cc:1456 rc_option_editor.cc:1458 rc_option_editor.cc:1460
+#: rc_option_editor.cc:1478 rc_option_editor.cc:1480 rc_option_editor.cc:1488
+#: rc_option_editor.cc:1490 rc_option_editor.cc:1508 rc_option_editor.cc:1521
+#: rc_option_editor.cc:1523 rc_option_editor.cc:1525 rc_option_editor.cc:1556
+#: rc_option_editor.cc:1558 rc_option_editor.cc:1560 rc_option_editor.cc:1568
+#: rc_option_editor.cc:1576 rc_option_editor.cc:1584
 msgid "Audio"
 msgstr "音频"
 
 #: add_route_dialog.cc:216 add_route_dialog.cc:227 add_route_dialog.cc:299
-#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1699
-#: rc_option_editor.cc:1707 rc_option_editor.cc:1715 rc_option_editor.cc:1724
-#: rc_option_editor.cc:1732 rc_option_editor.cc:1740 rc_option_editor.cc:1748
-#: rc_option_editor.cc:1757 rc_option_editor.cc:1766 rc_option_editor.cc:1775
-#: rc_option_editor.cc:1783 rc_option_editor.cc:1791
+#: editor_actions.cc:105 missing_file_dialog.cc:55 rc_option_editor.cc:1707
+#: rc_option_editor.cc:1715 rc_option_editor.cc:1723 rc_option_editor.cc:1732
+#: rc_option_editor.cc:1740 rc_option_editor.cc:1748 rc_option_editor.cc:1756
+#: rc_option_editor.cc:1765 rc_option_editor.cc:1774 rc_option_editor.cc:1783
+#: rc_option_editor.cc:1791 rc_option_editor.cc:1799
 msgid "MIDI"
 msgstr "MIDI"
 
@@ -465,7 +465,7 @@ msgid ""
 msgstr ""
 
 #: add_route_dialog.cc:319 add_route_dialog.cc:338 editor_actions.cc:385
-#: editor_rulers.cc:377 time_axis_view.cc:1301
+#: editor_rulers.cc:377 time_axis_view.cc:1305
 msgid "Normal"
 msgstr "普通"
 
@@ -509,7 +509,7 @@ msgstr "八声�"
 msgid "12 Channel"
 msgstr "�二声�"
 
-#: add_route_dialog.cc:475 mixer_strip.cc:2136
+#: add_route_dialog.cc:475 mixer_strip.cc:2131
 msgid "Custom"
 msgstr "自定义"
 
@@ -598,7 +598,7 @@ msgid "Track"
 msgstr "音轨"
 
 #: analysis_window.cc:68 editor_actions.cc:616 mixer_ui.cc:125
-#: mixer_ui.cc:1793
+#: mixer_ui.cc:1795
 msgid "Show"
 msgstr "显示"
 
@@ -606,96 +606,92 @@ msgstr "显示"
 msgid "Re-analyze data"
 msgstr "�新分�数�"
 
-#: ardour_button.cc:658
+#: ardour_button.cc:704
 msgid "button cannot watch state of non-existing Controllable\n"
 msgstr ""
 
-#: ardour_ui.cc:179
+#: ardour_ui.cc:180
 #, fuzzy
 msgid "audition"
 msgstr "监�"
 
-#: ardour_ui.cc:180
+#: ardour_ui.cc:181
 msgid "solo"
 msgstr ""
 
-#: ardour_ui.cc:181
+#: ardour_ui.cc:182
 #, fuzzy
 msgid "feedback"
 msgstr "�馈"
 
-#: ardour_ui.cc:183 speaker_dialog.cc:36
+#: ardour_ui.cc:187 speaker_dialog.cc:36
 msgid "Speaker Configuration"
 msgstr "扬声器�置"
 
-#: ardour_ui.cc:184 theme_manager.cc:56 theme_manager.cc:64
+#: ardour_ui.cc:188 theme_manager.cc:56 theme_manager.cc:64
 msgid "Theme Manager"
 msgstr "主题管�"
 
-#: ardour_ui.cc:185 keyeditor.cc:53
+#: ardour_ui.cc:189 keyeditor.cc:53
 msgid "Key Bindings"
 msgstr "按键绑定"
 
-#: ardour_ui.cc:186
+#: ardour_ui.cc:190
 msgid "Preferences"
 msgstr "首选项"
 
-#: ardour_ui.cc:187 ardour_ui.cc:192
+#: ardour_ui.cc:191 ardour_ui.cc:196
 #, fuzzy
 msgid "Add Tracks/Busses"
 msgstr "音轨/总线"
 
-#: ardour_ui.cc:188
+#: ardour_ui.cc:192
 msgid "About"
 msgstr "关于"
 
-#: ardour_ui.cc:189 location_ui.cc:1134
+#: ardour_ui.cc:193 location_ui.cc:1146
 msgid "Locations"
 msgstr "�置"
 
-#: ardour_ui.cc:190 route_params_ui.cc:57 route_params_ui.cc:604
+#: ardour_ui.cc:194 route_params_ui.cc:58 route_params_ui.cc:606
 msgid "Tracks and Busses"
 msgstr "音轨和总线"
 
-#: ardour_ui.cc:191
+#: ardour_ui.cc:195
 msgid "Properties"
 msgstr "属性"
 
-#: ardour_ui.cc:193 bundle_manager.cc:263
+#: ardour_ui.cc:197 bundle_manager.cc:263
 msgid "Bundle Manager"
 msgstr "�绑管�"
 
-#: ardour_ui.cc:194 big_clock_window.cc:35
+#: ardour_ui.cc:198 big_clock_window.cc:35
 msgid "Big Clock"
 msgstr "大时钟"
 
-#: ardour_ui.cc:195
+#: ardour_ui.cc:199
 #, fuzzy
 msgid "Audio Connections"
 msgstr "音频连结管�"
 
-#: ardour_ui.cc:196
+#: ardour_ui.cc:200
 #, fuzzy
 msgid "MIDI Connections"
 msgstr "MIDI连接管�"
 
-#: ardour_ui.cc:198
+#: ardour_ui.cc:202
 msgid "Errors"
 msgstr "错误"
 
-#: ardour_ui.cc:299
-msgid "could not initialize %1."
-msgstr "无法�始化 %1."
-
-#: ardour_ui.cc:394
+#: ardour_ui.cc:388
 msgid "Starting audio engine"
 msgstr "�动音频引擎"
 
-#: ardour_ui.cc:763 startup.cc:638
+#: ardour_ui.cc:758 startup.cc:638
 msgid "%1 is ready for use"
 msgstr "%1 准备就绪"
 
-#: ardour_ui.cc:811
+#: ardour_ui.cc:806
 #, fuzzy
 msgid ""
 "WARNING: Your system has a limit for maximum amount of locked memory. This "
@@ -709,23 +705,23 @@ msgstr ""
 "\n"
 "此命令由 /etc/security/limits.conf 控制."
 
-#: ardour_ui.cc:828
+#: ardour_ui.cc:823
 msgid "Do not show this window again"
 msgstr "��显示此窗�"
 
-#: ardour_ui.cc:870
+#: ardour_ui.cc:865
 msgid "Don't quit"
 msgstr "�退出"
 
-#: ardour_ui.cc:871
+#: ardour_ui.cc:866
 msgid "Just quit"
 msgstr "��存而退出"
 
-#: ardour_ui.cc:872
+#: ardour_ui.cc:867
 msgid "Save and quit"
 msgstr "�存并退出"
 
-#: ardour_ui.cc:882
+#: ardour_ui.cc:877
 #, fuzzy
 msgid ""
 "%1 was unable to save your session.\n"
@@ -735,16 +731,16 @@ msgid ""
 "\"Just quit\" option."
 msgstr "Ardour 无法�存此会�.\n"
 
-#: ardour_ui.cc:913
+#: ardour_ui.cc:908
 #, fuzzy
 msgid "Please wait while %1 cleans up..."
 msgstr "请等待，%1 载入�视化数�"
 
-#: ardour_ui.cc:930
+#: ardour_ui.cc:925
 msgid "Unsaved Session"
 msgstr "未�存的会�"
 
-#: ardour_ui.cc:951
+#: ardour_ui.cc:946
 msgid ""
 "The session \"%1\"\n"
 "has not been saved.\n"
@@ -761,7 +757,7 @@ msgstr ""
 "\n"
 "你想干�?"
 
-#: ardour_ui.cc:954
+#: ardour_ui.cc:949
 msgid ""
 "The snapshot \"%1\"\n"
 "has not been saved.\n"
@@ -778,76 +774,76 @@ msgstr ""
 "\n"
 "你想干�?"
 
-#: ardour_ui.cc:968
+#: ardour_ui.cc:963
 msgid "Prompter"
 msgstr ""
 
-#: ardour_ui.cc:1045
+#: ardour_ui.cc:1049
 msgid "disconnected"
 msgstr "�消连接"
 
-#: ardour_ui.cc:1052
+#: ardour_ui.cc:1056
 #, c-format
 msgid "JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1056
+#: ardour_ui.cc:1060
 #, c-format
 msgid "JACK: <span foreground=\"green\">%<PRId64> kHz / %4.1f ms</span>"
 msgstr ""
 
-#: ardour_ui.cc:1074 export_video_dialog.cc:67
+#: ardour_ui.cc:1078 export_video_dialog.cc:68
 #, fuzzy
 msgid "File:"
 msgstr "文件开始:"
 
-#: ardour_ui.cc:1078
+#: ardour_ui.cc:1082
 msgid "BWF"
 msgstr ""
 
-#: ardour_ui.cc:1081
+#: ardour_ui.cc:1085
 #, fuzzy
 msgid "WAV"
 msgstr "WAVE"
 
-#: ardour_ui.cc:1084
+#: ardour_ui.cc:1088
 msgid "WAV64"
 msgstr ""
 
-#: ardour_ui.cc:1087 session_option_editor.cc:197
+#: ardour_ui.cc:1091 session_option_editor.cc:197
 msgid "CAF"
 msgstr "CAF"
 
-#: ardour_ui.cc:1090
+#: ardour_ui.cc:1094
 msgid "AIFF"
 msgstr ""
 
-#: ardour_ui.cc:1093
+#: ardour_ui.cc:1097
 msgid "iXML"
 msgstr ""
 
-#: ardour_ui.cc:1096
+#: ardour_ui.cc:1100
 msgid "RF64"
 msgstr ""
 
-#: ardour_ui.cc:1104
+#: ardour_ui.cc:1108
 msgid "32-float"
 msgstr ""
 
-#: ardour_ui.cc:1107
+#: ardour_ui.cc:1111
 msgid "24-int"
 msgstr ""
 
-#: ardour_ui.cc:1110
+#: ardour_ui.cc:1114
 msgid "16-int"
 msgstr ""
 
-#: ardour_ui.cc:1129
+#: ardour_ui.cc:1133
 #, c-format
 msgid "DSP: <span foreground=\"%s\">%5.1f%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1148
+#: ardour_ui.cc:1152
 #, c-format
 msgid ""
 "Buffers: <span foreground=\"green\">p:</span><span foreground=\"%s\">"
@@ -855,33 +851,33 @@ msgid ""
 "\">%<PRIu32>%%</span>"
 msgstr ""
 
-#: ardour_ui.cc:1184
+#: ardour_ui.cc:1188
 msgid "Disk: <span foreground=\"green\">Unknown</span>"
 msgstr ""
 
-#: ardour_ui.cc:1186
+#: ardour_ui.cc:1190
 msgid "Disk: <span foreground=\"green\">24hrs+</span>"
 msgstr ""
 
-#: ardour_ui.cc:1204
+#: ardour_ui.cc:1208
 msgid "Disk: <span foreground=\"green\">&gt;24 hrs</span>"
 msgstr ""
 
-#: ardour_ui.cc:1215
+#: ardour_ui.cc:1219
 #, c-format
 msgid "Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"
 msgstr ""
 
-#: ardour_ui.cc:1241
+#: ardour_ui.cc:1245
 #, c-format
 msgid "Timecode|TC: <span foreground=\"%s\">%s</span>"
 msgstr ""
 
-#: ardour_ui.cc:1358 ardour_ui.cc:1367 startup.cc:1045
+#: ardour_ui.cc:1362 ardour_ui.cc:1371 startup.cc:1054
 msgid "Recent Sessions"
 msgstr "最近的会�"
 
-#: ardour_ui.cc:1447
+#: ardour_ui.cc:1451
 msgid ""
 "%1 is not connected to JACK\n"
 "You cannot open or close sessions in this condition"
@@ -889,27 +885,27 @@ msgstr ""
 "%1 未连接到 JACK.\n"
 "�此情况下，你无法打开或关闭会�"
 
-#: ardour_ui.cc:1474
+#: ardour_ui.cc:1478
 msgid "Open Session"
 msgstr "打开会�"
 
-#: ardour_ui.cc:1492 session_import_dialog.cc:169
-#: session_metadata_dialog.cc:729 startup.cc:1074
+#: ardour_ui.cc:1503 session_import_dialog.cc:169
+#: session_metadata_dialog.cc:729 startup.cc:1083
 msgid "%1 sessions"
 msgstr "%1 会�"
 
-#: ardour_ui.cc:1529
+#: ardour_ui.cc:1540
 msgid "You cannot add a track without a session already loaded."
 msgstr "您�能在已载入的会�中添加音轨"
 
-#: ardour_ui.cc:1537
+#: ardour_ui.cc:1548
 #, fuzzy
 msgid "could not create %1 new mixed track"
 msgid_plural "could not create %1 new mixed tracks"
 msgstr[0] "无法创建 %1 新的MIDI音轨"
 msgstr[1] "无法创建 %1 新的MIDI音轨"
 
-#: ardour_ui.cc:1543 ardour_ui.cc:1604
+#: ardour_ui.cc:1554 ardour_ui.cc:1615
 msgid ""
 "There are insufficient JACK ports available\n"
 "to create a new track or bus.\n"
@@ -920,25 +916,25 @@ msgstr ""
 "无法继续新建音轨或总线\n"
 "请�存 %1，�新�动JACK带�更多的端�.\n"
 
-#: ardour_ui.cc:1578
+#: ardour_ui.cc:1589
 msgid "You cannot add a track or bus without a session already loaded."
 msgstr "您�能在已载入的会�或总线中添加音轨和总线"
 
-#: ardour_ui.cc:1587
+#: ardour_ui.cc:1598
 #, fuzzy
 msgid "could not create %1 new audio track"
 msgid_plural "could not create %1 new audio tracks"
 msgstr[0] "无法新建音频音轨"
 msgstr[1] "无法新建音频音轨"
 
-#: ardour_ui.cc:1596
+#: ardour_ui.cc:1607
 #, fuzzy
 msgid "could not create %1 new audio bus"
 msgid_plural "could not create %1 new audio busses"
 msgstr[0] "无法新建 %1 新的音频总线"
 msgstr[1] "无法新建 %1 新的音频总线"
 
-#: ardour_ui.cc:1713
+#: ardour_ui.cc:1724
 #, fuzzy
 msgid ""
 "Please create one or more tracks before trying to record.\n"
@@ -947,7 +943,7 @@ msgstr ""
 "在录音之�，请创建至少一个音轨\n"
 "请查看会���."
 
-#: ardour_ui.cc:2103
+#: ardour_ui.cc:2114
 msgid ""
 "The audio backend (JACK) was shutdown because:\n"
 "\n"
@@ -957,7 +953,7 @@ msgstr ""
 "\n"
 "%1"
 
-#: ardour_ui.cc:2105
+#: ardour_ui.cc:2116
 msgid ""
 "JACK has either been shutdown or it\n"
 "disconnected %1 because %1\n"
@@ -968,19 +964,19 @@ msgstr ""
 "原因是 %1 �够快.\n"
 "�试��JACK，�新连接并且�存会�."
 
-#: ardour_ui.cc:2131
+#: ardour_ui.cc:2142
 msgid "Unable to start the session running"
 msgstr "无法�动会�"
 
-#: ardour_ui.cc:2211
+#: ardour_ui.cc:2222
 msgid "Take Snapshot"
 msgstr "å¿«ç…§"
 
-#: ardour_ui.cc:2212
+#: ardour_ui.cc:2223
 msgid "Name of new snapshot"
 msgstr "新建快照的�称"
 
-#: ardour_ui.cc:2236
+#: ardour_ui.cc:2247
 #, fuzzy
 msgid ""
 "To ensure compatibility with various systems\n"
@@ -989,27 +985,27 @@ msgstr ""
 "为了确�在��系统的兼容性\n"
 "快照文件���包�字符 '/'"
 
-#: ardour_ui.cc:2248
+#: ardour_ui.cc:2259
 msgid "Confirm Snapshot Overwrite"
 msgstr "确定覆盖快照"
 
-#: ardour_ui.cc:2249
+#: ardour_ui.cc:2260
 msgid "A snapshot already exists with that name.  Do you want to overwrite it?"
 msgstr "已存在��快照. 覆盖之?"
 
-#: ardour_ui.cc:2252 utils_videotl.cc:66
+#: ardour_ui.cc:2263 utils_videotl.cc:67
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: ardour_ui.cc:2286
+#: ardour_ui.cc:2297
 msgid "Rename Session"
 msgstr "�命�会�"
 
-#: ardour_ui.cc:2287
+#: ardour_ui.cc:2298
 msgid "New session name"
 msgstr "新建快照的�称"
 
-#: ardour_ui.cc:2301 ardour_ui.cc:2681 ardour_ui.cc:2726
+#: ardour_ui.cc:2312 ardour_ui.cc:2692 ardour_ui.cc:2737
 #, fuzzy
 msgid ""
 "To ensure compatibility with various systems\n"
@@ -1018,12 +1014,12 @@ msgstr ""
 "为了确�在��系统的兼容性\n"
 "会�文件���包�字符 '/'"
 
-#: ardour_ui.cc:2309
+#: ardour_ui.cc:2320
 msgid ""
 "That name is already in use by another directory/folder. Please try again."
 msgstr "此�称已被�一个文件夹使用. 请��试一�."
 
-#: ardour_ui.cc:2318
+#: ardour_ui.cc:2329
 msgid ""
 "Renaming this session failed.\n"
 "Things could be seriously messed up at this point"
@@ -1031,19 +1027,19 @@ msgstr ""
 "�命�会�失败.\n"
 "从现在开始事情将会�得乱七八糟"
 
-#: ardour_ui.cc:2429
+#: ardour_ui.cc:2440
 msgid "Save Template"
 msgstr "�存模�..."
 
-#: ardour_ui.cc:2430
+#: ardour_ui.cc:2441
 msgid "Name for template:"
 msgstr "模��:"
 
-#: ardour_ui.cc:2431
+#: ardour_ui.cc:2442
 msgid "-template"
 msgstr "-模�"
 
-#: ardour_ui.cc:2469
+#: ardour_ui.cc:2480
 msgid ""
 "This session\n"
 "%1\n"
@@ -1053,52 +1049,52 @@ msgstr ""
 "%1\n"
 "已存在. 打开它?"
 
-#: ardour_ui.cc:2479
+#: ardour_ui.cc:2490
 msgid "Open Existing Session"
 msgstr "打开已存在的会�"
 
-#: ardour_ui.cc:2717
+#: ardour_ui.cc:2728
 msgid "There is no existing session at \"%1\""
 msgstr " \"%1\" 没有会�文件"
 
-#: ardour_ui.cc:2804
+#: ardour_ui.cc:2815
 msgid "Please wait while %1 loads your session"
 msgstr "请等待 %1 载入会�"
 
-#: ardour_ui.cc:2819
+#: ardour_ui.cc:2830
 msgid "Port Registration Error"
 msgstr "端�(port)注册错误"
 
-#: ardour_ui.cc:2820
+#: ardour_ui.cc:2831
 msgid "Click the Close button to try again."
 msgstr "�击关闭按钮，��试一�"
 
-#: ardour_ui.cc:2841
+#: ardour_ui.cc:2852
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "会�  \"%1 (快照 %2)\" 装载失败."
 
-#: ardour_ui.cc:2847
+#: ardour_ui.cc:2858
 msgid "Loading Error"
 msgstr "装载错误"
 
-#: ardour_ui.cc:2848
+#: ardour_ui.cc:2859
 msgid "Click the Refresh button to try again."
 msgstr "�击刷新按钮,��试一�"
 
-#: ardour_ui.cc:2930
+#: ardour_ui.cc:2941
 msgid "Could not create session in \"%1\""
 msgstr "在 \"%1\" 无法创建会�"
 
-#: ardour_ui.cc:3030
+#: ardour_ui.cc:3041
 msgid "No files were ready for clean-up"
 msgstr "没有�以清空的文件"
 
-#: ardour_ui.cc:3034 ardour_ui.cc:3044 ardour_ui.cc:3177 ardour_ui.cc:3184
+#: ardour_ui.cc:3045 ardour_ui.cc:3055 ardour_ui.cc:3188 ardour_ui.cc:3195
 #: ardour_ui_ed.cc:104
 msgid "Clean-up"
 msgstr "清空"
 
-#: ardour_ui.cc:3035
+#: ardour_ui.cc:3046
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
@@ -1106,19 +1102,19 @@ msgid ""
 "require some unused files to continue to exist."
 msgstr ""
 
-#: ardour_ui.cc:3094
+#: ardour_ui.cc:3105
 msgid "kilo"
 msgstr ""
 
-#: ardour_ui.cc:3097
+#: ardour_ui.cc:3108
 msgid "mega"
 msgstr ""
 
-#: ardour_ui.cc:3100
+#: ardour_ui.cc:3111
 msgid "giga"
 msgstr ""
 
-#: ardour_ui.cc:3105
+#: ardour_ui.cc:3116
 #, fuzzy
 msgid ""
 "The following file was deleted from %2,\n"
@@ -1135,7 +1131,7 @@ msgstr[1] ""
 "%2,\n"
 "释放出 %3 %4 bytes 的�盘空间"
 
-#: ardour_ui.cc:3112
+#: ardour_ui.cc:3123
 #, fuzzy
 msgid ""
 "The following file was not in use and \n"
@@ -1178,11 +1174,11 @@ msgstr[1] ""
 "将会释放�外的\n"
 "%3 %4bytes 的�盘空间.\n"
 
-#: ardour_ui.cc:3172
+#: ardour_ui.cc:3183
 msgid "Are you sure you want to clean-up?"
 msgstr "您确认�删除这些文件�"
 
-#: ardour_ui.cc:3179
+#: ardour_ui.cc:3190
 msgid ""
 "Clean-up is a destructive operation.\n"
 "ALL undo/redo information will be lost if you clean-up.\n"
@@ -1192,81 +1188,81 @@ msgstr ""
 "如果你清空了, 所有的撤销/��信�将会丢失.\n"
 "清空将会把所有未使用过的文件弄到 \"死亡\" �置"
 
-#: ardour_ui.cc:3187
+#: ardour_ui.cc:3198
 msgid "CleanupDialog"
 msgstr "清空对�框"
 
-#: ardour_ui.cc:3217
+#: ardour_ui.cc:3228
 msgid "Cleaned Files"
 msgstr "清除文件"
 
-#: ardour_ui.cc:3234
+#: ardour_ui.cc:3245
 msgid "deleted file"
 msgstr "删除文件"
 
-#: ardour_ui.cc:3326
+#: ardour_ui.cc:3337
 msgid ""
 "Video-Server was not launched by Ardour. The request to stop it is ignored."
 msgstr ""
 
-#: ardour_ui.cc:3330
+#: ardour_ui.cc:3341
 msgid "Stop Video-Server"
 msgstr ""
 
-#: ardour_ui.cc:3331
+#: ardour_ui.cc:3342
 msgid "Do you really want to stop the Video Server?"
 msgstr ""
 
-#: ardour_ui.cc:3334
+#: ardour_ui.cc:3345
 #, fuzzy
 msgid "Yes, Stop It"
 msgstr "是, 销�它."
 
-#: ardour_ui.cc:3360
+#: ardour_ui.cc:3371
 msgid "The Video Server is already started."
 msgstr ""
 
-#: ardour_ui.cc:3362
+#: ardour_ui.cc:3373
 msgid ""
 "An external Video Server is configured and can be reached. Not starting a "
 "new instance."
 msgstr ""
 
-#: ardour_ui.cc:3370 ardour_ui.cc:3455
+#: ardour_ui.cc:3381 ardour_ui.cc:3471
 msgid ""
 "Could not connect to the Video Server. Start it or configure its access URL "
 "in Edit -> Preferences."
 msgstr ""
 
-#: ardour_ui.cc:3394
+#: ardour_ui.cc:3405
 msgid "Specified docroot is not an existing directory."
 msgstr ""
 
-#: ardour_ui.cc:3399
+#: ardour_ui.cc:3410
 msgid "Given Video Server is not an executable file."
 msgstr ""
 
-#: ardour_ui.cc:3432
+#: ardour_ui.cc:3443
 msgid "Cannot launch the video-server"
 msgstr ""
 
-#: ardour_ui.cc:3441
+#: ardour_ui.cc:3452
 msgid "Video-server was started but does not respond to requests..."
 msgstr ""
 
-#: ardour_ui.cc:3477 editor_audio_import.cc:629
+#: ardour_ui.cc:3497 editor_audio_import.cc:632
 msgid "could not open %1"
 msgstr "无法打开%1"
 
-#: ardour_ui.cc:3481
+#: ardour_ui.cc:3501
 msgid "no video-file selected"
 msgstr ""
 
-#: ardour_ui.cc:3641
+#: ardour_ui.cc:3673
 msgid "Recording was stopped because your system could not keep up."
 msgstr "您的系统无法继续, 录音�止."
 
-#: ardour_ui.cc:3670
+#: ardour_ui.cc:3702
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1279,7 +1275,7 @@ msgstr ""
 "\n"
 "确切地说, �盘的读写速度无法跟上录音速度\n"
 
-#: ardour_ui.cc:3689
+#: ardour_ui.cc:3721
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with %1.\n"
@@ -1292,11 +1288,11 @@ msgstr ""
 "\n"
 "确切地说, �盘的读写速度无法跟上播放速度\n"
 
-#: ardour_ui.cc:3729
+#: ardour_ui.cc:3761
 msgid "Crash Recovery"
 msgstr "崩溃��"
 
-#: ardour_ui.cc:3730
+#: ardour_ui.cc:3762
 #, fuzzy
 msgid ""
 "This session appears to have been in the\n"
@@ -1313,19 +1309,19 @@ msgstr ""
 "Ardour�以为你��一些��到的音频\n"
 "你也�以忽略它. 请你选择.\n"
 
-#: ardour_ui.cc:3742
+#: ardour_ui.cc:3774
 msgid "Ignore crash data"
 msgstr "忽略崩�的数�"
 
-#: ardour_ui.cc:3743
+#: ardour_ui.cc:3775
 msgid "Recover from crash"
 msgstr "��到崩溃�"
 
-#: ardour_ui.cc:3763
+#: ardour_ui.cc:3795
 msgid "Sample Rate Mismatch"
 msgstr "采样率�匹�"
 
-#: ardour_ui.cc:3764
+#: ardour_ui.cc:3796
 #, fuzzy
 msgid ""
 "This session was created with a sample rate of %1 Hz, but\n"
@@ -1336,23 +1332,23 @@ msgstr ""
 "\n"
 "当�音频引擎的采样率为 %2 Hz.\n"
 
-#: ardour_ui.cc:3773
+#: ardour_ui.cc:3805
 msgid "Do not load session"
 msgstr "��装载会�"
 
-#: ardour_ui.cc:3774
+#: ardour_ui.cc:3806
 msgid "Load session anyway"
 msgstr "转载会�"
 
-#: ardour_ui.cc:3797
+#: ardour_ui.cc:3829
 msgid "Could not disconnect from JACK"
 msgstr "无法断开JACK的连接"
 
-#: ardour_ui.cc:3810
+#: ardour_ui.cc:3842
 msgid "Could not reconnect to JACK"
 msgstr "无法�新连接到JACK"
 
-#: ardour_ui.cc:4084
+#: ardour_ui.cc:4116
 msgid ""
 "%4This is a session from an older version of %3%5\n"
 "\n"
@@ -1375,64 +1371,69 @@ msgstr "用户界�: 无法设置编辑器."
 msgid "UI: cannot setup mixer"
 msgstr "用户界�: 无法设置混音器."
 
-#: ardour_ui2.cc:125
+#: ardour_ui2.cc:82
+#, fuzzy
+msgid "UI: cannot setup meterbridge"
+msgstr "用户界�: 无法设置混音器."
+
+#: ardour_ui2.cc:130
 msgid "Play from playhead"
 msgstr "从播放头播放"
 
-#: ardour_ui2.cc:126
+#: ardour_ui2.cc:131
 msgid "Stop playback"
 msgstr "�止回放"
 
-#: ardour_ui2.cc:127
+#: ardour_ui2.cc:132
 msgid "Toggle record"
 msgstr "出�录音"
 
-#: ardour_ui2.cc:128
+#: ardour_ui2.cc:133
 msgid "Play range/selection"
 msgstr "播放范围/选区"
 
-#: ardour_ui2.cc:129
+#: ardour_ui2.cc:134
 msgid "Go to start of session"
 msgstr "转至会�起点"
 
-#: ardour_ui2.cc:130
+#: ardour_ui2.cc:135
 msgid "Go to end of session"
 msgstr "转至会�终点"
 
-#: ardour_ui2.cc:131
+#: ardour_ui2.cc:136
 msgid "Play loop range"
 msgstr "播放循环范围"
 
-#: ardour_ui2.cc:132
+#: ardour_ui2.cc:137
 msgid ""
 "MIDI Panic\n"
 "Send note off and reset controller messages on all MIDI channels"
 msgstr ""
 
-#: ardour_ui2.cc:133
+#: ardour_ui2.cc:138
 msgid "Return to last playback start when stopped"
 msgstr "当�止时返回至最�一次回放起点"
 
-#: ardour_ui2.cc:134
+#: ardour_ui2.cc:139
 #, fuzzy
 msgid "Playhead follows Range Selections and Edits"
 msgstr "播放头到范围开始"
 
-#: ardour_ui2.cc:135
+#: ardour_ui2.cc:140
 msgid "Be sensible about input monitoring"
 msgstr ""
 
-#: ardour_ui2.cc:136
+#: ardour_ui2.cc:141
 msgid "Enable/Disable audio click"
 msgstr ""
 
-#: ardour_ui2.cc:137 monitor_section.cc:101
+#: ardour_ui2.cc:142 monitor_section.cc:101
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
 msgstr ""
 
-#: ardour_ui2.cc:138
+#: ardour_ui2.cc:143
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
@@ -1440,11 +1441,11 @@ msgstr ""
 "当�用时监�开始.\n"
 "点击�止监�."
 
-#: ardour_ui2.cc:139
+#: ardour_ui2.cc:144
 msgid "When active, there is a feedback loop."
 msgstr ""
 
-#: ardour_ui2.cc:140
+#: ardour_ui2.cc:145
 msgid ""
 "<b>Primary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1452,7 +1453,7 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:141
+#: ardour_ui2.cc:146
 msgid ""
 "<b>Secondary Clock</b> right-click to set display mode. Click to edit, click"
 "+drag a digit or mouse-over+scroll wheel to modify.\n"
@@ -1460,27 +1461,32 @@ msgid ""
 "confirm; postfix the edit with '+' or '-' to enter delta times.\n"
 msgstr ""
 
-#: ardour_ui2.cc:173
+#: ardour_ui2.cc:147
+#, fuzzy
+msgid "Reset Level Meter"
+msgstr "�置包络线"
+
+#: ardour_ui2.cc:179
 msgid "[ERROR]: "
 msgstr "[错误]:"
 
-#: ardour_ui2.cc:175
+#: ardour_ui2.cc:181
 msgid "[WARNING]: "
 msgstr "[警告]:"
 
-#: ardour_ui2.cc:177
+#: ardour_ui2.cc:183
 msgid "[INFO]: "
 msgstr "[信�]: "
 
-#: ardour_ui2.cc:241 ardour_ui_ed.cc:376
+#: ardour_ui2.cc:247 ardour_ui_ed.cc:377
 msgid "Auto Return"
 msgstr "自动返回"
 
-#: ardour_ui2.cc:243 ardour_ui_ed.cc:379
+#: ardour_ui2.cc:249 ardour_ui_ed.cc:380
 msgid "Follow Edits"
 msgstr ""
 
-#: ardour_ui2.cc:621 rc_option_editor.cc:1004 rc_option_editor.cc:1022
+#: ardour_ui2.cc:628 rc_option_editor.cc:1004 rc_option_editor.cc:1022
 #: rc_option_editor.cc:1025 rc_option_editor.cc:1027 rc_option_editor.cc:1029
 #: rc_option_editor.cc:1037 rc_option_editor.cc:1045 rc_option_editor.cc:1047
 #: rc_option_editor.cc:1055 rc_option_editor.cc:1062 rc_option_editor.cc:1071
@@ -1500,23 +1506,23 @@ msgstr "设置编辑器"
 msgid "Setup Mixer"
 msgstr "设置混音器"
 
-#: ardour_ui_dependents.cc:84
+#: ardour_ui_dependents.cc:85
 msgid "Reload Session History"
 msgstr "�新装摘会�历�"
 
-#: ardour_ui_dialogs.cc:206
+#: ardour_ui_dialogs.cc:242
 msgid "Don't close"
 msgstr "别关闭"
 
-#: ardour_ui_dialogs.cc:207
+#: ardour_ui_dialogs.cc:243
 msgid "Just close"
 msgstr "��存而关闭"
 
-#: ardour_ui_dialogs.cc:208
+#: ardour_ui_dialogs.cc:244
 msgid "Save and close"
 msgstr "�存并关闭"
 
-#: ardour_ui_dialogs.cc:293
+#: ardour_ui_dialogs.cc:340
 msgid "This screen is not tall enough to display the mixer window"
 msgstr ""
 
@@ -1529,7 +1535,7 @@ msgstr "会�"
 msgid "Sync"
 msgstr "�步"
 
-#: ardour_ui_ed.cc:107 engine_dialog.cc:365
+#: ardour_ui_ed.cc:107 engine_dialog.cc:369
 msgid "Options"
 msgstr "选项"
 
@@ -1557,15 +1563,15 @@ msgstr "文件类型"
 msgid "Sample Format"
 msgstr "采样格�"
 
-#: ardour_ui_ed.cc:114 rc_option_editor.cc:1818 rc_option_editor.cc:1831
+#: ardour_ui_ed.cc:114 rc_option_editor.cc:1826 rc_option_editor.cc:1839
 msgid "Control Surfaces"
 msgstr "控制表�"
 
-#: ardour_ui_ed.cc:115 rc_option_editor.cc:1550
+#: ardour_ui_ed.cc:115 rc_option_editor.cc:1558
 msgid "Plugins"
 msgstr "�件"
 
-#: ardour_ui_ed.cc:116 rc_option_editor.cc:1894
+#: ardour_ui_ed.cc:116 rc_option_editor.cc:1902
 msgid "Metering"
 msgstr ""
 
@@ -1581,7 +1587,7 @@ msgstr ""
 msgid "Denormal Handling"
 msgstr ""
 
-#: ardour_ui_ed.cc:123 route_time_axis.cc:1475
+#: ardour_ui_ed.cc:123 route_time_axis.cc:1489
 msgid "New..."
 msgstr "新建..."
 
@@ -1624,8 +1630,8 @@ msgstr "å¿«ç…§..."
 msgid "Save As..."
 msgstr "�存为..."
 
-#: ardour_ui_ed.cc:153 editor_actions.cc:1710 editor_markers.cc:858
-#: editor_snapshots.cc:123 mixer_strip.cc:1464 route_time_axis.cc:1471
+#: ardour_ui_ed.cc:153 editor_actions.cc:1719 editor_markers.cc:858
+#: editor_snapshots.cc:123 mixer_strip.cc:1471 route_time_axis.cc:1485
 msgid "Rename..."
 msgstr "�命�..."
 
@@ -1654,7 +1660,7 @@ msgid "Stem export..."
 msgstr ""
 
 #: ardour_ui_ed.cc:175 editor_export_audio.cc:63 export_dialog.cc:129
-#: export_video_dialog.cc:71
+#: export_video_dialog.cc:72
 msgid "Export"
 msgstr "导出"
 
@@ -1666,11 +1672,11 @@ msgstr "清空未使用的�..."
 msgid "Flush Wastebasket"
 msgstr "清空回收站"
 
-#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1464
+#: ardour_ui_ed.cc:189 keyeditor.cc:253 rc_option_editor.cc:1472
 msgid "JACK"
 msgstr "JACK"
 
-#: ardour_ui_ed.cc:190 route_params_ui.cc:104
+#: ardour_ui_ed.cc:190 route_params_ui.cc:105
 msgid "Latency"
 msgstr "延迟"
 
@@ -1678,8 +1684,8 @@ msgstr "延迟"
 msgid "Reconnect"
 msgstr "�新链接"
 
-#: ardour_ui_ed.cc:195 global_port_matrix.cc:198 io_selector.cc:210
-#: mixer_strip.cc:712 mixer_strip.cc:838
+#: ardour_ui_ed.cc:195 global_port_matrix.cc:207 io_selector.cc:210
+#: mixer_strip.cc:719 mixer_strip.cc:845
 msgid "Disconnect"
 msgstr "�消连接"
 
@@ -1696,7 +1702,7 @@ msgstr "最大化编辑空间"
 msgid "Show Toolbars"
 msgstr "显示缩放工具�"
 
-#: ardour_ui_ed.cc:230 mixer_ui.cc:1863 mixer_ui.cc:1869
+#: ardour_ui_ed.cc:230 mixer_ui.cc:1865 mixer_ui.cc:1871
 #, fuzzy
 msgid "Window|Mixer"
 msgstr "窗�"
@@ -1706,28 +1712,33 @@ msgstr "窗�"
 msgid "Toggle Editor+Mixer"
 msgstr "显示编辑器混音器"
 
-#: ardour_ui_ed.cc:233 midi_tracer.cc:39
+#: ardour_ui_ed.cc:232 meterbridge.cc:230 meterbridge.cc:236
+#, fuzzy
+msgid "Window|Meterbridge"
+msgstr "窗�"
+
+#: ardour_ui_ed.cc:234 midi_tracer.cc:39
 msgid "MIDI Tracer"
 msgstr "MIDI示踪"
 
-#: ardour_ui_ed.cc:235
+#: ardour_ui_ed.cc:236
 msgid "Chat"
 msgstr "�天"
 
-#: ardour_ui_ed.cc:237
+#: ardour_ui_ed.cc:238
 #, fuzzy
 msgid "Help|Manual"
 msgstr "手册"
 
-#: ardour_ui_ed.cc:238
+#: ardour_ui_ed.cc:239
 msgid "Reference"
 msgstr "�考"
 
-#: ardour_ui_ed.cc:240 plugin_ui.cc:419
+#: ardour_ui_ed.cc:241 plugin_ui.cc:418
 msgid "Save"
 msgstr "�存"
 
-#: ardour_ui_ed.cc:248 rc_option_editor.cc:1114 rc_option_editor.cc:1125
+#: ardour_ui_ed.cc:249 rc_option_editor.cc:1114 rc_option_editor.cc:1125
 #: rc_option_editor.cc:1134 rc_option_editor.cc:1147 rc_option_editor.cc:1160
 #: rc_option_editor.cc:1169 rc_option_editor.cc:1179 rc_option_editor.cc:1181
 #: rc_option_editor.cc:1191 rc_option_editor.cc:1207 rc_option_editor.cc:1220
@@ -1737,100 +1748,100 @@ msgstr "�存"
 msgid "Transport"
 msgstr ""
 
-#: ardour_ui_ed.cc:254 engine_dialog.cc:85 sfdb_ui.cc:559
+#: ardour_ui_ed.cc:255 engine_dialog.cc:85
 msgid "Stop"
 msgstr "暂�"
 
-#: ardour_ui_ed.cc:257
+#: ardour_ui_ed.cc:258
 msgid "Roll"
 msgstr ""
 
-#: ardour_ui_ed.cc:261
+#: ardour_ui_ed.cc:262
 msgid "Start/Stop"
 msgstr "开始/暂�"
 
-#: ardour_ui_ed.cc:264
+#: ardour_ui_ed.cc:265
 msgid "Start/Continue/Stop"
 msgstr "开始/继续/暂�"
 
-#: ardour_ui_ed.cc:267
+#: ardour_ui_ed.cc:268
 msgid "Stop and Forget Capture"
 msgstr "暂�并废弃录音"
 
-#: ardour_ui_ed.cc:277
+#: ardour_ui_ed.cc:278
 msgid "Transition To Roll"
 msgstr ""
 
-#: ardour_ui_ed.cc:281
+#: ardour_ui_ed.cc:282
 msgid "Transition To Reverse"
 msgstr ""
 
-#: ardour_ui_ed.cc:285
+#: ardour_ui_ed.cc:286
 msgid "Play Loop Range"
 msgstr "循环播放范围"
 
-#: ardour_ui_ed.cc:288
+#: ardour_ui_ed.cc:289
 msgid "Play Selected Range"
 msgstr "播放已选择的范围"
 
-#: ardour_ui_ed.cc:291
+#: ardour_ui_ed.cc:292
 #, fuzzy
 msgid "Play Selection w/Preroll"
 msgstr "播放被选区域"
 
-#: ardour_ui_ed.cc:295
+#: ardour_ui_ed.cc:296
 msgid "Enable Record"
 msgstr "�用录音"
 
-#: ardour_ui_ed.cc:298
+#: ardour_ui_ed.cc:299
 msgid "Start Recording"
 msgstr "开始录音"
 
-#: ardour_ui_ed.cc:302
+#: ardour_ui_ed.cc:303
 msgid "Rewind"
 msgstr "倒带"
 
-#: ardour_ui_ed.cc:305
+#: ardour_ui_ed.cc:306
 msgid "Rewind (Slow)"
 msgstr "倒带(慢速)"
 
-#: ardour_ui_ed.cc:308
+#: ardour_ui_ed.cc:309
 msgid "Rewind (Fast)"
 msgstr "倒带(快速)"
 
-#: ardour_ui_ed.cc:311 startup.cc:727
+#: ardour_ui_ed.cc:312 startup.cc:727
 msgid "Forward"
 msgstr "å¿«è¿›"
 
-#: ardour_ui_ed.cc:314
+#: ardour_ui_ed.cc:315
 msgid "Forward (Slow)"
 msgstr "快进(慢速)"
 
-#: ardour_ui_ed.cc:317
+#: ardour_ui_ed.cc:318
 msgid "Forward (Fast)"
 msgstr "倒带(快速)"
 
-#: ardour_ui_ed.cc:320
+#: ardour_ui_ed.cc:321
 msgid "Goto Zero"
 msgstr "转到零点"
 
-#: ardour_ui_ed.cc:323
+#: ardour_ui_ed.cc:324
 msgid "Goto Start"
 msgstr "转到起始�置"
 
-#: ardour_ui_ed.cc:326
+#: ardour_ui_ed.cc:327
 msgid "Goto End"
 msgstr "转到末尾�置"
 
-#: ardour_ui_ed.cc:329
+#: ardour_ui_ed.cc:330
 msgid "Goto Wall Clock"
 msgstr "转到确切的本地时间"
 
-#: ardour_ui_ed.cc:333
+#: ardour_ui_ed.cc:334
 msgid "Focus On Clock"
 msgstr "�定时间指针"
 
-#: ardour_ui_ed.cc:337 ardour_ui_ed.cc:346 audio_clock.cc:2046 editor.cc:237
+#: ardour_ui_ed.cc:338 ardour_ui_ed.cc:347 audio_clock.cc:2046 editor.cc:237
 #: editor_actions.cc:544 editor_actions.cc:553 export_timespan_selector.cc:88
 #: session_option_editor.cc:41 session_option_editor.cc:61
 #: session_option_editor.cc:80 session_option_editor.cc:96
@@ -1839,126 +1850,126 @@ msgstr "�定时间指针"
 msgid "Timecode"
 msgstr "时间�"
 
-#: ardour_ui_ed.cc:339 ardour_ui_ed.cc:348 editor_actions.cc:542
+#: ardour_ui_ed.cc:340 ardour_ui_ed.cc:349 editor_actions.cc:542
 msgid "Bars & Beats"
 msgstr "�节 & ��"
 
-#: ardour_ui_ed.cc:341 ardour_ui_ed.cc:350
+#: ardour_ui_ed.cc:342 ardour_ui_ed.cc:351
 msgid "Minutes & Seconds"
 msgstr "分&秒"
 
-#: ardour_ui_ed.cc:343 ardour_ui_ed.cc:352 audio_clock.cc:2050 editor.cc:238
+#: ardour_ui_ed.cc:344 ardour_ui_ed.cc:353 audio_clock.cc:2050 editor.cc:238
 #: editor_actions.cc:543
 msgid "Samples"
 msgstr "采样"
 
-#: ardour_ui_ed.cc:355
+#: ardour_ui_ed.cc:356
 msgid "Punch In"
 msgstr "切入"
 
-#: ardour_ui_ed.cc:356 mixer_strip.cc:1904 route_ui.cc:132
+#: ardour_ui_ed.cc:357 mixer_strip.cc:1905 route_ui.cc:137
 #: time_info_box.cc:113
 msgid "In"
 msgstr ""
 
-#: ardour_ui_ed.cc:359
+#: ardour_ui_ed.cc:360
 msgid "Punch Out"
 msgstr "切出"
 
-#: ardour_ui_ed.cc:360 time_info_box.cc:114
+#: ardour_ui_ed.cc:361 time_info_box.cc:114
 msgid "Out"
 msgstr "ýstup"
 
-#: ardour_ui_ed.cc:363
+#: ardour_ui_ed.cc:364
 msgid "Punch In/Out"
 msgstr "切入/切出"
 
-#: ardour_ui_ed.cc:364
+#: ardour_ui_ed.cc:365
 msgid "In/Out"
 msgstr "入/出"
 
-#: ardour_ui_ed.cc:367 rc_option_editor.cc:1071
+#: ardour_ui_ed.cc:368 rc_option_editor.cc:1071
 msgid "Click"
 msgstr "点击"
 
-#: ardour_ui_ed.cc:370
+#: ardour_ui_ed.cc:371
 msgid "Auto Input"
 msgstr "自动输入"
 
-#: ardour_ui_ed.cc:373
+#: ardour_ui_ed.cc:374
 msgid "Auto Play"
 msgstr "自动播放"
 
-#: ardour_ui_ed.cc:384
+#: ardour_ui_ed.cc:385
 msgid "Sync Startup to Video"
 msgstr "�步�动到视频"
 
-#: ardour_ui_ed.cc:386
+#: ardour_ui_ed.cc:387
 msgid "Time Master"
 msgstr "时间主控"
 
-#: ardour_ui_ed.cc:393
+#: ardour_ui_ed.cc:394
 msgid "Toggle Record Enable Track %1"
 msgstr ""
 
-#: ardour_ui_ed.cc:400
+#: ardour_ui_ed.cc:401
 msgid "Percentage"
 msgstr "百分比"
 
-#: ardour_ui_ed.cc:401 shuttle_control.cc:169
+#: ardour_ui_ed.cc:402 shuttle_control.cc:169
 msgid "Semitones"
 msgstr "�音"
 
-#: ardour_ui_ed.cc:405
+#: ardour_ui_ed.cc:406
 msgid "Send MTC"
 msgstr "��MTC"
 
-#: ardour_ui_ed.cc:407
+#: ardour_ui_ed.cc:408
 msgid "Send MMC"
 msgstr "��MMC"
 
-#: ardour_ui_ed.cc:409
+#: ardour_ui_ed.cc:410
 msgid "Use MMC"
 msgstr "使用MMC"
 
-#: ardour_ui_ed.cc:411 rc_option_editor.cc:1702
+#: ardour_ui_ed.cc:412 rc_option_editor.cc:1710
 msgid "Send MIDI Clock"
 msgstr "��MIDI时钟"
 
-#: ardour_ui_ed.cc:413
+#: ardour_ui_ed.cc:414
 msgid "Send MIDI Feedback"
 msgstr "��MIDI�馈"
 
-#: ardour_ui_ed.cc:419
+#: ardour_ui_ed.cc:420
 msgid "Panic"
 msgstr ""
 
-#: ardour_ui_ed.cc:559
+#: ardour_ui_ed.cc:560
 msgid "Wall Clock"
 msgstr "本地时间"
 
-#: ardour_ui_ed.cc:560
+#: ardour_ui_ed.cc:561
 msgid "Disk Space"
 msgstr "盘空间"
 
-#: ardour_ui_ed.cc:561
+#: ardour_ui_ed.cc:562
 msgid "DSP"
 msgstr "数字信�处�"
 
-#: ardour_ui_ed.cc:562
+#: ardour_ui_ed.cc:563
 msgid "Buffers"
 msgstr "缓冲"
 
-#: ardour_ui_ed.cc:563
+#: ardour_ui_ed.cc:564
 msgid "JACK Sampling Rate and Latency"
 msgstr "JACK采样率和延迟"
 
-#: ardour_ui_ed.cc:564
+#: ardour_ui_ed.cc:565
 #, fuzzy
 msgid "Timecode Format"
 msgstr "时间�框架"
 
-#: ardour_ui_ed.cc:565
+#: ardour_ui_ed.cc:566
 msgid "File Format"
 msgstr "文件格�"
 
@@ -1972,11 +1983,11 @@ msgstr ""
 msgid "Internal"
 msgstr "内部的"
 
-#: ardour_ui_options.cc:473
+#: ardour_ui_options.cc:482
 msgid "Enable/Disable external positional sync"
 msgstr "�用/�用外部�置�步"
 
-#: ardour_ui_options.cc:475
+#: ardour_ui_options.cc:484
 msgid "Sync to JACK is not possible: video pull up/down is set"
 msgstr ""
 
@@ -2007,7 +2018,7 @@ msgstr "节�"
 msgid "Meter"
 msgstr "标尺"
 
-#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1030
+#: audio_clock.cc:1819 audio_streamview.cc:116 editor_actions.cc:1039
 #: midi_region_view.cc:2991 session_metadata_dialog.cc:331
 #: session_metadata_dialog.cc:379 session_metadata_dialog.cc:435
 #: session_metadata_dialog.cc:716
@@ -2097,33 +2108,33 @@ msgid "hide track"
 msgstr "��音轨"
 
 #: automation_time_axis.cc:255 automation_time_axis.cc:307
-#: automation_time_axis.cc:496 gain_meter.cc:196 generic_pluginui.cc:456
-#: generic_pluginui.cc:733 panner_ui.cc:150
+#: automation_time_axis.cc:496 gain_meter.cc:195 generic_pluginui.cc:456
+#: generic_pluginui.cc:746 panner_ui.cc:150
 #, fuzzy
 msgid "Automation|Manual"
 msgstr "自动化"
 
 #: automation_time_axis.cc:257 automation_time_axis.cc:318
 #: automation_time_axis.cc:501 editor.cc:1933 editor.cc:2010
-#: editor_actions.cc:118 editor_actions.cc:1856 gain_meter.cc:199
-#: generic_pluginui.cc:459 generic_pluginui.cc:735 midi_time_axis.cc:1488
+#: editor_actions.cc:118 editor_actions.cc:1865 gain_meter.cc:198
+#: generic_pluginui.cc:459 generic_pluginui.cc:748 midi_time_axis.cc:1488
 #: midi_time_axis.cc:1491 midi_time_axis.cc:1494 panner_ui.cc:153
 msgid "Play"
 msgstr "播放"
 
 #: automation_time_axis.cc:259 automation_time_axis.cc:329
-#: automation_time_axis.cc:506 gain_meter.cc:202 generic_pluginui.cc:462
-#: generic_pluginui.cc:737 panner_ui.cc:156
+#: automation_time_axis.cc:506 gain_meter.cc:201 generic_pluginui.cc:462
+#: generic_pluginui.cc:750 panner_ui.cc:156
 msgid "Write"
 msgstr ""
 
 #: automation_time_axis.cc:261 automation_time_axis.cc:340
-#: automation_time_axis.cc:511 gain_meter.cc:205 generic_pluginui.cc:465
-#: generic_pluginui.cc:739 panner_ui.cc:159
+#: automation_time_axis.cc:511 gain_meter.cc:204 generic_pluginui.cc:465
+#: generic_pluginui.cc:752 panner_ui.cc:159
 msgid "Touch"
 msgstr ""
 
-#: automation_time_axis.cc:351 generic_pluginui.cc:468
+#: automation_time_axis.cc:351 generic_pluginui.cc:468 meter_patterns.cc:108
 msgid "???"
 msgstr "???"
 
@@ -2132,7 +2143,7 @@ msgid "clear automation"
 msgstr "清除自动化"
 
 #: automation_time_axis.cc:485 editor_actions.cc:613 editor_markers.cc:857
-#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:699
+#: location_ui.cc:55 plugin_selector.cc:85 route_time_axis.cc:708
 msgid "Hide"
 msgstr "��"
 
@@ -2153,7 +2164,7 @@ msgstr "离散"
 msgid "Linear"
 msgstr "先行"
 
-#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:638
+#: automation_time_axis.cc:543 rhythm_ferret.cc:110 route_time_axis.cc:647
 #: shuttle_control.cc:188
 msgid "Mode"
 msgstr "模�"
@@ -2170,13 +2181,13 @@ msgstr "编辑�绑"
 msgid "Direction:"
 msgstr "方�:"
 
-#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:156
-#: mixer_strip.cc:2132
+#: bundle_manager.cc:205 bundle_manager.cc:209 mixer_strip.cc:158
+#: mixer_strip.cc:2127
 msgid "Input"
 msgstr "输入"
 
 #: bundle_manager.cc:206 bundle_manager.cc:211 bundle_manager.cc:245
-#: mixer_strip.cc:161 mixer_strip.cc:2135
+#: mixer_strip.cc:163 mixer_strip.cc:2130
 msgid "Output"
 msgstr "输出"
 
@@ -2186,8 +2197,8 @@ msgid "Edit"
 msgstr "编辑"
 
 #: bundle_manager.cc:265 editor.cc:5493 editor_actions.cc:310
-#: editor_actions.cc:368 plugin_ui.cc:420 processor_box.cc:2227
-#: route_time_axis.cc:704
+#: editor_actions.cc:368 plugin_ui.cc:419 processor_box.cc:2229
+#: route_time_axis.cc:713
 msgid "Delete"
 msgstr "删除"
 
@@ -2360,7 +2371,7 @@ msgstr "时间"
 
 #: edit_note_dialog.cc:98 editor_regions.cc:114
 #: export_timespan_selector.cc:359 export_timespan_selector.cc:421
-#: location_ui.cc:313 midi_list_editor.cc:114 time_info_box.cc:105
+#: location_ui.cc:317 midi_list_editor.cc:114 time_info_box.cc:105
 msgid "Length"
 msgstr "长度"
 
@@ -2607,17 +2618,17 @@ msgid "Ranges & Marks"
 msgstr ""
 
 #: editor.cc:690 editor.cc:5345 rc_option_editor.cc:1294
-#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1327
-#: rc_option_editor.cc:1329 rc_option_editor.cc:1337 rc_option_editor.cc:1345
-#: rc_option_editor.cc:1365 rc_option_editor.cc:1377 rc_option_editor.cc:1379
+#: rc_option_editor.cc:1302 rc_option_editor.cc:1310 rc_option_editor.cc:1318
+#: rc_option_editor.cc:1335 rc_option_editor.cc:1337 rc_option_editor.cc:1345
+#: rc_option_editor.cc:1353 rc_option_editor.cc:1373 rc_option_editor.cc:1385
 #: rc_option_editor.cc:1387 rc_option_editor.cc:1395 rc_option_editor.cc:1403
-#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1434
-#: rc_option_editor.cc:1438
+#: rc_option_editor.cc:1411 rc_option_editor.cc:1419 rc_option_editor.cc:1427
+#: rc_option_editor.cc:1442 rc_option_editor.cc:1446
 msgid "Editor"
 msgstr "编辑器"
 
 #: editor.cc:1215 editor.cc:1225 editor.cc:4440 editor_actions.cc:130
-#: editor_actions.cc:1804
+#: editor_actions.cc:1813
 msgid "Loop"
 msgstr "循环"
 
@@ -2642,8 +2653,8 @@ msgstr ""
 msgid "Slow"
 msgstr "æ…¢"
 
-#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1606
-#: sfdb_ui.cc:1715
+#: editor.cc:1390 editor.cc:1483 editor.cc:1545 sfdb_ui.cc:1627
+#: sfdb_ui.cc:1736
 msgid "Fast"
 msgstr "å¿«"
 
@@ -2663,7 +2674,7 @@ msgstr "激活"
 msgid "Slowest"
 msgstr "最慢"
 
-#: editor.cc:1572 route_time_axis.cc:1863 selection.cc:1009 selection.cc:1064
+#: editor.cc:1572 route_time_axis.cc:1877 selection.cc:1009 selection.cc:1064
 msgid "programming error: "
 msgstr "程�错误:"
 
@@ -2780,7 +2791,7 @@ msgid "Select All in Track"
 msgstr "在音轨选择所有"
 
 #: editor.cc:1942 editor.cc:2019 editor_actions.cc:185
-#: export_timespan_selector.cc:53 processor_box.cc:2235
+#: export_timespan_selector.cc:53 processor_box.cc:2237
 msgid "Select All"
 msgstr "选择所有"
 
@@ -2832,15 +2843,15 @@ msgstr "播放头和编辑点间选择范围"
 msgid "Select"
 msgstr "选择"
 
-#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2220
+#: editor.cc:1965 editor.cc:2036 editor_actions.cc:309 processor_box.cc:2222
 msgid "Cut"
 msgstr "剪切"
 
-#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2223
+#: editor.cc:1966 editor.cc:2037 editor_actions.cc:312 processor_box.cc:2225
 msgid "Copy"
 msgstr "�制"
 
-#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2231
+#: editor.cc:1967 editor.cc:2038 editor_actions.cc:313 processor_box.cc:2233
 msgid "Paste"
 msgstr "粘贴"
 
@@ -2998,7 +3009,7 @@ msgstr "��"
 msgid "Redo (%1)"
 msgstr "�� (%1)"
 
-#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1785
+#: editor.cc:3286 editor.cc:3310 editor_actions.cc:106 editor_actions.cc:1794
 msgid "Duplicate"
 msgstr "�制"
 
@@ -3025,8 +3036,8 @@ msgstr "删除播放列表"
 msgid "Keep Playlist"
 msgstr "��播放列表"
 
-#: editor.cc:3877 editor_audio_import.cc:579 editor_ops.cc:5856
-#: processor_box.cc:1990 processor_box.cc:2015
+#: editor.cc:3877 editor_audio_import.cc:581 editor_ops.cc:5856
+#: sfdb_freesound_mootcher.cc:69 processor_box.cc:2003 processor_box.cc:2028
 msgid "Cancel"
 msgstr "�消"
 
@@ -3047,7 +3058,7 @@ msgstr "清除播放列表"
 msgid "Please wait while %1 loads visual data."
 msgstr "请等待，%1 载入�视化数�"
 
-#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2251
+#: editor.cc:5492 editor_markers.cc:940 panner_ui.cc:393 processor_box.cc:2253
 msgid "Edit..."
 msgstr "编辑..."
 
@@ -3096,7 +3107,7 @@ msgstr ""
 msgid "Position"
 msgstr "�置"
 
-#: editor_actions.cc:101 gain_meter.cc:124 gain_meter.cc:755 panner_ui.cc:177
+#: editor_actions.cc:101 gain_meter.cc:121 gain_meter.cc:791 panner_ui.cc:177
 #: panner_ui.cc:586
 msgid "Trim"
 msgstr ""
@@ -3109,7 +3120,7 @@ msgstr "增益"
 msgid "Ranges"
 msgstr "范围"
 
-#: editor_actions.cc:104 editor_actions.cc:1781 session_option_editor.cc:145
+#: editor_actions.cc:104 editor_actions.cc:1790 session_option_editor.cc:145
 #: session_option_editor.cc:147 session_option_editor.cc:156
 #: session_option_editor.cc:163
 msgid "Fades"
@@ -3147,7 +3158,7 @@ msgstr "MIDI选项"
 msgid "Misc Options"
 msgstr "其他选项"
 
-#: editor_actions.cc:115 rc_option_editor.cc:1452 route_group_dialog.cc:48
+#: editor_actions.cc:115 rc_option_editor.cc:1460 route_group_dialog.cc:48
 #: session_option_editor.cc:218 session_option_editor.cc:225
 msgid "Monitoring"
 msgstr "监控中"
@@ -3188,8 +3199,8 @@ msgstr "第二时钟"
 msgid "Separate"
 msgstr "分离"
 
-#: editor_actions.cc:132 mixer_strip.cc:1916 route_time_axis.cc:199
-#: route_time_axis.cc:2397
+#: editor_actions.cc:132 mixer_strip.cc:1914 route_time_axis.cc:208
+#: route_time_axis.cc:2417
 msgid "Solo"
 msgstr ""
 
@@ -3201,7 +3212,7 @@ msgstr "�框架"
 msgid "Timecode fps"
 msgstr "时间�FPS"
 
-#: editor_actions.cc:137 route_time_axis.cc:421
+#: editor_actions.cc:137 route_time_axis.cc:430
 msgid "Height"
 msgstr "高度"
 
@@ -3326,7 +3337,7 @@ msgstr "播放头到范围开始"
 msgid "Playhead to Range End"
 msgstr "播放头到范围结�"
 
-#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2237
+#: editor_actions.cc:186 export_timespan_selector.cc:61 processor_box.cc:2239
 msgid "Deselect All"
 msgstr "�选所有"
 
@@ -3598,9 +3609,9 @@ msgstr ""
 msgid "Toggle Active"
 msgstr ""
 
-#: editor_actions.cc:370 editor_actions.cc:1707 editor_markers.cc:876
-#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1488
-#: route_time_axis.cc:701
+#: editor_actions.cc:370 editor_actions.cc:1716 editor_markers.cc:876
+#: editor_markers.cc:941 editor_snapshots.cc:121 mixer_strip.cc:1495
+#: route_time_axis.cc:710
 msgid "Remove"
 msgstr "移除"
 
@@ -3608,19 +3619,19 @@ msgstr "移除"
 msgid "Fit Selected Tracks"
 msgstr ""
 
-#: editor_actions.cc:376 time_axis_view.cc:1298
+#: editor_actions.cc:376 time_axis_view.cc:1302
 msgid "Largest"
 msgstr "最大的"
 
-#: editor_actions.cc:379 time_axis_view.cc:1299
+#: editor_actions.cc:379 time_axis_view.cc:1303
 msgid "Larger"
 msgstr "更大的"
 
-#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1300
+#: editor_actions.cc:382 editor_rulers.cc:375 time_axis_view.cc:1304
 msgid "Large"
 msgstr "大"
 
-#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1302
+#: editor_actions.cc:388 editor_rulers.cc:379 time_axis_view.cc:1306
 msgid "Small"
 msgstr "å°�"
 
@@ -3718,7 +3729,7 @@ msgstr ""
 msgid "Slide"
 msgstr ""
 
-#: editor_actions.cc:478 editor_actions.cc:1728 editor_markers.cc:860
+#: editor_actions.cc:478 editor_actions.cc:1737 editor_markers.cc:860
 #: editor_rulers.cc:386 location_ui.cc:56
 msgid "Lock"
 msgstr ""
@@ -3894,7 +3905,7 @@ msgstr "分:秒"
 msgid "Video Monitor"
 msgstr "监控中"
 
-#: editor_actions.cc:549 rc_option_editor.cc:1834
+#: editor_actions.cc:549 rc_option_editor.cc:1842
 msgid "Video"
 msgstr ""
 
@@ -3905,7 +3916,7 @@ msgstr "上�到顶"
 
 #: editor_actions.cc:554
 #, fuzzy
-msgid "Framenumber"
+msgid "Frame number"
 msgstr "音轨��"
 
 #: editor_actions.cc:555
@@ -3996,7 +4007,7 @@ msgstr "移除总线"
 
 #: editor_actions.cc:652 editor_audio_import.cc:279
 #: session_import_dialog.cc:74 session_import_dialog.cc:94
-#: session_metadata_dialog.cc:297 editor_videotimeline.cc:107
+#: session_metadata_dialog.cc:297 editor_videotimeline.cc:108
 msgid "Import"
 msgstr "导入"
 
@@ -4037,293 +4048,293 @@ msgstr "载入�� %1"
 msgid "Could not find editor.bindings in search path %1"
 msgstr ""
 
-#: editor_actions.cc:1019 editor_actions.cc:1415 editor_actions.cc:1426
-#: editor_actions.cc:1479 editor_actions.cc:1490 editor_actions.cc:1537
-#: editor_actions.cc:1547 editor_regions.cc:1561
+#: editor_actions.cc:1028 editor_actions.cc:1424 editor_actions.cc:1435
+#: editor_actions.cc:1488 editor_actions.cc:1499 editor_actions.cc:1546
+#: editor_actions.cc:1556 editor_regions.cc:1561
 msgid "programming error: %1: %2"
 msgstr "程�错误: %1: %2"
 
-#: editor_actions.cc:1713
+#: editor_actions.cc:1722
 msgid "Raise"
 msgstr "上�"
 
-#: editor_actions.cc:1716
+#: editor_actions.cc:1725
 msgid "Raise to Top"
 msgstr "上�到顶"
 
-#: editor_actions.cc:1719 gtk-custom-ruler.c:132
+#: editor_actions.cc:1728 gtk-custom-ruler.c:132
 msgid "Lower"
 msgstr ""
 
-#: editor_actions.cc:1722
+#: editor_actions.cc:1731
 msgid "Lower to Bottom"
 msgstr ""
 
-#: editor_actions.cc:1725
+#: editor_actions.cc:1734
 msgid "Move to Original Position"
 msgstr ""
 
-#: editor_actions.cc:1730
+#: editor_actions.cc:1739
 msgid "Lock to Video"
 msgstr ""
 
-#: editor_actions.cc:1735 editor_markers.cc:867
+#: editor_actions.cc:1744 editor_markers.cc:867
 msgid "Glue to Bars and Beats"
 msgstr ""
 
-#: editor_actions.cc:1740
+#: editor_actions.cc:1749
 msgid "Remove Sync"
 msgstr "移除�步"
 
-#: editor_actions.cc:1743 mixer_strip.cc:1903 route_time_axis.cc:200
+#: editor_actions.cc:1752 mixer_strip.cc:1904 route_time_axis.cc:209
 msgid "Mute"
 msgstr "�音"
 
-#: editor_actions.cc:1746
+#: editor_actions.cc:1755
 msgid "Normalize..."
 msgstr "标准化..."
 
-#: editor_actions.cc:1749
+#: editor_actions.cc:1758
 msgid "Reverse"
 msgstr "�转"
 
-#: editor_actions.cc:1752
+#: editor_actions.cc:1761
 msgid "Make Mono Regions"
 msgstr ""
 
-#: editor_actions.cc:1755
+#: editor_actions.cc:1764
 msgid "Boost Gain"
 msgstr "�高增益"
 
-#: editor_actions.cc:1758
+#: editor_actions.cc:1767
 msgid "Cut Gain"
 msgstr ""
 
-#: editor_actions.cc:1761
+#: editor_actions.cc:1770
 msgid "Pitch Shift..."
 msgstr "基音转移"
 
-#: editor_actions.cc:1764
+#: editor_actions.cc:1773
 msgid "Transpose..."
 msgstr ""
 
-#: editor_actions.cc:1767
+#: editor_actions.cc:1776
 msgid "Opaque"
 msgstr "��明度"
 
-#: editor_actions.cc:1771 editor_regions.cc:116
+#: editor_actions.cc:1780 editor_regions.cc:116
 msgid "Fade In"
 msgstr "æ·¡å…¥"
 
-#: editor_actions.cc:1776 editor_regions.cc:117
+#: editor_actions.cc:1785 editor_regions.cc:117
 msgid "Fade Out"
 msgstr "淡出"
 
-#: editor_actions.cc:1791
+#: editor_actions.cc:1800
 msgid "Multi-Duplicate..."
 msgstr "多�制..."
 
-#: editor_actions.cc:1796
+#: editor_actions.cc:1805
 msgid "Fill Track"
 msgstr "填充音轨"
 
-#: editor_actions.cc:1800 editor_markers.cc:955
+#: editor_actions.cc:1809 editor_markers.cc:955
 msgid "Set Loop Range"
 msgstr "设置循环范围"
 
-#: editor_actions.cc:1807
+#: editor_actions.cc:1816
 msgid "Set Punch"
 msgstr "设置Punch"
 
-#: editor_actions.cc:1811
+#: editor_actions.cc:1820
 #, fuzzy
 msgid "Add Single Range Marker"
 msgstr "添加一个范围标记"
 
-#: editor_actions.cc:1816
+#: editor_actions.cc:1825
 #, fuzzy
 msgid "Add Range Marker Per Region"
 msgstr "添加范围标记"
 
-#: editor_actions.cc:1820
+#: editor_actions.cc:1829
 #, fuzzy
 msgid "Snap Position To Grid"
 msgstr "对�到网络"
 
-#: editor_actions.cc:1823
+#: editor_actions.cc:1832
 msgid "Close Gaps"
 msgstr ""
 
-#: editor_actions.cc:1826
+#: editor_actions.cc:1835
 msgid "Rhythm Ferret..."
 msgstr ""
 
-#: editor_actions.cc:1829
+#: editor_actions.cc:1838
 msgid "Export..."
 msgstr "导出..."
 
-#: editor_actions.cc:1835
+#: editor_actions.cc:1844
 msgid "Separate Under"
 msgstr ""
 
-#: editor_actions.cc:1839
+#: editor_actions.cc:1848
 msgid "Set Fade In Length"
 msgstr "设置淡入长度"
 
-#: editor_actions.cc:1840
+#: editor_actions.cc:1849
 msgid "Set Fade Out Length"
 msgstr "设置淡出长度"
 
-#: editor_actions.cc:1841
+#: editor_actions.cc:1850
 msgid "Set Tempo from Region = Bar"
 msgstr "从区域设置节�=�节"
 
-#: editor_actions.cc:1846
+#: editor_actions.cc:1855
 msgid "Split at Percussion Onsets"
 msgstr ""
 
-#: editor_actions.cc:1851
+#: editor_actions.cc:1860
 msgid "List Editor..."
 msgstr "编辑列表"
 
-#: editor_actions.cc:1854
+#: editor_actions.cc:1863
 msgid "Properties..."
 msgstr "属性..."
 
-#: editor_actions.cc:1858
+#: editor_actions.cc:1867
 msgid "Bounce (with processing)"
 msgstr ""
 
-#: editor_actions.cc:1859
+#: editor_actions.cc:1868
 msgid "Bounce (without processing)"
 msgstr ""
 
-#: editor_actions.cc:1860
+#: editor_actions.cc:1869
 msgid "Combine"
 msgstr ""
 
-#: editor_actions.cc:1861
+#: editor_actions.cc:1870
 msgid "Uncombine"
 msgstr ""
 
-#: editor_actions.cc:1863
+#: editor_actions.cc:1872
 msgid "Spectral Analysis..."
 msgstr "频谱分�..."
 
-#: editor_actions.cc:1865
+#: editor_actions.cc:1874
 msgid "Reset Envelope"
 msgstr "�置包络线"
 
-#: editor_actions.cc:1867
+#: editor_actions.cc:1876
 msgid "Reset Gain"
 msgstr "预设增益"
 
-#: editor_actions.cc:1872
+#: editor_actions.cc:1881
 msgid "Envelope Active"
 msgstr "激活包络线"
 
-#: editor_actions.cc:1876
+#: editor_actions.cc:1885
 #, fuzzy
 msgid "Quantize..."
 msgstr "�化"
 
-#: editor_actions.cc:1877 editor_actions.cc:1878
+#: editor_actions.cc:1886 editor_actions.cc:1887
 msgid "Insert Patch Change..."
 msgstr ""
 
-#: editor_actions.cc:1879
+#: editor_actions.cc:1888
 msgid "Unlink from other copies"
 msgstr ""
 
-#: editor_actions.cc:1880
+#: editor_actions.cc:1889
 msgid "Strip Silence..."
 msgstr ""
 
-#: editor_actions.cc:1881
+#: editor_actions.cc:1890
 msgid "Set Range Selection"
 msgstr ""
 
-#: editor_actions.cc:1883
+#: editor_actions.cc:1892
 msgid "Nudge Later"
 msgstr ""
 
-#: editor_actions.cc:1884
+#: editor_actions.cc:1893
 msgid "Nudge Earlier"
 msgstr ""
 
-#: editor_actions.cc:1889
+#: editor_actions.cc:1898
 msgid "Nudge Later by Capture Offset"
 msgstr ""
 
-#: editor_actions.cc:1896
+#: editor_actions.cc:1905
 msgid "Nudge Earlier by Capture Offset"
 msgstr ""
 
-#: editor_actions.cc:1900
+#: editor_actions.cc:1909
 msgid "Trim to Loop"
 msgstr ""
 
-#: editor_actions.cc:1901
+#: editor_actions.cc:1910
 msgid "Trim to Punch"
 msgstr ""
 
-#: editor_actions.cc:1903
+#: editor_actions.cc:1912
 msgid "Trim to Previous"
 msgstr ""
 
-#: editor_actions.cc:1904
+#: editor_actions.cc:1913
 msgid "Trim to Next"
 msgstr ""
 
-#: editor_actions.cc:1911
+#: editor_actions.cc:1920
 msgid "Insert Region From Region List"
 msgstr ""
 
-#: editor_actions.cc:1917
+#: editor_actions.cc:1926
 msgid "Set Sync Position"
 msgstr "设置�步�置"
 
-#: editor_actions.cc:1918
+#: editor_actions.cc:1927
 msgid "Place Transient"
 msgstr ""
 
-#: editor_actions.cc:1919
+#: editor_actions.cc:1928
 msgid "Split"
 msgstr ""
 
-#: editor_actions.cc:1920
+#: editor_actions.cc:1929
 msgid "Trim Start at Edit Point"
 msgstr ""
 
-#: editor_actions.cc:1921
+#: editor_actions.cc:1930
 msgid "Trim End at Edit Point"
 msgstr ""
 
-#: editor_actions.cc:1926
+#: editor_actions.cc:1935
 msgid "Align Start"
 msgstr ""
 
-#: editor_actions.cc:1933
+#: editor_actions.cc:1942
 msgid "Align Start Relative"
 msgstr ""
 
-#: editor_actions.cc:1937
+#: editor_actions.cc:1946
 msgid "Align End"
 msgstr ""
 
-#: editor_actions.cc:1942
+#: editor_actions.cc:1951
 msgid "Align End Relative"
 msgstr ""
 
-#: editor_actions.cc:1949
+#: editor_actions.cc:1958
 msgid "Align Sync"
 msgstr ""
 
-#: editor_actions.cc:1956
+#: editor_actions.cc:1965
 msgid "Align Sync Relative"
 msgstr ""
 
-#: editor_actions.cc:1960 editor_actions.cc:1963
+#: editor_actions.cc:1969 editor_actions.cc:1972
 msgid "Choose Top..."
 msgstr ""
 
@@ -4351,32 +4362,32 @@ msgstr ""
 "此会�已�存在一个�为 %1 的�文件. 你想把 %2 作为一个新的�导入进�, 或跳过"
 "它?"
 
-#: editor_audio_import.cc:279 editor_videotimeline.cc:107
+#: editor_audio_import.cc:279 editor_videotimeline.cc:108
 msgid "Cancel Import"
 msgstr "�消导入"
 
-#: editor_audio_import.cc:541
+#: editor_audio_import.cc:543
 msgid "Editor: cannot open file \"%1\", (%2)"
 msgstr "编辑器: 无法打开文件 \"%1\", (%2)"
 
-#: editor_audio_import.cc:549
+#: editor_audio_import.cc:551
 msgid "Cancel entire import"
 msgstr "�消全部导入"
 
-#: editor_audio_import.cc:550
+#: editor_audio_import.cc:552
 msgid "Don't embed it"
 msgstr "�嵌入之"
 
-#: editor_audio_import.cc:551
+#: editor_audio_import.cc:553
 msgid "Embed all without questions"
 msgstr "嵌入所有, ��问"
 
-#: editor_audio_import.cc:554 editor_audio_import.cc:583
+#: editor_audio_import.cc:556 editor_audio_import.cc:585
 #: export_format_dialog.cc:58
 msgid "Sample rate"
 msgstr "采样率"
 
-#: editor_audio_import.cc:555 editor_audio_import.cc:584
+#: editor_audio_import.cc:557 editor_audio_import.cc:586
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
@@ -4384,7 +4395,7 @@ msgstr ""
 "%1\n"
 "此音频文件的采样率与会�的采样率�匹�!"
 
-#: editor_audio_import.cc:580
+#: editor_audio_import.cc:582
 msgid "Embed it anyway"
 msgstr "嵌入之, �管了"
 
@@ -4421,32 +4432,32 @@ msgstr "�制节�标记"
 msgid "move tempo mark"
 msgstr "移动节�标记"
 
-#: editor_drag.cc:2544
+#: editor_drag.cc:2545
 msgid "change fade in length"
 msgstr "改��入长度"
 
-#: editor_drag.cc:2662
+#: editor_drag.cc:2663
 msgid "change fade out length"
 msgstr "改��出长度"
 
-#: editor_drag.cc:3017
+#: editor_drag.cc:3018
 msgid "move marker"
 msgstr "移动标记"
 
-#: editor_drag.cc:3580
+#: editor_drag.cc:3581
 msgid "An error occurred while executing time stretch operation"
 msgstr "当执行时间延伸�作时出现错误"
 
-#: editor_drag.cc:4010
+#: editor_drag.cc:4011
 #, fuzzy
 msgid "programming_error: %1"
 msgstr "程�错误: %1"
 
-#: editor_drag.cc:4080 editor_markers.cc:680
+#: editor_drag.cc:4081 editor_markers.cc:680
 msgid "new range marker"
 msgstr "新范围标记"
 
-#: editor_drag.cc:4761
+#: editor_drag.cc:4762
 msgid "rubberband selection"
 msgstr ""
 
@@ -4524,7 +4535,7 @@ msgid "Sharing Solo?"
 msgstr ""
 
 #: editor_route_groups.cc:103 midi_time_axis.cc:1504 midi_time_axis.cc:1507
-#: midi_time_axis.cc:1510 mixer_strip.cc:1902
+#: midi_time_axis.cc:1510 mixer_strip.cc:1903
 msgid "Rec"
 msgstr ""
 
@@ -4601,7 +4612,7 @@ msgid "end"
 msgstr "结�"
 
 #: editor_markers.cc:646 editor_ops.cc:1744 editor_ops.cc:1764
-#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1005
+#: editor_ops.cc:1788 editor_ops.cc:1815 location_ui.cc:1017
 msgid "add marker"
 msgstr "添加标记"
 
@@ -4610,7 +4621,7 @@ msgstr "添加标记"
 msgid "range"
 msgstr "范围"
 
-#: editor_markers.cc:713 location_ui.cc:840
+#: editor_markers.cc:713 location_ui.cc:852
 msgid "remove marker"
 msgstr "移除标记"
 
@@ -4691,8 +4702,8 @@ msgstr "�命�标记"
 msgid "Rename Range"
 msgstr "�命�范围"
 
-#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1768
-#: processor_box.cc:2233 route_time_axis.cc:968 route_ui.cc:1535
+#: editor_markers.cc:1363 editor_mouse.cc:2510 processor_box.cc:1781
+#: processor_box.cc:2235 route_time_axis.cc:982 route_ui.cc:1540
 msgid "Rename"
 msgstr "�命�"
 
@@ -4833,7 +4844,7 @@ msgstr "移动区域到原始�置"
 msgid "Rename Region"
 msgstr "�命�区域"
 
-#: editor_ops.cc:2372 processor_box.cc:1766 route_ui.cc:1533
+#: editor_ops.cc:2372 processor_box.cc:1779 route_ui.cc:1538
 msgid "New name:"
 msgstr "新�字:"
 
@@ -4999,7 +5010,7 @@ msgstr ""
 "(这个�作有��性, �能撤销!)"
 
 #: editor_ops.cc:4509 editor_ops.cc:6512 editor_regions.cc:460
-#: editor_snapshots.cc:158 route_ui.cc:1477
+#: editor_snapshots.cc:158 route_ui.cc:1482
 msgid "No, do nothing."
 msgstr "�, 什么都��."
 
@@ -5189,11 +5200,11 @@ msgstr ""
 msgid "close region gaps"
 msgstr "关闭区间空白"
 
-#: editor_ops.cc:6461 route_ui.cc:1451
+#: editor_ops.cc:6461 route_ui.cc:1456
 msgid "That would be bad news ...."
 msgstr ""
 
-#: editor_ops.cc:6466 route_ui.cc:1456
+#: editor_ops.cc:6466 route_ui.cc:1461
 msgid ""
 "Removing the master or monitor bus is such a bad idea\n"
 "that %1 is not going to allow it.\n"
@@ -5207,7 +5218,7 @@ msgstr ""
 msgid "tracks"
 msgstr "音轨"
 
-#: editor_ops.cc:6485 route_ui.cc:1817
+#: editor_ops.cc:6485 route_ui.cc:1822
 msgid "track"
 msgstr "音轨"
 
@@ -5215,7 +5226,7 @@ msgstr "音轨"
 msgid "busses"
 msgstr "总线"
 
-#: editor_ops.cc:6491 route_ui.cc:1817
+#: editor_ops.cc:6491 route_ui.cc:1822
 msgid "bus"
 msgstr "总线"
 
@@ -5257,7 +5268,7 @@ msgstr ""
 msgid "Yes, remove them."
 msgstr "是的, 移除他们."
 
-#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1478
+#: editor_ops.cc:6516 editor_snapshots.cc:159 route_ui.cc:1483
 msgid "Yes, remove it."
 msgstr "使得, 移除它."
 
@@ -5329,7 +5340,7 @@ msgstr ""
 msgid "Length of region fade-out (units: secondary clock), () if dsisabled"
 msgstr ""
 
-#: editor_regions.cc:118 mixer_strip.cc:1960 mono_panner.cc:179
+#: editor_regions.cc:118 mixer_strip.cc:1954 mono_panner.cc:179
 #: stereo_panner.cc:217 stereo_panner.cc:240
 msgid "L"
 msgstr ""
@@ -5347,8 +5358,9 @@ msgstr ""
 msgid "Region position glued to Bars|Beats time?"
 msgstr ""
 
-#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:723
-#: mixer_strip.cc:1934 panner_ui.cc:554 stereo_panner.cc:237
+#: editor_regions.cc:120 editor_routes.cc:207 gain_meter.cc:759
+#: mixer_strip.cc:1931 meter_strip.cc:320 panner_ui.cc:554
+#: stereo_panner.cc:237
 msgid "M"
 msgstr ""
 
@@ -5418,7 +5430,8 @@ msgstr "音轨/总线"
 msgid "Track/Bus visible ?"
 msgstr "音轨/总线"
 
-#: editor_routes.cc:204 mixer_strip.cc:1951 route_time_axis.cc:2387
+#: editor_routes.cc:204 mixer_strip.cc:1945 meter_strip.cc:334
+#: route_time_axis.cc:2407
 msgid "A"
 msgstr ""
 
@@ -5427,7 +5440,7 @@ msgstr ""
 msgid "Track/Bus active ?"
 msgstr "音轨/总线"
 
-#: editor_routes.cc:205 mixer_strip.cc:1935
+#: editor_routes.cc:205 mixer_strip.cc:1932
 msgid "I"
 msgstr ""
 
@@ -5436,7 +5449,7 @@ msgstr ""
 msgid "MIDI input enabled"
 msgstr "\t%1 MIDI inputs\n"
 
-#: editor_routes.cc:206 mixer_strip.cc:1933 mono_panner.cc:198
+#: editor_routes.cc:206 mixer_strip.cc:1930 mono_panner.cc:198
 #: stereo_panner.cc:215 stereo_panner.cc:242
 msgid "R"
 msgstr ""
@@ -5451,7 +5464,7 @@ msgstr "�用录音"
 msgid "Muted"
 msgstr "�音"
 
-#: editor_routes.cc:208 mixer_strip.cc:1947
+#: editor_routes.cc:208 mixer_strip.cc:1941 meter_strip.cc:330
 msgid "S"
 msgstr ""
 
@@ -5464,7 +5477,7 @@ msgstr "独�..."
 msgid "SI"
 msgstr ""
 
-#: editor_routes.cc:209 mixer_strip.cc:351 rc_option_editor.cc:1872
+#: editor_routes.cc:209 mixer_strip.cc:353 rc_option_editor.cc:1880
 #, fuzzy
 msgid "Solo Isolated"
 msgstr "Solo隔离"
@@ -5752,141 +5765,145 @@ msgid "192000Hz"
 msgstr "192000 Hz"
 
 #: engine_dialog.cc:127 engine_dialog.cc:132 engine_dialog.cc:169
-#: engine_dialog.cc:552 midi_channel_selector.cc:163
+#: engine_dialog.cc:562 midi_channel_selector.cc:163
 #: midi_channel_selector.cc:402 midi_channel_selector.cc:438
-#: rc_option_editor.cc:1250 sfdb_ui.cc:542
+#: rc_option_editor.cc:1250 sfdb_ui.cc:538
 msgid "None"
 msgstr ""
 
-#: engine_dialog.cc:128 engine_dialog.cc:553
+#: engine_dialog.cc:128 engine_dialog.cc:563
 msgid "Triangular"
 msgstr "三角形"
 
-#: engine_dialog.cc:129 engine_dialog.cc:555
+#: engine_dialog.cc:129 engine_dialog.cc:565
 msgid "Rectangular"
 msgstr "矩形"
 
-#: engine_dialog.cc:130 engine_dialog.cc:557
+#: engine_dialog.cc:130 engine_dialog.cc:567
 msgid "Shaped"
 msgstr "形状"
 
-#: engine_dialog.cc:158 engine_dialog.cc:473 engine_dialog.cc:964
+#: engine_dialog.cc:158 engine_dialog.cc:483 engine_dialog.cc:974
 msgid "Playback/recording on 1 device"
 msgstr "在设备1 播放/录音"
 
-#: engine_dialog.cc:159 engine_dialog.cc:477 engine_dialog.cc:530
-#: engine_dialog.cc:967
+#: engine_dialog.cc:159 engine_dialog.cc:487 engine_dialog.cc:540
+#: engine_dialog.cc:977
 msgid "Playback/recording on 2 devices"
 msgstr "在设备2 播放/录音"
 
-#: engine_dialog.cc:160 engine_dialog.cc:493 engine_dialog.cc:970
+#: engine_dialog.cc:160 engine_dialog.cc:503 engine_dialog.cc:980
 msgid "Playback only"
 msgstr "仅播放"
 
-#: engine_dialog.cc:161 engine_dialog.cc:495 engine_dialog.cc:973
+#: engine_dialog.cc:161 engine_dialog.cc:505 engine_dialog.cc:983
 msgid "Recording only"
 msgstr "仅录音"
 
-#: engine_dialog.cc:170 engine_dialog.cc:571
+#: engine_dialog.cc:171 engine_dialog.cc:448
+msgid "coremidi"
+msgstr ""
+
+#: engine_dialog.cc:173 engine_dialog.cc:581
 msgid "seq"
 msgstr ""
 
-#: engine_dialog.cc:171 engine_dialog.cc:573
+#: engine_dialog.cc:174 engine_dialog.cc:583
 msgid "raw"
 msgstr ""
 
-#: engine_dialog.cc:177
+#: engine_dialog.cc:181
 msgid "Driver:"
 msgstr "驱动:"
 
-#: engine_dialog.cc:182
+#: engine_dialog.cc:186
 #, fuzzy
 msgid "Audio Interface:"
 msgstr "接�:"
 
-#: engine_dialog.cc:187 sfdb_ui.cc:148 sfdb_ui.cc:261 sfdb_ui.cc:266
+#: engine_dialog.cc:191 sfdb_ui.cc:147 sfdb_ui.cc:260 sfdb_ui.cc:265
 msgid "Sample rate:"
 msgstr "采样率:"
 
-#: engine_dialog.cc:192
+#: engine_dialog.cc:196
 msgid "Buffer size:"
 msgstr "缓冲区大�:"
 
-#: engine_dialog.cc:198
+#: engine_dialog.cc:202
 msgid "Number of buffers:"
 msgstr "缓冲区数�:"
 
-#: engine_dialog.cc:205
+#: engine_dialog.cc:209
 msgid "Approximate latency:"
 msgstr "大约延迟:"
 
-#: engine_dialog.cc:218
+#: engine_dialog.cc:222
 msgid "Audio mode:"
 msgstr "音频模�:"
 
-#: engine_dialog.cc:280 engine_dialog.cc:404
+#: engine_dialog.cc:284 engine_dialog.cc:408
 msgid "Ignore"
 msgstr "忽略"
 
-#: engine_dialog.cc:288
+#: engine_dialog.cc:292
 msgid "Client timeout"
 msgstr "客户端超时"
 
-#: engine_dialog.cc:295
+#: engine_dialog.cc:299
 msgid "Number of ports:"
 msgstr "端�数�:"
 
-#: engine_dialog.cc:300
+#: engine_dialog.cc:304
 msgid "MIDI driver:"
 msgstr "MIDI驱动:"
 
-#: engine_dialog.cc:306
+#: engine_dialog.cc:310
 msgid "Dither:"
 msgstr ""
 
-#: engine_dialog.cc:315
+#: engine_dialog.cc:319
 msgid ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 msgstr ""
 "No JACK server found anywhere on this system. Please install JACK and restart"
 
-#: engine_dialog.cc:323
+#: engine_dialog.cc:327
 msgid "Server:"
 msgstr "�务器:"
 
-#: engine_dialog.cc:335
+#: engine_dialog.cc:339
 msgid "Input device:"
 msgstr "输入设备:"
 
-#: engine_dialog.cc:339
+#: engine_dialog.cc:343
 msgid "Output device:"
 msgstr "输出设备:"
 
-#: engine_dialog.cc:344
+#: engine_dialog.cc:348
 msgid "Hardware input latency:"
 msgstr "硬件输入延迟:"
 
-#: engine_dialog.cc:347 engine_dialog.cc:353
+#: engine_dialog.cc:351 engine_dialog.cc:357
 msgid "samples"
 msgstr "采样"
 
-#: engine_dialog.cc:350
+#: engine_dialog.cc:354
 msgid "Hardware output latency:"
 msgstr "硬件输出延迟:"
 
-#: engine_dialog.cc:364
+#: engine_dialog.cc:368
 msgid "Device"
 msgstr "设备"
 
-#: engine_dialog.cc:366
+#: engine_dialog.cc:370
 msgid "Advanced"
 msgstr "高级"
 
-#: engine_dialog.cc:643
+#: engine_dialog.cc:653
 msgid "cannot open JACK rc file %1 to store parameters"
 msgstr "无法打开JACK的rc文件%1�储存�数"
 
-#: engine_dialog.cc:777
+#: engine_dialog.cc:787
 msgid ""
 "You do not have any audio devices capable of\n"
 "simultaneous playback and recording.\n"
@@ -5903,31 +5920,31 @@ msgid ""
 "%1 and choose the relevant device then."
 msgstr ""
 
-#: engine_dialog.cc:790
+#: engine_dialog.cc:800
 msgid "No suitable audio devices"
 msgstr "没有�适的音频设备"
 
-#: engine_dialog.cc:1007
+#: engine_dialog.cc:1017
 msgid "JACK appears to be missing from the %1 bundle"
 msgstr "JACK%1"
 
-#: engine_dialog.cc:1077
+#: engine_dialog.cc:1087
 msgid "You need to choose an audio device first."
 msgstr "你需�先选择一个音频设备"
 
-#: engine_dialog.cc:1094
+#: engine_dialog.cc:1104
 msgid "Audio device \"%1\" not known on this computer."
 msgstr "电脑无法识别音频设备 %1"
 
-#: engine_dialog.cc:1246
+#: engine_dialog.cc:1256
 msgid "AudioSetup value for %1 is missing data"
 msgstr ""
 
-#: engine_dialog.cc:1325
+#: engine_dialog.cc:1335
 msgid "configuration files contain a JACK server path that doesn't exist (%1)"
 msgstr ""
 
-#: export_channel_selector.cc:45 sfdb_ui.cc:146
+#: export_channel_selector.cc:45 sfdb_ui.cc:145
 msgid "Channels:"
 msgstr "通�:"
 
@@ -6086,9 +6103,9 @@ msgid "Folder:"
 msgstr "文件:"
 
 #: export_filename_selector.cc:37 session_import_dialog.cc:44
-#: transcode_video_dialog.cc:58 video_server_dialog.cc:44
-#: video_server_dialog.cc:46 export_video_dialog.cc:68
-#: export_video_dialog.cc:70
+#: transcode_video_dialog.cc:59 video_server_dialog.cc:45
+#: video_server_dialog.cc:47 export_video_dialog.cc:69
+#: export_video_dialog.cc:71
 msgid "Browse"
 msgstr "�览"
 
@@ -6212,6 +6229,13 @@ msgstr "FLAC选项"
 msgid "Broadcast Wave options"
 msgstr "广播Wave (Broadcast Wave) 选项"
 
+#: export_format_selector.cc:136
+#, fuzzy
+msgid "Do you really want to remove the format?"
+msgstr ""
+"你确定移除快照 \"%1\"?\n"
+"(��撤销)"
+
 #: export_preset_selector.cc:28
 msgid "Preset"
 msgstr "预设"
@@ -6224,6 +6248,13 @@ msgstr ""
 "被选中的预设载入��功!\n"
 "是�是其引用的的格�被删除了?"
 
+#: export_preset_selector.cc:156
+#, fuzzy
+msgid "Do you really want to remove this preset?"
+msgstr ""
+"你确定移除快照 \"%1\"?\n"
+"(��撤销)"
+
 #: export_timespan_selector.cc:46
 msgid "Show Times as:"
 msgstr "显示时间："
@@ -6236,36 +6267,49 @@ msgstr "到"
 msgid "Range"
 msgstr "范围"
 
-#: gain_meter.cc:109 gain_meter.cc:431 gain_meter.cc:820
+#: sfdb_freesound_mootcher.cc:189 sfdb_freesound_mootcher.cc:324
+#, fuzzy
+msgid "curl error %1 (%2)"
+msgstr "程�错误: %1 (%2)"
+
+#: sfdb_freesound_mootcher.cc:266
+msgid "getSoundResourceFile: There is no valid root in the xml file"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:271
+msgid "getSoundResourceFile: root = %1, != response"
+msgstr ""
+
+#: sfdb_freesound_mootcher.cc:410
+msgid "%1"
+msgstr ""
+
+#: gain_meter.cc:106 gain_meter.cc:357 gain_meter.cc:462 gain_meter.cc:856
 msgid "-inf"
 msgstr ""
 
-#: gain_meter.cc:115 gain_meter.cc:869
+#: gain_meter.cc:112 gain_meter.cc:913
 msgid "Fader automation mode"
 msgstr ""
 
-#: gain_meter.cc:116 gain_meter.cc:870
+#: gain_meter.cc:113 gain_meter.cc:914
 msgid "Fader automation type"
 msgstr ""
 
-#: gain_meter.cc:125 gain_meter.cc:759 panner_ui.cc:178 panner_ui.cc:590
+#: gain_meter.cc:122 gain_meter.cc:795 panner_ui.cc:178 panner_ui.cc:590
 msgid "Abs"
 msgstr ""
 
-#: gain_meter.cc:334
-msgid "-Inf"
-msgstr ""
-
-#: gain_meter.cc:726 mixer_strip.cc:1954 panner_ui.cc:557
-#: route_time_axis.cc:2391
+#: gain_meter.cc:762 mixer_strip.cc:1948 meter_strip.cc:337 panner_ui.cc:557
+#: route_time_axis.cc:2411
 msgid "P"
 msgstr ""
 
-#: gain_meter.cc:729 panner_ui.cc:560
+#: gain_meter.cc:765 panner_ui.cc:560
 msgid "T"
 msgstr ""
 
-#: gain_meter.cc:732 panner_ui.cc:563
+#: gain_meter.cc:768 panner_ui.cc:563
 msgid "W"
 msgstr ""
 
@@ -6277,7 +6321,7 @@ msgstr "<span size=\"large\">预设</span>"
 msgid "Switches"
 msgstr ""
 
-#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2210
+#: generic_pluginui.cc:242 generic_pluginui.cc:376 processor_box.cc:2212
 msgid "Controls"
 msgstr "控制"
 
@@ -6305,68 +6349,68 @@ msgstr "音频连结管�"
 msgid "MIDI Connection Manager"
 msgstr "MIDI连接管�"
 
-#: global_port_matrix.cc:204 io_selector.cc:216
+#: global_port_matrix.cc:213 io_selector.cc:216
 msgid "port"
 msgstr ""
 
-#: group_tabs.cc:306
+#: group_tabs.cc:308
 msgid "Selection..."
 msgstr ""
 
-#: group_tabs.cc:307
+#: group_tabs.cc:309
 msgid "Record Enabled..."
 msgstr "�用录音..."
 
-#: group_tabs.cc:308
+#: group_tabs.cc:310
 msgid "Soloed..."
 msgstr "独�..."
 
-#: group_tabs.cc:314
+#: group_tabs.cc:316
 #, fuzzy
 msgid "Create New Group ..."
 msgstr "新群组"
 
-#: group_tabs.cc:315
+#: group_tabs.cc:317
 msgid "Create New Group From"
 msgstr ""
 
-#: group_tabs.cc:318
+#: group_tabs.cc:320
 #, fuzzy
 msgid "Edit Group..."
 msgstr "新群组"
 
-#: group_tabs.cc:319
+#: group_tabs.cc:321
 #, fuzzy
 msgid "Collect Group"
 msgstr "没有群组"
 
-#: group_tabs.cc:320
+#: group_tabs.cc:322
 #, fuzzy
 msgid "Remove Group"
 msgstr "移除总线"
 
-#: group_tabs.cc:323
+#: group_tabs.cc:325
 #, fuzzy
 msgid "Remove Subgroup Bus"
 msgstr "移除总线"
 
-#: group_tabs.cc:325
+#: group_tabs.cc:327
 msgid "Add New Subgroup Bus"
 msgstr ""
 
-#: group_tabs.cc:327
+#: group_tabs.cc:329
 msgid "Add New Aux Bus (pre-fader)"
 msgstr ""
 
-#: group_tabs.cc:328
+#: group_tabs.cc:330
 msgid "Add New Aux Bus (post-fader)"
 msgstr ""
 
-#: group_tabs.cc:334
+#: group_tabs.cc:336
 msgid "Enable All Groups"
 msgstr ""
 
-#: group_tabs.cc:335
+#: group_tabs.cc:337
 #, fuzzy
 msgid "Disable All Groups"
 msgstr "�用所有"
@@ -6461,11 +6505,11 @@ msgstr "导入文件: %2 的 %1"
 msgid "I/O selector"
 msgstr "输入/输出 选择器"
 
-#: io_selector.cc:266
+#: io_selector.cc:265
 msgid "%1 input"
 msgstr "%1 输入"
 
-#: io_selector.cc:268
+#: io_selector.cc:267
 msgid "%1 output"
 msgstr "%1 输出"
 
@@ -6545,7 +6589,7 @@ msgstr[1] "采样"
 msgid "Reset"
 msgstr "预设"
 
-#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1734
+#: latency_gui.cc:151 rhythm_ferret.cc:274 sfdb_ui.cc:1755
 msgid "programming error: %1 (%2)"
 msgstr "程�错误: %1 (%2)"
 
@@ -6573,68 +6617,68 @@ msgstr ""
 msgid "Pre-Emphasis"
 msgstr ""
 
-#: location_ui.cc:310
+#: location_ui.cc:314
 #, fuzzy
 msgid "Remove this range"
 msgstr "忘记此范围"
 
-#: location_ui.cc:311
+#: location_ui.cc:315
 msgid "Start time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:312
+#: location_ui.cc:316
 msgid "End time - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:315
+#: location_ui.cc:319
 #, fuzzy
 msgid "Set range start from playhead location"
 msgstr "从播放头设置范围标记"
 
-#: location_ui.cc:316
+#: location_ui.cc:320
 #, fuzzy
 msgid "Set range end from playhead location"
 msgstr "从区间选择设置范围"
 
-#: location_ui.cc:320
+#: location_ui.cc:324
 #, fuzzy
 msgid "Remove this marker"
 msgstr "忘记这个标记"
 
-#: location_ui.cc:321
+#: location_ui.cc:325
 msgid "Position - middle click to locate here"
 msgstr ""
 
-#: location_ui.cc:323
+#: location_ui.cc:327
 #, fuzzy
 msgid "Set marker time from playhead location"
 msgstr "从区间选择设置范围"
 
-#: location_ui.cc:462
+#: location_ui.cc:494
 msgid "You cannot put a CD marker at the start of the session"
 msgstr "无法在会�开始放置CD标记"
 
-#: location_ui.cc:708
+#: location_ui.cc:720
 msgid "New Marker"
 msgstr "新标记"
 
-#: location_ui.cc:709
+#: location_ui.cc:721
 msgid "New Range"
 msgstr "新范围"
 
-#: location_ui.cc:722
+#: location_ui.cc:734
 msgid "<b>Loop/Punch Ranges</b>"
 msgstr "<b>循环/Punch 范围</b>"
 
-#: location_ui.cc:747
+#: location_ui.cc:759
 msgid "<b>Markers (Including CD Index)</b>"
 msgstr "<b>标记(包括CD索引)</b>"
 
-#: location_ui.cc:782
+#: location_ui.cc:794
 msgid "<b>Ranges (Including CD Track Ranges)</b>"
 msgstr "<b>范围(包括CD轨�区间)</b>"
 
-#: location_ui.cc:1024
+#: location_ui.cc:1036
 msgid "add range marker"
 msgstr "添加范围标记"
 
@@ -6719,45 +6763,49 @@ msgstr ""
 "然�连接到%1, 或者现在退出%1.\n"
 "现在你没办法�存会�, 因为你的连接信��能会丢失.\n"
 
-#: main.cc:491
+#: main.cc:487
 msgid " (built using "
 msgstr ""
 
-#: main.cc:494
+#: main.cc:490
 msgid " and GCC version "
 msgstr ""
 
-#: main.cc:504
+#: main.cc:500
 msgid "Copyright (C) 1999-2012 Paul Davis"
 msgstr ""
 
-#: main.cc:505
+#: main.cc:501
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker, Robin Gareus"
 msgstr ""
 
-#: main.cc:507
+#: main.cc:503
 msgid "%1 comes with ABSOLUTELY NO WARRANTY"
 msgstr ""
 
-#: main.cc:508
+#: main.cc:504
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 msgstr ""
 
-#: main.cc:509
+#: main.cc:505
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr ""
 
-#: main.cc:510
+#: main.cc:506
 msgid "under certain conditions; see the source for copying conditions."
 msgstr ""
 
-#: main.cc:519
+#: main.cc:513
+msgid "could not initialize %1."
+msgstr "无法�始化 %1."
+
+#: main.cc:522
 msgid "Cannot xinstall SIGPIPE error handler"
 msgstr ""
 
-#: main.cc:525
+#: main.cc:528
 #, fuzzy
 msgid "could not create %1 GUI"
 msgstr "无法创建Ardour用户图形界�"
@@ -6766,7 +6814,7 @@ msgstr "无法创建Ardour用户图形界�"
 msgid "Display delta to edit cursor"
 msgstr ""
 
-#: marker.cc:251 video_image_frame.cc:120
+#: marker.cc:251 video_image_frame.cc:121
 #, fuzzy
 msgid "MarkerText"
 msgstr "标记"
@@ -7282,7 +7330,7 @@ msgstr "点击选择一个�外的文件夹"
 msgid "Missing Plugins"
 msgstr "丢失�件"
 
-#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:59
+#: missing_plugin_dialog.cc:33 transcode_video_dialog.cc:60
 msgid "OK"
 msgstr "OK"
 
@@ -7362,223 +7410,236 @@ msgstr "载入�� %1"
 msgid "Could not find mixer.bindings in search path %1"
 msgstr ""
 
-#: mixer_strip.cc:91 mixer_strip.cc:119 mixer_strip.cc:1720
+#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:1721
 msgid "pre"
 msgstr ""
 
-#: mixer_strip.cc:93 mixer_strip.cc:121 mixer_strip.cc:352 mixer_strip.cc:1293
-#: rc_option_editor.cc:1873
+#: mixer_strip.cc:95 mixer_strip.cc:123 mixer_strip.cc:354 mixer_strip.cc:1300
+#: rc_option_editor.cc:1881
 #, fuzzy
 msgid "Comments"
 msgstr "注释"
 
-#: mixer_strip.cc:145
+#: mixer_strip.cc:147
 msgid "Click to toggle the width of this mixer strip."
 msgstr ""
 
-#: mixer_strip.cc:147
+#: mixer_strip.cc:149
 msgid ""
 "\n"
 "%1-%2-click to toggle the width of all strips."
 msgstr ""
 
-#: mixer_strip.cc:154
+#: mixer_strip.cc:156
 #, fuzzy
 msgid "Hide this mixer strip"
 msgstr "��此音轨"
 
-#: mixer_strip.cc:165
+#: mixer_strip.cc:167
 #, fuzzy
 msgid "Click to select metering point"
 msgstr "选择测�点"
 
-#: mixer_strip.cc:171
+#: mixer_strip.cc:173
 msgid "tupni"
 msgstr ""
 
-#: mixer_strip.cc:190
+#: mixer_strip.cc:192
 msgid "Isolate Solo"
 msgstr ""
 
-#: mixer_strip.cc:199
+#: mixer_strip.cc:201
 msgid "Lock Solo Status"
 msgstr ""
 
-#: mixer_strip.cc:201 mixer_strip.cc:1929
+#: mixer_strip.cc:203 mixer_strip.cc:1926
 msgid "lock"
 msgstr ""
 
-#: mixer_strip.cc:202 mixer_strip.cc:1928
+#: mixer_strip.cc:204 mixer_strip.cc:1925
 msgid "iso"
 msgstr ""
 
-#: mixer_strip.cc:256
+#: mixer_strip.cc:258
 msgid "Mix group"
 msgstr ""
 
-#: mixer_strip.cc:349 rc_option_editor.cc:1870
+#: mixer_strip.cc:351 rc_option_editor.cc:1878
 #, fuzzy
 msgid "Phase Invert"
 msgstr "�转"
 
-#: mixer_strip.cc:350 rc_option_editor.cc:1871 route_ui.cc:1213
+#: mixer_strip.cc:352 rc_option_editor.cc:1879 route_ui.cc:1218
 msgid "Solo Safe"
 msgstr "Solo安全"
 
-#: mixer_strip.cc:353 mixer_ui.cc:124 route_time_axis.cc:664
+#: mixer_strip.cc:355 mixer_ui.cc:124 route_time_axis.cc:673
 msgid "Group"
 msgstr "组"
 
-#: mixer_strip.cc:354 rc_option_editor.cc:1874
+#: mixer_strip.cc:356 rc_option_editor.cc:1882
 #, fuzzy
 msgid "Meter Point"
 msgstr "编辑点"
 
-#: mixer_strip.cc:466
+#: mixer_strip.cc:470
 msgid "Enable/Disable MIDI input"
 msgstr "�用/�用MIDI输入"
 
-#: mixer_strip.cc:616
+#: mixer_strip.cc:622
 msgid ""
 "Aux\n"
 "Sends"
 msgstr ""
 
-#: mixer_strip.cc:640
+#: mixer_strip.cc:646
 msgid "Snd"
 msgstr ""
 
-#: mixer_strip.cc:694 mixer_strip.cc:822 processor_box.cc:2152
+#: mixer_strip.cc:701 mixer_strip.cc:829 processor_box.cc:2154
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr ""
 
-#: mixer_strip.cc:1089
+#: mixer_strip.cc:1096
 msgid "<b>INPUT</b> to %1"
 msgstr ""
 
-#: mixer_strip.cc:1092
+#: mixer_strip.cc:1099
 msgid "<b>OUTPUT</b> from %1"
 msgstr ""
 
-#: mixer_strip.cc:1167
+#: mixer_strip.cc:1174
 msgid "Disconnected"
 msgstr "失去连接"
 
-#: mixer_strip.cc:1296
+#: mixer_strip.cc:1303
 #, fuzzy
 msgid "*Comments*"
 msgstr "注释"
 
-#: mixer_strip.cc:1303
+#: mixer_strip.cc:1310
 #, fuzzy
 msgid "Cmt"
 msgstr "剪切"
 
-#: mixer_strip.cc:1306
+#: mixer_strip.cc:1313
 msgid "*Cmt*"
 msgstr ""
 
-#: mixer_strip.cc:1312
+#: mixer_strip.cc:1319
 msgid "Click to Add/Edit Comments"
 msgstr ""
 
-#: mixer_strip.cc:1351
+#: mixer_strip.cc:1358
 msgid ": comment editor"
 msgstr ": 注释编辑器"
 
-#: mixer_strip.cc:1428
+#: mixer_strip.cc:1435
 msgid "Grp"
 msgstr "组"
 
-#: mixer_strip.cc:1431
+#: mixer_strip.cc:1438
 msgid "~G"
 msgstr "~G"
 
-#: mixer_strip.cc:1460
+#: mixer_strip.cc:1467
 msgid "Comments..."
 msgstr "注释..."
 
-#: mixer_strip.cc:1462
+#: mixer_strip.cc:1469
 msgid "Save As Template..."
 msgstr "�存为模�..."
 
-#: mixer_strip.cc:1468 route_group_dialog.cc:39 route_time_axis.cc:687
+#: mixer_strip.cc:1475 route_group_dialog.cc:39 route_time_axis.cc:696
 msgid "Active"
 msgstr "�用(Active)"
 
-#: mixer_strip.cc:1475
+#: mixer_strip.cc:1482
 msgid "Adjust Latency..."
 msgstr "调整延迟..."
 
-#: mixer_strip.cc:1478
+#: mixer_strip.cc:1485
 msgid "Protect Against Denormals"
 msgstr ""
 
-#: mixer_strip.cc:1484 route_time_axis.cc:426
+#: mixer_strip.cc:1491 route_time_axis.cc:435
 msgid "Remote Control ID..."
 msgstr ""
 
-#: mixer_strip.cc:1716 mixer_strip.cc:1740
+#: mixer_strip.cc:1717 mixer_strip.cc:1741
 msgid "in"
 msgstr ""
 
-#: mixer_strip.cc:1724
+#: mixer_strip.cc:1725
 msgid "post"
 msgstr ""
 
-#: mixer_strip.cc:1728
+#: mixer_strip.cc:1729
 msgid "out"
 msgstr ""
 
-#: mixer_strip.cc:1733
+#: mixer_strip.cc:1734
 msgid "custom"
 msgstr ""
 
-#: mixer_strip.cc:1744
+#: mixer_strip.cc:1745
 msgid "pr"
 msgstr ""
 
-#: mixer_strip.cc:1748
+#: mixer_strip.cc:1749
 msgid "po"
 msgstr ""
 
-#: mixer_strip.cc:1752
+#: mixer_strip.cc:1753
 msgid "o"
 msgstr ""
 
-#: mixer_strip.cc:1757
+#: mixer_strip.cc:1758
 msgid "c"
 msgstr ""
 
-#: mixer_strip.cc:1905 route_ui.cc:138
+#: mixer_strip.cc:1906 route_ui.cc:143
 msgid "Disk"
 msgstr ""
 
-#: mixer_strip.cc:1920 monitor_section.cc:63
+#: mixer_strip.cc:1918 monitor_section.cc:63
 msgid "AFL"
 msgstr ""
 
-#: mixer_strip.cc:1923 monitor_section.cc:64
+#: mixer_strip.cc:1921 monitor_section.cc:64
 msgid "PFL"
 msgstr ""
 
-#: mixer_strip.cc:1936
+#: mixer_strip.cc:1933
 msgid "D"
 msgstr ""
 
-#: mixer_strip.cc:1959
+#: mixer_strip.cc:1953
 msgid "i"
 msgstr ""
 
-#: mixer_strip.cc:2133
+#: mixer_strip.cc:2128
 msgid "Pre-fader"
 msgstr ""
 
-#: mixer_strip.cc:2134
+#: mixer_strip.cc:2129
 #, fuzzy
 msgid "Post-fader"
 msgstr "交�淡入淡出"
 
+#: mixer_strip.cc:2166 meter_strip.cc:728
+msgid "Change all in Group to %1"
+msgstr ""
+
+#: mixer_strip.cc:2168 meter_strip.cc:730
+#, fuzzy
+msgid "Change all to %1"
+msgstr "通� %1"
+
+#: mixer_strip.cc:2170 meter_strip.cc:732
+msgid "Change same track-type to %1"
+msgstr ""
+
 #: mixer_ui.cc:1189
 msgid "track display list item for renamed strip not found!"
 msgstr ""
@@ -7587,10 +7648,67 @@ msgstr ""
 msgid "-all-"
 msgstr ""
 
-#: mixer_ui.cc:1792
+#: mixer_ui.cc:1794
 msgid "Strips"
 msgstr ""
 
+#: meter_strip.cc:764
+msgid "Variable height"
+msgstr ""
+
+#: meter_strip.cc:765
+#, fuzzy
+msgid "Short"
+msgstr "短"
+
+#: meter_strip.cc:766
+msgid "Tall"
+msgstr ""
+
+#: meter_strip.cc:767
+msgid "Grande"
+msgstr ""
+
+#: meter_strip.cc:768
+msgid "Venti"
+msgstr ""
+
+#: meter_patterns.cc:81
+msgid "Peak"
+msgstr ""
+
+#: meter_patterns.cc:84
+msgid "RMS + Peak"
+msgstr ""
+
+#: meter_patterns.cc:87
+msgid "IEC1/DIN"
+msgstr ""
+
+#: meter_patterns.cc:90
+msgid "IEC1/Nordic"
+msgstr ""
+
+#: meter_patterns.cc:93
+msgid "IEC2/BBC"
+msgstr ""
+
+#: meter_patterns.cc:96
+msgid "IEC2/EBU"
+msgstr ""
+
+#: meter_patterns.cc:99
+msgid "K20"
+msgstr ""
+
+#: meter_patterns.cc:102
+msgid "K14"
+msgstr ""
+
+#: meter_patterns.cc:105
+msgid "VU"
+msgstr ""
+
 #: monitor_section.cc:62
 msgid "SiP"
 msgstr ""
@@ -7962,7 +8080,7 @@ msgstr ""
 msgid "Panner (2D)"
 msgstr ""
 
-#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:452
+#: panner2d.cc:783 panner_ui.cc:384 plugin_ui.cc:451
 msgid "Bypass"
 msgstr ""
 
@@ -8135,7 +8253,7 @@ msgstr "根�类别"
 msgid "Eh? LADSPA plugins don't have editors!"
 msgstr "呃?LADSPA�件没有编辑器"
 
-#: plugin_ui.cc:125 plugin_ui.cc:228
+#: plugin_ui.cc:125 plugin_ui.cc:227
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
@@ -8146,83 +8264,95 @@ msgstr "未知类型编辑器�件 (�示: 此版本的Ardour没有VST支�)"
 msgid "unknown type of editor-supplying plugin"
 msgstr "未知类型编辑器�件"
 
-#: plugin_ui.cc:258
+#: plugin_ui.cc:257
 #, fuzzy
 msgid ""
 "unknown type of editor-supplying plugin (note: no linuxVST support in this "
 "version of %1)"
 msgstr "未知类型编辑器�件 (�示: 此版本的Ardour没有LinuxVST支�)"
 
-#: plugin_ui.cc:330
+#: plugin_ui.cc:329
 msgid "create_lv2_editor called on non-LV2 plugin"
 msgstr ""
 
-#: plugin_ui.cc:418
+#: plugin_ui.cc:417
 msgid "Add"
 msgstr "增添"
 
-#: plugin_ui.cc:422
+#: plugin_ui.cc:421
 #, fuzzy
 msgid "Description"
 msgstr "方�:"
 
-#: plugin_ui.cc:423
+#: plugin_ui.cc:422
 msgid "Plugin analysis"
 msgstr "�件分�"
 
-#: plugin_ui.cc:430
+#: plugin_ui.cc:429
 msgid ""
 "Presets (if any) for this plugin\n"
 "(Both factory and user-created)"
 msgstr ""
 
-#: plugin_ui.cc:431
+#: plugin_ui.cc:430
 #, fuzzy
 msgid "Save a new preset"
 msgstr "新预设的�称"
 
-#: plugin_ui.cc:432
+#: plugin_ui.cc:431
 msgid "Save the current preset"
 msgstr ""
 
-#: plugin_ui.cc:433
+#: plugin_ui.cc:432
 msgid "Delete the current preset"
 msgstr ""
 
-#: plugin_ui.cc:434
+#: plugin_ui.cc:433
 msgid "Disable signal processing by the plugin"
 msgstr ""
 
-#: plugin_ui.cc:467 plugin_ui.cc:632
+#: plugin_ui.cc:466 plugin_ui.cc:662
 msgid ""
 "Click to allow the plugin to receive keyboard events that %1 would normally "
 "use as a shortcut"
 msgstr "�击��许此�件接�键盘事件, 这样�就�以正常地使用 %1 快�键"
 
-#: plugin_ui.cc:468
+#: plugin_ui.cc:467
 msgid "Click to enable/disable this plugin"
 msgstr "�击��用/�用此�件"
 
-#: plugin_ui.cc:507
+#: plugin_ui.cc:506
 #, fuzzy
 msgid "latency (%1 sample)"
 msgid_plural "latency (%1 samples)"
 msgstr[0] "延迟 (%1 采样)"
 msgstr[1] "延迟 (%1 采样)"
 
-#: plugin_ui.cc:509
+#: plugin_ui.cc:508
 msgid "latency (%1 ms)"
 msgstr "延迟 (%1 毫秒)"
 
-#: plugin_ui.cc:520
+#: plugin_ui.cc:519
 msgid "Edit Latency"
 msgstr "Upravit prodlevu"
 
-#: plugin_ui.cc:559
+#: plugin_ui.cc:558
 msgid "Plugin preset %1 not found"
 msgstr "未找到�件预设%1"
 
-#: plugin_ui.cc:639
+#: plugin_ui.cc:595
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin_ui.cc:615 plugin_ui.cc:630
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"newer version"
+msgstr ""
+
+#: plugin_ui.cc:669
 msgid "Click to allow normal use of %1 keyboard shortcuts"
 msgstr "�击��许正常地使用 %1 快�键"
 
@@ -8327,77 +8457,79 @@ msgstr "检测中..."
 msgid "Port Insert "
 msgstr "�入端�"
 
-#: port_matrix.cc:323 port_matrix.cc:342
+#: port_matrix.cc:331 port_matrix.cc:357
 msgid "<b>Sources</b>"
 msgstr "<b>�</b>"
 
-#: port_matrix.cc:324 port_matrix.cc:343
+#: port_matrix.cc:332 port_matrix.cc:358
 msgid "<b>Destinations</b>"
 msgstr "<b>目的地</b>"
 
-#: port_matrix.cc:419 port_matrix.cc:427
+#: port_matrix.cc:440 port_matrix.cc:448
 #, c-format
 msgid "Add %s %s"
 msgstr "增加 %s %s"
 
-#: port_matrix.cc:435
+#: port_matrix.cc:456
 #, c-format
 msgid "Rename '%s'..."
 msgstr "�命� '%s'..."
 
-#: port_matrix.cc:451
+#: port_matrix.cc:472
 msgid "Remove all"
 msgstr "移除所有"
 
-#: port_matrix.cc:471 port_matrix.cc:483
+#: port_matrix.cc:492 port_matrix.cc:504
 #, c-format
 msgid "%s all"
 msgstr "%s 所有"
 
-#: port_matrix.cc:506
+#: port_matrix.cc:527
 msgid "Rescan"
 msgstr "�新扫�"
 
-#: port_matrix.cc:508
+#: port_matrix.cc:529
 msgid "Show individual ports"
 msgstr "显示�个端�"
 
-#: port_matrix.cc:514
+#: port_matrix.cc:535
 msgid "Flip"
 msgstr ""
 
-#: port_matrix.cc:702
+#: port_matrix.cc:723
 #, fuzzy
 msgid ""
 "It is not possible to add a port here, as the first processor in the track "
 "or buss cannot support the new configuration."
 msgstr "此端���移除, 作为音轨或总线的第一个�件, �接�新的输入数目."
 
-#: port_matrix.cc:705
+#: port_matrix.cc:726
 msgid "Cannot add port"
 msgstr ""
 
-#: port_matrix.cc:727
+#: port_matrix.cc:748
 msgid "Port removal not allowed"
 msgstr "��许端�移除"
 
-#: port_matrix.cc:728
+#: port_matrix.cc:749
+#, fuzzy
 msgid ""
-"This port cannot be removed, as the first plugin in the track or buss cannot "
-"accept the new number of inputs."
+"This port cannot be removed.\n"
+"Either the first plugin in the track or buss cannot accept\n"
+"the new number of inputs or the last plugin has more outputs."
 msgstr "此端���移除, 作为音轨或总线的第一个�件, �接�新的输入数目."
 
-#: port_matrix.cc:945
+#: port_matrix.cc:966
 #, c-format
 msgid "Remove '%s'"
 msgstr "移除 '%s'"
 
-#: port_matrix.cc:960
+#: port_matrix.cc:981
 #, c-format
 msgid "%s all from '%s'"
 msgstr "%s 所有, 从 '%s'"
 
-#: port_matrix.cc:1026
+#: port_matrix.cc:1047
 msgid "channel"
 msgstr "声�"
 
@@ -8409,53 +8541,53 @@ msgstr "没有连接的端�"
 msgid "There are no %1 ports to connect."
 msgstr "没有 %1 端��连接."
 
-#: processor_box.cc:255
+#: processor_box.cc:256
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show GUI.\n"
 "Alt+double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:258
+#: processor_box.cc:259
 msgid ""
 "<b>%1</b>\n"
 "Double-click to show generic GUI."
 msgstr ""
 
-#: processor_box.cc:371
+#: processor_box.cc:372
 #, fuzzy
 msgid "Show All Controls"
 msgstr "显示所有的自动化"
 
-#: processor_box.cc:375
+#: processor_box.cc:376
 #, fuzzy
 msgid "Hide All Controls"
 msgstr "��所有自动化"
 
-#: processor_box.cc:464
+#: processor_box.cc:465
 #, fuzzy
 msgid "on"
 msgstr "完�"
 
-#: processor_box.cc:464 rc_option_editor.cc:1903 rc_option_editor.cc:1917
+#: processor_box.cc:465 rc_option_editor.cc:1911 rc_option_editor.cc:1925
 msgid "off"
 msgstr ""
 
-#: processor_box.cc:729
+#: processor_box.cc:742
 msgid ""
 "Right-click to add/remove/edit\n"
 "plugins,inserts,sends and more"
 msgstr ""
 
-#: processor_box.cc:1184 processor_box.cc:1578
+#: processor_box.cc:1197 processor_box.cc:1591
 msgid "Plugin Incompatibility"
 msgstr "�件�匹�"
 
-#: processor_box.cc:1187
+#: processor_box.cc:1200
 msgid "You attempted to add the plugin \"%1\" in slot %2.\n"
 msgstr ""
 
-#: processor_box.cc:1193
+#: processor_box.cc:1206
 msgid ""
 "\n"
 "This plugin has:\n"
@@ -8463,41 +8595,41 @@ msgstr ""
 "\n"
 "此�件:\n"
 
-#: processor_box.cc:1196
+#: processor_box.cc:1209
 #, fuzzy
 msgid "\t%1 MIDI input\n"
 msgid_plural "\t%1 MIDI inputs\n"
 msgstr[0] "\t%1 MIDI inputs\n"
 msgstr[1] "\t%1 MIDI inputs\n"
 
-#: processor_box.cc:1200
+#: processor_box.cc:1213
 #, fuzzy
 msgid "\t%1 audio input\n"
 msgid_plural "\t%1 audio inputs\n"
 msgstr[0] "\t%1 audio inputs\n"
 msgstr[1] "\t%1 audio inputs\n"
 
-#: processor_box.cc:1203
+#: processor_box.cc:1216
 msgid ""
 "\n"
 "but at the insertion point, there are:\n"
 msgstr ""
 
-#: processor_box.cc:1206
+#: processor_box.cc:1219
 #, fuzzy
 msgid "\t%1 MIDI channel\n"
 msgid_plural "\t%1 MIDI channels\n"
 msgstr[0] "\t%1 MIDI channels\n"
 msgstr[1] "\t%1 MIDI channels\n"
 
-#: processor_box.cc:1210
+#: processor_box.cc:1223
 #, fuzzy
 msgid "\t%1 audio channel\n"
 msgid_plural "\t%1 audio channels\n"
 msgstr[0] "\t%1 audio channels\n"
 msgstr[1] "\t%1 audio channels\n"
 
-#: processor_box.cc:1213
+#: processor_box.cc:1226
 msgid ""
 "\n"
 "%1 is unable to insert this plugin here.\n"
@@ -8505,37 +8637,37 @@ msgstr ""
 "\n"
 "%1 无法�次�入�件."
 
-#: processor_box.cc:1249
+#: processor_box.cc:1262
 msgid "Cannot set up new send: %1"
 msgstr ""
 
-#: processor_box.cc:1581
+#: processor_box.cc:1594
 msgid ""
 "You cannot reorder these plugins/sends/inserts\n"
 "in that way because the inputs and\n"
 "outputs will not work correctly."
 msgstr ""
 
-#: processor_box.cc:1765
+#: processor_box.cc:1778
 msgid "Rename Processor"
 msgstr "�命�处�器"
 
-#: processor_box.cc:1796
+#: processor_box.cc:1809
 msgid "At least 100 IO objects exist with a name like %1 - name not changed"
 msgstr "至少有100个IO(输入输出)对象存在�这样的%1的�称 -�称没有改�"
 
-#: processor_box.cc:1930
+#: processor_box.cc:1943
 msgid "plugin insert constructor failed"
 msgstr ""
 
-#: processor_box.cc:1941
+#: processor_box.cc:1954
 msgid ""
 "Copying the set of processors on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
 "could not match the configuration of this track."
 msgstr ""
 
-#: processor_box.cc:1987
+#: processor_box.cc:2000
 msgid ""
 "Do you really want to remove all processors from %1?\n"
 "(this cannot be undone)"
@@ -8543,72 +8675,72 @@ msgstr ""
 "你真想�移除所有处�器从 %1?\n"
 "(此�作��撤销)"
 
-#: processor_box.cc:1991 processor_box.cc:2016
+#: processor_box.cc:2004 processor_box.cc:2029
 msgid "Yes, remove them all"
 msgstr "确定移除所有"
 
-#: processor_box.cc:1993 processor_box.cc:2018
+#: processor_box.cc:2006 processor_box.cc:2031
 msgid "Remove processors"
 msgstr "移除处�器"
 
-#: processor_box.cc:2008
+#: processor_box.cc:2021
 msgid ""
 "Do you really want to remove all pre-fader processors from %1?\n"
 "(this cannot be undone)"
 msgstr ""
 
-#: processor_box.cc:2011
+#: processor_box.cc:2024
 msgid ""
 "Do you really want to remove all post-fader processors from %1?\n"
 "(this cannot be undone)"
 msgstr ""
 
-#: processor_box.cc:2198
+#: processor_box.cc:2200
 msgid "New Plugin"
 msgstr "新�件"
 
-#: processor_box.cc:2201
+#: processor_box.cc:2203
 msgid "New Insert"
 msgstr "新�入"
 
-#: processor_box.cc:2204
+#: processor_box.cc:2206
 msgid "New External Send ..."
 msgstr ""
 
-#: processor_box.cc:2208
+#: processor_box.cc:2210
 msgid "New Aux Send ..."
 msgstr ""
 
-#: processor_box.cc:2212
+#: processor_box.cc:2214
 msgid "Clear (all)"
 msgstr "清除(所有)"
 
-#: processor_box.cc:2214
+#: processor_box.cc:2216
 msgid "Clear (pre-fader)"
 msgstr ""
 
-#: processor_box.cc:2216
+#: processor_box.cc:2218
 msgid "Clear (post-fader)"
 msgstr ""
 
-#: processor_box.cc:2242
+#: processor_box.cc:2244
 msgid "Activate All"
 msgstr "激活所有"
 
-#: processor_box.cc:2244
+#: processor_box.cc:2246
 #, fuzzy
 msgid "Deactivate All"
 msgstr "�消激活所有"
 
-#: processor_box.cc:2246
+#: processor_box.cc:2248
 msgid "A/B Plugins"
 msgstr "A/B �件"
 
-#: processor_box.cc:2255
+#: processor_box.cc:2257
 msgid "Edit with generic controls..."
 msgstr ""
 
-#: processor_box.cc:2531
+#: processor_box.cc:2557
 msgid "%1: %2 (by %3)"
 msgstr ""
 
@@ -8768,7 +8900,7 @@ msgstr ""
 msgid ""
 "Base URL of the video-server including http prefix. This is usually 'http://"
 "hostname.example.org:1554/' and defaults to 'http://localhost:1554/' when "
-"the video-server is runing locally"
+"the video-server is running locally"
 msgstr ""
 
 #: rc_option_editor.cc:836
@@ -8861,7 +8993,7 @@ msgstr ""
 msgid "Click gain level"
 msgstr "�击音频文件:"
 
-#: rc_option_editor.cc:1083 route_time_axis.cc:206 route_time_axis.cc:667
+#: rc_option_editor.cc:1083 route_time_axis.cc:215 route_time_axis.cc:676
 msgid "Automation"
 msgstr "自动化"
 
@@ -9043,93 +9175,97 @@ msgstr "当音频区域移除时移除相应自动化"
 msgid "Show meters on tracks in the editor"
 msgstr "在编辑器的音轨显示仪表"
 
-#: rc_option_editor.cc:1320
+#: rc_option_editor.cc:1321
+msgid "Display master-meter in the toolbar"
+msgstr ""
+
+#: rc_option_editor.cc:1328
 msgid "Regions in active edit groups are edited together"
 msgstr ""
 
-#: rc_option_editor.cc:1321
+#: rc_option_editor.cc:1329
 #, fuzzy
 msgid "whenever they overlap in time"
 msgstr "缩短已存在的新音符"
 
-#: rc_option_editor.cc:1322
+#: rc_option_editor.cc:1330
 msgid "only if they have identical length, position and origin"
 msgstr ""
 
-#: rc_option_editor.cc:1332
+#: rc_option_editor.cc:1340
 msgid "Make rubberband selection rectangle snap to the grid"
 msgstr ""
 
-#: rc_option_editor.cc:1340
+#: rc_option_editor.cc:1348
 msgid "Show waveforms in regions"
 msgstr "显示区域的波形"
 
-#: rc_option_editor.cc:1348
+#: rc_option_editor.cc:1356
 #, fuzzy
 msgid "Show gain envelopes in audio regions"
 msgstr "显示区域的波形"
 
-#: rc_option_editor.cc:1349
+#: rc_option_editor.cc:1357
 msgid "in all modes"
 msgstr ""
 
-#: rc_option_editor.cc:1350
+#: rc_option_editor.cc:1358
 msgid "only in region gain mode"
 msgstr ""
 
-#: rc_option_editor.cc:1357
+#: rc_option_editor.cc:1365
 msgid "Waveform scale"
 msgstr "波形标尺"
 
-#: rc_option_editor.cc:1362
+#: rc_option_editor.cc:1370
 msgid "linear"
 msgstr "先行"
 
-#: rc_option_editor.cc:1363
+#: rc_option_editor.cc:1371
 msgid "logarithmic"
 msgstr "对数"
 
-#: rc_option_editor.cc:1369
+#: rc_option_editor.cc:1377
 msgid "Waveform shape"
 msgstr "波形形状"
 
-#: rc_option_editor.cc:1374
+#: rc_option_editor.cc:1382
 msgid "traditional"
 msgstr "传统的"
 
-#: rc_option_editor.cc:1375
+#: rc_option_editor.cc:1383
 msgid "rectified"
 msgstr "整�的"
 
-#: rc_option_editor.cc:1382
+#: rc_option_editor.cc:1390
 msgid "Show waveforms for audio while it is being recorded"
 msgstr "在录制音频的时候显示波形"
 
-#: rc_option_editor.cc:1390
+#: rc_option_editor.cc:1398
 msgid "Show zoom toolbar"
 msgstr "显示缩放工具�"
 
-#: rc_option_editor.cc:1398
+#: rc_option_editor.cc:1406
 msgid "Color regions using their track's color"
 msgstr ""
 
-#: rc_option_editor.cc:1406
+#: rc_option_editor.cc:1414
 msgid "Update editor window during drags of the summary"
 msgstr ""
 
-#: rc_option_editor.cc:1414
+#: rc_option_editor.cc:1422
 msgid "Synchronise editor and mixer track order"
 msgstr ""
 
-#: rc_option_editor.cc:1422
+#: rc_option_editor.cc:1430
 msgid "Synchronise editor and mixer selection"
 msgstr ""
 
-#: rc_option_editor.cc:1429
+#: rc_option_editor.cc:1437
 msgid "Name new markers"
 msgstr "命�新标签"
 
-#: rc_option_editor.cc:1435
+#: rc_option_editor.cc:1443
 msgid ""
 "If enabled, popup a dialog when a new marker is created to allow its name to "
 "be set as it is created.\n"
@@ -9137,339 +9273,424 @@ msgid ""
 "You can always rename markers by right-clicking on them"
 msgstr ""
 
-#: rc_option_editor.cc:1441
+#: rc_option_editor.cc:1449
 msgid "Auto-scroll editor window when dragging near its edges"
 msgstr ""
 
-#: rc_option_editor.cc:1448
+#: rc_option_editor.cc:1456
 msgid "Buffering"
 msgstr "缓冲中"
 
-#: rc_option_editor.cc:1456
+#: rc_option_editor.cc:1464
 msgid "Record monitoring handled by"
 msgstr ""
 
-#: rc_option_editor.cc:1467
+#: rc_option_editor.cc:1475
 msgid "ardour"
 msgstr "ardour"
 
-#: rc_option_editor.cc:1468
+#: rc_option_editor.cc:1476
 msgid "audio hardware"
 msgstr "音频硬件"
 
-#: rc_option_editor.cc:1475
+#: rc_option_editor.cc:1483
 msgid "Tape machine mode"
 msgstr "�带机模�"
 
-#: rc_option_editor.cc:1480
+#: rc_option_editor.cc:1488
 msgid "Connection of tracks and busses"
 msgstr "音轨和总线的连接"
 
-#: rc_option_editor.cc:1485
+#: rc_option_editor.cc:1493
 msgid "Auto-connect master/monitor busses"
 msgstr "自动连接 主控/监视 总线"
 
-#: rc_option_editor.cc:1492
+#: rc_option_editor.cc:1500
 msgid "Connect track inputs"
 msgstr "链接音轨输入"
 
-#: rc_option_editor.cc:1497
+#: rc_option_editor.cc:1505
 msgid "automatically to physical inputs"
 msgstr "自动物�数入"
 
-#: rc_option_editor.cc:1498 rc_option_editor.cc:1511
+#: rc_option_editor.cc:1506 rc_option_editor.cc:1519
 msgid "manually"
 msgstr "手动"
 
-#: rc_option_editor.cc:1504
+#: rc_option_editor.cc:1512
 msgid "Connect track and bus outputs"
 msgstr "链接音轨和总线的输出"
 
-#: rc_option_editor.cc:1509
+#: rc_option_editor.cc:1517
 msgid "automatically to physical outputs"
 msgstr "自动物�数出"
 
-#: rc_option_editor.cc:1510
+#: rc_option_editor.cc:1518
 msgid "automatically to master bus"
 msgstr "自动化主控总线"
 
-#: rc_option_editor.cc:1515
+#: rc_option_editor.cc:1523
 msgid "Denormals"
 msgstr "异常"
 
-#: rc_option_editor.cc:1520
+#: rc_option_editor.cc:1528
 msgid "Use DC bias to protect against denormals"
 msgstr "使用�压直�放置异常"
 
-#: rc_option_editor.cc:1527
+#: rc_option_editor.cc:1535
 msgid "Processor handling"
 msgstr "处�器处�"
 
-#: rc_option_editor.cc:1532
+#: rc_option_editor.cc:1540
 msgid "no processor handling"
 msgstr "无处�器处�"
 
-#: rc_option_editor.cc:1537
+#: rc_option_editor.cc:1545
 msgid "use FlushToZero"
 msgstr ""
 
-#: rc_option_editor.cc:1541
+#: rc_option_editor.cc:1549
 msgid "use DenormalsAreZero"
 msgstr ""
 
-#: rc_option_editor.cc:1545
+#: rc_option_editor.cc:1553
 msgid "use FlushToZero and DenormalsAreZero"
 msgstr ""
 
-#: rc_option_editor.cc:1555
+#: rc_option_editor.cc:1563
 #, fuzzy
 msgid "Silence plugins when the transport is stopped"
 msgstr "当�输�止时�止�件"
 
-#: rc_option_editor.cc:1563
+#: rc_option_editor.cc:1571
 msgid "Make new plugins active"
 msgstr "�用新�件"
 
-#: rc_option_editor.cc:1571
+#: rc_option_editor.cc:1579
 msgid "Enable automatic analysis of audio"
 msgstr "�用音频自动分�"
 
-#: rc_option_editor.cc:1579
+#: rc_option_editor.cc:1587
 msgid "Replicate missing region channels"
 msgstr "�制�失的区域通�"
 
-#: rc_option_editor.cc:1586 rc_option_editor.cc:1601 rc_option_editor.cc:1613
-#: rc_option_editor.cc:1625 rc_option_editor.cc:1637 rc_option_editor.cc:1641
-#: rc_option_editor.cc:1649 rc_option_editor.cc:1657 rc_option_editor.cc:1665
-#: rc_option_editor.cc:1667 rc_option_editor.cc:1675 rc_option_editor.cc:1683
-#: rc_option_editor.cc:1691
+#: rc_option_editor.cc:1594 rc_option_editor.cc:1609 rc_option_editor.cc:1621
+#: rc_option_editor.cc:1633 rc_option_editor.cc:1645 rc_option_editor.cc:1649
+#: rc_option_editor.cc:1657 rc_option_editor.cc:1665 rc_option_editor.cc:1673
+#: rc_option_editor.cc:1675 rc_option_editor.cc:1683 rc_option_editor.cc:1691
+#: rc_option_editor.cc:1699
 msgid "Solo / mute"
 msgstr "独�/�音"
 
-#: rc_option_editor.cc:1589
+#: rc_option_editor.cc:1597
 msgid "Solo-in-place mute cut (dB)"
 msgstr ""
 
-#: rc_option_editor.cc:1596
+#: rc_option_editor.cc:1604
 msgid "Solo controls are Listen controls"
 msgstr ""
 
-#: rc_option_editor.cc:1605
+#: rc_option_editor.cc:1613
 msgid "Listen Position"
 msgstr ""
 
-#: rc_option_editor.cc:1610
+#: rc_option_editor.cc:1618
 msgid "after-fader (AFL)"
 msgstr ""
 
-#: rc_option_editor.cc:1611
+#: rc_option_editor.cc:1619
 msgid "pre-fader (PFL)"
 msgstr ""
 
-#: rc_option_editor.cc:1617
+#: rc_option_editor.cc:1625
 msgid "PFL signals come from"
 msgstr ""
 
-#: rc_option_editor.cc:1622
+#: rc_option_editor.cc:1630
 msgid "before pre-fader processors"
 msgstr ""
 
-#: rc_option_editor.cc:1623
+#: rc_option_editor.cc:1631
 msgid "pre-fader but after pre-fader processors"
 msgstr ""
 
-#: rc_option_editor.cc:1629
+#: rc_option_editor.cc:1637
 msgid "AFL signals come from"
 msgstr ""
 
-#: rc_option_editor.cc:1634
+#: rc_option_editor.cc:1642
 msgid "immediately post-fader"
 msgstr ""
 
-#: rc_option_editor.cc:1635
+#: rc_option_editor.cc:1643
 msgid "after post-fader processors (before pan)"
 msgstr ""
 
-#: rc_option_editor.cc:1644
+#: rc_option_editor.cc:1652
 msgid "Exclusive solo"
 msgstr "执行solo"
 
-#: rc_option_editor.cc:1652
+#: rc_option_editor.cc:1660
 msgid "Show solo muting"
 msgstr ""
 
-#: rc_option_editor.cc:1660
+#: rc_option_editor.cc:1668
 msgid "Soloing overrides muting"
 msgstr ""
 
-#: rc_option_editor.cc:1665
+#: rc_option_editor.cc:1673
 msgid "Default track / bus muting options"
 msgstr "默认 音轨/总线 �音选项"
 
-#: rc_option_editor.cc:1670
+#: rc_option_editor.cc:1678
 msgid "Mute affects pre-fader sends"
 msgstr ""
 
-#: rc_option_editor.cc:1678
+#: rc_option_editor.cc:1686
 msgid "Mute affects post-fader sends"
 msgstr ""
 
-#: rc_option_editor.cc:1686
+#: rc_option_editor.cc:1694
 msgid "Mute affects control outputs"
 msgstr ""
 
-#: rc_option_editor.cc:1694
+#: rc_option_editor.cc:1702
 msgid "Mute affects main outputs"
 msgstr " ovlivní hlavní výstupy"
 
-#: rc_option_editor.cc:1710
+#: rc_option_editor.cc:1718
 msgid "Send MIDI Time Code"
 msgstr "��MIDI时间�"
 
-#: rc_option_editor.cc:1718
+#: rc_option_editor.cc:1726
 msgid "Percentage either side of normal transport speed to transmit MTC"
 msgstr ""
 
-#: rc_option_editor.cc:1727
+#: rc_option_editor.cc:1735
 msgid "Obey MIDI Machine Control commands"
 msgstr "�守MIDI机器控制命令(MTC commands)"
 
-#: rc_option_editor.cc:1735
+#: rc_option_editor.cc:1743
 msgid "Send MIDI Machine Control commands"
 msgstr "��MIDI机器控制命令(MTC commands)"
 
-#: rc_option_editor.cc:1743
+#: rc_option_editor.cc:1751
 msgid "Send MIDI control feedback"
 msgstr "��MIDI控制�馈"
 
-#: rc_option_editor.cc:1751
+#: rc_option_editor.cc:1759
 msgid "Inbound MMC device ID"
 msgstr "�内的MMC设备ID"
 
-#: rc_option_editor.cc:1760
+#: rc_option_editor.cc:1768
 msgid "Outbound MMC device ID"
 msgstr "�外的MMC设备ID"
 
-#: rc_option_editor.cc:1769
+#: rc_option_editor.cc:1777
 msgid "Initial program change"
 msgstr "�始程�改�"
 
-#: rc_option_editor.cc:1778
+#: rc_option_editor.cc:1786
 msgid "Display first MIDI bank/program as 0"
 msgstr ""
 
-#: rc_option_editor.cc:1786
+#: rc_option_editor.cc:1794
 msgid "Never display periodic MIDI messages (MTC, MIDI Clock)"
 msgstr ""
 
-#: rc_option_editor.cc:1794
+#: rc_option_editor.cc:1802
 #, fuzzy
 msgid "Sound MIDI notes as they are selected"
 msgstr "没有选择MIDI通�"
 
-#: rc_option_editor.cc:1802 rc_option_editor.cc:1812 rc_option_editor.cc:1814
+#: rc_option_editor.cc:1810 rc_option_editor.cc:1820 rc_option_editor.cc:1822
 #, fuzzy
 msgid "User interaction"
 msgstr "区域�作"
 
-#: rc_option_editor.cc:1805
+#: rc_option_editor.cc:1813
 msgid ""
 "Use translations of %1 messages\n"
 "   <i>(requires a restart of %1 to take effect)</i>\n"
 "   <i>(if available for your language preferences)</i>"
 msgstr ""
 
-#: rc_option_editor.cc:1812
+#: rc_option_editor.cc:1820
 msgid "Keyboard"
 msgstr "键盘"
 
-#: rc_option_editor.cc:1822
+#: rc_option_editor.cc:1830
 msgid "Control surface remote ID"
 msgstr "控制表�移动的ID"
 
-#: rc_option_editor.cc:1827
+#: rc_option_editor.cc:1835
 msgid "assigned by user"
 msgstr "由用户指定"
 
-#: rc_option_editor.cc:1828
+#: rc_option_editor.cc:1836
 msgid "follows order of mixer"
 msgstr "混音器的如下顺�"
 
-#: rc_option_editor.cc:1829
+#: rc_option_editor.cc:1837
 msgid "follows order of editor"
 msgstr "编辑器的如下顺�"
 
-#: rc_option_editor.cc:1838 rc_option_editor.cc:1846 rc_option_editor.cc:1856
-#: rc_option_editor.cc:1877 rc_option_editor.cc:1886 rc_option_editor.cc:1894
-#: rc_option_editor.cc:1908 rc_option_editor.cc:1925
+#: rc_option_editor.cc:1846 rc_option_editor.cc:1854 rc_option_editor.cc:1864
+#: rc_option_editor.cc:1885 rc_option_editor.cc:1894 rc_option_editor.cc:1902
+#: rc_option_editor.cc:1916 rc_option_editor.cc:1935 rc_option_editor.cc:1951
+#: rc_option_editor.cc:1967 rc_option_editor.cc:1981 rc_option_editor.cc:1995
+#: rc_option_editor.cc:1997
 #, fuzzy
 msgid "Preferences|GUI"
 msgstr "首选项"
 
-#: rc_option_editor.cc:1841
+#: rc_option_editor.cc:1849
 msgid "Graphically indicate mouse pointer hovering over various widgets"
 msgstr ""
 
-#: rc_option_editor.cc:1849
+#: rc_option_editor.cc:1857
 msgid "Show tooltips if mouse hovers over a control"
 msgstr ""
 
-#: rc_option_editor.cc:1859
+#: rc_option_editor.cc:1867
 msgid "GUI"
 msgstr ""
 
-#: rc_option_editor.cc:1862
+#: rc_option_editor.cc:1870
 msgid "update transport clock display every 40ms instead of every 100ms"
 msgstr ""
 
-#: rc_option_editor.cc:1879
+#: rc_option_editor.cc:1887
 #, fuzzy
 msgid "Mixer Strip"
 msgstr "混音器"
 
-#: rc_option_editor.cc:1889
+#: rc_option_editor.cc:1897
 msgid "Use narrow strips in the mixer by default"
 msgstr ""
 
-#: rc_option_editor.cc:1898
-msgid "Meter hold time"
-msgstr ""
+#: rc_option_editor.cc:1906
+#, fuzzy
+msgid "Peak hold time"
+msgstr "峰阈值"
 
-#: rc_option_editor.cc:1904
+#: rc_option_editor.cc:1912
 msgid "short"
 msgstr "短"
 
-#: rc_option_editor.cc:1905 rc_option_editor.cc:1920
+#: rc_option_editor.cc:1913
 msgid "medium"
 msgstr "中"
 
-#: rc_option_editor.cc:1906
+#: rc_option_editor.cc:1914
 msgid "long"
 msgstr "é•¿"
 
-#: rc_option_editor.cc:1912
-msgid "Meter fall-off"
+#: rc_option_editor.cc:1920
+#, fuzzy
+msgid "DPM fall-off"
+msgstr "标尺衰�"
+
+#: rc_option_editor.cc:1926
+msgid "slowest [6.6dB/sec]"
 msgstr ""
 
-#: rc_option_editor.cc:1918
-msgid "slowest"
-msgstr "最慢"
+#: rc_option_editor.cc:1927
+msgid "slow [8.6dB/sec] (BBC PPM, EBU PPM)"
+msgstr ""
 
-#: rc_option_editor.cc:1919
-msgid "slow"
-msgstr "æ…¢"
+#: rc_option_editor.cc:1928
+msgid "slowish [12.0dB/sec] (DIN)"
+msgstr ""
 
-#: rc_option_editor.cc:1921
-msgid "fast"
-msgstr "å¿«"
+#: rc_option_editor.cc:1929
+msgid "moderate [13.3dB/sec] (EBU Digi PPM, IRT Digi PPM)"
+msgstr ""
+
+#: rc_option_editor.cc:1930
+msgid "medium [20dB/sec]"
+msgstr ""
 
-#: rc_option_editor.cc:1922
-msgid "faster"
-msgstr "较快"
+#: rc_option_editor.cc:1931
+msgid "fast [32dB/sec]"
+msgstr ""
 
-#: rc_option_editor.cc:1923
-msgid "fastest"
-msgstr "最快"
+#: rc_option_editor.cc:1932
+msgid "faster [46dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1933
+msgid "fastest [70dB/sec]"
+msgstr ""
+
+#: rc_option_editor.cc:1939
+msgid "Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1944 rc_option_editor.cc:1960
+msgid "-24dBFS (SMPTE US: 4dBu = -20dBFS)"
+msgstr ""
+
+#: rc_option_editor.cc:1945 rc_option_editor.cc:1961
+msgid "-20dBFS (SMPTE RP.0155)"
+msgstr ""
+
+#: rc_option_editor.cc:1946 rc_option_editor.cc:1962
+msgid "-18dBFS (EBU, BBC)"
+msgstr ""
+
+#: rc_option_editor.cc:1947 rc_option_editor.cc:1963
+msgid "-15dBFS (DIN)"
+msgstr ""
+
+#: rc_option_editor.cc:1949
+msgid ""
+"Configure meter-marks and color-knee point for dBFS scale DPM, set reference "
+"level for IEC1/Nordic, IEC2 PPM and VU meter."
+msgstr ""
+
+#: rc_option_editor.cc:1955
+msgid "IEC1/DIN Meter line-up level; 0dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1965
+msgid "Reference level for IEC1/DIN meter."
+msgstr ""
+
+#: rc_option_editor.cc:1971
+msgid "VU Meter standard"
+msgstr ""
+
+#: rc_option_editor.cc:1976
+msgid "0VU = -2dBu (France)"
+msgstr ""
+
+#: rc_option_editor.cc:1977
+msgid "0VU = 0dBu (North America, Australia)"
+msgstr ""
+
+#: rc_option_editor.cc:1978
+msgid "0VU = +4dBu (standard)"
+msgstr ""
+
+#: rc_option_editor.cc:1979
+msgid "0VU = +8dBu"
+msgstr ""
+
+#: rc_option_editor.cc:1985
+#, fuzzy
+msgid "Peak threshold [dBFS]"
+msgstr "峰阈值"
+
+#: rc_option_editor.cc:1993
+msgid ""
+"Specify the audio signal level in dbFS at and above which the meter-peak "
+"indicator will flash red."
+msgstr ""
+
+#: rc_option_editor.cc:2000
+msgid "LED meter style"
+msgstr ""
 
 #: region_editor.cc:79
 msgid "audition this region"
@@ -9479,11 +9700,11 @@ msgstr "监�此区域"
 msgid "Position:"
 msgstr "�置:"
 
-#: region_editor.cc:90 add_video_dialog.cc:169
+#: region_editor.cc:90 add_video_dialog.cc:170
 msgid "End:"
 msgstr "终点:"
 
-#: region_editor.cc:92 sfdb_ui.cc:140
+#: region_editor.cc:92 sfdb_ui.cc:139
 msgid "Length:"
 msgstr "长度:"
 
@@ -9507,23 +9728,23 @@ msgstr "�:"
 msgid "Source:"
 msgstr "�:"
 
-#: region_editor.cc:167
+#: region_editor.cc:166
 msgid "Region '%1'"
 msgstr "区域 '%1'"
 
-#: region_editor.cc:274
+#: region_editor.cc:273
 msgid "change region start position"
 msgstr "改�区域开始�置"
 
-#: region_editor.cc:290
+#: region_editor.cc:289
 msgid "change region end position"
 msgstr "改�区域结��置"
 
-#: region_editor.cc:310
+#: region_editor.cc:309
 msgid "change region length"
 msgstr "改�区域长度"
 
-#: region_editor.cc:404 region_editor.cc:416
+#: region_editor.cc:403 region_editor.cc:415
 msgid "change region sync point"
 msgstr "改�区域�步点"
 
@@ -9723,318 +9944,318 @@ msgid ""
 "A route group of this name already exists.  Please use a different name."
 msgstr ""
 
-#: route_params_ui.cc:82
+#: route_params_ui.cc:83
 msgid "Tracks/Busses"
 msgstr "音轨/总线"
 
-#: route_params_ui.cc:101
+#: route_params_ui.cc:102
 msgid "Inputs"
 msgstr "输入"
 
-#: route_params_ui.cc:102
+#: route_params_ui.cc:103
 msgid "Outputs"
 msgstr "输出"
 
-#: route_params_ui.cc:103
+#: route_params_ui.cc:104
 msgid "Plugins, Inserts & Sends"
 msgstr ""
 
-#: route_params_ui.cc:211
+#: route_params_ui.cc:208
 msgid "route display list item for renamed route not found!"
 msgstr ""
 
-#: route_params_ui.cc:258 route_params_ui.cc:286
+#: route_params_ui.cc:255 route_params_ui.cc:283
 #, c-format
 msgid "Playback delay: %<PRId64> samples"
 msgstr "回放延迟: %<PRId64> 采样"
 
-#: route_params_ui.cc:478
+#: route_params_ui.cc:475
 msgid "NO TRACK"
 msgstr "没有音轨"
 
-#: route_params_ui.cc:611 route_params_ui.cc:612
+#: route_params_ui.cc:613 route_params_ui.cc:614
 msgid "No Track or Bus Selected"
 msgstr "没有选择音轨或总线"
 
-#: route_time_axis.cc:96
+#: route_time_axis.cc:97
 msgid "g"
 msgstr ""
 
-#: route_time_axis.cc:97
+#: route_time_axis.cc:98
 msgid "p"
 msgstr ""
 
-#: route_time_axis.cc:98
+#: route_time_axis.cc:99
 msgid "a"
 msgstr ""
 
-#: route_time_axis.cc:168
+#: route_time_axis.cc:173
 msgid "Record (Right-click for Step Edit)"
 msgstr "录音(�键�步调整)"
 
-#: route_time_axis.cc:171
+#: route_time_axis.cc:176
 msgid "Record"
 msgstr "录制"
 
-#: route_time_axis.cc:201
+#: route_time_axis.cc:210
 msgid "Route Group"
 msgstr ""
 
-#: route_time_axis.cc:204
+#: route_time_axis.cc:213
 #, fuzzy
 msgid "MIDI Controllers and Automation"
 msgstr "MIDI控制输入"
 
-#: route_time_axis.cc:381
+#: route_time_axis.cc:390
 msgid "Show All Automation"
 msgstr "显示所有的自动化"
 
-#: route_time_axis.cc:384
+#: route_time_axis.cc:393
 msgid "Show Existing Automation"
 msgstr "显示已有的自动化"
 
-#: route_time_axis.cc:387
+#: route_time_axis.cc:396
 msgid "Hide All Automation"
 msgstr "��所有自动化"
 
-#: route_time_axis.cc:396
+#: route_time_axis.cc:405
 #, fuzzy
 msgid "Processor automation"
 msgstr "清除自动化"
 
-#: route_time_axis.cc:415
+#: route_time_axis.cc:424
 msgid "Color..."
 msgstr "颜色..."
 
-#: route_time_axis.cc:472
+#: route_time_axis.cc:481
 msgid "Overlaid"
 msgstr "��"
 
-#: route_time_axis.cc:478
+#: route_time_axis.cc:487
 msgid "Stacked"
 msgstr ""
 
-#: route_time_axis.cc:486
+#: route_time_axis.cc:495
 msgid "Layers"
 msgstr "层"
 
-#: route_time_axis.cc:555
+#: route_time_axis.cc:564
 msgid "Automatic (based on I/O connections)"
 msgstr "自动的(基于I/O连接)"
 
-#: route_time_axis.cc:564
+#: route_time_axis.cc:573
 msgid "(Currently: Existing Material)"
 msgstr "(当�：现有�料)"
 
-#: route_time_axis.cc:567
+#: route_time_axis.cc:576
 msgid "(Currently: Capture Time)"
 msgstr "(当�：�获时间)"
 
-#: route_time_axis.cc:575
+#: route_time_axis.cc:584
 msgid "Align With Existing Material"
 msgstr "与已有�料对�"
 
-#: route_time_axis.cc:580
+#: route_time_axis.cc:589
 msgid "Align With Capture Time"
 msgstr "与�获时间对�"
 
-#: route_time_axis.cc:585
+#: route_time_axis.cc:594
 msgid "Alignment"
 msgstr "对�"
 
-#: route_time_axis.cc:620
+#: route_time_axis.cc:629
 msgid "Normal Mode"
 msgstr "一般模�"
 
-#: route_time_axis.cc:626
+#: route_time_axis.cc:635
 msgid "Tape Mode"
 msgstr "�带模�"
 
-#: route_time_axis.cc:632
+#: route_time_axis.cc:641
 msgid "Non-Layered Mode"
 msgstr "�底层模�"
 
-#: route_time_axis.cc:645 route_time_axis.cc:1587
+#: route_time_axis.cc:654 route_time_axis.cc:1601
 msgid "Playlist"
 msgstr "播放列表"
 
-#: route_time_axis.cc:965
+#: route_time_axis.cc:979
 msgid "Rename Playlist"
 msgstr "�命�播放列表"
 
-#: route_time_axis.cc:966
+#: route_time_axis.cc:980
 msgid "New name for playlist:"
 msgstr "新的播放列表�称"
 
-#: route_time_axis.cc:1051
+#: route_time_axis.cc:1065
 msgid "New Copy Playlist"
 msgstr "新拷�播放列表"
 
-#: route_time_axis.cc:1052 route_time_axis.cc:1105
+#: route_time_axis.cc:1066 route_time_axis.cc:1119
 msgid "Name for new playlist:"
 msgstr "新播放列表�"
 
-#: route_time_axis.cc:1104
+#: route_time_axis.cc:1118
 msgid "New Playlist"
 msgstr "新的播放列表"
 
-#: route_time_axis.cc:1295
+#: route_time_axis.cc:1309
 msgid "You cannot create a track with that name as it is reserved for %1"
 msgstr "无法创建音轨，因为"
 
-#: route_time_axis.cc:1476
+#: route_time_axis.cc:1490
 msgid "New Copy..."
 msgstr "æ–°æ‹·è´�"
 
-#: route_time_axis.cc:1480
+#: route_time_axis.cc:1494
 msgid "New Take"
 msgstr ""
 
-#: route_time_axis.cc:1481
+#: route_time_axis.cc:1495
 msgid "Copy Take"
 msgstr ""
 
-#: route_time_axis.cc:1486
+#: route_time_axis.cc:1500
 msgid "Clear Current"
 msgstr "清除当�"
 
-#: route_time_axis.cc:1489
+#: route_time_axis.cc:1503
 msgid "Select From All..."
 msgstr "选择所有"
 
-#: route_time_axis.cc:1577
+#: route_time_axis.cc:1591
 msgid "Take: %1.%2"
 msgstr ""
 
-#: route_time_axis.cc:2267
+#: route_time_axis.cc:2291
 msgid "Underlays"
 msgstr "底层"
 
-#: route_time_axis.cc:2270
+#: route_time_axis.cc:2294
 msgid "Remove \"%1\""
 msgstr "移除 \"%1\""
 
-#: route_time_axis.cc:2320 route_time_axis.cc:2357
+#: route_time_axis.cc:2344 route_time_axis.cc:2381
 msgid "programming error: underlay reference pointer pairs are inconsistent!"
 msgstr "程�错误：底层�考指针对�一致"
 
-#: route_time_axis.cc:2388
+#: route_time_axis.cc:2408
 msgid "After-fade listen (AFL)"
 msgstr ""
 
-#: route_time_axis.cc:2392
+#: route_time_axis.cc:2412
 msgid "Pre-fade listen (PFL)"
 msgstr ""
 
-#: route_time_axis.cc:2396
+#: route_time_axis.cc:2416
 msgid "s"
 msgstr ""
 
-#: route_time_axis.cc:2400
+#: route_time_axis.cc:2419
 msgid "m"
 msgstr ""
 
-#: route_ui.cc:114
+#: route_ui.cc:119
 msgid "Mute this track"
 msgstr "�音此音轨"
 
-#: route_ui.cc:118
+#: route_ui.cc:123
 msgid "Mute other (non-soloed) tracks"
 msgstr "�音其他(�solo的)音轨"
 
-#: route_ui.cc:124
+#: route_ui.cc:129
 msgid "Enable recording on this track"
 msgstr "在此音轨�用录音"
 
-#: route_ui.cc:128
+#: route_ui.cc:133
 msgid "make mixer strips show sends to this bus"
 msgstr ""
 
-#: route_ui.cc:133
+#: route_ui.cc:138
 msgid "Monitor input"
 msgstr "监�输入"
 
-#: route_ui.cc:139
+#: route_ui.cc:144
 msgid "Monitor playback"
 msgstr "监�回放"
 
-#: route_ui.cc:586
+#: route_ui.cc:591
 msgid "Not connected to JACK - cannot engage record"
 msgstr ""
 
-#: route_ui.cc:781
+#: route_ui.cc:786
 msgid "Step Entry"
 msgstr ""
 
-#: route_ui.cc:854
+#: route_ui.cc:859
 msgid "Assign all tracks (prefader)"
 msgstr ""
 
-#: route_ui.cc:858
+#: route_ui.cc:863
 msgid "Assign all tracks and buses (prefader)"
 msgstr ""
 
-#: route_ui.cc:862
+#: route_ui.cc:867
 msgid "Assign all tracks (postfader)"
 msgstr ""
 
-#: route_ui.cc:866
+#: route_ui.cc:871
 msgid "Assign all tracks and buses (postfader)"
 msgstr ""
 
-#: route_ui.cc:870
+#: route_ui.cc:875
 msgid "Assign selected tracks (prefader)"
 msgstr ""
 
-#: route_ui.cc:874
+#: route_ui.cc:879
 msgid "Assign selected tracks and buses (prefader)"
 msgstr ""
 
-#: route_ui.cc:877
+#: route_ui.cc:882
 msgid "Assign selected tracks (postfader)"
 msgstr ""
 
-#: route_ui.cc:881
+#: route_ui.cc:886
 msgid "Assign selected tracks and buses (postfader)"
 msgstr ""
 
-#: route_ui.cc:884
+#: route_ui.cc:889
 msgid "Copy track/bus gains to sends"
 msgstr ""
 
-#: route_ui.cc:885
+#: route_ui.cc:890
 msgid "Set sends gain to -inf"
 msgstr ""
 
-#: route_ui.cc:886
+#: route_ui.cc:891
 msgid "Set sends gain to 0dB"
 msgstr ""
 
-#: route_ui.cc:1206
+#: route_ui.cc:1211
 msgid "Solo Isolate"
 msgstr "Solo隔离"
 
-#: route_ui.cc:1235
+#: route_ui.cc:1240
 msgid "Pre Fader"
 msgstr ""
 
-#: route_ui.cc:1241
+#: route_ui.cc:1246
 msgid "Post Fader"
 msgstr ""
 
-#: route_ui.cc:1247
+#: route_ui.cc:1252
 msgid "Control Outs"
 msgstr ""
 
-#: route_ui.cc:1253
+#: route_ui.cc:1258
 msgid "Main Outs"
 msgstr ""
 
-#: route_ui.cc:1385
+#: route_ui.cc:1390
 msgid "Color Selection"
 msgstr "颜色选择"
 
-#: route_ui.cc:1472
+#: route_ui.cc:1477
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "\n"
@@ -10048,7 +10269,7 @@ msgstr ""
 "\n"
 "(此动作��撤销, 而且此会�文件将会被�新写入!)"
 
-#: route_ui.cc:1474
+#: route_ui.cc:1479
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
 "\n"
@@ -10058,15 +10279,15 @@ msgstr ""
 "\n"
 "(此动作��撤销, 而且此会�文件将会被�新写入!)"
 
-#: route_ui.cc:1482
+#: route_ui.cc:1487
 msgid "Remove track"
 msgstr "移除音轨"
 
-#: route_ui.cc:1484
+#: route_ui.cc:1489
 msgid "Remove bus"
 msgstr "移除总线"
 
-#: route_ui.cc:1511
+#: route_ui.cc:1516
 msgid ""
 "The use of colons (':') is discouraged in track and bus names.\n"
 "Do you want to use this new name?"
@@ -10074,47 +10295,47 @@ msgstr ""
 "�建议使用 ':' 作为音轨和总线�称.\n"
 "你确定使用这个�称?"
 
-#: route_ui.cc:1515
+#: route_ui.cc:1520
 msgid "Use the new name"
 msgstr "使用新�称"
 
-#: route_ui.cc:1516
+#: route_ui.cc:1521
 msgid "Re-edit the name"
 msgstr "�新编辑�称"
 
-#: route_ui.cc:1529
+#: route_ui.cc:1534
 msgid "Rename Track"
 msgstr "�命�音轨"
 
-#: route_ui.cc:1531
+#: route_ui.cc:1536
 msgid "Rename Bus"
 msgstr "�命�总线"
 
-#: route_ui.cc:1690
+#: route_ui.cc:1695
 msgid " latency"
 msgstr " 延迟"
 
-#: route_ui.cc:1703
+#: route_ui.cc:1708
 msgid "Cannot create route template directory %1"
 msgstr "无法创建模�根目录%1"
 
-#: route_ui.cc:1709
+#: route_ui.cc:1714
 msgid "Save As Template"
 msgstr "�存为模�"
 
-#: route_ui.cc:1710
+#: route_ui.cc:1715
 msgid "Template name:"
 msgstr "模��称:"
 
-#: route_ui.cc:1783
+#: route_ui.cc:1788
 msgid "Remote Control ID"
 msgstr "移除控制ID"
 
-#: route_ui.cc:1793
+#: route_ui.cc:1798
 msgid "Remote control ID:"
 msgstr "移除控制ID:"
 
-#: route_ui.cc:1807
+#: route_ui.cc:1812
 msgid ""
 "The remote control ID of %1 is: %2\n"
 "\n"
@@ -10122,17 +10343,17 @@ msgid ""
 "The remote control ID of %3 cannot be changed."
 msgstr ""
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the master bus"
 msgstr "创建主控总线"
 
-#: route_ui.cc:1811
+#: route_ui.cc:1816
 #, fuzzy
 msgid "the monitor bus"
 msgstr "创建主控总线"
 
-#: route_ui.cc:1813
+#: route_ui.cc:1818
 msgid ""
 "The remote control ID of %6 is: %3\n"
 "\n"
@@ -10143,23 +10364,23 @@ msgid ""
 "change this%5"
 msgstr ""
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the mixer"
 msgstr "混音师"
 
-#: route_ui.cc:1816
+#: route_ui.cc:1821
 #, fuzzy
 msgid "the editor"
 msgstr "高度"
 
-#: route_ui.cc:1871
+#: route_ui.cc:1876
 msgid ""
 "Left-click to invert (phase reverse) channel %1 of this track.  Right-click "
 "to show menu."
 msgstr ""
 
-#: route_ui.cc:1873
+#: route_ui.cc:1878
 msgid "Click to show a menu of channels for inversion (phase reverse)"
 msgstr ""
 
@@ -10175,7 +10396,7 @@ msgstr ""
 msgid "the session folder"
 msgstr ""
 
-#: send_ui.cc:122
+#: send_ui.cc:126
 msgid "Send "
 msgstr "��"
 
@@ -10660,51 +10881,107 @@ msgstr ""
 msgid "Glue new regions to bars and beats"
 msgstr ""
 
-#: sfdb_ui.cc:87 sfdb_ui.cc:107 sfdb_ui.cc:116
+#: session_option_editor.cc:275 session_option_editor.cc:277
+#: session_option_editor.cc:284 session_option_editor.cc:291
+#: session_option_editor.cc:298 session_option_editor.cc:300
+#: session_option_editor.cc:307 session_option_editor.cc:314
+#: session_option_editor.cc:321 session_option_editor.cc:323
+#, fuzzy
+msgid "Meterbridge"
+msgstr "标尺"
+
+#: session_option_editor.cc:275
+msgid "Route Display"
+msgstr ""
+
+#: session_option_editor.cc:279
+#, fuzzy
+msgid "Show Midi Tracks"
+msgstr "显示所有MIDI轨"
+
+#: session_option_editor.cc:286
+#, fuzzy
+msgid "Show Busses"
+msgstr "总线"
+
+#: session_option_editor.cc:293
+#, fuzzy
+msgid "Include Master Bus"
+msgstr "创建主控总线"
+
+#: session_option_editor.cc:298
+msgid "Button Area"
+msgstr ""
+
+#: session_option_editor.cc:302
+#, fuzzy
+msgid "Rec-enable Button"
+msgstr "�用录音"
+
+#: session_option_editor.cc:309
+#, fuzzy
+msgid "Mute Button"
+msgstr "+按钮"
+
+#: session_option_editor.cc:316
+#, fuzzy
+msgid "Solo Button"
+msgstr "独�/�音"
+
+#: session_option_editor.cc:321
+msgid "Name Labels"
+msgstr ""
+
+#: session_option_editor.cc:325
+#, fuzzy
+msgid "Track Name"
+msgstr "音轨/总线"
+
+#: sfdb_ui.cc:86 sfdb_ui.cc:106 sfdb_ui.cc:115
 msgid "as new tracks"
 msgstr ""
 
-#: sfdb_ui.cc:89 sfdb_ui.cc:109
+#: sfdb_ui.cc:88 sfdb_ui.cc:108
 msgid "to selected tracks"
 msgstr ""
 
-#: sfdb_ui.cc:91 sfdb_ui.cc:111
+#: sfdb_ui.cc:90 sfdb_ui.cc:110
 msgid "to region list"
 msgstr ""
 
-#: sfdb_ui.cc:93 sfdb_ui.cc:113
+#: sfdb_ui.cc:92 sfdb_ui.cc:112
 msgid "as new tape tracks"
 msgstr ""
 
-#: sfdb_ui.cc:97
+#: sfdb_ui.cc:96
 msgid "programming error: unknown import mode string %1"
 msgstr "程�错误: 未知的导入模�字符串 %1"
 
-#: sfdb_ui.cc:124
+#: sfdb_ui.cc:123
 msgid "Auto-play"
 msgstr "自动播放"
 
-#: sfdb_ui.cc:130 sfdb_ui.cc:237
+#: sfdb_ui.cc:129 sfdb_ui.cc:236
 msgid "<b>Sound File Information</b>"
 msgstr "<b>声音文件信�</b>"
 
-#: sfdb_ui.cc:142
+#: sfdb_ui.cc:141
 msgid "Timestamp:"
 msgstr "时间戳:"
 
-#: sfdb_ui.cc:144
+#: sfdb_ui.cc:143
 msgid "Format:"
 msgstr "格�:"
 
-#: sfdb_ui.cc:183 sfdb_ui.cc:530
+#: sfdb_ui.cc:182 sfdb_ui.cc:526
 msgid "Tags:"
 msgstr "标签:"
 
-#: sfdb_ui.cc:320
+#: sfdb_ui.cc:319
 msgid "Auditioning of MIDI files is not yet supported"
 msgstr "暂�支�监�MIDI文件"
 
-#: sfdb_ui.cc:327
+#: sfdb_ui.cc:326
 msgid "Could not read file: %1 (%2)."
 msgstr "无法读�文件: %1 (%2)."
 
@@ -10733,11 +11010,11 @@ msgstr "音频文件"
 msgid "MIDI files"
 msgstr "MIDI文件"
 
-#: sfdb_ui.cc:458 add_video_dialog.cc:131
+#: sfdb_ui.cc:458 add_video_dialog.cc:132
 msgid "All files"
 msgstr "所有文件"
 
-#: sfdb_ui.cc:477 add_video_dialog.cc:142
+#: sfdb_ui.cc:477 add_video_dialog.cc:143
 msgid "Browse Files"
 msgstr "�览文件"
 
@@ -10745,179 +11022,167 @@ msgstr "�览文件"
 msgid "Paths"
 msgstr "路径"
 
-#: sfdb_ui.cc:517
+#: sfdb_ui.cc:515
 msgid "Search Tags"
 msgstr "�索标签"
 
-#: sfdb_ui.cc:535
+#: sfdb_ui.cc:531
 #, fuzzy
 msgid "Sort:"
 msgstr "整�"
 
-#: sfdb_ui.cc:543
+#: sfdb_ui.cc:539
 #, fuzzy
 msgid "Longest"
 msgstr "最大的"
 
-#: sfdb_ui.cc:544
+#: sfdb_ui.cc:540
 #, fuzzy
 msgid "Shortest"
 msgstr "快�键"
 
-#: sfdb_ui.cc:545
+#: sfdb_ui.cc:541
 #, fuzzy
 msgid "Newest"
 msgstr "最慢"
 
-#: sfdb_ui.cc:546
+#: sfdb_ui.cc:542
 msgid "Oldest"
 msgstr ""
 
-#: sfdb_ui.cc:547
+#: sfdb_ui.cc:543
 msgid "Most downloaded"
 msgstr ""
 
-#: sfdb_ui.cc:548
+#: sfdb_ui.cc:544
 #, fuzzy
 msgid "Least downloaded"
 msgstr "开始下载"
 
-#: sfdb_ui.cc:549
+#: sfdb_ui.cc:545
 msgid "Highest rated"
 msgstr ""
 
-#: sfdb_ui.cc:550
+#: sfdb_ui.cc:546
 msgid "Lowest rated"
 msgstr ""
 
-#: sfdb_ui.cc:555
+#: sfdb_ui.cc:551
 msgid "More"
 msgstr ""
 
-#: sfdb_ui.cc:572
+#: sfdb_ui.cc:555
+msgid "Similar"
+msgstr ""
+
+#: sfdb_ui.cc:567
 #, fuzzy
 msgid "ID"
 msgstr "MIDI"
 
-#: sfdb_ui.cc:573 add_video_dialog.cc:83
+#: sfdb_ui.cc:568 add_video_dialog.cc:84
 #, fuzzy
 msgid "Filename"
 msgstr "�命�"
 
-#: sfdb_ui.cc:575
+#: sfdb_ui.cc:570
 #, fuzzy
 msgid "Duration"
 msgstr "�续时间(秒)"
 
-#: sfdb_ui.cc:576
+#: sfdb_ui.cc:571
 #, fuzzy
 msgid "Size"
 msgstr "最大化尺寸"
 
-#: sfdb_ui.cc:577
+#: sfdb_ui.cc:572
 #, fuzzy
 msgid "Samplerate"
 msgstr "采样率"
 
-#: sfdb_ui.cc:578
+#: sfdb_ui.cc:573
 msgid "License"
 msgstr ""
 
-#: sfdb_ui.cc:594
+#: sfdb_ui.cc:591
 msgid "Search Freesound"
 msgstr "寻找自由的声音"
 
-#: sfdb_ui.cc:615
+#: sfdb_ui.cc:611
 msgid "Press to import selected files and close this window"
 msgstr ""
 
-#: sfdb_ui.cc:616
+#: sfdb_ui.cc:612
 msgid "Press to import selected files and leave this window open"
 msgstr ""
 
-#: sfdb_ui.cc:617
+#: sfdb_ui.cc:613
 msgid "Press to close this window without importing any files"
 msgstr ""
 
-#: sfdb_ui.cc:846
-msgid "found %1 match"
-msgid_plural "found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:862
+#: sfdb_ui.cc:809
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr "SoundFileBrowser: 无法标记化字符串"
 
-#: sfdb_ui.cc:960
+#: sfdb_ui.cc:1009
 msgid "%1 more page of 100 results available"
 msgid_plural "%1 more pages of 100 results available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sfdb_ui.cc:965
+#: sfdb_ui.cc:1014
 msgid "No more results available"
 msgstr ""
 
-#: sfdb_ui.cc:1029
+#: sfdb_ui.cc:1078
 msgid "B"
 msgstr ""
 
-#: sfdb_ui.cc:1031
+#: sfdb_ui.cc:1080
 msgid "kB"
 msgstr ""
 
-#: sfdb_ui.cc:1033 sfdb_ui.cc:1035
+#: sfdb_ui.cc:1082 sfdb_ui.cc:1084
 msgid "MB"
 msgstr ""
 
-#: sfdb_ui.cc:1037
+#: sfdb_ui.cc:1086
 msgid "GB"
 msgstr ""
 
-#: sfdb_ui.cc:1070
-msgid "Search returned no results."
-msgstr ""
-
-#: sfdb_ui.cc:1072
-msgid "Found %1 match"
-msgid_plural "Found %1 matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: sfdb_ui.cc:1277 sfdb_ui.cc:1585 sfdb_ui.cc:1635 sfdb_ui.cc:1653
+#: sfdb_ui.cc:1298 sfdb_ui.cc:1606 sfdb_ui.cc:1656 sfdb_ui.cc:1674
 msgid "one track per file"
 msgstr "1音轨/1文件"
 
-#: sfdb_ui.cc:1280 sfdb_ui.cc:1636 sfdb_ui.cc:1654
+#: sfdb_ui.cc:1301 sfdb_ui.cc:1657 sfdb_ui.cc:1675
 msgid "one track per channel"
 msgstr "1音轨/1声�"
 
-#: sfdb_ui.cc:1288 sfdb_ui.cc:1638 sfdb_ui.cc:1655
+#: sfdb_ui.cc:1309 sfdb_ui.cc:1659 sfdb_ui.cc:1676
 msgid "sequence files"
 msgstr "顺�文件"
 
-#: sfdb_ui.cc:1291 sfdb_ui.cc:1643
+#: sfdb_ui.cc:1312 sfdb_ui.cc:1664
 msgid "all files in one track"
 msgstr "所有文件在一个音轨上"
 
-#: sfdb_ui.cc:1292 sfdb_ui.cc:1637
+#: sfdb_ui.cc:1313 sfdb_ui.cc:1658
 msgid "merge files"
 msgstr "�并文件"
 
-#: sfdb_ui.cc:1298 sfdb_ui.cc:1640
+#: sfdb_ui.cc:1319 sfdb_ui.cc:1661
 msgid "one region per file"
 msgstr "1区域/1文件"
 
-#: sfdb_ui.cc:1301 sfdb_ui.cc:1641
+#: sfdb_ui.cc:1322 sfdb_ui.cc:1662
 msgid "one region per channel"
 msgstr "1区域/1声�"
 
-#: sfdb_ui.cc:1306 sfdb_ui.cc:1642 sfdb_ui.cc:1656
+#: sfdb_ui.cc:1327 sfdb_ui.cc:1663 sfdb_ui.cc:1677
 msgid "all files in one region"
 msgstr "所有文件在一个区域"
 
-#: sfdb_ui.cc:1373
+#: sfdb_ui.cc:1394
 msgid ""
 "One or more of the selected files\n"
 "cannot be used by %1"
@@ -10925,58 +11190,58 @@ msgstr ""
 "一个或多个所选文件\n"
 "�能被用于 %1"
 
-#: sfdb_ui.cc:1513
+#: sfdb_ui.cc:1534
 msgid "Copy files to session"
 msgstr "�制文件到会�"
 
-#: sfdb_ui.cc:1530 sfdb_ui.cc:1693
+#: sfdb_ui.cc:1551 sfdb_ui.cc:1714
 msgid "file timestamp"
 msgstr "文件时间戳"
 
-#: sfdb_ui.cc:1531 sfdb_ui.cc:1695
+#: sfdb_ui.cc:1552 sfdb_ui.cc:1716
 msgid "edit point"
 msgstr "编辑点"
 
-#: sfdb_ui.cc:1532 sfdb_ui.cc:1697
+#: sfdb_ui.cc:1553 sfdb_ui.cc:1718
 msgid "playhead"
 msgstr "播放头"
 
-#: sfdb_ui.cc:1533
+#: sfdb_ui.cc:1554
 msgid "session start"
 msgstr "开始会�"
 
-#: sfdb_ui.cc:1538
+#: sfdb_ui.cc:1559
 msgid "<b>Add files as ...</b>"
 msgstr ""
 
-#: sfdb_ui.cc:1560
+#: sfdb_ui.cc:1581
 #, fuzzy
 msgid "<b>Insert at</b>"
 msgstr "�入于:"
 
-#: sfdb_ui.cc:1573
+#: sfdb_ui.cc:1594
 #, fuzzy
 msgid "<b>Mapping</b>"
 msgstr "<b>共享中</b>"
 
-#: sfdb_ui.cc:1591
+#: sfdb_ui.cc:1612
 #, fuzzy
 msgid "<b>Conversion quality</b>"
 msgstr "采样率转�质�"
 
-#: sfdb_ui.cc:1603 sfdb_ui.cc:1709
+#: sfdb_ui.cc:1624 sfdb_ui.cc:1730
 msgid "Best"
 msgstr "最佳质�"
 
-#: sfdb_ui.cc:1604 sfdb_ui.cc:1711
+#: sfdb_ui.cc:1625 sfdb_ui.cc:1732
 msgid "Good"
 msgstr "高质�"
 
-#: sfdb_ui.cc:1605 sfdb_ui.cc:1713
+#: sfdb_ui.cc:1626 sfdb_ui.cc:1734
 msgid "Quick"
 msgstr "速度优先"
 
-#: sfdb_ui.cc:1607
+#: sfdb_ui.cc:1628
 msgid "Fastest"
 msgstr "最快"
 
@@ -11067,21 +11332,21 @@ msgstr "我想�关于这个会�的更多选项"
 
 #: startup.cc:194
 msgid ""
-"<b>Welcome to this BETA release of Ardour 3.0</b>\n"
+"<b>Welcome to this BETA release of Ardour %1</b>\n"
 "\n"
-"Ardour 3.0 has been released for Linux but because of the lack of testers,\n"
+"Ardour %1 has been released for Linux but because of the lack of testers,\n"
 "it is still at the beta stage on OS X. So, a few guidelines:\n"
 "\n"
 "1) Please do <b>NOT</b> use this software with the expectation that it is "
 "stable or reliable\n"
 "   though it may be so, depending on your workflow.\n"
-"3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
-"4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
+"2) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n"
+"3) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to "
 "report issues\n"
-"   making sure to note the product version number as 3.0-beta.\n"
-"5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
+"   making sure to note the product version number as %1-beta.\n"
+"4) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and "
 "pass on comments.\n"
-"6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
+"5) Please <b>DO</b> join us on IRC for real time discussions about ardour3. "
 "You\n"
 "   can get there directly from Ardour via the Help->Chat menu option.\n"
 "\n"
@@ -11213,10 +11478,6 @@ msgstr ""
 msgid "Click to open the program website in your web browser"
 msgstr ""
 
-#: startup.cc:594
-msgid "What would you like to do ?"
-msgstr "你想干什么?"
-
 #: startup.cc:729
 msgid "Open"
 msgstr "打开 "
@@ -11229,84 +11490,84 @@ msgstr "会��称:"
 msgid "Create session folder in:"
 msgstr "在创建会�文件夹:"
 
-#: startup.cc:813
+#: startup.cc:821
 msgid "Select folder for session"
 msgstr "为会�选择一个文件夹"
 
-#: startup.cc:845
+#: startup.cc:853
 msgid "Use this template"
 msgstr "使用此模�"
 
-#: startup.cc:848
+#: startup.cc:856
 msgid "no template"
 msgstr "没有模�"
 
-#: startup.cc:876
+#: startup.cc:884
 msgid "Use an existing session as a template:"
 msgstr "使用一个存在的会�当作模�"
 
-#: startup.cc:888
+#: startup.cc:896
 msgid "Select template"
 msgstr "选择模�"
 
-#: startup.cc:914
+#: startup.cc:922
 msgid "New Session"
 msgstr "新会�"
 
-#: startup.cc:1068
+#: startup.cc:1077
 msgid "Select session file"
 msgstr "选择会�文件"
 
-#: startup.cc:1084
+#: startup.cc:1093
 msgid "Browse:"
 msgstr "�览:"
 
-#: startup.cc:1093
+#: startup.cc:1102
 msgid "Select a session"
 msgstr "选择一个会�"
 
-#: startup.cc:1119 startup.cc:1120 startup.cc:1121
+#: startup.cc:1129 startup.cc:1130 startup.cc:1131
 msgid "channels"
 msgstr "声�"
 
-#: startup.cc:1135
+#: startup.cc:1145
 msgid "<b>Busses</b>"
 msgstr "<b>总线</b>"
 
-#: startup.cc:1136
+#: startup.cc:1146
 msgid "<b>Inputs</b>"
 msgstr "<b>输入</b>"
 
-#: startup.cc:1137
+#: startup.cc:1147
 msgid "<b>Outputs</b>"
 msgstr "<b>输出</b>"
 
-#: startup.cc:1145
+#: startup.cc:1155
 msgid "Create master bus"
 msgstr "创建主控总线"
 
-#: startup.cc:1155
+#: startup.cc:1165
 #, fuzzy
 msgid "Automatically connect to physical inputs"
 msgstr "自动连接物�输入"
 
-#: startup.cc:1162 startup.cc:1221
+#: startup.cc:1172 startup.cc:1231
 msgid "Use only"
 msgstr "仅使用"
 
-#: startup.cc:1215
+#: startup.cc:1225
 msgid "Automatically connect outputs"
 msgstr "自动连接到输出"
 
-#: startup.cc:1237
+#: startup.cc:1247
 msgid "... to master bus"
 msgstr "... 到主控总线"
 
-#: startup.cc:1247
+#: startup.cc:1257
 msgid "... to physical outputs"
 msgstr "... 到物�输出"
 
-#: startup.cc:1297
+#: startup.cc:1307
 msgid "Advanced Session Options"
 msgstr "高级会�选项"
 
@@ -11991,19 +12252,19 @@ msgstr "�置文件 %1 还没�存"
 msgid "bad XPM header %1"
 msgstr ""
 
-#: utils.cc:292
+#: utils.cc:292 utils.cc:324
 msgid "missing RGBA style for \"%1\""
 msgstr ""
 
-#: utils.cc:544
+#: utils.cc:591
 msgid "cannot find XPM file for %1"
 msgstr ""
 
-#: utils.cc:570
+#: utils.cc:617
 msgid "cannot find icon image for %1 using %2"
 msgstr ""
 
-#: utils.cc:585
+#: utils.cc:632
 msgid "Caught exception while loading icon named %1"
 msgstr ""
 
@@ -12011,84 +12272,86 @@ msgstr ""
 msgid "VerboseCanvasCursor"
 msgstr ""
 
-#: add_video_dialog.cc:54
+#: add_video_dialog.cc:55
 #, fuzzy
 msgid "Set Video Track"
 msgstr "添加音频音轨"
 
-#: add_video_dialog.cc:62
+#: add_video_dialog.cc:63
 #, fuzzy
 msgid "Launch External Video Monitor"
 msgstr "监控中"
 
-#: add_video_dialog.cc:63
+#: add_video_dialog.cc:64
 msgid "Adjust Session Framerate to Match Video Framerate"
 msgstr ""
 
-#: add_video_dialog.cc:65
+#: add_video_dialog.cc:66
 msgid "Reload docroot"
 msgstr ""
 
-#: add_video_dialog.cc:110 add_video_dialog.cc:114
+#: add_video_dialog.cc:111 add_video_dialog.cc:115
 msgid "VideoServerIndex"
 msgstr ""
 
-#: add_video_dialog.cc:128
+#: add_video_dialog.cc:129
 #, fuzzy
 msgid "Video files"
 msgstr "音频文件"
 
-#: add_video_dialog.cc:163
+#: add_video_dialog.cc:164
 #, fuzzy
 msgid "<b>Video Information</b>"
 msgstr "<b>声音文件信�</b>"
 
-#: add_video_dialog.cc:166
+#: add_video_dialog.cc:167
 #, fuzzy
 msgid "Start:"
 msgstr "开始"
 
-#: add_video_dialog.cc:172
+#: add_video_dialog.cc:173
 #, fuzzy
 msgid "Frame rate:"
 msgstr "采样率:"
 
-#: add_video_dialog.cc:175
+#: add_video_dialog.cc:176
 msgid "Aspect Ratio:"
 msgstr ""
 
-#: add_video_dialog.cc:653
+#: add_video_dialog.cc:654
 msgid " %1 fps"
 msgstr ""
 
-#: editor_videotimeline.cc:138
+#: editor_videotimeline.cc:146
 msgid "Export Successful: %1"
 msgstr ""
 
-#: video_timeline.cc:467
+#: video_timeline.cc:469
 msgid ""
 "Parsing video file info failed. Is the Video Server running? Is the file "
 "readable by the Video Server? Does the docroot match? Is it a video file?"
 msgstr ""
 
-#: video_timeline.cc:501
-msgid "Failed to set session-framerate: "
-msgstr ""
-
-#: video_timeline.cc:501
-msgid " does not have a corresponding option setting in Ardour."
+#: video_timeline.cc:507
+msgid ""
+"Failed to set session-framerate: '%1' does not have a corresponding option "
+"setting in %2."
 msgstr ""
 
-#: video_timeline.cc:507
+#: video_timeline.cc:515
 msgid ""
-"Video file's framerate is not equal to Ardour session timecode's framerate: "
+"Video file's framerate is not equal to %1 session timecode's framerate: '%2' "
+"vs '%3'"
 msgstr ""
 
-#: video_timeline.cc:508
-msgid " vs "
+#: video_timeline.cc:588
+msgid ""
+"Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually "
+"means that the video server was not started by ardour and uses a different "
+"document-root."
 msgstr ""
 
-#: video_timeline.cc:690
+#: video_timeline.cc:737
 msgid ""
 "Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
 "(a custom path to xjadeo can be specified by setting the XJREMOTE "
@@ -12096,18 +12359,18 @@ msgid ""
 "xjadeo's remote-control interface 'xjremote')."
 msgstr ""
 
-#: video_monitor.cc:282
+#: video_monitor.cc:281
 #, fuzzy
 msgid "Video Monitor: File Not Found."
 msgstr "监控中"
 
-#: transcode_ffmpeg.cc:71
+#: transcode_ffmpeg.cc:73
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system.\n"
 "Video import and export is not possible until you install those tools.\n"
-"Ardour requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
+"%1 requires ffmpeg and ffprobe from ffmpeg.org - version 1.1 or newer.\n"
 "\n"
-"The tools are included with the Ardour releases from ardour.org and also "
+"The tools are included with the %1 releases from ardour.org and also "
 "available with the video-server at http://x42.github.com/harvid/\n"
 "\n"
 "Important: the files need to be installed in $PATH and named ffmpeg_harvid "
@@ -12117,378 +12380,387 @@ msgid ""
 "ffprobe to ffprobe_harvid.\n"
 msgstr ""
 
-#: transcode_video_dialog.cc:55
+#: transcode_video_dialog.cc:56
 #, fuzzy
 msgid "Transcode/Import Video File "
 msgstr "导出为音频文件..."
 
-#: transcode_video_dialog.cc:57
+#: transcode_video_dialog.cc:58
 #, fuzzy
 msgid "Output File:"
 msgstr "输出设备:"
 
-#: transcode_video_dialog.cc:60 export_video_dialog.cc:72
+#: transcode_video_dialog.cc:61 export_video_dialog.cc:73
 msgid "Abort"
 msgstr ""
 
-#: transcode_video_dialog.cc:62
+#: transcode_video_dialog.cc:63
 #, fuzzy
 msgid "Height = "
 msgstr "高度"
 
-#: transcode_video_dialog.cc:65
+#: transcode_video_dialog.cc:66
 msgid "Manual Override"
 msgstr ""
 
-#: transcode_video_dialog.cc:69
-msgid "Debug Mode: Print ffmpeg Command and Output to stdout."
+#: transcode_video_dialog.cc:70 export_video_dialog.cc:89
+msgid "Debug Mode: Print ffmpeg command and output to stdout."
 msgstr ""
 
-#: transcode_video_dialog.cc:106
+#: transcode_video_dialog.cc:107
 #, fuzzy
 msgid "<b>File Information</b>"
 msgstr "<b>声音文件信�</b>"
 
-#: transcode_video_dialog.cc:112
+#: transcode_video_dialog.cc:113
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Import "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: transcode_video_dialog.cc:119
+#: transcode_video_dialog.cc:120
 msgid ""
 "File-info can not be read. Most likely '%1' is not a valid video-file or an "
 "unsupported video codec or format."
 msgstr ""
 
-#: transcode_video_dialog.cc:133
+#: transcode_video_dialog.cc:134
 msgid "FPS:"
 msgstr ""
 
-#: transcode_video_dialog.cc:135
+#: transcode_video_dialog.cc:136
 #, fuzzy
 msgid "Duration:"
 msgstr "�续时间(秒)"
 
-#: transcode_video_dialog.cc:137
+#: transcode_video_dialog.cc:138
 msgid "Codec:"
 msgstr ""
 
-#: transcode_video_dialog.cc:139
+#: transcode_video_dialog.cc:140
 msgid "Geometry:"
 msgstr ""
 
-#: transcode_video_dialog.cc:154
+#: transcode_video_dialog.cc:155
 #, fuzzy
 msgid "??"
 msgstr "???"
 
-#: transcode_video_dialog.cc:175
+#: transcode_video_dialog.cc:176
 #, fuzzy
 msgid "<b>Import Settings</b>"
 msgstr "<b>选项</b>"
 
-#: transcode_video_dialog.cc:180
+#: transcode_video_dialog.cc:181
 msgid "Do Not Import Video"
 msgstr ""
 
-#: transcode_video_dialog.cc:181
+#: transcode_video_dialog.cc:182
 msgid "Reference From Current Location"
 msgstr ""
 
-#: transcode_video_dialog.cc:183
+#: transcode_video_dialog.cc:184
 #, fuzzy
 msgid "Import/Transcode Video to Session"
 msgstr "从会�导入"
 
-#: transcode_video_dialog.cc:197
+#: transcode_video_dialog.cc:198
 msgid "Scale Video: Width = "
 msgstr ""
 
-#: transcode_video_dialog.cc:204
+#: transcode_video_dialog.cc:205
 msgid "Original Width"
 msgstr ""
 
-#: transcode_video_dialog.cc:219
+#: transcode_video_dialog.cc:220
 msgid "Bitrate (KBit/s):"
 msgstr ""
 
-#: transcode_video_dialog.cc:224
+#: transcode_video_dialog.cc:225
 #, fuzzy
 msgid "Extract Audio:"
 msgstr "导出音频"
 
-#: transcode_video_dialog.cc:344
+#: transcode_video_dialog.cc:345
 #, fuzzy
 msgid "Extracting Audio.."
 msgstr "导出音频"
 
-#: transcode_video_dialog.cc:347
+#: transcode_video_dialog.cc:348
 msgid "Audio Extraction Failed."
 msgstr ""
 
-#: transcode_video_dialog.cc:373
+#: transcode_video_dialog.cc:374
 msgid "Transcoding Video.."
 msgstr ""
 
-#: transcode_video_dialog.cc:407
+#: transcode_video_dialog.cc:408
 #, fuzzy
 msgid "Transcoding Failed."
 msgstr "开�翻译功能"
 
-#: transcode_video_dialog.cc:490
+#: transcode_video_dialog.cc:491
 #, fuzzy
 msgid "Save Transcoded Video File"
 msgstr "导出为音频文件..."
 
-#: video_server_dialog.cc:42
+#: video_server_dialog.cc:43
 msgid "Launch Video Server"
 msgstr ""
 
-#: video_server_dialog.cc:43
+#: video_server_dialog.cc:44
 msgid "Server Executable:"
 msgstr ""
 
-#: video_server_dialog.cc:45
+#: video_server_dialog.cc:46
 #, fuzzy
 msgid "Server Docroot:"
 msgstr "�务器:"
 
-#: video_server_dialog.cc:51
+#: video_server_dialog.cc:52
 msgid "Don't show this dialog again. (Reset in Edit->Preferences)."
 msgstr ""
 
-#: video_server_dialog.cc:90
+#: video_server_dialog.cc:92
 msgid ""
 "The external video server 'harvid' can not be found. The tool is included "
-"with the Ardour releases from ardour.org, alternatively you can download it "
-"from http://x42.github.com/harvid/ or acquire it from your distribution."
+"with the %1 releases from ardour.org, alternatively you can download it from "
+"http://x42.github.com/harvid/ or acquire it from your distribution."
 msgstr ""
 
-#: video_server_dialog.cc:117
+#: video_server_dialog.cc:120
 msgid "Listen Address:"
 msgstr ""
 
-#: video_server_dialog.cc:122
+#: video_server_dialog.cc:125
 msgid "Listen Port:"
 msgstr ""
 
-#: video_server_dialog.cc:127
+#: video_server_dialog.cc:130
 #, fuzzy
 msgid "Cache Size:"
 msgstr "最大化尺寸"
 
-#: video_server_dialog.cc:132
+#: video_server_dialog.cc:136
 msgid ""
-"Ardour relies on an external Video Server for the videotimeline.\n"
+"%1 relies on an external Video Server for the videotimeline.\n"
 "The server configured in Edit -> Prefereces -> Video is not reachable.\n"
 "Do you want ardour to launch 'harvid' on this machine?"
 msgstr ""
 
-#: video_server_dialog.cc:171
+#: video_server_dialog.cc:176
 msgid "Set Video Server Executable"
 msgstr ""
 
-#: video_server_dialog.cc:191
+#: video_server_dialog.cc:196
 msgid "Server docroot"
 msgstr ""
 
-#: utils_videotl.cc:52
+#: utils_videotl.cc:53
 msgid "Destination is outside Video Server's docroot. "
 msgstr ""
 
-#: utils_videotl.cc:53
+#: utils_videotl.cc:54
 msgid ""
 "The destination file path is outside of the Video Server's docroot. The file "
 "will not be readable by the Video Server. Do you still want to continue?"
 msgstr ""
 
-#: utils_videotl.cc:56
+#: utils_videotl.cc:57
 msgid "Continue"
 msgstr ""
 
-#: utils_videotl.cc:62
+#: utils_videotl.cc:63
 #, fuzzy
 msgid "Confirm Overwrite"
 msgstr "确定覆盖快照"
 
-#: utils_videotl.cc:63
+#: utils_videotl.cc:64
 #, fuzzy
 msgid "A file with the same name already exists.  Do you want to overwrite it?"
 msgstr "已存在��快照. 覆盖之?"
 
-#: utils_videotl.cc:73 utils_videotl.cc:89
+#: utils_videotl.cc:74 utils_videotl.cc:90
 #, fuzzy
 msgid "Cannot create video folder \"%1\" (%2)"
 msgstr "无法创建用户Ardour文件夹 %1 (%2)"
 
-#: export_video_dialog.cc:65
+#: export_video_dialog.cc:66
 #, fuzzy
 msgid "Export Video File "
 msgstr "导出为音频文件..."
 
-#: export_video_dialog.cc:69
+#: export_video_dialog.cc:70
 #, fuzzy
 msgid "Video:"
 msgstr "开始"
 
-#: export_video_dialog.cc:73
+#: export_video_dialog.cc:74
 msgid "Scale Video (W x H):"
 msgstr ""
 
-#: export_video_dialog.cc:78
+#: export_video_dialog.cc:79
 msgid "Set Aspect Ratio:"
 msgstr ""
 
-#: export_video_dialog.cc:79
+#: export_video_dialog.cc:80
 #, fuzzy
 msgid "Normalize Audio"
 msgstr "标准化到："
 
-#: export_video_dialog.cc:80
+#: export_video_dialog.cc:81
 msgid "2 Pass Encoding"
 msgstr ""
 
-#: export_video_dialog.cc:81
+#: export_video_dialog.cc:82
 msgid "Codec Optimizations:"
 msgstr ""
 
-#: export_video_dialog.cc:83
+#: export_video_dialog.cc:84
 msgid "Deinterlace"
 msgstr ""
 
-#: export_video_dialog.cc:84
+#: export_video_dialog.cc:85
 msgid "Use [2] B-frames (MPEG 2 or 4 only)"
 msgstr ""
 
-#: export_video_dialog.cc:85
+#: export_video_dialog.cc:86
 msgid "Override FPS (Default is to retain FPS from the input video file):"
 msgstr ""
 
-#: export_video_dialog.cc:86
+#: export_video_dialog.cc:87
 #, fuzzy
 msgid "Include Session Metadata"
 msgstr "标记会�元数�"
 
-#: export_video_dialog.cc:88
-msgid "Enable Debug Mode: Print ffmpeg Command & Output to stdout."
-msgstr ""
-
-#: export_video_dialog.cc:106
+#: export_video_dialog.cc:107
 msgid ""
 "No ffprobe or ffmpeg executables could be found on this system. Video Export "
-"is not possible until you install those tools. See the Log widow for more "
+"is not possible until you install those tools. See the Log window for more "
 "information."
 msgstr ""
 
-#: export_video_dialog.cc:116
+#: export_video_dialog.cc:117
 #, fuzzy
 msgid "<b>Output:</b>"
 msgstr "<b>输出</b>"
 
-#: export_video_dialog.cc:126
+#: export_video_dialog.cc:127
 #, fuzzy
 msgid "<b>Input:</b>"
 msgstr "<b>输入</b>"
 
-#: export_video_dialog.cc:137
+#: export_video_dialog.cc:138
 #, fuzzy
 msgid "Audio:"
 msgstr "音频"
 
-#: export_video_dialog.cc:139
+#: export_video_dialog.cc:140
 #, fuzzy
 msgid "Master Bus"
 msgstr "创建主控总线"
 
-#: export_video_dialog.cc:166
+#: export_video_dialog.cc:145
+msgid "from the %1 session's start to the session's end"
+msgstr ""
+
+#: export_video_dialog.cc:149
+msgid "from 00:00:00:00 to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:151
+msgid "from the video's start to the video's end"
+msgstr ""
+
+#: export_video_dialog.cc:184
 #, fuzzy
 msgid "<b>Settings:</b>"
 msgstr "<b>目的地</b>"
 
-#: export_video_dialog.cc:174
+#: export_video_dialog.cc:192
 #, fuzzy
 msgid "Range:"
 msgstr "范围"
 
-#: export_video_dialog.cc:177
+#: export_video_dialog.cc:195
 #, fuzzy
 msgid "Preset:"
 msgstr "预设"
 
-#: export_video_dialog.cc:180
+#: export_video_dialog.cc:198
 #, fuzzy
 msgid "Video Codec:"
 msgstr "文件:"
 
-#: export_video_dialog.cc:183
+#: export_video_dialog.cc:201
 #, fuzzy
 msgid "Video KBit/s:"
 msgstr "开始"
 
-#: export_video_dialog.cc:186
+#: export_video_dialog.cc:204
 #, fuzzy
 msgid "Audio Codec:"
 msgstr "音频模�:"
 
-#: export_video_dialog.cc:189
+#: export_video_dialog.cc:207
 #, fuzzy
 msgid "Audio KBit/s:"
 msgstr "音频文件"
 
-#: export_video_dialog.cc:192
+#: export_video_dialog.cc:210
 #, fuzzy
 msgid "Audio Samplerate:"
 msgstr "采样率:"
 
-#: export_video_dialog.cc:369
+#: export_video_dialog.cc:387
 #, fuzzy
 msgid "Normalizing audio"
 msgstr "归一化值"
 
-#: export_video_dialog.cc:373
+#: export_video_dialog.cc:391
 #, fuzzy
 msgid "Exporting audio"
 msgstr "导出音频"
 
-#: export_video_dialog.cc:419
+#: export_video_dialog.cc:437
 #, fuzzy
-msgid "Exporting Audio.."
+msgid "Exporting Audio..."
 msgstr "导出音频"
 
-#: export_video_dialog.cc:476
+#: export_video_dialog.cc:494
 msgid ""
 "Export Video: Cannot query duration of video-file, using duration from "
 "timeline instead."
 msgstr ""
 
-#: export_video_dialog.cc:505
+#: export_video_dialog.cc:523
 msgid "Export Video: No Master Out Ports to Connect for Audio Export"
 msgstr ""
 
-#: export_video_dialog.cc:544
-msgid "Encoding Video.."
-msgstr ""
+#: export_video_dialog.cc:562
+#, fuzzy
+msgid "Encoding Video..."
+msgstr "开�翻译功能"
 
-#: export_video_dialog.cc:563
+#: export_video_dialog.cc:581
 msgid "Export Video: Video input file cannot be read."
 msgstr ""
 
-#: export_video_dialog.cc:661
+#: export_video_dialog.cc:679
 msgid "Encoding Video.. Pass 1/2"
 msgstr ""
 
-#: export_video_dialog.cc:673
+#: export_video_dialog.cc:691
 msgid "Encoding Video.. Pass 2/2"
 msgstr ""
 
-#: export_video_dialog.cc:761
+#: export_video_dialog.cc:779
 #, fuzzy
 msgid "Transcoding failed."
 msgstr "开�翻译功能"
 
-#: export_video_dialog.cc:930 export_video_dialog.cc:950
+#: export_video_dialog.cc:948 export_video_dialog.cc:968
 #, fuzzy
 msgid "Save Exported Video File"
 msgstr "导出为音频文件..."
@@ -12506,33 +12778,33 @@ msgstr ""
 msgid "<b>Video Export Info</b>"
 msgstr ""
 
-#: export_video_infobox.cc:46
+#: export_video_infobox.cc:48
 msgid ""
-"Ardour video export is not recommended for mastering!\n"
-"While 'ffmpeg' (which is used by ardour) can produce high-quality files, "
-"this export lacks the possibility to tweak many settings. We recommend to "
-"use 'winff', 'devede' or 'dvdauthor' to mux & master. Nevertheless this "
-"video-export comes in handy to do quick snapshots, intermediates, dailies or "
-"online videos.\n"
-"\n"
-"The soundtrack is created from the master-bus of the current Ardour "
-"session.\n"
+"Video encoding is a non-trivial task with many details.\n"
 "\n"
-"The video soure defaults to the file used in the video timeline, which may "
-"not the best quality to start with, you should the original video file.\n"
+"Please see the manual at %1/video-timeline/operations/#export.\n"
 "\n"
-"If the export-range is longer than the original video, black video frames "
-"are prefixed and/or appended. This process may fail with non-standard pixel-"
-"aspect-ratios.\n"
-"\n"
-"The file-format is determined by the extension that you choose for the "
-"output file (.avi, .mov, .flv, .ogv,...)\n"
-"Note: not all combinations of format+codec+settings produce files which are "
-"according so spec. e.g. flv files require sample-rates of 22.1kHz or "
-"44.1kHz, mpeg containers can not be used with ac3 audio-codec, etc. If in "
-"doubt, use one of the built-in presets."
+"Open Manual in Browser? "
 msgstr ""
 
+#~ msgid "slowest"
+#~ msgstr "最慢"
+
+#~ msgid "slow"
+#~ msgstr "æ…¢"
+
+#~ msgid "fast"
+#~ msgstr "å¿«"
+
+#~ msgid "faster"
+#~ msgstr "较快"
+
+#~ msgid "fastest"
+#~ msgstr "最快"
+
+#~ msgid "What would you like to do ?"
+#~ msgstr "你想干什么?"
+
 #~ msgid "Connect"
 #~ msgstr "连接"
 
diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc
index 531a5cf2c4..2a93cf6bee 100644
--- a/gtk2_ardour/port_group.cc
+++ b/gtk2_ardour/port_group.cc
@@ -21,7 +21,6 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/algorithm/string.hpp>
 
-#include "midi++/manager.h"
 #include "midi++/mmc.h"
 
 #include "ardour/audioengine.h"
@@ -29,9 +28,12 @@
 #include "ardour/bundle.h"
 #include "ardour/control_protocol_manager.h"
 #include "ardour/io_processor.h"
+#include "ardour/midi_port.h"
+#include "ardour/midiport_manager.h"
 #include "ardour/session.h"
 #include "ardour/user_bundle.h"
 #include "ardour/port.h"
+
 #include "control_protocol/control_protocol.h"
 
 #include "gui_thread.h"
@@ -452,37 +454,35 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
 
 	/* Ardour's sync ports */
 
-	MIDI::Manager* midi_manager = MIDI::Manager::instance ();
-	if (midi_manager && (type == DataType::MIDI || type == DataType::NIL)) {
+	if ((type == DataType::MIDI || type == DataType::NIL)) {
 		boost::shared_ptr<Bundle> sync (new Bundle (_("Sync"), inputs));
-		MIDI::MachineControl* mmc = midi_manager->mmc ();
-		AudioEngine& ae = session->engine ();
+		AudioEngine* ae = AudioEngine::instance();
 
 		if (inputs) {
 			sync->add_channel (
-				_("MTC in"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->mtc_input_port()->name())
+				_("MTC in"), DataType::MIDI, ae->make_port_name_non_relative (session->mtc_input_port()->name())
 				);
 			sync->add_channel (
-				_("MIDI control in"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->midi_input_port()->name())
+				_("MIDI control in"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_input_port()->name())
 				);
 			sync->add_channel (
-				_("MIDI clock in"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->midi_clock_input_port()->name())
+				_("MIDI clock in"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_clock_input_port()->name())
 				);
 			sync->add_channel (
-				_("MMC in"), DataType::MIDI, ae.make_port_name_non_relative (mmc->input_port()->name())
+				_("MMC in"), DataType::MIDI, ae->make_port_name_non_relative (session->mmc_input_port()->name())
 				);
 		} else {
 			sync->add_channel (
-				_("MTC out"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->mtc_output_port()->name())
+				_("MTC out"), DataType::MIDI, ae->make_port_name_non_relative (session->mtc_output_port()->name())
 				);
 			sync->add_channel (
-				_("MIDI control out"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->midi_output_port()->name())
+				_("MIDI control out"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_output_port()->name())
 				);
 			sync->add_channel (
-				_("MIDI clock out"), DataType::MIDI, ae.make_port_name_non_relative (midi_manager->midi_clock_output_port()->name())
+				_("MIDI clock out"), DataType::MIDI, ae->make_port_name_non_relative (session->midi_clock_output_port()->name())
 				);
 			sync->add_channel (
-				_("MMC out"), DataType::MIDI, ae.make_port_name_non_relative (mmc->output_port()->name())
+				_("MMC out"), DataType::MIDI, ae->make_port_name_non_relative (session->mmc_output_port()->name())
 				);
 		}
 
@@ -499,20 +499,12 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
         string lpnc = lpn;
         lpnc += ':';
 
-	const char ** ports = 0;
-	if (type == DataType::NIL) {
-		ports = session->engine().get_ports ("", "", inputs ? JackPortIsInput : JackPortIsOutput);
-	} else {
-		ports = session->engine().get_ports ("", type.to_jack_type(), inputs ? JackPortIsInput : JackPortIsOutput);
-	}
-
- 	if (ports) {
-
-		int n = 0;
+	vector<string> ports;
+	if (AudioEngine::instance()->get_ports ("", type, inputs ? IsInput : IsOutput, ports) > 0) {
 
-		while (ports[n]) {
+		for (vector<string>::const_iterator s = ports.begin(); s != ports.end(); ) {
 
-			std::string const p = ports[n];
+			std::string const p = *s;
 
 			if (!system->has_port(p) &&
 			    !bus->has_port(p) &&
@@ -526,7 +518,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
                                 */
 
                                 if (p.find ("Midi-Through") != string::npos) {
-                                        ++n;
+                                        ++s;
                                         continue;
                                 }
 
@@ -539,15 +531,15 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
 
                                 if ((lp.find (N_(":monitor")) != string::npos) &&
                                     (lp.find (lpn) != string::npos)) {
-                                        ++n;
+                                        ++s;
                                         continue;
                                 }
 
 				/* can't use the audio engine for this as we are looking at non-Ardour ports */
 
-				jack_port_t* jp = jack_port_by_name (session->engine().jack(), p.c_str());
-				if (jp) {
-					DataType t (jack_port_type (jp));
+				PortEngine::PortHandle ph = AudioEngine::instance()->port_engine().get_port_by_name (p);
+				if (ph) {
+					DataType t (AudioEngine::instance()->port_engine().port_data_type (ph));
 					if (t != DataType::NIL) {
 						if (port_has_prefix (p, N_("system:")) ||
                                                     port_has_prefix (p, N_("alsa_pcm")) ||
@@ -560,10 +552,8 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
 				}
 			}
 
-			++n;
+			++s;
 		}
-
-		free (ports);
 	}
 
 	for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
diff --git a/gtk2_ardour/port_insert_ui.cc b/gtk2_ardour/port_insert_ui.cc
index 0511b357db..3c495f0e79 100644
--- a/gtk2_ardour/port_insert_ui.cc
+++ b/gtk2_ardour/port_insert_ui.cc
@@ -66,7 +66,7 @@ PortInsertUI::PortInsertUI (Gtk::Window* parent, ARDOUR::Session* sess, boost::s
 void
 PortInsertUI::update_latency_display ()
 {
-        framecnt_t const sample_rate = input_selector.session()->engine().frame_rate();
+        framecnt_t const sample_rate = AudioEngine::instance()->sample_rate();
         if (sample_rate == 0) {
                 latency_display.set_text (_("Disconnected from audio engine"));
         } else {
@@ -93,7 +93,7 @@ PortInsertUI::check_latency_measurement ()
         }
 
         char buf[128];
-        framecnt_t const sample_rate = AudioEngine::instance()->frame_rate();
+        framecnt_t const sample_rate = AudioEngine::instance()->sample_rate();
 
         if (sample_rate == 0) {
                 latency_display.set_text (_("Disconnected from audio engine"));
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 1c5c47c41e..d475e28605 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -2202,10 +2202,10 @@ ProcessorBox::register_actions ()
 
 	act = ActionManager::register_action (popup_act_grp, X_("newinsert"), _("New Insert"),
 			sigc::ptr_fun (ProcessorBox::rb_choose_insert));
-	ActionManager::jack_sensitive_actions.push_back (act);
+	ActionManager::engine_sensitive_actions.push_back (act);
 	act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New External Send ..."),
 			sigc::ptr_fun (ProcessorBox::rb_choose_send));
-	ActionManager::jack_sensitive_actions.push_back (act);
+	ActionManager::engine_sensitive_actions.push_back (act);
 
 	ActionManager::register_action (popup_act_grp, X_("newaux"), _("New Aux Send ..."));
 
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 910dcb89eb..04b3b5a8c2 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -31,8 +31,6 @@
 #include "pbd/fpu.h"
 #include "pbd/cpus.h"
 
-#include "midi++/manager.h"
-
 #include "ardour/audioengine.h"
 #include "ardour/dB.h"
 #include "ardour/rc_configuration.h"
@@ -1460,8 +1458,8 @@ RCOptionEditor::RCOptionEditor ()
 
 #ifndef __APPLE__
         /* no JACK monitoring on CoreAudio */
-        if (AudioEngine::instance()->can_request_hardware_monitoring()) {
-                mm->add (HardwareMonitoring, _("JACK"));
+        if (AudioEngine::instance()->port_engine().can_monitor_input()) {
+                mm->add (HardwareMonitoring, _("via Audio Driver"));
         }
 #endif
 	mm->add (SoftwareMonitoring, _("ardour"));
diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc
index bb10bea16f..76f3d4e264 100644
--- a/gtk2_ardour/route_params_ui.cc
+++ b/gtk2_ardour/route_params_ui.cc
@@ -277,7 +277,7 @@ RouteParams_UI::cleanup_latency_frame ()
 void
 RouteParams_UI::setup_latency_frame ()
 {
-	latency_widget = new LatencyGUI (*(_route->output()), _session->frame_rate(), _session->engine().frames_per_cycle());
+	latency_widget = new LatencyGUI (*(_route->output()), _session->frame_rate(), AudioEngine::instance()->samples_per_cycle());
 
 	char buf[128];
 	snprintf (buf, sizeof (buf), _("Playback delay: %" PRId64 " samples"), _route->initial_delay());
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index c1dde89c39..8cc1512d3b 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1692,7 +1692,7 @@ RouteUI::map_frozen ()
 void
 RouteUI::adjust_latency ()
 {
-	LatencyDialog dialog (_route->name() + _(" latency"), *(_route->output()), _session->frame_rate(), _session->engine().frames_per_cycle());
+	LatencyDialog dialog (_route->name() + _(" latency"), *(_route->output()), _session->frame_rate(), AudioEngine::instance()->samples_per_cycle());
 }
 
 void
diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc
index 4a16c57259..1bc4e031f0 100644
--- a/gtk2_ardour/send_ui.cc
+++ b/gtk2_ardour/send_ui.cc
@@ -113,6 +113,10 @@ SendUI::update ()
 void
 SendUI::fast_update ()
 {
+	if (!is_mapped()) {
+		return;
+	}
+
 	if (Config->get_meter_falloff() > 0.0f) {
 		_gpm.update_meters ();
 	}
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index e24e7d6989..266a7e2a27 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -34,6 +34,7 @@
 #include "pbd/stacktrace.h"
 #include "pbd/openuri.h"
 
+#include "ardour/audioengine.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/recent_sessions.h"
 #include "ardour/session.h"
@@ -74,7 +75,6 @@ ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name,
 	, 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)
 	, more_new_session_options_button (_("I'd like more options for this session"))
 	, _output_limit_count_adj (1, 0, 100, 1, 10, 0)
@@ -91,13 +91,12 @@ ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name,
 	, _existing_session_chooser_used (false)
 {
 	new_user = !Glib::file_test (been_here_before_path(), Glib::FILE_TEST_EXISTS);
-	need_audio_setup = EngineControl::need_setup ();
 	need_session_info = (session_name.empty() || require_new);
 
 	_provided_session_name = session_name;
 	_provided_session_path = session_path;
 	
-	if (need_audio_setup || need_session_info || new_user) {
+	if (need_session_info || new_user) {
 
 		use_template_button.set_group (session_template_group);
 		use_session_as_template_button.set_group (session_template_group);
@@ -139,18 +138,10 @@ ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name,
 			setup_monitoring_choice_page ();
 			setup_monitor_section_choice_page ();
 			
-			if (need_audio_setup) {
-				setup_audio_page ();
-			}
-			
 			ic_new_session_button.set_active (true); // always create new session on first run
 			
 		} else {
 			
-			if (need_audio_setup) {
-				setup_audio_page ();
-			}
-			
 			setup_initial_choice_page ();
 		}
 
@@ -183,7 +174,7 @@ ArdourStartup::~ArdourStartup ()
 bool
 ArdourStartup::ready_without_display () const
 {
-	return !new_user && !need_audio_setup && !need_session_info;
+	return !new_user && !need_session_info;
 }
 
 void
@@ -311,24 +302,6 @@ ArdourStartup::session_folder ()
 }
 
 void
-ArdourStartup::setup_audio_page ()
-{
-	engine_dialog = manage (new EngineControl);
-
-	engine_dialog->set_border_width (12);
-
-	engine_dialog->show_all ();
-
-	audio_page_index = append_page (*engine_dialog);
-	set_page_type (*engine_dialog, ASSISTANT_PAGE_CONTENT);
-	set_page_title (*engine_dialog, _("Audio / MIDI Setup"));
-
-	/* the default parameters should work, so the page is potentially complete */
-
-	set_page_complete (*engine_dialog, true);
-}
-
-void
 ArdourStartup::setup_new_user_page ()
 {
 	Label* foomatic = manage (new Label);
@@ -403,8 +376,6 @@ Where would you like new %1 sessions to be stored by default?\n\n\
 	vbox->pack_start (*txt, false, false);
 	vbox->pack_start (*hbox, false, true);
 
-	cerr << "Setting defaultDIR session dir to [" << Config->get_default_session_parent_dir() << "]\n";
-
 	default_dir_chooser->set_current_folder (poor_mans_glob (Config->get_default_session_parent_dir()));
 	default_dir_chooser->signal_current_folder_changed().connect (sigc::mem_fun (*this, &ArdourStartup::default_dir_changed));
 	default_dir_chooser->show ();
@@ -661,13 +632,6 @@ ArdourStartup::on_delete_event (GdkEventAny*)
 void
 ArdourStartup::on_apply ()
 {
-	if (engine_dialog) {
-		if (engine_dialog->setup_engine ()) {
-                        set_current_page (audio_page_index);
-                        return;
-                }
-	}
-
 	if (config_modified) {
 
 		if (default_dir_chooser) {
diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index 4af6ffbc2a..4dcc3a9fb2 100644
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -56,8 +56,6 @@ class ArdourStartup : public Gtk::Assistant {
 	bool use_session_template();
 	std::string session_template_name();
 
-	EngineControl* engine_control() { return engine_dialog; }
-
 	// advanced session options
 
 	bool create_master_bus() const;
@@ -82,7 +80,6 @@ class ArdourStartup : public Gtk::Assistant {
 	gint _response;
 	bool config_modified;
 	bool new_user;
-        bool need_audio_setup;
         bool need_session_info;
 	bool new_only;
         std::string _provided_session_name;
@@ -175,11 +172,6 @@ class ArdourStartup : public Gtk::Assistant {
 
 	void existing_session_selected ();
 
-	/* audio setup page */
-
-	void setup_audio_page ();
-	EngineControl* engine_dialog;
-
 	/* new sessions */
 
 	void setup_new_session_page ();
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index fce1d0b46c..0e9ca9f190 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -343,8 +343,15 @@ set_color (Gdk::Color& c, int rgb)
 bool
 relay_key_press (GdkEventKey* ev, Gtk::Window* win)
 {
+	PublicEditor& ed (PublicEditor::instance());
+
+	if (&ed == 0) {
+		/* early key press in pre-main-window-dialogs, no editor yet */
+		return false;
+	}
+
 	if (!key_press_focus_accelerator_handler (*win, ev)) {
-		return PublicEditor::instance().on_key_press_event(ev);
+		return ed.on_key_press_event(ev);
 	} else {
 		return true;
 	}
diff --git a/gtk2_ardour/volume_controller.cc b/gtk2_ardour/volume_controller.cc
index 27fd705978..6db3bc7d7a 100644
--- a/gtk2_ardour/volume_controller.cc
+++ b/gtk2_ardour/volume_controller.cc
@@ -142,7 +142,6 @@ VolumeController::adjust (double control_delta)
 	double v;
 
 	if (!_linear) {
-
 		/* we map back into the linear/fractional slider position,
 		 * because this kind of control goes all the way down
 		 * to -inf dB, and we want this occur in a reasonable way in
@@ -150,7 +149,7 @@ VolumeController::adjust (double control_delta)
 		 * gain coefficient domain (or dB domain), the lower end of the
 		 * control range (getting close to -inf dB) takes forever.
 		 */
-
+#if 0
 		/* convert to linear/fractional slider position domain */
 		v = gain_to_slider_position_with_max (_controllable->get_value (), _controllable->upper());
 		/* increment in this domain */
@@ -171,6 +170,57 @@ VolumeController::adjust (double control_delta)
 		}
 		/* and return it */
 		return dB_to_coefficient (v);
+#else
+		/* ^^ Above algorithm is not symmetric. Scroll up to steps, scoll down two steps, -> different gain.
+		 *
+		 * see ./libs/gtkmm2ext/gtkmm2ext/motionfeedback.h and gtk2_ardour/monitor_section.cc:
+		 * min-delta (corr) = MIN(0.01 * page inc, 1 * size_inc) // (gain_control uses size_inc=0.01, page_inc=0.1)
+		 * range corr: 0..2   -> -inf..+6dB
+		 * step sizes  [0.01, 0.10, 0.20] * page_inc,   [1,2,10,100] * step_inc. [1,2,10,100] * page_inc
+		 *
+		 * 0.001, 0.01, 0.02, 0.1, .2,  1, 10
+		 * -> 1k steps between -inf..0dB
+		 * -> 1k steps between 0..+dB
+		 *
+		 *  IOW:
+		 *  the range is from *0  (-inf dB)  to  *2.0  ( +6dB)
+		 *  the knob is configured to to go in steps of 0.001  - that's 2000 steps between 0 and 2.
+		 *  or 1000 steps between 0 and 1.
+		 *
+		 *  we cannot round to .01dB steps because
+		 *  There are only 600 possible values between  +0db and +6dB when going in steps of .01dB
+		 *  1000/600 = 1.66666...
+		 *
+		 ******
+		 * idea: make the 'controllable use a fixed range of dB.
+		 * do a 1:1 mapping between values.  :et's stick with the range of 0..2 in 0.001 steps
+		 *
+		 * "-80" becomes 0 and "+6" becomes 2000. (NB +6dB is actually 1995, but we clamp that to the top)
+		 *
+		 * This approach is better (more consistet) but not good. At least the dial does not annoy me as much
+		 * anymore as it did before.
+		 *
+		 * const double stretchfactor = rint((_controllable->upper() - _controllable->lower()) / 0.001); // 2000;
+		 * const double logfactor =  stretchfactor / ((20.0 * log10( _controllable->upper())) + 80.0); // = 23.250244732
+		 */
+		v = _controllable->get_value ();
+		/* assume everything below -60dB is silent (.001 ^= -60dB)
+		 * but map range -80db..+6dB to a scale of 0..2000
+		 * 80db was motivated because 2000/((20.0 * log(1)) + 80.0) is an integer value. "0dB" is included on the scale.
+		 * but this leaves a dead area at the bottom of the meter..
+		 */
+		double arange = (v >= 0.001) ? ( ((20.0 * log10(v)) + 80.0) * 23.250244732 ) : ( 0 );
+		/* add the delta */
+		v = rint(arange) + rint(control_delta * 1000.0); // (min steps is 1.0/0.001 == 1000.0)
+		/* catch bottom -80..-60 db in one step */
+		if (v < 466) v = (control_delta > 0) ? 0.001 : 0;
+		/* reverse operation  (pow(10, .05 * ((v / 23.250244732) - 80.0)))
+		 * can be simplified to :*/
+		else v = pow(10, (v * 0.00215051499) - 4.0);
+		/* clamp value in coefficient domain */
+		v = std::max (_controllable->lower(), std::min (_controllable->upper(), v));
+		return v;
+#endif
 	} else {
 		double mult;
 
diff --git a/gtk2_ardour/window_manager.cc b/gtk2_ardour/window_manager.cc
index 5fa1b6c7b0..3ab9e1adff 100644
--- a/gtk2_ardour/window_manager.cc
+++ b/gtk2_ardour/window_manager.cc
@@ -410,7 +410,7 @@ ProxyBase::hide ()
 }
 
 bool
-ProxyBase::handle_win_event (GdkEventAny *ev)
+ProxyBase::handle_win_event (GdkEventAny* /*ev*/)
 {
 	hide();
 	return true;
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 30bfdb3154..4e5c41b826 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -506,6 +506,7 @@ def build(bld):
                 'SMALLER' : '9',
                 'SMALL' : '10',
                 'NORMAL' : '11',
+                'BIG' : '13',
                 'BIGGER' : '17',
                 'LARGE' : '18',
                 'LARGER' : '28',
@@ -531,6 +532,7 @@ def build(bld):
                 'SMALLER' : '8',
                 'SMALL' : '9',
                 'NORMAL' : '10',
+                'BIG' : '14',
                 'BIGGER' : '17',
                 'LARGE' : '18',
                 'LARGER' : '24',
diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h
index eaf6b572fd..311611997f 100644
--- a/libs/ardour/ardour/ardour.h
+++ b/libs/ardour/ardour/ardour.h
@@ -75,9 +75,7 @@ namespace ARDOUR {
 	bool translations_are_enabled ();
 	bool set_translations_enabled (bool);
 
-	static inline microseconds_t get_microseconds () {
-		return (microseconds_t) jack_get_time();
-	}
+	microseconds_t get_microseconds ();
 
 	void setup_fpu ();
 	std::vector<SyncSource> get_available_sync_options();
diff --git a/libs/midi++2/midi++/jack_midi_port.h b/libs/ardour/ardour/async_midi_port.h
index a8859387a4..76bdac0409 100644
--- a/libs/midi++2/midi++/jack_midi_port.h
+++ b/libs/ardour/ardour/async_midi_port.h
@@ -16,14 +16,12 @@
 
 */
 
-#ifndef  __libmidi_port_h__
-#define  __libmidi_port_h__
+#ifndef  __libardour_async_midiport_h__
+#define  __libardour_async_midiport_h__
 
 #include <string>
 #include <iostream>
 
-#include <jack/types.h>
-
 #include "pbd/xml++.h"
 #include "pbd/crossthread.h"
 #include "pbd/signals.h"
@@ -36,68 +34,46 @@
 #include "midi++/parser.h"
 #include "midi++/port.h"
 
-namespace MIDI {
+#include "ardour/midi_port.h"
+
+namespace ARDOUR {
 
-class Channel;
-class PortRequest;
+	class AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port {
 
-class JackMIDIPort : public Port {
   public:
-	JackMIDIPort (std::string const &, Port::Flags, jack_client_t *);
-	JackMIDIPort (const XMLNode&, jack_client_t *);
-	~JackMIDIPort ();
+        AsyncMIDIPort (std::string const &, PortFlags);
+	~AsyncMIDIPort ();
 
-	XMLNode& get_state () const;
-	void set_state (const XMLNode&);
+        /* called from an RT context */
 
 	void cycle_start (pframes_t nframes);
-	void cycle_end ();
-
+	void cycle_end (pframes_t nframes);
+    
+        /* called from non-RT context */
+    
 	void parse (framecnt_t timestamp);
-	int write (const byte *msg, size_t msglen, timestamp_t timestamp);
-	int read (byte *buf, size_t bufsize);
+        int write (const MIDI::byte *msg, size_t msglen, MIDI::timestamp_t timestamp);
+        int read (MIDI::byte *buf, size_t bufsize);
 	void drain (int check_interval_usecs);
 	int selectable () const { return xthread.selectable(); }
 
-	pframes_t nframes_this_cycle() const { return _nframes_this_cycle; }
-
-	void reestablish (jack_client_t *);
-	void reconnect ();
-
 	static void set_process_thread (pthread_t);
 	static pthread_t get_process_thread () { return _process_thread; }
 	static bool is_process_thread();
 
-	static PBD::Signal0<void> MakeConnections;
-	static PBD::Signal0<void> JackHalted;
-
-private:	
-	bool              _currently_in_cycle;
-	pframes_t         _nframes_this_cycle;
-	jack_client_t*    _jack_client;
-	jack_port_t*      _jack_port;
-	timestamp_t       _last_write_timestamp;
+  private:	
+	bool                    _currently_in_cycle;
+        MIDI::timestamp_t       _last_write_timestamp;
 	RingBuffer< Evoral::Event<double> > output_fifo;
-	Evoral::EventRingBuffer<timestamp_t> input_fifo;
-        Glib::Threads::Mutex output_fifo_lock;
-	CrossThreadChannel xthread;
-
-	int create_port ();
-
-	/** Channel used to signal to the MidiControlUI that input has arrived */
-	
-	std::string _connections;
-	PBD::ScopedConnection connect_connection;
-	PBD::ScopedConnection halt_connection;
-	void flush (void* jack_port_buffer);
-	void jack_halted ();
-	void make_connections ();
-	void init (std::string const &, Flags);
+        Evoral::EventRingBuffer<MIDI::timestamp_t> input_fifo;
+        Glib::Threads::Mutex    output_fifo_lock;
+	CrossThreadChannel      xthread;
 
-	static pthread_t _process_thread;
+        void flush_output_fifo (pframes_t);
 
+	static pthread_t _process_thread;
 };
 
-} // namespace MIDI
+} // namespace ARDOUR
 
-#endif // __libmidi_port_h__
+#endif /* __libardour_async_midiport_h__ */
diff --git a/libs/ardour/ardour/audio_backend.h b/libs/ardour/ardour/audio_backend.h
new file mode 100644
index 0000000000..4d57f0b43d
--- /dev/null
+++ b/libs/ardour/ardour/audio_backend.h
@@ -0,0 +1,444 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __libardour_audiobackend_h__
+#define __libardour_audiobackend_h__
+
+#include <string>
+#include <vector>
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <boost/function.hpp>
+
+#include "ardour/types.h"
+#include "ardour/audioengine.h"
+#include "ardour/port_engine.h"
+#include "ardour/visibility.h"
+
+#ifdef ARDOURBACKEND_DLL_EXPORTS // defined if we are building the ARDOUR Panners DLLs (instead of using them)
+    #define ARDOURBACKEND_API LIBARDOUR_HELPER_DLL_EXPORT
+#else
+    #define ARDOURBACKEND_API LIBARDOUR_HELPER_DLL_IMPORT
+#endif 
+#define ARDOURBACKEND_LOCAL LIBARDOUR_HELPER_DLL_LOCAL
+
+namespace ARDOUR {
+
+class AudioBackend : public PortEngine {
+  public:
+
+    AudioBackend (AudioEngine& e) : PortEngine (e), engine (e) {}
+    virtual ~AudioBackend () {}
+
+    /** Return the name of this backend.
+     *
+     * Should use a well-known, unique term. Expected examples
+     * might include "JACK", "CoreAudio", "ASIO" etc.
+     */
+    virtual std::string name() const = 0;
+
+    /** Return true if the callback from the underlying mechanism/API
+     * (CoreAudio, JACK, ASIO etc.) occurs in a thread subject to realtime
+     * constraints. Return false otherwise.
+    */
+    virtual bool is_realtime () const = 0;
+
+    /* Discovering devices and parameters */
+
+    /** Return true if this backend requires the selection of a "driver"
+     * before any device can be selected. Return false otherwise.
+     *
+     * Intended mainly to differentiate between meta-APIs like JACK
+     * which can still expose different backends (such as ALSA or CoreAudio 
+     * or FFADO or netjack) and those like ASIO or CoreAudio which
+     * do not.
+     */
+    virtual bool requires_driver_selection() const { return false; }
+
+    /** If the return value of requires_driver_selection() is true,
+     * then this function can return the list of known driver names.
+     *
+     * If the return value of requires_driver_selection() is false,
+     * then this function should not be called. If it is called
+     * its return value is an empty vector of strings.
+     */
+    virtual std::vector<std::string> enumerate_drivers() const { return std::vector<std::string>(); }
+
+    /** Returns zero if the backend can successfully use @param name as the
+     * driver, non-zero otherwise.
+     *
+     * Should not be used unless the backend returns true from
+     * requires_driver_selection()
+     */
+    virtual int set_driver (const std::string& /*drivername*/) { return 0; }
+
+    /** used to list device names along with whether or not they are currently
+     *  available. 
+    */
+    struct DeviceStatus {
+	std::string name;
+	bool        available;
+
+	DeviceStatus (const std::string& s, bool avail) : name (s), available (avail) {}
+    };
+
+    /** Returns a collection of DeviceStatuses identifying devices discovered
+     * by this backend since the start of the process.
+     *
+     * Any of the names in each DeviceStatus may be used to identify a
+     * device in other calls to the backend, though any of them may become
+     * invalid at any time.
+     */
+    virtual std::vector<DeviceStatus> enumerate_devices () const = 0;
+
+    /** Returns a collection of float identifying sample rates that are
+     * potentially usable with the hardware identified by @param device.
+     * Any of these values may be supplied in other calls to this backend
+     * as the desired sample rate to use with the name device, but the
+     * requested sample rate may turn out to be unavailable, or become invalid
+     * at any time.
+     */
+    virtual std::vector<float> available_sample_rates (const std::string& device) const = 0;
+    /** Returns a collection of uint32 identifying buffer sizes that are
+     * potentially usable with the hardware identified by @param device.
+     * Any of these values may be supplied in other calls to this backend
+     * as the desired buffer size to use with the name device, but the
+     * requested buffer size may turn out to be unavailable, or become invalid
+     * at any time.
+     */
+    virtual std::vector<uint32_t> available_buffer_sizes (const std::string& device) const = 0;
+
+    /** Returns the maximum number of input channels that are potentially
+     * usable with the hardware identified by @param device.  Any number from 1
+     * to the value returned may be supplied in other calls to this backend as
+     * the input channel count to use with the name device, but the requested
+     * count may turn out to be unavailable, or become invalid at any time.
+     */
+    virtual uint32_t available_input_channel_count (const std::string& device) const = 0;
+
+    /** Returns the maximum number of output channels that are potentially
+     * usable with the hardware identified by @param device.  Any number from 1
+     * to the value returned may be supplied in other calls to this backend as
+     * the output channel count to use with the name device, but the requested
+     * count may turn out to be unavailable, or become invalid at any time.
+     */
+    virtual uint32_t available_output_channel_count (const std::string& device) const = 0;
+
+    /* Return true if the derived class can change the sample rate of the
+     * device in use while the device is already being used. Return false
+     * otherwise. (example: JACK cannot do this as of September 2013)
+     */
+    virtual bool can_change_sample_rate_when_running () const = 0;
+    /* Return true if the derived class can change the buffer size of the
+     * device in use while the device is already being used. Return false
+     * otherwise. 
+     */
+    virtual bool can_change_buffer_size_when_running () const = 0;
+
+    /* Set the hardware parameters.
+     * 
+     * If called when the current state is stopped or paused,
+     * the changes will not take effect until the state changes to running.
+     *
+     * If called while running, the state will change as fast as the
+     * implementation allows.
+     *
+     * All set_*() methods return zero on success, non-zero otherwise.
+     */
+
+    /** Set the name of the device to be used
+     */
+    virtual int set_device_name (const std::string&) = 0;
+    /** Set the sample rate to be used
+     */
+    virtual int set_sample_rate (float) = 0;
+    /** Set the buffer size to be used.
+     *
+     * The device is assumed to use a double buffering scheme, so that one
+     * buffer's worth of data can be processed by hardware while software works
+     * on the other buffer. All known suitable audio APIs support this model
+     * (though ALSA allows for alternate numbers of buffers, and CoreAudio
+     * doesn't directly expose the concept).
+     */
+    virtual int set_buffer_size (uint32_t) = 0;
+    /** Set the preferred underlying hardware sample format
+     *
+     * This does not change the sample format (32 bit float) read and
+     * written to the device via the Port API.
+     */
+    virtual int set_sample_format (SampleFormat) = 0;
+    /** Set the preferred underlying hardware data layout.
+     * If @param yn is true, then the hardware will interleave
+     * samples for successive channels; otherwise, the hardware will store
+     * samples for a single channel contiguously.
+     * 
+     * Setting this does not change the fact that all data streams
+     * to and from Ports are mono (essentially, non-interleaved)
+     */
+    virtual int set_interleaved (bool yn) = 0;
+    /** Set the number of input channels that should be used
+     */
+    virtual int set_input_channels (uint32_t) = 0;
+    /** Set the number of output channels that should be used
+     */
+    virtual int set_output_channels (uint32_t) = 0;
+    /** Set the (additional) input latency that cannot be determined via 
+     * the implementation's underlying code (e.g. latency from
+     * external D-A/D-A converters. Units are samples.
+     */
+    virtual int set_systemic_input_latency (uint32_t) = 0;
+    /** Set the (additional) output latency that cannot be determined via 
+     * the implementation's underlying code (e.g. latency from
+     * external D-A/D-A converters. Units are samples.
+     */
+    virtual int set_systemic_output_latency (uint32_t) = 0;
+
+    /* Retrieving parameters */
+
+    virtual std::string  device_name () const = 0;
+    virtual float        sample_rate () const = 0;
+    virtual uint32_t     buffer_size () const = 0;
+    virtual SampleFormat sample_format () const = 0;
+    virtual bool         interleaved () const = 0;
+    virtual uint32_t     input_channels () const = 0;
+    virtual uint32_t     output_channels () const = 0;
+    virtual uint32_t     systemic_input_latency () const = 0;
+    virtual uint32_t     systemic_output_latency () const = 0;
+
+    /** Return the name of a control application for the 
+     * selected/in-use device. If no such application exists,
+     * or if no device has been selected or is in-use,
+     * return an empty string.
+     */
+    virtual std::string control_app_name() const = 0;
+    /** Launch the control app for the currently in-use or
+     * selected device. May do nothing if the control
+     * app is undefined or cannot be launched.
+     */
+    virtual void launch_control_app () = 0;
+    /* Basic state control */
+
+    /** Start using the device named in the most recent call
+     * to set_device(), with the parameters set by various
+     * the most recent calls to set_sample_rate() etc. etc.
+     * 
+     * At some undetermined time after this function is successfully called,
+     * the backend will start calling the ::process_callback() method of
+     * the AudioEngine referenced by @param engine. These calls will
+     * occur in a thread created by and/or under the control of the backend.
+     *
+     * Return zero if successful, negative values otherwise.
+     */
+    virtual int start () = 0;
+
+    /** Stop using the device currently in use. 
+     *
+     * If the function is successfully called, no subsequent calls to the
+     * process_callback() of @param engine will be made after the function
+     * returns, until parameters are reset and start() are called again.
+     * 
+     * The backend is considered to be un-configured after a successful
+     * return, and requires calls to set hardware parameters before it can be
+     * start()-ed again. See pause() for a way to avoid this. stop() should
+     * only be used when reconfiguration is required OR when there are no 
+     * plans to use the backend in the future with a reconfiguration.
+     *
+     * Return zero if successful, 1 if the device is not in use, negative values on error
+     */
+    virtual int stop () = 0;
+
+    /** Temporarily cease using the device named in the most recent call to set_parameters().
+     *
+     * If the function is successfully called, no subsequent calls to the
+     * process_callback() of @param engine will be made after the function
+     * returns, until start() is called again.
+     * 
+     * The backend will retain its existing parameter configuration after a successful
+     * return, and does NOT require any calls to set hardware parameters before it can be
+     * start()-ed again. 
+     *
+     * Return zero if successful, 1 if the device is not in use, negative values on error
+     */
+    virtual int pause () = 0;
+
+    /** While remaining connected to the device, and without changing its
+     * configuration, start (or stop) calling the process_callback() of @param engine
+     * without waiting for the device. Once process_callback() has returned, it
+     * will be called again immediately, thus allowing for faster-than-realtime
+     * processing.
+     *
+     * All registered ports remain in existence and all connections remain
+     * unaltered. However, any physical ports should NOT be used by the
+     * process_callback() during freewheeling - the data behaviour is undefined.
+     *
+     * If @param start_stop is true, begin this behaviour; otherwise cease this
+     * behaviour if it currently occuring, and return to calling
+     * process_callback() of @param engine by waiting for the device.
+     *
+     * Return zero on success, non-zero otherwise.
+     */
+    virtual int freewheel (bool start_stop) = 0;
+
+    /** return the fraction of the time represented by the current buffer
+     * size that is being used for each buffer process cycle, as a value
+     * from 0.0 to 1.0
+     *
+     * E.g. if the buffer size represents 5msec and current processing
+     * takes 1msec, the returned value should be 0.2. 
+     * 
+     * Implementations can feel free to smooth the values returned over
+     * time (e.g. high pass filtering, or its equivalent).
+     */
+    virtual float cpu_load() const  = 0;
+
+    /* Transport Control (JACK is the only audio API that currently offers
+       the concept of shared transport control)
+    */
+    
+    /** Attempt to change the transport state to TransportRolling. 
+     */
+    virtual void transport_start () {}
+    /** Attempt to change the transport state to TransportStopped. 
+     */
+    virtual void transport_stop () {}
+    /** return the current transport state
+     */
+    virtual TransportState transport_state () const { return TransportStopped; }
+    /** Attempt to locate the transport to @param pos
+     */
+    virtual void transport_locate (framepos_t /*pos*/) {}
+    /** Return the current transport location, in samples measured
+     * from the origin (defined by the transport time master)
+     */
+    virtual framepos_t transport_frame() const { return 0; }
+
+    /** If @param yn is true, become the time master for any inter-application transport
+     * timebase, otherwise cease to be the time master for the same.
+     *
+     * Return zero on success, non-zero otherwise
+     * 
+     * JACK is the only currently known audio API with the concept of a shared
+     * transport timebase.
+     */
+    virtual int set_time_master (bool /*yn*/) { return 0; }
+
+    virtual int        usecs_per_cycle () const { return 1000000 * (buffer_size() / sample_rate()); }
+    virtual size_t     raw_buffer_size (DataType t) = 0;
+    
+    /* Process time */
+    
+    /** return the time according to the sample clock in use, measured in
+     * samples since an arbitrary zero time in the past. The value should
+     * increase monotonically and linearly, without interruption from any
+     * source (including CPU frequency scaling).
+     *
+     * It is extremely likely that any implementation will use a DLL, since
+     * this function can be called from any thread, at any time, and must be 
+     * able to accurately determine the correct sample time.
+     *
+     * Can be called from any thread.
+     */
+    virtual pframes_t sample_time () = 0;
+
+    /** Return the time according to the sample clock in use when the most
+     * recent buffer process cycle began. Can be called from any thread.
+     */
+    virtual pframes_t sample_time_at_cycle_start () = 0;
+
+    /** Return the time since the current buffer process cycle started,
+     * in samples, according to the sample clock in use.
+     * 
+     * Can ONLY be called from within a process() callback tree (which
+     * implies that it can only be called by a process thread)
+     */
+    virtual pframes_t samples_since_cycle_start () = 0;
+
+    /** Return true if it possible to determine the offset in samples of the
+     * first video frame that starts within the current buffer process cycle,
+     * measured from the first sample of the cycle. If returning true,
+     * set @param offset to that offset.
+     *
+     * Eg. if it can be determined that the first video frame within the cycle
+     * starts 28 samples after the first sample of the cycle, then this method
+     * should return true and set @param offset to 28.
+     *
+     * May be impossible to support outside of JACK, which has specific support
+     * (in some cases, hardware support) for this feature.
+     *
+     * Can ONLY be called from within a process() callback tree (which implies
+     * that it can only be called by a process thread)
+     */
+    virtual bool get_sync_offset (pframes_t& /*offset*/) const { return false; }
+
+    /** Create a new thread suitable for running part of the buffer process
+     * cycle (i.e. Realtime scheduling, memory allocation, etc. etc are all
+     * correctly setup), with a stack size given in bytes by specified @param
+     * stacksize. The thread will begin executing @param func, and will exit
+     * when that function returns.
+     */
+    virtual int create_process_thread (boost::function<void()> func, AudioBackendNativeThread*, size_t stacksize) = 0;
+
+    /** Wait for the thread specified by @param thread to exit.
+     * 
+     * Return zero on success, non-zero on failure.
+     */
+    virtual int wait_for_process_thread_exit (AudioBackendNativeThread thread) = 0;
+
+    virtual void update_latencies () = 0;
+
+  protected:
+    AudioEngine&          engine;
+};
+
+struct AudioBackendInfo {
+    const char* name;
+
+    /** Using arg1 and arg2, initialize this audiobackend.
+     * 
+     * Returns zero on success, non-zero otherwise.
+     */
+    int (*instantiate) (const std::string& arg1, const std::string& arg2);
+
+    /** Release all resources associated with this audiobackend
+     */
+    int (*deinstantiate) (void);
+
+    /** Factory method to create an AudioBackend-derived class.
+     * 
+     * Returns a valid shared_ptr to the object if successfull,
+     * or a "null" shared_ptr otherwise.
+     */
+    boost::shared_ptr<AudioBackend> (*factory) (AudioEngine&);
+
+    /** Return true if the underlying mechanism/API has been
+     * configured and does not need (re)configuration in order
+     * to be usable. Return false otherwise.
+     *
+     * Note that this may return true if (re)configuration, even though
+     * not currently required, is still possible.
+     */
+    bool (*already_configured)();
+};
+
+} // namespace
+
+#endif /* __libardour_audiobackend_h__ */
+    
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index b636cb4734..5a856e9b36 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -114,7 +114,7 @@ class AudioDiskstream : public Diskstream
 	XMLNode& get_state(void);
 	int      set_state(const XMLNode& node, int version);
 
-	void request_jack_monitors_input (bool);
+	void request_input_monitoring (bool);
 
 	static void swap_by_ptr (Sample *first, Sample *last) {
 		while (first < last) {
@@ -160,7 +160,7 @@ class AudioDiskstream : public Diskstream
 		std::string name;
 
 		bool is_physical () const;
-		void request_jack_monitors_input (bool) const;
+		void request_input_monitoring (bool) const;
 	};
 
 	/** Information about one of our channels */
diff --git a/libs/ardour/ardour/audio_port.h b/libs/ardour/ardour/audio_port.h
index 7f084a5c85..f87b134e9e 100644
--- a/libs/ardour/ardour/audio_port.h
+++ b/libs/ardour/ardour/audio_port.h
@@ -46,10 +46,10 @@ class AudioPort : public Port
 	AudioBuffer& get_audio_buffer (pframes_t nframes);
 
   protected:
-	friend class AudioEngine;
+	friend class PortManager;
+	AudioPort (std::string const &, PortFlags);
 
-	AudioPort (std::string const &, Flags);
-        /* special access for engine only */
+        /* special access for PortManager only (hah, C++) */
         Sample* engine_get_whole_audio_buffer ();
 
   private:
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index 165ad6744f..201d960479 100644
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -33,26 +33,22 @@
 
 #include <glibmm/threads.h>
 
-#include "pbd/rcu.h"
 #include "pbd/signals.h"
 #include "pbd/stacktrace.h"
 
-#include <jack/weakjack.h>
-#include <jack/jack.h>
-#include <jack/transport.h>
-#include <jack/thread.h>
-
 #include "ardour/ardour.h"
-
 #include "ardour/data_type.h"
 #include "ardour/session_handle.h"
 #include "ardour/types.h"
 #include "ardour/chan_count.h"
+#include "ardour/port_manager.h"
 
 #ifdef HAVE_JACK_SESSION
 #include <jack/session.h>
 #endif
 
+class MTDM;
+
 namespace ARDOUR {
 
 class InternalPort;
@@ -60,299 +56,191 @@ class MidiPort;
 class Port;
 class Session;
 class ProcessThread;
+class AudioBackend;
+class AudioBackendInfo;
 
-class AudioEngine : public SessionHandlePtr
+class AudioEngine : public SessionHandlePtr, public PortManager
 {
 public:
-	typedef std::map<std::string,boost::shared_ptr<Port> > Ports;
-
-	AudioEngine (std::string client_name, std::string session_uuid);
-	virtual ~AudioEngine ();
-
-	jack_client_t* jack() const;
-	bool connected() const { return _jack != 0; }
-
-	bool is_realtime () const;
-
-	ProcessThread* main_thread() const { return _main_thread; }
-
-	std::string client_name() const { return jack_client_name; }
-
-	int reconnect_to_jack ();
-	int disconnect_from_jack();
-
-	int stop (bool forever = false);
-	int start ();
-	bool running() const { return _running; }
-
-	Glib::Threads::Mutex& process_lock() { return _process_lock; }
-
-	framecnt_t frame_rate () const;
-	pframes_t frames_per_cycle () const;
-
-	size_t raw_buffer_size(DataType t);
-
-	int usecs_per_cycle () const { return _usecs_per_cycle; }
-
-	bool get_sync_offset (pframes_t & offset) const;
-
-	pframes_t frames_since_cycle_start () {
-  	        jack_client_t* _priv_jack = _jack;
-		if (!_running || !_priv_jack) {
-			return 0;
-		}
-		return jack_frames_since_cycle_start (_priv_jack);
-	}
-
-	pframes_t frame_time () {
-  	        jack_client_t* _priv_jack = _jack;
-		if (!_running || !_priv_jack) {
-			return 0;
-		}
-		return jack_frame_time (_priv_jack);
-	}
-
-	pframes_t frame_time_at_cycle_start () {
-  	        jack_client_t* _priv_jack = _jack;
-		if (!_running || !_priv_jack) {
-			return 0;
-		}
-		return jack_last_frame_time (_priv_jack);
-	}
-
-	pframes_t transport_frame () const {
-  	        const jack_client_t* _priv_jack = _jack;
-		if (!_running || !_priv_jack) {
-			return 0;
-		}
-		return jack_get_current_transport_frame (_priv_jack);
-	}
-
-	int request_buffer_size (pframes_t);
-
-	framecnt_t processed_frames() const { return _processed_frames; }
-
-	float get_cpu_load() {
-  	        jack_client_t* _priv_jack = _jack;
-		if (!_running || !_priv_jack) {
-			return 0;
-		}
-		return jack_cpu_load (_priv_jack);
-	}
-
-	void set_session (Session *);
-	void remove_session (); // not a replacement for SessionHandle::session_going_away()
-
-	class PortRegistrationFailure : public std::exception {
-	public:
-		PortRegistrationFailure (std::string const & why = "")
-			: reason (why) {}
-
-		~PortRegistrationFailure () throw () {}
-
-		virtual const char *what() const throw () { return reason.c_str(); }
-
-	private:
-		std::string reason;
-	};
-
-	class NoBackendAvailable : public std::exception {
-	public:
-		virtual const char *what() const throw() { return "could not connect to engine backend"; }
-	};
-
-	boost::shared_ptr<Port> register_input_port (DataType, const std::string& portname);
-	boost::shared_ptr<Port> register_output_port (DataType, const std::string& portname);
-	int unregister_port (boost::shared_ptr<Port>);
-
-	bool port_is_physical (const std::string&) const;
-	void request_jack_monitors_input (const std::string&, bool) const;
-
-	void split_cycle (pframes_t offset);
-
-	int connect (const std::string& source, const std::string& destination);
-	int disconnect (const std::string& source, const std::string& destination);
-	int disconnect (boost::shared_ptr<Port>);
-
-	const char ** get_ports (const std::string& port_name_pattern, const std::string& type_name_pattern, uint32_t flags);
-
-	bool can_request_hardware_monitoring ();
-
-	ChanCount n_physical_outputs () const;
-	ChanCount n_physical_inputs () const;
-
-	void get_physical_outputs (DataType type, std::vector<std::string>&);
-	void get_physical_inputs (DataType type, std::vector<std::string>&);
-
-	boost::shared_ptr<Port> get_port_by_name (const std::string &);
-	void port_renamed (const std::string&, const std::string&);
 
-	enum TransportState {
-		TransportStopped = JackTransportStopped,
-		TransportRolling = JackTransportRolling,
-		TransportLooping = JackTransportLooping,
-		TransportStarting = JackTransportStarting
-	};
-
-	void transport_start ();
-	void transport_stop ();
-	void transport_locate (framepos_t);
-	TransportState transport_state ();
-
-	int  reset_timebase ();
-
-        void update_latencies ();
-
-	/* start/stop freewheeling */
-
-	int freewheel (bool onoff);
-	bool freewheeling() const { return _freewheeling; }
-
-	/* this signal is sent for every process() cycle while freewheeling.
-_	   the regular process() call to session->process() is not made.
-	*/
-
-	PBD::Signal1<int, pframes_t> Freewheel;
-
-	PBD::Signal0<void> Xrun;
-
-	/* this signal is if JACK notifies us of a graph order event */
-
-	PBD::Signal0<void> GraphReordered;
-
-#ifdef HAVE_JACK_SESSION
-	PBD::Signal1<void,jack_session_event_t *> JackSessionEvent;
-#endif
-
-
-	/* this signal is emitted if the sample rate changes */
-
-	PBD::Signal1<void, framecnt_t> SampleRateChanged;
-
-	/* this signal is sent if JACK ever disconnects us */
-
-	PBD::Signal1<void,const char*> Halted;
-
-	/* these two are emitted when the engine itself is
-	   started and stopped
-	*/
-
-	PBD::Signal0<void> Running;
-	PBD::Signal0<void> Stopped;
-
-	/** Emitted if a JACK port is registered or unregistered */
-	PBD::Signal0<void> PortRegisteredOrUnregistered;
-
-	/** Emitted if a JACK port is connected or disconnected.
-	 *  The Port parameters are the ports being connected / disconnected, or 0 if they are not known to Ardour.
-	 *  The std::string parameters are the (long) port names.
-	 *  The bool parameter is true if ports were connected, or false for disconnected.
-	 */
-	PBD::Signal5<void, boost::weak_ptr<Port>, std::string, boost::weak_ptr<Port>, std::string, bool> PortConnectedOrDisconnected;
-
-	std::string make_port_name_relative (std::string) const;
-	std::string make_port_name_non_relative (std::string) const;
-	bool port_is_mine (const std::string&) const;
-
-	static AudioEngine* instance() { return _instance; }
-	static void destroy();
-	void died ();
-
-	int create_process_thread (boost::function<void()>, pthread_t*, size_t stacksize);
-
-private:
-	static AudioEngine*       _instance;
-
-	jack_client_t* volatile   _jack; /* could be reset to null by SIGPIPE or another thread */
-	std::string                jack_client_name;
-	Glib::Threads::Mutex      _process_lock;
-        Glib::Threads::Cond        session_removed;
-	bool                       session_remove_pending;
-        frameoffset_t              session_removal_countdown;
-        gain_t                     session_removal_gain;
-        gain_t                     session_removal_gain_step;
-	bool                      _running;
-	bool                      _has_run;
-	mutable framecnt_t        _buffer_size;
-	std::map<DataType,size_t> _raw_buffer_sizes;
-	mutable framecnt_t        _frame_rate;
-	/// number of frames between each check for changes in monitor input
-	framecnt_t                 monitor_check_interval;
-	/// time of the last monitor check in frames
-	framecnt_t                 last_monitor_check;
-	/// the number of frames processed since start() was called
-	framecnt_t                _processed_frames;
-	bool                      _freewheeling;
-	bool                      _pre_freewheel_mmc_enabled;
-	int                       _usecs_per_cycle;
-	bool                       port_remove_in_progress;
-        Glib::Threads::Thread*     m_meter_thread;
-	ProcessThread*            _main_thread;
-
-	SerializedRCUManager<Ports> ports;
-
-	boost::shared_ptr<Port> register_port (DataType type, const std::string& portname, bool input);
-
-	int    process_callback (pframes_t nframes);
-	void*  process_thread ();
-	void   remove_all_ports ();
-
-	ChanCount n_physical (unsigned long) const;
-	void get_physical (DataType, unsigned long, std::vector<std::string> &);
-
-	void port_registration_failure (const std::string& portname);
-
-	static int  _xrun_callback (void *arg);
-#ifdef HAVE_JACK_SESSION
-	static void _session_callback (jack_session_event_t *event, void *arg);
-#endif
-	static int  _graph_order_callback (void *arg);
-	static void* _process_thread (void *arg);
-	static int  _sample_rate_callback (pframes_t nframes, void *arg);
-	static int  _bufsize_callback (pframes_t nframes, void *arg);
-	static void _jack_timebase_callback (jack_transport_state_t, pframes_t, jack_position_t*, int, void*);
-	static int  _jack_sync_callback (jack_transport_state_t, jack_position_t*, void *arg);
-	static void _freewheel_callback (int , void *arg);
-	static void _registration_callback (jack_port_id_t, int, void *);
-	static void _connect_callback (jack_port_id_t, jack_port_id_t, int, void *);
-
-	void jack_timebase_callback (jack_transport_state_t, pframes_t, jack_position_t*, int);
-	int  jack_sync_callback (jack_transport_state_t, jack_position_t*);
-	int  jack_bufsize_callback (pframes_t);
-	int  jack_sample_rate_callback (pframes_t);
-	void freewheel_callback (int);
-        void connect_callback (jack_port_id_t, jack_port_id_t, int);
-
-	void set_jack_callbacks ();
-
-	static void _latency_callback (jack_latency_callback_mode_t, void*);
-	void jack_latency_callback (jack_latency_callback_mode_t);
-
-	int connect_to_jack (std::string client_name, std::string session_uuid);
-
-	static void halted (void *);
-	static void halted_info (jack_status_t,const char*,void *);
-
-	void meter_thread ();
-	void start_metering_thread ();
-	void stop_metering_thread ();
-
-	static gint      m_meter_exit;
-
-	struct ThreadData {
-		AudioEngine* engine;
-		boost::function<void()> f;
-		size_t stacksize;
-
-		ThreadData (AudioEngine* ae, boost::function<void()> fp, size_t stacksz)
-		: engine (ae) , f (fp) , stacksize (stacksz) {}
-	};
-
-	static void* _start_process_thread (void*);
-        void parameter_changed (const std::string&);
-        PBD::ScopedConnection config_connection;
+    static AudioEngine* create ();
+
+    virtual ~AudioEngine ();
+
+    int discover_backends();
+    std::vector<const AudioBackendInfo*> available_backends() const;
+    std::string current_backend_name () const;
+    boost::shared_ptr<AudioBackend> set_backend (const std::string&, const std::string& arg1, const std::string& arg2);
+    boost::shared_ptr<AudioBackend> current_backend() const { return _backend; }
+    bool setup_required () const;
+
+    ProcessThread* main_thread() const { return _main_thread; }
+    
+    /* START BACKEND PROXY API 
+     *
+     * See audio_backend.h for full documentation and semantics. These wrappers
+     * just forward to a backend implementation.
+     */
+
+    int            start ();
+    int            stop ();
+    int            pause ();
+    int            freewheel (bool start_stop);
+    float          get_cpu_load() const ;
+    void           transport_start ();
+    void           transport_stop ();
+    TransportState transport_state ();
+    void           transport_locate (framepos_t pos);
+    framepos_t     transport_frame();
+    framecnt_t     sample_rate () const;
+    pframes_t      samples_per_cycle () const;
+    int            usecs_per_cycle () const;
+    size_t         raw_buffer_size (DataType t);
+    pframes_t      sample_time ();
+    pframes_t      sample_time_at_cycle_start ();
+    pframes_t      samples_since_cycle_start ();
+    bool           get_sync_offset (pframes_t& offset) const;
+    int            create_process_thread (boost::function<void()> func, AudioBackendNativeThread*, size_t stacksize);
+    int            wait_for_process_thread_exit (AudioBackendNativeThread);
+    bool           is_realtime() const;
+    bool           connected() const;
+
+    int set_device_name (const std::string&);
+    int set_sample_rate (float);
+    int set_buffer_size (uint32_t);
+    int set_sample_format (SampleFormat);
+    int set_interleaved (bool yn);
+    int set_input_channels (uint32_t);
+    int set_output_channels (uint32_t);
+    int set_systemic_input_latency (uint32_t);
+    int set_systemic_output_latency (uint32_t);
+
+    /* END BACKEND PROXY API */
+
+    bool freewheeling() const { return _freewheeling; }
+    bool running() const { return _running; }
+
+    Glib::Threads::Mutex& process_lock() { return _process_lock; }
+
+    int request_buffer_size (pframes_t samples) {
+	    return set_buffer_size (samples);
+    }
+
+    framecnt_t processed_frames() const { return _processed_frames; }
+    
+    void set_session (Session *);
+    void remove_session (); // not a replacement for SessionHandle::session_going_away()
+    Session* session() const { return _session; }
+
+    class NoBackendAvailable : public std::exception {
+      public:
+	virtual const char *what() const throw() { return "could not connect to engine backend"; }
+    };
+    
+    void split_cycle (pframes_t offset);
+    
+    int  reset_timebase ();
+    
+    void update_latencies ();
+    
+    /* this signal is sent for every process() cycle while freewheeling.
+       (the regular process() call to session->process() is not made)
+    */
+    
+    PBD::Signal1<int, pframes_t> Freewheel;
+    
+    PBD::Signal0<void> Xrun;
+
+    /* this signal is emitted if the sample rate changes */
+    
+    PBD::Signal1<void, framecnt_t> SampleRateChanged;
+    
+    /* this signal is sent if the backend ever disconnects us */
+    
+    PBD::Signal1<void,const char*> Halted;
+    
+    /* these two are emitted when the engine itself is
+       started and stopped
+    */
+    
+    PBD::Signal0<void> Running;
+    PBD::Signal0<void> Stopped;
+
+    static AudioEngine* instance() { return _instance; }
+    static void destroy();
+    void died ();
+    
+    /* The backend will cause these at the appropriate time(s)
+     */
+    int  process_callback (pframes_t nframes);
+    int  buffer_size_change (pframes_t nframes);
+    int  sample_rate_change (pframes_t nframes);
+    void freewheel_callback (bool);
+    void timebase_callback (TransportState state, pframes_t nframes, framepos_t pos, int new_position);
+    int  sync_callback (TransportState state, framepos_t position);
+    int  port_registration_callback ();
+    void latency_callback (bool for_playback);
+    void halted_callback (const char* reason);
+
+    /* sets up the process callback thread */
+    static void thread_init_callback (void *);
+
+    /* latency measurement */
+
+    MTDM* mtdm();
+    int  prepare_for_latency_measurement ();
+    void start_latency_detection ();
+    void stop_latency_detection ();
+    void set_latency_input_port (const std::string&);
+    void set_latency_output_port (const std::string&);
+    uint32_t latency_signal_delay () const { return _latency_signal_latency; }
+
+  private:
+    AudioEngine ();
+
+    static AudioEngine*       _instance;
+
+    Glib::Threads::Mutex      _process_lock;
+    Glib::Threads::Cond        session_removed;
+    bool                       session_remove_pending;
+    frameoffset_t              session_removal_countdown;
+    gain_t                     session_removal_gain;
+    gain_t                     session_removal_gain_step;
+    bool                      _running;
+    bool                      _freewheeling;
+    /// number of frames between each check for changes in monitor input
+    framecnt_t                 monitor_check_interval;
+    /// time of the last monitor check in frames
+    framecnt_t                 last_monitor_check;
+    /// the number of frames processed since start() was called
+    framecnt_t                _processed_frames;
+    Glib::Threads::Thread*     m_meter_thread;
+    ProcessThread*            _main_thread;
+    MTDM*                     _mtdm;
+    bool                      _measuring_latency;
+    PortEngine::PortHandle    _latency_input_port;
+    PortEngine::PortHandle    _latency_output_port;
+    framecnt_t                _latency_flush_frames;
+    std::string               _latency_input_name;
+    std::string               _latency_output_name;
+    framecnt_t                _latency_signal_latency;
+    bool                      _started_for_latency;
+
+    void meter_thread ();
+    void start_metering_thread ();
+    void stop_metering_thread ();
+    
+    static gint      m_meter_exit;
+    
+    void parameter_changed (const std::string&);
+    PBD::ScopedConnection config_connection;
+
+    typedef std::map<std::string,AudioBackendInfo*> BackendMap;
+    BackendMap _backends;
+    AudioBackendInfo* backend_discover (const std::string&);
+    void drop_backend ();
 };
-
+	
 } // namespace ARDOUR
 
 #endif /* __ardour_audioengine_h__ */
diff --git a/libs/ardour/ardour/backend_search_path.h b/libs/ardour/ardour/backend_search_path.h
new file mode 100644
index 0000000000..2adc22bd6f
--- /dev/null
+++ b/libs/ardour/ardour/backend_search_path.h
@@ -0,0 +1,39 @@
+/*
+    Copyright (C) 2011 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __ardour_backend_search_path_h__
+#define __ardour_backend_search_path_h__
+
+#include "pbd/search_path.h"
+
+namespace ARDOUR {
+
+	/**
+	 * return a SearchPath containing directories in which to look for
+	 * backend plugins.
+	 *
+	 * If ARDOUR_BACKEND_PATH is defined then the SearchPath returned
+	 * will contain only those directories specified in it, otherwise it will
+	 * contain the user and system directories which may contain audio/MIDI
+	 * backends.
+	 */
+	PBD::SearchPath backend_search_path ();
+
+} // namespace ARDOUR
+
+#endif /* __ardour_backend_search_path_h__ */
diff --git a/libs/ardour/ardour/buffer_set.h b/libs/ardour/ardour/buffer_set.h
index 12e9dbc63b..26d47682af 100644
--- a/libs/ardour/ardour/buffer_set.h
+++ b/libs/ardour/ardour/buffer_set.h
@@ -70,7 +70,7 @@ public:
 	void clear();
 
 	void attach_buffers (PortSet& ports);
-	void get_jack_port_addresses (PortSet &, framecnt_t);
+	void get_backend_port_addresses (PortSet &, framecnt_t);
 
 	/* the capacity here is a size_t and has a different interpretation depending
 	   on the DataType of the buffers. for audio, its a frame count. for MIDI
diff --git a/libs/ardour/ardour/data_type.h b/libs/ardour/ardour/data_type.h
index 6a016ae75a..b4129e2629 100644
--- a/libs/ardour/ardour/data_type.h
+++ b/libs/ardour/ardour/data_type.h
@@ -21,11 +21,11 @@
 #define __ardour_data_type_h__
 
 #include <string>
-#include <jack/jack.h>
+#include <stdint.h>
+#include <glib.h>
 
 namespace ARDOUR {
 
-
 /** A type of Data Ardour is capable of processing.
  *
  * The majority of this class is dedicated to conversion to and from various
@@ -61,33 +61,25 @@ public:
 
 	/** Construct from a string (Used for loading from XML and Ports)
 	 * The string can be as in an XML file (eg "audio" or "midi"), or a
-	 * Jack type string (from jack_port_type) */
+	 */
 	DataType(const std::string& str)
 	: _symbol(NIL) {
-		if (str == "audio" || str == JACK_DEFAULT_AUDIO_TYPE)
+		if (!g_ascii_strncasecmp(str.c_str(), "audio", str.length())) {
 			_symbol = AUDIO;
-		else if (str == "midi" || str == JACK_DEFAULT_MIDI_TYPE)
+		} else if (!g_ascii_strncasecmp(str.c_str(), "midi", str.length())) {
 			_symbol = MIDI;
-	}
-
-	/** Get the Jack type this DataType corresponds to */
-	const char* to_jack_type() const {
-		switch (_symbol) {
-			case AUDIO: return JACK_DEFAULT_AUDIO_TYPE;
-			case MIDI:  return JACK_DEFAULT_MIDI_TYPE;
-			default:    return "";
 		}
 	}
 
 	/** Inverse of the from-string constructor */
 	const char* to_string() const {
 		switch (_symbol) {
-			case AUDIO: return "audio";
-			case MIDI:  return "midi";
-			default:    return "unknown"; // reeeally shouldn't ever happen
+		case AUDIO: return "audio";
+		case MIDI:  return "midi";
+		default:    return "unknown"; // reeeally shouldn't ever happen
 		}
 	}
-
+    
 	const char* to_i18n_string () const;
 
 	inline operator uint32_t() const { return (uint32_t)_symbol; }
@@ -125,7 +117,6 @@ private:
 };
 
 
-
 } // namespace ARDOUR
 
 #endif // __ardour_data_type_h__
diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h
index 202d0cc424..5811f7a484 100644
--- a/libs/ardour/ardour/debug.h
+++ b/libs/ardour/ardour/debug.h
@@ -63,6 +63,7 @@ namespace PBD {
 		extern uint64_t OrderKeys;
 		extern uint64_t Automation;
 		extern uint64_t WiimoteControl;
+		extern uint64_t Ports;
 	}
 }
 
diff --git a/libs/ardour/ardour/directory_names.h b/libs/ardour/ardour/directory_names.h
index 9f7c778d33..935cdd977b 100644
--- a/libs/ardour/ardour/directory_names.h
+++ b/libs/ardour/ardour/directory_names.h
@@ -38,6 +38,7 @@ extern const char* const route_templates_dir_name;
 extern const char* const surfaces_dir_name;
 extern const char* const user_config_dir_name;
 extern const char* const panner_dir_name;
+extern const char* const backend_dir_name;
 
 };
 
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 427b52b054..7a4bccbb46 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -133,8 +133,8 @@ class Diskstream : public SessionObject, public PublicDiskstream
 	virtual XMLNode& get_state(void);
 	virtual int      set_state(const XMLNode&, int version);
 
-	virtual void request_jack_monitors_input (bool) {}
-	virtual void ensure_jack_monitors_input (bool) {}
+	virtual void request_input_monitoring (bool) {}
+	virtual void ensure_input_monitoring (bool) {}
 
 	framecnt_t   capture_offset() const { return _capture_offset; }
 	virtual void set_capture_offset ();
diff --git a/libs/ardour/ardour/export_format_base.h b/libs/ardour/ardour/export_format_base.h
index a96d1148fc..a21c977833 100644
--- a/libs/ardour/ardour/export_format_base.h
+++ b/libs/ardour/ardour/export_format_base.h
@@ -49,6 +49,7 @@ class ExportFormatBase {
 		F_None = 0,
 		F_WAV = SF_FORMAT_WAV,
 		F_W64 = SF_FORMAT_W64,
+		F_CAF = SF_FORMAT_CAF,
 		F_AIFF = SF_FORMAT_AIFF,
 		F_AU = SF_FORMAT_AU,
 		F_IRCAM = SF_FORMAT_IRCAM,
diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h
index cac09d34af..08af6fb721 100644
--- a/libs/ardour/ardour/graph.h
+++ b/libs/ardour/ardour/graph.h
@@ -36,6 +36,7 @@
 #include "pbd/semutils.h"
 
 #include "ardour/types.h"
+#include "ardour/audio_backend.h"
 #include "ardour/session_handle.h"
 
 namespace ARDOUR
@@ -92,7 +93,7 @@ protected:
 	virtual void session_going_away ();
 
 private:
-	std::list<pthread_t> _thread_list;
+	std::list<AudioBackendNativeThread> _thread_list;
 	volatile bool        _quit_threads;
 
 	void reset_thread_list ();
diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h
index 4cd34b3026..56aa9dc7cf 100644
--- a/libs/ardour/ardour/lv2_plugin.h
+++ b/libs/ardour/ardour/lv2_plugin.h
@@ -75,6 +75,7 @@ class LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee
 	const void* c_ui_type();
 
 	bool is_external_ui () const;
+	bool is_external_kx () const;
 	bool ui_is_resizable () const;
 
 	const char* port_symbol (uint32_t port) const;
diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h
index 5ef5e4c845..781396a598 100644
--- a/libs/ardour/ardour/midi_buffer.h
+++ b/libs/ardour/ardour/midi_buffer.h
@@ -44,7 +44,6 @@ public:
 	void copy(const MidiBuffer& copy);
 
 	bool     push_back(const Evoral::MIDIEvent<TimeType>& event);
-	bool     push_back(const jack_midi_event_t& event);
 	bool     push_back(TimeType time, size_t size, const uint8_t* data);
 	uint8_t* reserve(TimeType time, size_t size);
 
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index 34fa0ae79a..b1c126b339 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -81,7 +81,7 @@ class MidiDiskstream : public Diskstream
 	XMLNode& get_state(void);
 	int set_state(const XMLNode&, int version);
 
-	void ensure_jack_monitors_input (bool);
+	void ensure_input_monitoring (bool);
 
 	boost::shared_ptr<SMFSource> write_source ()    { return _write_source; }
 
diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index 5dc55398cb..00617d90ec 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -21,6 +21,8 @@
 #ifndef __ardour_midi_port_h__
 #define __ardour_midi_port_h__
 
+#include "midi++/parser.h"
+
 #include "ardour/port.h"
 #include "ardour/midi_buffer.h"
 #include "ardour/midi_state_tracker.h"
@@ -56,18 +58,35 @@ class MidiPort : public Port {
 
 	MidiBuffer& get_midi_buffer (pframes_t nframes);
 
+        void set_always_parse (bool yn);
+        MIDI::Parser& self_parser() { return _self_parser; }
+
   protected:
-	friend class AudioEngine;
+        friend class PortManager;
 
-	MidiPort (const std::string& name, Flags);
+        MidiPort (const std::string& name, PortFlags);
 
   private:
 	MidiBuffer* _buffer;
 	bool        _has_been_mixed_down;
 	bool        _resolve_required;
 	bool        _input_active;
-
-	void resolve_notes (void* jack_buffer, MidiBuffer::TimeType when);
+        bool        _always_parse;
+
+    /* Naming this is tricky. AsyncMIDIPort inherits (for now, aug 2013) from
+     * both MIDI::Port, which has _parser, and this (ARDOUR::MidiPort). We
+     * need parsing support in this object, independently of what the
+     * MIDI::Port/AsyncMIDIPort stuff does. Rather than risk errors coming
+     * from not explicitly naming which _parser we want, we will call this
+     * _self_parser for now.
+     *
+     * Ultimately, MIDI::Port should probably go away or be fully integrated
+     * into this object, somehow.
+     */
+
+        MIDI::Parser _self_parser;
+
+	void resolve_notes (void* buffer, MidiBuffer::TimeType when);
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h
index 34e97494be..c15a530057 100644
--- a/libs/ardour/ardour/midi_ui.h
+++ b/libs/ardour/ardour/midi_ui.h
@@ -26,13 +26,11 @@
 #include "pbd/signals.h"
 #include "pbd/stacktrace.h"
 
-namespace MIDI {
-	class Port;
-}
 
 namespace ARDOUR {
 
 class Session;
+class AsyncMIDIPort;
 
 /* this is mostly a placeholder because I suspect that at some
    point we will want to add more members to accomodate
@@ -67,7 +65,7 @@ class MidiControlUI : public AbstractUI<MidiUIRequest>
 	ARDOUR::Session& _session;
 	PBD::ScopedConnection rebind_connection;
 
-	bool midi_input_handler (Glib::IOCondition, MIDI::Port*);
+	bool midi_input_handler (Glib::IOCondition, AsyncMIDIPort*);
 	void reset_ports ();
 	void clear_ports ();
 
diff --git a/libs/ardour/ardour/midiport_manager.h b/libs/ardour/ardour/midiport_manager.h
new file mode 100644
index 0000000000..9f93c43d5a
--- /dev/null
+++ b/libs/ardour/ardour/midiport_manager.h
@@ -0,0 +1,99 @@
+/*
+    Copyright (C) 1998 Paul Barton-Davis
+    
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __midiport_manager_h__
+#define __midiport_manager_h__
+
+#include <list>
+
+#include <string>
+
+#include "pbd/rcu.h"
+
+#include "midi++/types.h"
+#include "midi++/port.h"
+
+#include "ardour/types.h"
+
+namespace ARDOUR {
+
+class MidiPort;
+class Port;
+
+class MidiPortManager {
+  public:
+    MidiPortManager();
+    virtual ~MidiPortManager ();
+	
+    /* Ports used for control. These are read/written to outside of the
+     * process callback (asynchronously with respect to when data
+     * actually arrives). 
+     *
+     * More detail: we do actually read/write data for these ports
+     * inside the process callback, but incoming data is only parsed
+     * and outgoing data is only generated *outside* the process
+     * callback. 
+     */
+
+    MIDI::Port* midi_input_port () const { return _midi_input_port; }
+    MIDI::Port* midi_output_port () const { return _midi_output_port; }
+    MIDI::Port* mmc_input_port () const { return _mmc_input_port; }
+    MIDI::Port* mmc_output_port () const { return _mmc_output_port; }
+    
+    /* Ports used for synchronization. These have their I/O handled inside the
+     * process callback.
+     */
+
+    boost::shared_ptr<MidiPort> mtc_input_port() const { return _mtc_input_port; }
+    boost::shared_ptr<MidiPort> mtc_output_port() const { return _mtc_output_port; }
+    boost::shared_ptr<MidiPort> midi_clock_input_port() const { return _midi_clock_input_port; }
+    boost::shared_ptr<MidiPort> midi_clock_output_port() const { return _midi_clock_output_port; }
+    
+    void set_midi_port_states (const XMLNodeList&);
+    std::list<XMLNode*> get_midi_port_states () const;
+
+    PBD::Signal0<void> PortsChanged;
+
+  protected:
+    /* asynchronously handled ports: MIDI::Port */
+    MIDI::Port* _midi_input_port;
+    MIDI::Port* _midi_output_port;
+    MIDI::Port* _mmc_input_port;
+    MIDI::Port* _mmc_output_port;
+    /* these point to the same objects as the 4 members above,
+       but cast to their ARDOUR::Port base class
+    */
+    boost::shared_ptr<Port> _midi_in;
+    boost::shared_ptr<Port> _midi_out;
+    boost::shared_ptr<Port> _mmc_in;
+    boost::shared_ptr<Port> _mmc_out;
+
+    /* synchronously handled ports: ARDOUR::MidiPort */
+    boost::shared_ptr<MidiPort> _mtc_input_port;
+    boost::shared_ptr<MidiPort> _mtc_output_port;
+    boost::shared_ptr<MidiPort> _midi_clock_input_port;
+    boost::shared_ptr<MidiPort> _midi_clock_output_port;
+
+    void create_ports ();
+
+};
+
+} // namespace MIDI
+
+#endif  // __midi_port_manager_h__
diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index e225117d94..77bf2b6f71 100644
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -30,6 +30,7 @@
 #include "pbd/signals.h"
 
 #include "ardour/data_type.h"
+#include "ardour/port_engine.h"
 #include "ardour/types.h"
 
 namespace ARDOUR {
@@ -40,11 +41,6 @@ class Buffer;
 class Port : public boost::noncopyable
 {
 public:
-	enum Flags {
-		IsInput = JackPortIsInput,
-		IsOutput = JackPortIsOutput,
-	};
-
 	virtual ~Port ();
 
 	static void set_connecting_blocked( bool yn ) {
@@ -62,7 +58,7 @@ public:
 	int set_name (std::string const &);
 
 	/** @return flags */
-	Flags flags () const {
+        PortFlags flags () const {
 		return _flags;
 	}
 
@@ -90,24 +86,24 @@ public:
 	virtual int connect (Port *);
 	int disconnect (Port *);
 
-	void ensure_jack_monitors_input (bool);
-	bool jack_monitoring_input () const;
+	void request_input_monitoring (bool);
+	void ensure_input_monitoring (bool);
+	bool monitoring_input () const;
 	int reestablish ();
 	int reconnect ();
-	void request_jack_monitors_input (bool);
 
 	bool last_monitor() const { return _last_monitor; }
 	void set_last_monitor (bool yn) { _last_monitor = yn; }
 
-	jack_port_t* jack_port() const { return _jack_port; }
+        PortEngine::PortHandle port_handle() { return _port_handle; }
 
-	void get_connected_latency_range (jack_latency_range_t& range, bool playback) const;
+        void get_connected_latency_range (LatencyRange& range, bool playback) const;
 
-	void set_private_latency_range (jack_latency_range_t& range, bool playback);
-	const jack_latency_range_t&  private_latency_range (bool playback) const;
+	void set_private_latency_range (LatencyRange& range, bool playback);
+	const LatencyRange&  private_latency_range (bool playback) const;
 
-	void set_public_latency_range (jack_latency_range_t& range, bool playback) const;
-	jack_latency_range_t public_latency_range (bool playback) const;
+	void set_public_latency_range (LatencyRange& range, bool playback) const;
+	LatencyRange public_latency_range (bool playback) const;
 
 	virtual void reset ();
 
@@ -122,8 +118,6 @@ public:
 
 	bool physically_connected () const;
 
-	static void set_engine (AudioEngine *);
-
 	PBD::Signal1<void,bool> MonitorInputChanged;
 	static PBD::Signal2<void,boost::shared_ptr<Port>,boost::shared_ptr<Port> > PostDisconnect;
 	static PBD::Signal0<void> PortDrop;
@@ -141,11 +135,16 @@ public:
 
 	virtual void increment_port_buffer_offset (pframes_t n);
 
+	virtual XMLNode& get_state (void) const;
+	virtual int set_state (const XMLNode&, int version);
+
+        static std::string state_node_name;
+
 protected:
 
-	Port (std::string const &, DataType, Flags);
+	Port (std::string const &, DataType, PortFlags);
 
-	jack_port_t* _jack_port; ///< JACK port
+        PortEngine::PortHandle _port_handle;
 
 	static bool	  _connecting_blocked;
 	static pframes_t  _global_port_buffer_offset;   /* access only from process() tree */
@@ -153,18 +152,16 @@ protected:
 
 	framecnt_t _port_buffer_offset; /* access only from process() tree */
 
-	jack_latency_range_t _private_playback_latency;
-	jack_latency_range_t _private_capture_latency;
-
-	static AudioEngine* _engine; ///< the AudioEngine
+	LatencyRange _private_playback_latency;
+	LatencyRange _private_capture_latency;
 
 private:
 	std::string _name;  ///< port short name
-	Flags       _flags; ///< flags
+	PortFlags       _flags; ///< flags
 	bool        _last_monitor;
 
 	/** ports that we are connected to, kept so that we can
-	    reconnect to JACK when required
+	    reconnect to the backend when required
 	*/
 	std::set<std::string> _connections;
 
diff --git a/libs/ardour/ardour/port_engine.h b/libs/ardour/ardour/port_engine.h
new file mode 100644
index 0000000000..8c0ec9e754
--- /dev/null
+++ b/libs/ardour/ardour/port_engine.h
@@ -0,0 +1,345 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __libardour_port_engine_h__
+#define __libardour_port_engine_h__
+
+#include <vector>
+#include <string>
+
+#include <stdint.h>
+
+#include "ardour/data_type.h"
+#include "ardour/types.h"
+
+namespace ARDOUR {
+
+class PortManager;
+
+/** PortEngine is an abstract base class that defines the functionality
+ * required by Ardour. 
+ * 
+ * A Port is basically an endpoint for a datastream (which can either be
+ * continuous, like audio, or event-based, like MIDI). Ports have buffers
+ * associated with them into which data can be written (if they are output
+ * ports) and from which data can be read (if they input ports). Ports can be
+ * connected together so that data written to an output port can be read from
+ * an input port. These connections can be 1:1, 1:N OR N:1. 
+ *
+ * Ports may be associated with software only, or with hardware.  Hardware
+ * related ports are often referred to as physical, and correspond to some
+ * relevant physical entity on a hardware device, such as an audio jack or a
+ * MIDI connector. Physical ports may be potentially asked to monitor their
+ * inputs, though some implementations may not support this.
+ *
+ * Most physical ports will also be considered "terminal", which means that
+ * data delivered there or read from there will go to or comes from a system
+ * outside of the PortEngine implementation's control (e.g. the analog domain
+ * for audio, or external MIDI devices for MIDI). Non-physical ports can also
+ * be considered "terminal". For example, the output port of a software
+ * synthesizer is a terminal port, because the data contained in its buffer
+ * does not and cannot be considered to come from any other port - it is
+ * synthesized by its owner.
+ *
+ * Ports also have latency associated with them. Each port has a playback
+ * latency and a capture latency:
+ *
+ * <b>capture latency</b>: how long since the data read from the buffer of a
+ *                  port arrived at at a terminal port.  The data will have
+ *                  come from the "outside world" if the terminal port is also
+ *                  physical, or will have been synthesized by the entity that
+ *                  owns the terminal port.
+ *                  
+ * <b>playback latency</b>: how long until the data written to the buffer of
+ *                   port will reach a terminal port.
+ *
+ *
+ * For more detailed questions about the PortEngine API, consult the JACK API
+ * documentation, on which this entire object is based.
+ */
+
+class PortEngine {
+  public:
+    PortEngine (PortManager& pm) : manager (pm) {}
+    virtual ~PortEngine() {}
+    
+    /** Return a private, type-free pointer to any data
+     * that might be useful to a concrete implementation
+     */
+    virtual void* private_handle() const = 0;
+
+    /* We use void* here so that the API can be defined for any implementation.
+     * 
+     * We could theoretically use a template (PortEngine<T>) and define
+     * PortHandle as T, but this complicates the desired inheritance
+     * pattern in which FooPortEngine handles things for the Foo API,
+     * rather than being a derivative of PortEngine<Foo>.
+    */
+       
+    typedef void* PortHandle;
+
+    /** Return the name of this process as used by the port manager
+     * when naming ports.
+     */
+    virtual const std::string& my_name() const = 0;
+ 
+    /** Return true if the underlying mechanism/API is still available
+     * for us to utilize. return false if some or all of the AudioBackend
+     * API can no longer be effectively used.
+     */
+    virtual bool available() const = 0;
+
+    /** Return the maximum size of a port name 
+     */
+    virtual uint32_t port_name_size() const = 0;
+
+    /** Returns zero if the port referred to by @param port was set to @param
+     * name. Return non-zero otherwise.
+     */
+    virtual int         set_port_name (PortHandle port, const std::string& name) = 0;
+    /** Return the name of the port referred to by @param port. If the port
+     * does not exist, return an empty string.
+     */
+    virtual std::string get_port_name (PortHandle) const = 0;
+    /** Return a reference to a port with the fullname @param name. Return
+     * a null pointer if no such port exists.
+     */
+    virtual PortHandle* get_port_by_name (const std::string&) const = 0;
+
+    /** Find the set of ports whose names, types and flags match
+     * specified values, place the names of each port into @param ports,
+     * and return the count of the number found.
+     *
+     * To avoid selecting by name, pass an empty string for @param
+     * port_name_pattern.
+     * 
+     * To avoid selecting by type, pass DataType::NIL as @param type.
+     * 
+     * To avoid selecting by flags, pass PortFlags (0) as @param flags.
+     */
+    virtual int get_ports (const std::string& port_name_pattern, DataType type, PortFlags flags, std::vector<std::string>& ports) const = 0;
+
+    /** Return the Ardour data type handled by the port referred to by @param
+     * port. Returns DataType::NIL if the port does not exist.
+     */
+    virtual DataType port_data_type (PortHandle port) const = 0;
+
+    /** Create a new port whose fullname will be the conjuction of my_name(),
+     * ":" and @param shortname. The port will handle data specified by @param
+     * type and will have the flags given by @param flags. If successfull,
+     * return a reference to the port, otherwise return a null pointer.
+    */
+    virtual PortHandle register_port (const std::string& shortname, ARDOUR::DataType type, ARDOUR::PortFlags flags) = 0;
+
+    /* Destroy the port referred to by @param port, including all resources
+     * associated with it. This will also disconnect @param port from any ports it
+     * is connected to.
+     */
+    virtual void       unregister_port (PortHandle) = 0;
+    
+    /* Connection management */
+
+    /** Ensure that data written to the port named by @param src will be
+     * readable from the port named by @param dst. Return zero on success,
+     * non-zero otherwise.
+    */
+    virtual int   connect (const std::string& src, const std::string& dst) = 0;
+
+    /** Remove any existing connection between the ports named by @param src and 
+     * @param dst. Return zero on success, non-zero otherwise.
+     */
+    virtual int   disconnect (const std::string& src, const std::string& dst) = 0;
+    
+    
+    /** Ensure that data written to the port referenced by @param portwill be
+     * readable from the port named by @param dst. Return zero on success,
+     * non-zero otherwise.
+    */
+    virtual int   connect (PortHandle src, const std::string& dst) = 0;
+    /** Remove any existing connection between the port referenced by @param src and 
+     * the port named @param dst. Return zero on success, non-zero otherwise.
+     */ 
+    virtual int   disconnect (PortHandle src, const std::string& dst) = 0;
+
+    /** Remove all connections between the port referred to by @param port and
+     * any other ports. Return zero on success, non-zero otherwise.
+     */
+    virtual int   disconnect_all (PortHandle port) = 0;
+
+    /** Return true if the port referred to by @param port has any connections
+     * to other ports. Return false otherwise.
+     */
+    virtual bool  connected (PortHandle port, bool process_callback_safe = true) = 0;
+    /** Return true if the port referred to by @param port is connected to
+     * the port named by @param name. Return false otherwise.
+     */
+    virtual bool  connected_to (PortHandle, const std::string& name, bool process_callback_safe = true) = 0;
+
+    /** Return true if the port referred to by @param port has any connections
+     * to ports marked with the PortFlag IsPhysical. Return false otherwise.
+     */
+    virtual bool  physically_connected (PortHandle port, bool process_callback_safe = true) = 0;
+
+    /** Place the names of all ports connected to the port named by @param
+     * ports into @param names, and return the number of connections.
+     */
+    virtual int   get_connections (PortHandle port, std::vector<std::string>& names, bool process_callback_safe = true) = 0;
+
+    /* MIDI */
+
+    /** Retrieve a MIDI event from the data at @param port_buffer. The event
+    number to be retrieved is given by @param event_index (a value of zero
+    indicates that the first event in the port_buffer should be retrieved).
+    * 
+    * The data associated with the event will be copied into the buffer at
+    * @param buf and the number of bytes written will be stored in @param
+    * size. The timestamp of the event (which is always relative to the start 
+    * of the current process cycle, in samples) will be stored in @param
+    * timestamp
+    */
+    virtual int      midi_event_get (pframes_t& timestamp, size_t& size, uint8_t** buf, void* port_buffer, uint32_t event_index) = 0;
+
+    /** Place a MIDI event consisting of @param size bytes copied from the data
+     * at @param buf into the port buffer referred to by @param
+     * port_buffer. The MIDI event will be marked with a time given by @param
+     * timestamp. Return zero on success, non-zero otherwise.
+     *
+     * Events  must be added monotonically to a port buffer. An attempt to 
+     * add a non-monotonic event (e.g. out-of-order) will cause this method
+     * to return a failure status.
+     */
+    virtual int      midi_event_put (void* port_buffer, pframes_t timestamp, const uint8_t* buffer, size_t size) = 0;
+
+    /** Return the number of MIDI events in the data at @param port_buffer
+     */
+    virtual uint32_t get_midi_event_count (void* port_buffer) = 0;
+
+    /** Clear the buffer at @param port_buffer of all MIDI events.
+     *
+     * After a call to this method, an immediate, subsequent call to
+     * get_midi_event_count() with the same @param port_buffer argument must
+     * return zero.
+    */
+    virtual void     midi_clear (void* port_buffer) = 0;
+
+    /* Monitoring */
+
+    /** Return true if the implementation can offer input monitoring.
+     *
+     * Input monitoring involves the (selective) routing of incoming data
+     * to an outgoing data stream, without the data being passed to the CPU.
+     *
+     * Only certain audio hardware can provide this, and only certain audio
+     * APIs can offer it.
+     */
+    virtual bool  can_monitor_input() const = 0;
+    /** Increment or decrement the number of requests to monitor the input 
+     * of the hardware channel represented by the port referred to by @param
+     * port.
+     *
+     * If the number of requests rises above zero, input monitoring will
+     * be enabled (if can_monitor_input() returns true for the implementation).
+     * 
+     * If the number of requests falls to zero, input monitoring will be
+     * disabled (if can_monitor_input() returns true for the implementation)
+     */
+    virtual int   request_input_monitoring (PortHandle port, bool yn) = 0;
+    /* Force input monitoring of the hardware channel represented by the port
+     * referred to by @param port to be on or off, depending on the true/false
+     * status of @param yn. The request count is ignored when using this
+     * method, so if this is called with yn set to false, input monitoring will
+     * be disabled regardless of the number of requests to enable it.
+    */
+    virtual int   ensure_input_monitoring (PortHandle port, bool yn) = 0;
+    /** Return true if input monitoring is enabled for the hardware channel
+     * represented by the port referred to by @param port. Return false
+     * otherwise.
+     */
+    virtual bool  monitoring_input (PortHandle port) = 0;
+
+    /* Latency management
+     */
+    
+    /** Set the latency range for the port referred to by @param port to @param
+     * r. The playback range will be set if @param for_playback is true,
+     * otherwise the capture range will be set.
+     */
+    virtual void          set_latency_range (PortHandle port, bool for_playback, LatencyRange r) = 0;
+    /** Return the latency range for the port referred to by @param port.
+     * The playback range will be returned if @param for_playback is true,
+     * otherwise the capture range will be returned.
+     */
+    virtual LatencyRange  get_latency_range (PortHandle port, bool for_playback) = 0;
+
+    /* Discovering physical ports */
+
+    /** Return true if the port referred to by @param port has the IsPhysical
+     * flag set. Return false otherwise.
+     */
+    virtual bool      port_is_physical (PortHandle port) const = 0;
+
+    /** Store into @param names the names of all ports with the IsOutput and
+     * IsPhysical flag set, that handle data of type @param type.
+     *
+     * This can be used to discover outputs associated with hardware devices.
+     */
+    virtual void      get_physical_outputs (DataType type, std::vector<std::string>& names) = 0;
+    /** Store into @param names the names of all ports with the IsInput and
+     * IsPhysical flags set, that handle data of type @param type.
+     *
+     * This can be used to discover inputs associated with hardware devices.
+     */
+    virtual void      get_physical_inputs (DataType type, std::vector<std::string>& names) = 0;
+    /** Return the total count (possibly mixed between different data types)
+	of the number of ports with the IsPhysical and IsOutput flags set.
+    */
+    virtual ChanCount n_physical_outputs () const = 0;
+    /** Return the total count (possibly mixed between different data types)
+	of the number of ports with the IsPhysical and IsInput flags set.
+    */
+    virtual ChanCount n_physical_inputs () const = 0;
+
+    /** Return the address of the memory area where data for the port can be
+     * written (if the port has the PortFlag IsOutput set) or read (if the port
+     * has the PortFlag IsInput set).
+     *
+     * The return value is untyped because buffers containing different data
+     * depending on the port type.
+     */
+    virtual void* get_buffer (PortHandle, pframes_t) = 0;
+
+    /* MIDI ports (the ones in libmidi++) need this to be able to correctly
+     * schedule MIDI events within their buffers. It is a bit odd that we
+     * expose this here, because it is also exposed by AudioBackend, but they
+     * only have access to a PortEngine object, not an AudioBackend.
+     * 
+     * Return the time according to the sample clock in use when the current 
+     * buffer process cycle began. 
+     *
+     * XXX to be removed after some more design cleanup. 
+     */
+    virtual pframes_t sample_time_at_cycle_start () = 0;
+
+  protected:
+    PortManager& manager;
+};
+
+}
+
+#endif /* __libardour_port_engine_h__ */
diff --git a/libs/ardour/ardour/port_manager.h b/libs/ardour/ardour/port_manager.h
new file mode 100644
index 0000000000..ba15142d83
--- /dev/null
+++ b/libs/ardour/ardour/port_manager.h
@@ -0,0 +1,170 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __libardour_port_manager_h__
+#define __libardour_port_manager_h__
+
+#include <vector>
+#include <string>
+#include <exception>
+#include <map>
+
+#include <stdint.h>
+
+#include <boost/shared_ptr.hpp>
+
+#include "pbd/rcu.h"
+
+#include "ardour/chan_count.h"
+#include "ardour/midiport_manager.h"
+#include "ardour/port.h"
+
+namespace ARDOUR {
+
+class PortEngine;
+class AudioBackend;
+
+class PortManager 
+{
+  public:
+    typedef std::map<std::string,boost::shared_ptr<Port> > Ports;
+    typedef std::list<boost::shared_ptr<Port> > PortList;
+    
+    PortManager ();
+    virtual ~PortManager() {}
+
+    PortEngine& port_engine();
+
+    uint32_t port_name_size() const;
+    std::string my_name() const;
+
+    /* Port registration */
+    
+    boost::shared_ptr<Port> register_input_port (DataType, const std::string& portname, bool async = false);
+    boost::shared_ptr<Port> register_output_port (DataType, const std::string& portname, bool async = false);
+    int unregister_port (boost::shared_ptr<Port>);
+    
+    /* Port connectivity */
+    
+    int  connect (const std::string& source, const std::string& destination);
+    int  disconnect (const std::string& source, const std::string& destination);
+    int  disconnect (boost::shared_ptr<Port>);
+    int  reestablish_ports ();
+    int  reconnect_ports ();
+
+    bool  connected (const std::string&);
+    bool  connected_to (const std::string&, const std::string&);
+    bool  physically_connected (const std::string&);
+    int   get_connections (const std::string&, std::vector<std::string>&);
+
+    /* Naming */
+
+    boost::shared_ptr<Port> get_port_by_name (const std::string &);
+    void                    port_renamed (const std::string&, const std::string&);
+    std::string             make_port_name_relative (const std::string& name) const;
+    std::string             make_port_name_non_relative (const std::string& name) const;
+    bool                    port_is_mine (const std::string& fullname) const;
+
+    /* other Port management */
+    
+    bool      port_is_physical (const std::string&) const;
+    void      get_physical_outputs (DataType type, std::vector<std::string>&);
+    void      get_physical_inputs (DataType type, std::vector<std::string>&);
+    ChanCount n_physical_outputs () const;
+    ChanCount n_physical_inputs () const;
+
+    int get_ports (const std::string& port_name_pattern, DataType type, PortFlags flags, std::vector<std::string>&);
+    int get_ports (DataType, PortList&);
+
+    void remove_all_ports ();
+    
+    /* per-Port monitoring */
+    
+    bool can_request_input_monitoring () const;
+    void request_input_monitoring (const std::string&, bool) const;
+    void ensure_input_monitoring (const std::string&, bool) const;
+    
+    class PortRegistrationFailure : public std::exception {
+      public:
+	PortRegistrationFailure (std::string const & why = "")
+		: reason (why) {}
+	
+	~PortRegistrationFailure () throw () {}
+	
+	const char *what() const throw () { return reason.c_str(); }
+	
+      private:
+	std::string reason;
+    };
+
+    /* the port engine will invoke these callbacks when the time is right */
+    
+    void registration_callback ();
+    int graph_order_callback ();
+    void connect_callback (const std::string&, const std::string&, bool connection);
+
+    bool port_remove_in_progress() const { return _port_remove_in_progress; }
+
+    /** Emitted if the backend notifies us of a graph order event */
+    PBD::Signal0<void> GraphReordered;
+
+    /** Emitted if a Port is registered or unregistered */
+    PBD::Signal0<void> PortRegisteredOrUnregistered;
+    
+    /** Emitted if a Port is connected or disconnected.
+     *  The Port parameters are the ports being connected / disconnected, or 0 if they are not known to Ardour.
+     *  The std::string parameters are the (long) port names.
+     *  The bool parameter is true if ports were connected, or false for disconnected.
+     */
+    PBD::Signal5<void, boost::weak_ptr<Port>, std::string, boost::weak_ptr<Port>, std::string, bool> PortConnectedOrDisconnected;
+
+  protected:
+    boost::shared_ptr<AudioBackend> _backend;
+    SerializedRCUManager<Ports> ports;
+    bool _port_remove_in_progress;
+
+    boost::shared_ptr<Port> register_port (DataType type, const std::string& portname, bool input, bool async = false);
+    void port_registration_failure (const std::string& portname);
+
+    /** List of ports to be used between ::cycle_start() and ::cycle_end()
+     */
+    boost::shared_ptr<Ports> _cycle_ports;
+
+    void fade_out (gain_t, gain_t, pframes_t);
+    void silence (pframes_t nframes);
+    void check_monitoring ();
+    /** Signal the start of an audio cycle.
+     * This MUST be called before any reading/writing for this cycle.
+     * Realtime safe.
+     */
+    void cycle_start (pframes_t nframes);
+	
+    /** Signal the end of an audio cycle.
+     * This signifies that the cycle began with @ref cycle_start has ended.
+     * This MUST be called at the end of each cycle.
+     * Realtime safe.
+     */
+    void cycle_end (pframes_t nframes);
+};
+
+
+	
+} // namespace
+
+#endif /* __libardour_port_manager_h__ */
diff --git a/libs/ardour/ardour/public_diskstream.h b/libs/ardour/ardour/public_diskstream.h
index da481a6dee..125e1a21ce 100644
--- a/libs/ardour/ardour/public_diskstream.h
+++ b/libs/ardour/ardour/public_diskstream.h
@@ -33,8 +33,8 @@ public:
 	virtual ~PublicDiskstream() {}
 
 	virtual boost::shared_ptr<Playlist> playlist () = 0;
-	virtual void request_jack_monitors_input (bool) = 0;
-	virtual void ensure_jack_monitors_input (bool) = 0;
+	virtual void request_input_monitoring (bool) = 0;
+	virtual void ensure_input_monitoring (bool) = 0;
 	virtual bool destructive () const = 0;
 	virtual std::list<boost::shared_ptr<Source> > & last_capture_sources () = 0;
 	virtual void set_capture_offset () = 0;
diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h
index ff1c5f035c..e2f68477a1 100644
--- a/libs/ardour/ardour/rc_configuration.h
+++ b/libs/ardour/ardour/rc_configuration.h
@@ -52,7 +52,6 @@ class RCConfiguration : public Configuration
 	XMLNode * instant_xml (const std::string& str);
 
 	XMLNode* control_protocol_state () { return _control_protocol_state; }
-	std::list<XMLNode*> midi_port_states () { return _midi_port_states; }
 
 	/* define accessor methods */
 
@@ -81,11 +80,6 @@ class RCConfiguration : public Configuration
 #undef  CONFIG_VARIABLE_SPECIAL
 
 	XMLNode* _control_protocol_state;
-
-	/** MIDI port nodes from the RC configuration.  We store them so that we can set their
-	    state once the audio engine and hence ports are up.
-	*/
-	std::list<XMLNode*> _midi_port_states;
 };
 
 /* XXX: rename this */
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index efe51e7b49..1d81473f1d 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -110,6 +110,8 @@ class IOProcessor;
 class ImportStatus;
 class MidiClockTicker;
 class MidiControlUI;
+class MidiPortManager;
+class MidiPort;
 class MidiRegion;
 class MidiSource;
 class MidiTrack;
@@ -381,9 +383,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	framecnt_t worst_track_latency ()  const { return _worst_track_latency; }
 	framecnt_t worst_playback_latency () const { return _worst_output_latency + _worst_track_latency; }
 
-#ifdef HAVE_JACK_SESSION
-	void jack_session_event (jack_session_event_t* event);
-#endif
 	int save_state (std::string snapshot_name, bool pending = false, bool switch_to_snapshot = false);
 	int restore_state (std::string snapshot_name);
 	int save_template (std::string template_name);
@@ -556,6 +555,11 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
 	int remove_last_capture ();
 
+        /** handlers should return 0 for "everything OK", and any other value for
+	 * "cannot setup audioengine".
+	 */
+        static PBD::Signal1<int,uint32_t> AudioEngineSetupRequired;
+
 	/** handlers should return -1 for "stop cleanup",
 	    0 for "yes, delete this playlist",
 	    1 for "no, don't delete this playlist".
@@ -813,8 +817,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	boost::shared_ptr<SessionPlaylists> playlists;
 
 	void send_mmc_locate (framepos_t);
-	int send_full_time_code (framepos_t);
-	void send_song_position_pointer (framepos_t);
+        void queue_full_time_code () { _send_timecode_update = true; }
+        void queue_song_position_pointer () { /* currently does nothing */ }
 
 	bool step_editing() const { return (_step_editors > 0); }
 
@@ -863,6 +867,27 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	boost::shared_ptr<IO> ltc_input_io() { return _ltc_input; }
 	boost::shared_ptr<IO> ltc_output_io() { return _ltc_output; }
 
+    MIDI::Port* midi_input_port () const;
+    MIDI::Port* midi_output_port () const;
+    MIDI::Port* mmc_output_port () const;
+    MIDI::Port* mmc_input_port () const;
+
+    boost::shared_ptr<MidiPort> midi_clock_output_port () const;
+    boost::shared_ptr<MidiPort> midi_clock_input_port () const;
+    boost::shared_ptr<MidiPort> mtc_output_port () const;
+    boost::shared_ptr<MidiPort> mtc_input_port () const;
+
+    MIDI::MachineControl& mmc() { return *_mmc; }
+
+        /* Callbacks specifically related to JACK, and called directly
+	 * from the JACK audio backend.
+         */
+
+#ifdef HAVE_JACK_SESSION
+	void jack_session_event (jack_session_event_t* event);
+#endif
+        void jack_timebase_callback (jack_transport_state_t, pframes_t, jack_position_t*, int);
+
   protected:
 	friend class AudioEngine;
 	void set_block_size (pframes_t nframes);
@@ -1046,7 +1071,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	boost::scoped_ptr<SessionDirectory> _session_dir;
 
 	void hookup_io ();
-	void when_engine_running ();
+        int when_engine_running ();
 	void graph_reordered ();
 
 	/** current snapshot name, without the .ardour suffix */
@@ -1112,8 +1137,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	void             auto_loop_changed (Location *);
 	void             auto_loop_declick_range (Location *, framepos_t &, framepos_t &);
 
-	void first_stage_init (std::string path, std::string snapshot_name);
-	int  second_stage_init ();
+	void pre_engine_init (std::string path);
+	int  post_engine_init ();
 	void remove_empty_sounds ();
 
 	void setup_midi_control ();
@@ -1216,7 +1241,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	framepos_t        ltc_timecode_offset;
 	bool              ltc_timecode_negative_offset;
 
-	jack_latency_range_t ltc_out_latency;
+	LatencyRange      ltc_out_latency;
 
 	void ltc_tx_initialize();
 	void ltc_tx_cleanup();
@@ -1261,6 +1286,13 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	void engine_halted ();
 	void xrun_recovery ();
 
+    /* These are synchronous and so can only be called from within the process
+     * cycle
+     */
+
+    int  send_full_time_code (framepos_t, pframes_t nframes);
+    void send_song_position_pointer (framepos_t);
+
 	TempoMap    *_tempo_map;
 	void          tempo_map_changed (const PBD::PropertyChange&);
 
@@ -1429,9 +1461,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 	 */
 	std::list<GQuark> _current_trans_quarks;
 
-	void jack_timebase_callback (jack_transport_state_t, pframes_t, jack_position_t*, int);
-	int  jack_sync_callback (jack_transport_state_t, jack_position_t*);
-	void reset_jack_connection (jack_client_t* jack);
+        int  backend_sync_callback (TransportState, framepos_t);
+
 	void process_rtop (SessionEvent*);
 
 	void  update_latency (bool playback);
@@ -1585,6 +1616,15 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
 
         void reconnect_ltc_input ();
         void reconnect_ltc_output ();
+
+    /* persistent, non-track related MIDI ports */
+    MidiPortManager* _midi_ports;
+    MIDI::MachineControl* _mmc;
+
+    void setup_ltc ();
+    void setup_click ();
+    void setup_bundles ();
+    int  ensure_engine (uint32_t desired_sample_rate);
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 9862824da9..c60acb1df7 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -40,14 +40,12 @@
 #define PLUSMINUS(A) ( ((A)<0) ? "-" : (((A)>0) ? "+" : "\u00B1") )
 #define LEADINGZERO(A) ( (A)<10 ? "   " : (A)<100 ? "  " : (A)<1000 ? " " : "" )
 
-namespace MIDI {
-	class Port;
-}
-
 namespace ARDOUR {
 
 class TempoMap;
 class Session;
+class AudioEngine;
+class MidiPort;
 
 /**
  * @class Slave
@@ -252,10 +250,10 @@ class TimecodeSlave : public Slave {
 
 class MTC_Slave : public TimecodeSlave {
   public:
-	MTC_Slave (Session&, MIDI::Port&);
+	MTC_Slave (Session&, MidiPort&);
 	~MTC_Slave ();
 
-	void rebind (MIDI::Port&);
+	void rebind (MidiPort&);
 	bool speed_and_position (double&, framepos_t&);
 
 	bool locked() const;
@@ -273,7 +271,7 @@ class MTC_Slave : public TimecodeSlave {
 
   private:
 	Session&    session;
-	MIDI::Port* port;
+	MidiPort*   port;
 	PBD::ScopedConnectionList port_connections;
 	PBD::ScopedConnection     config_connection;
 	bool        can_notify_on_unknown_rate;
@@ -354,7 +352,7 @@ public:
 	std::string approximate_current_delta() const;
 
   private:
-	void parse_ltc(const jack_nframes_t, const jack_default_audio_sample_t * const, const framecnt_t);
+	void parse_ltc(const pframes_t, const Sample* const, const framecnt_t);
 	void process_ltc(framepos_t const);
 	void init_engine_dll (framepos_t, int32_t);
 	bool detect_discontinuity(LTCFrameExt *, int, bool);
@@ -391,7 +389,7 @@ public:
 
 	PBD::ScopedConnectionList port_connections;
 	PBD::ScopedConnection     config_connection;
-	jack_latency_range_t      ltc_slave_latency;
+        LatencyRange  ltc_slave_latency;
 
 	/* DLL - chase LTC */
 	int    transport_direction;
@@ -404,13 +402,13 @@ public:
 
 class MIDIClock_Slave : public Slave {
   public:
-	MIDIClock_Slave (Session&, MIDI::Port&, int ppqn = 24);
+	MIDIClock_Slave (Session&, MidiPort&, int ppqn = 24);
 
 	/// Constructor for unit tests
 	MIDIClock_Slave (ISlaveSessionProxy* session_proxy = 0, int ppqn = 24);
 	~MIDIClock_Slave ();
 
-	void rebind (MIDI::Port&);
+	void rebind (MidiPort&);
 	bool speed_and_position (double&, framepos_t&);
 
 	bool locked() const;
@@ -426,7 +424,6 @@ class MIDIClock_Slave : public Slave {
 
   protected:
 	ISlaveSessionProxy* session;
-	MIDI::Port* port;
 	PBD::ScopedConnectionList port_connections;
 
 	/// pulses per quarter note for one MIDI clock frame (default 24)
@@ -492,7 +489,7 @@ class MIDIClock_Slave : public Slave {
 class JACK_Slave : public Slave
 {
   public:
-	JACK_Slave (jack_client_t*);
+	JACK_Slave (AudioEngine&);
 	~JACK_Slave ();
 
 	bool speed_and_position (double& speed, framepos_t& pos);
@@ -502,11 +499,10 @@ class JACK_Slave : public Slave
 	bool ok() const;
 	framecnt_t resolution () const { return 1; }
 	bool requires_seekahead () const { return false; }
-	void reset_client (jack_client_t* jack);
 	bool is_always_synced() const { return true; }
 
   private:
-	jack_client_t* jack;
+        AudioEngine& engine;
 	double speed;
 	bool _starting;
 };
diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h
index b6e5376c12..7f0d1987fc 100644
--- a/libs/ardour/ardour/ticker.h
+++ b/libs/ardour/ardour/ticker.h
@@ -27,17 +27,13 @@
 #include "ardour/session_handle.h"
 
 
-#ifndef TICKER_H_
-#define TICKER_H_
+#ifndef __libardour_ticker_h__
+#define __libardour_ticker_h__
 
-namespace MIDI {
-	class Port;
-}
-
-namespace ARDOUR
-{
+namespace ARDOUR {
 
 class Session;
+class MidiPort;
 
 class MidiClockTicker : public SessionHandlePtr, boost::noncopyable
 {
@@ -45,7 +41,7 @@ public:
 	MidiClockTicker ();
 	virtual ~MidiClockTicker();
 
-	void tick (const framepos_t& transport_frames);
+        void tick (const framepos_t& transport_frames, pframes_t nframes);
 
 	bool has_midi_port() const { return _midi_port != 0; }
 
@@ -58,9 +54,6 @@ public:
 	/// slot for the signal session::TransportStateChange
 	void transport_state_changed();
 
-	/// slot for the signal session::PositionChanged
-	void position_changed (framepos_t position);
-
 	/// slot for the signal session::TransportLooped
 	void transport_looped();
 
@@ -70,23 +63,25 @@ public:
 	/// pulses per quarter note (default 24)
 	void set_ppqn(int ppqn) { _ppqn = ppqn; }
 
-private:
-	MIDI::Port*  _midi_port;
-	int          _ppqn;
-	double       _last_tick;
-
-	class Position;
-	boost::scoped_ptr<Position> _pos;
-
-	double one_ppqn_in_frames (framepos_t transport_position);
-
-	void send_midi_clock_event (pframes_t offset);
-	void send_start_event (pframes_t offset);
-	void send_continue_event (pframes_t offset);
-	void send_stop_event (pframes_t offset);
-	void send_position_event (uint32_t midi_clocks, pframes_t offset);
+  private:
+    boost::shared_ptr<MidiPort> _midi_port;
+    int        _ppqn;
+    double     _last_tick;
+    bool       _send_pos;
+    bool       _send_state;
+
+    class Position;
+    boost::scoped_ptr<Position> _pos;
+    
+    double one_ppqn_in_frames (framepos_t transport_position);
+
+    void send_midi_clock_event (pframes_t offset, pframes_t nframes);
+    void send_start_event (pframes_t offset, pframes_t nframes);
+    void send_continue_event (pframes_t offset, pframes_t nframes);
+    void send_stop_event (pframes_t offset, pframes_t nframes);
+    void send_position_event (uint32_t midi_clocks, pframes_t offset, pframes_t nframes);
 };
-
 }
+ // namespace 
 
-#endif /* TICKER_H_ */
+#endif /* __libardour_ticker_h__ */
diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h
index 7159261b51..bdf420763b 100644
--- a/libs/ardour/ardour/track.h
+++ b/libs/ardour/ardour/track.h
@@ -115,8 +115,8 @@ class Track : public Route, public PublicDiskstream
 
 	/* PublicDiskstream interface */
 	boost::shared_ptr<Playlist> playlist ();
-	void request_jack_monitors_input (bool);
-	void ensure_jack_monitors_input (bool);
+	void request_input_monitoring (bool);
+	void ensure_input_monitoring (bool);
 	bool destructive () const;
 	std::list<boost::shared_ptr<Source> > & last_capture_sources ();
 	void set_capture_offset ();
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 2115149872..f2319d7669 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -26,10 +26,9 @@
 #include <boost/shared_ptr.hpp>
 #include <sys/types.h>
 #include <stdint.h>
+#include <pthread.h>
 
 #include <inttypes.h>
-#include <jack/types.h>
-#include <jack/midiport.h>
 
 #include "timecode/bbt_time.h"
 #include "timecode/time.h"
@@ -53,12 +52,12 @@ namespace ARDOUR {
 	class Route;
 	class Region;
 
-	typedef jack_default_audio_sample_t Sample;
-	typedef float                       pan_t;
-	typedef float                       gain_t;
-	typedef uint32_t                    layer_t;
-	typedef uint64_t                    microseconds_t;
-	typedef jack_nframes_t              pframes_t;
+	typedef float    Sample;
+	typedef float    pan_t;
+	typedef float    gain_t;
+	typedef uint32_t layer_t;
+	typedef uint64_t microseconds_t;
+	typedef uint32_t pframes_t;
 
 	/* Any position measured in audio frames.
 	   Assumed to be non-negative but not enforced.
@@ -585,6 +584,42 @@ namespace ARDOUR {
 		FadeSymmetric,
 	};
 
+	enum TransportState {
+		/* these values happen to match the constants used by JACK but
+		   this equality cannot be assumed.
+		*/
+		TransportStopped = 0,
+		TransportRolling = 1, 
+		TransportLooping = 2, 
+		TransportStarting = 3,
+	};
+
+	enum PortFlags {
+		/* these values happen to match the constants used by JACK but
+		   this equality cannot be assumed.
+		*/
+		IsInput = 0x1, 
+		IsOutput = 0x2,
+		IsPhysical = 0x4,
+		CanMonitor = 0x8,
+		IsTerminal = 0x10
+	};
+
+	struct LatencyRange {
+	    uint32_t min; //< samples
+	    uint32_t max; //< samples
+	};
+
+/* PLATFORM SPECIFIC #ifdef's here */
+
+	/** Define the native thread type used on the platform */
+	typedef pthread_t AudioBackendNativeThread;
+	static inline bool self_thread_equal (AudioBackendNativeThread thr) {
+		return pthread_equal (thr, pthread_self());
+	}
+
+/* PLATFORM SPECIFIC #endif's here */
+
 } // namespace ARDOUR
 
 
diff --git a/libs/ardour/ardour/visibility.h b/libs/ardour/ardour/visibility.h
new file mode 100644
index 0000000000..09287b877d
--- /dev/null
+++ b/libs/ardour/ardour/visibility.h
@@ -0,0 +1,44 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __libardour_visibility_h__
+#define __libardour_visibility_h__
+
+/* _WIN32 is defined by most compilers targetting Windows, but within the
+ * ardour source tree, we also define COMPILER_MSVC or COMPILER_MINGW depending
+ * on how a Windows build is built.
+ */
+
+#if defined _WIN32 || defined __CYGWIN__ || defined(COMPILER_MSVC) || defined(COMPILER_MINGW)
+  #define LIBARDOUR_HELPER_DLL_IMPORT __declspec(dllimport)
+  #define LIBARDOUR_HELPER_DLL_EXPORT __declspec(dllexport)
+  #define LIBARDOUR_HELPER_DLL_LOCAL
+#else
+  #if __GNUC__ >= 4
+    #define LIBARDOUR_HELPER_DLL_IMPORT __attribute__ ((visibility ("default")))
+    #define LIBARDOUR_HELPER_DLL_EXPORT __attribute__ ((visibility ("default")))
+    #define LIBARDOUR_HELPER_DLL_LOCAL  __attribute__ ((visibility ("hidden")))
+  #else
+    #define LIBARDOUR_HELPER_DLL_IMPORT
+    #define LIBARDOUR_HELPER_DLL_EXPORT
+    #define LIBARDOUR_HELPER_DLL_LOCAL
+  #endif
+#endif
+
+#endif /* __libardour_visibility_h__ */
diff --git a/libs/ardour/async_midi_port.cc b/libs/ardour/async_midi_port.cc
new file mode 100644
index 0000000000..5bc8e22833
--- /dev/null
+++ b/libs/ardour/async_midi_port.cc
@@ -0,0 +1,303 @@
+/*
+    Copyright (C) 1998 Paul Barton-Davis
+    
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    $Id$
+*/
+
+#include <iostream>
+
+#include "pbd/error.h"
+#include "pbd/stacktrace.h"
+
+#include "midi++/types.h"
+
+#include "ardour/async_midi_port.h"
+#include "ardour/audioengine.h"
+#include "ardour/midi_buffer.h"
+
+using namespace MIDI;
+using namespace ARDOUR;
+using namespace std;
+using namespace PBD;
+
+namespace Evoral {
+	template class EventRingBuffer<timestamp_t>;
+}
+
+pthread_t AsyncMIDIPort::_process_thread;
+
+#define port_engine AudioEngine::instance()->port_engine()
+
+AsyncMIDIPort::AsyncMIDIPort (string const & name, PortFlags flags)
+	: MidiPort (name, flags)
+	, MIDI::Port (name, MIDI::Port::Flags (0))
+	, _currently_in_cycle (false)
+	, _last_write_timestamp (0)
+	, output_fifo (512)
+	, input_fifo (1024)
+	, xthread (true)
+{
+}
+
+AsyncMIDIPort::~AsyncMIDIPort ()
+{
+}
+
+void
+AsyncMIDIPort::flush_output_fifo (pframes_t nframes)
+{
+	RingBuffer< Evoral::Event<double> >::rw_vector vec = { { 0, 0 }, { 0, 0 } };
+	size_t written;
+
+	output_fifo.get_read_vector (&vec);
+
+	MidiBuffer& mb (get_midi_buffer (nframes));
+			
+	if (vec.len[0]) {
+		Evoral::Event<double>* evp = vec.buf[0];
+		
+		for (size_t n = 0; n < vec.len[0]; ++n, ++evp) {
+			mb.push_back (evp->time(), evp->size(), evp->buffer());
+		}
+	}
+	
+	if (vec.len[1]) {
+		Evoral::Event<double>* evp = vec.buf[1];
+
+		for (size_t n = 0; n < vec.len[1]; ++n, ++evp) {
+			mb.push_back (evp->time(), evp->size(), evp->buffer());
+		}
+	}
+	
+	if ((written = vec.len[0] + vec.len[1]) != 0) {
+		output_fifo.increment_read_idx (written);
+	}
+}
+
+void
+AsyncMIDIPort::cycle_start (pframes_t nframes)
+{
+	_currently_in_cycle = true;
+	MidiPort::cycle_start (nframes);
+
+	/* dump anything waiting in the output FIFO at the start of the port
+	 * buffer
+	 */
+
+	if (ARDOUR::Port::sends_output()) {
+		flush_output_fifo (nframes);
+	} 
+	
+	/* copy incoming data from the port buffer into the input FIFO
+	   and if necessary wakeup the reader
+	*/
+
+	if (ARDOUR::Port::receives_input()) {
+		MidiBuffer& mb (get_midi_buffer (nframes));
+		pframes_t when = AudioEngine::instance()->sample_time_at_cycle_start();
+
+		for (MidiBuffer::iterator b = mb.begin(); b != mb.end(); ++b) {
+			input_fifo.write (when, (Evoral::EventType) 0, (*b).size(), (*b).buffer());
+		}
+		
+		if (!mb.empty()) {
+			xthread.wakeup ();
+		}
+	}
+
+}
+
+void
+AsyncMIDIPort::cycle_end (pframes_t nframes)
+{
+	if (ARDOUR::Port::sends_output()) {
+		/* move any additional data from output FIFO into the port
+		   buffer.
+		*/
+		flush_output_fifo (nframes);
+	}
+
+	MidiPort::cycle_end (nframes);
+
+	_currently_in_cycle = false;
+}
+
+/** wait for the output FIFO to be emptied by successive process() callbacks.
+ *
+ * Cannot be called from a processing thread.
+ */
+void
+AsyncMIDIPort::drain (int check_interval_usecs)
+{
+	RingBuffer< Evoral::Event<double> >::rw_vector vec = { { 0, 0 }, { 0, 0} };
+
+	if (!AudioEngine::instance()->running() || AudioEngine::instance()->session() == 0) {
+		/* no more process calls - it will never drain */
+		return;
+	}
+
+
+	if (is_process_thread()) {
+		error << "Process thread called MIDI::AsyncMIDIPort::drain() - this cannot work" << endmsg;
+		return;
+	}
+
+	while (1) {
+		output_fifo.get_write_vector (&vec);
+		if (vec.len[0] + vec.len[1] >= output_fifo.bufsize() - 1) {
+			break;
+		}
+		usleep (check_interval_usecs);
+	}
+}
+
+int
+AsyncMIDIPort::write (const byte * msg, size_t msglen, timestamp_t timestamp)
+{
+	int ret = 0;
+
+	if (!ARDOUR::Port::sends_output()) {
+		return ret;
+	}
+
+	if (!is_process_thread()) {
+
+		/* this is the best estimate of "when" this MIDI data is being
+		 * delivered
+		 */
+		
+		_parser->set_timestamp (AudioEngine::instance()->sample_time() + timestamp);
+		for (size_t n = 0; n < msglen; ++n) {
+			_parser->scanner (msg[n]);
+		}
+
+		Glib::Threads::Mutex::Lock lm (output_fifo_lock);
+		RingBuffer< Evoral::Event<double> >::rw_vector vec = { { 0, 0 }, { 0, 0} };
+		
+		output_fifo.get_write_vector (&vec);
+
+		if (vec.len[0] + vec.len[1] < 1) {
+			error << "no space in FIFO for non-process thread MIDI write" << endmsg;
+			return 0;
+		}
+
+		if (vec.len[0]) {
+                        if (!vec.buf[0]->owns_buffer()) {
+                                vec.buf[0]->set_buffer (0, 0, true);
+                        }
+			vec.buf[0]->set (msg, msglen, timestamp);
+		} else {
+                        if (!vec.buf[1]->owns_buffer()) {
+                                vec.buf[1]->set_buffer (0, 0, true);
+                        }
+			vec.buf[1]->set (msg, msglen, timestamp);
+		}
+
+		output_fifo.increment_write_idx (1);
+		
+		ret = msglen;
+
+	} else {
+
+		_parser->set_timestamp (AudioEngine::instance()->sample_time_at_cycle_start() + timestamp);
+		for (size_t n = 0; n < msglen; ++n) {
+			_parser->scanner (msg[n]);
+		}
+
+		if (timestamp >= _cycle_nframes) {
+			std::cerr << "attempting to write MIDI event of " << msglen << " bytes at time "
+				  << timestamp << " of " << _cycle_nframes
+				  << " (this will not work - needs a code fix)"
+				  << std::endl;
+		}
+
+		/* This is the process thread, which makes checking
+		 * _currently_in_cycle atomic and safe, since it is only
+		 * set from cycle_start() and cycle_end(), also called
+		 * only from the process thread.
+		 */
+
+		if (_currently_in_cycle) {
+
+			MidiBuffer& mb (get_midi_buffer (_cycle_nframes));
+			
+			if (timestamp == 0) {
+				timestamp = _last_write_timestamp;
+			} 
+			
+			if (mb.push_back (timestamp, msglen, msg)) {
+				ret = msglen;
+				_last_write_timestamp = timestamp;
+
+			} else {
+				cerr << "AsyncMIDIPort (" << ARDOUR::Port::name() << "): write of " << msglen << " @ " << timestamp << " failed\n" << endl;
+				PBD::stacktrace (cerr, 20);
+				ret = 0;
+			}
+		} else {
+			cerr << "write to JACK midi port failed: not currently in a process cycle." << endl;
+			PBD::stacktrace (cerr, 20);
+		}
+	}
+
+	return ret;
+}
+
+
+int
+AsyncMIDIPort::read (MIDI::byte *, size_t)
+{
+	if (!ARDOUR::Port::receives_input()) {
+		return 0;
+	}
+	
+	timestamp_t time;
+	Evoral::EventType type;
+	uint32_t size;
+	byte buffer[input_fifo.capacity()];
+
+	while (input_fifo.read (&time, &type, &size, buffer)) {
+		_parser->set_timestamp (time);
+		for (uint32_t i = 0; i < size; ++i) {
+			_parser->scanner (buffer[i]);
+		}
+	}
+
+	return 0;
+}
+
+void
+AsyncMIDIPort::parse (framecnt_t)
+{
+	MIDI::byte buf[1];
+
+	/* see ::read() to realize why buf is not used */
+	read (buf, sizeof (buf));
+}
+
+void
+AsyncMIDIPort::set_process_thread (pthread_t thr)
+{
+	_process_thread = thr;
+}
+
+bool
+AsyncMIDIPort::is_process_thread()
+{
+	return pthread_equal (pthread_self(), _process_thread);
+}
+
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index b9ce987c87..a9f9f40d64 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -925,7 +925,7 @@ AudioDiskstream::internal_playback_seek (framecnt_t distance)
 	boost::shared_ptr<ChannelList> c = channels.reader();
 
 	for (chan = c->begin(); chan != c->end(); ++chan) {
-		(*chan)->playback_buf->increment_read_ptr (llabs(distance));
+		(*chan)->playback_buf->increment_read_ptr (std::llabs(distance));
 	}
 
 	if (first_recordable_frame < max_framepos) {
@@ -1754,7 +1754,7 @@ AudioDiskstream::prep_record_enable ()
 	if (Config->get_monitoring_model() == HardwareMonitoring) {
 
 		for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
-			(*chan)->source.request_jack_monitors_input (!(_session.config.get_auto_input() && rolling));
+			(*chan)->source.request_input_monitoring (!(_session.config.get_auto_input() && rolling));
 			capturing_sources.push_back ((*chan)->write_source);
 			(*chan)->write_source->mark_streaming_write_started ();
 		}
@@ -1775,7 +1775,7 @@ AudioDiskstream::prep_record_disable ()
 	boost::shared_ptr<ChannelList> c = channels.reader();
 	if (Config->get_monitoring_model() == HardwareMonitoring) {
 		for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
-			(*chan)->source.request_jack_monitors_input (false);
+			(*chan)->source.request_input_monitoring (false);
 		}
 	}
 	capturing_sources.clear ();
@@ -2041,12 +2041,12 @@ AudioDiskstream::allocate_temporary_buffers ()
 }
 
 void
-AudioDiskstream::request_jack_monitors_input (bool yn)
+AudioDiskstream::request_input_monitoring (bool yn)
 {
 	boost::shared_ptr<ChannelList> c = channels.reader();
 
 	for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
-		(*chan)->source.request_jack_monitors_input (yn);
+		(*chan)->source.request_input_monitoring (yn);
 	}
 }
 
@@ -2369,13 +2369,13 @@ AudioDiskstream::ChannelSource::is_physical () const
 }
 
 void
-AudioDiskstream::ChannelSource::request_jack_monitors_input (bool yn) const
+AudioDiskstream::ChannelSource::request_input_monitoring (bool yn) const
 {
 	if (name.empty()) {
 		return;
 	}
 
-	return AudioEngine::instance()->request_jack_monitors_input (name, yn);
+	return AudioEngine::instance()->request_input_monitoring (name, yn);
 }
 
 AudioDiskstream::ChannelInfo::ChannelInfo (framecnt_t playback_bufsize, framecnt_t capture_bufsize, framecnt_t speed_size, framecnt_t wrap_size)
diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc
index 240224ea5e..6a86360b69 100644
--- a/libs/ardour/audio_port.cc
+++ b/libs/ardour/audio_port.cc
@@ -21,13 +21,17 @@
 #include "pbd/stacktrace.h"
 
 #include "ardour/audio_buffer.h"
+#include "ardour/audioengine.h"
 #include "ardour/audio_port.h"
 #include "ardour/data_type.h"
+#include "ardour/port_engine.h"
 
 using namespace ARDOUR;
 using namespace std;
 
-AudioPort::AudioPort (const std::string& name, Flags flags)
+#define port_engine AudioEngine::instance()->port_engine()
+
+AudioPort::AudioPort (const std::string& name, PortFlags flags)
 	: Port (name, DataType::AUDIO, flags)
 	, _buffer (new AudioBuffer (0))
 {
@@ -73,7 +77,7 @@ AudioBuffer&
 AudioPort::get_audio_buffer (pframes_t nframes)
 {
 	/* caller must hold process lock */
-	_buffer->set_data ((Sample *) jack_port_get_buffer (_jack_port, _cycle_nframes) +
+	_buffer->set_data ((Sample *) port_engine.get_buffer (_port_handle, _cycle_nframes) +
 			   _global_port_buffer_offset + _port_buffer_offset, nframes);
 	return *_buffer;
 }
@@ -82,7 +86,7 @@ Sample*
 AudioPort::engine_get_whole_audio_buffer ()
 {
 	/* caller must hold process lock */
-	return (Sample *) jack_port_get_buffer (_jack_port, _cycle_nframes);
+	return (Sample *) port_engine.get_buffer (_port_handle, _cycle_nframes);
 }
 
 
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 0530dbfce9..7f77f637a3 100644
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -96,7 +96,7 @@ AudioTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
 	}
 
 	_diskstream->set_record_enabled (false);
-	_diskstream->request_jack_monitors_input (false);
+	_diskstream->request_input_monitoring (false);
 
 	DiskstreamChanged (); /* EMIT SIGNAL */
 }
@@ -315,7 +315,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 	if (!lm.locked()) {
 		boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
 		framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
-		if (can_internal_playback_seek(llabs(playback_distance))) {
+		if (can_internal_playback_seek(std::llabs(playback_distance))) {
 			/* TODO should declick */
 			internal_playback_seek(playback_distance);
 		}
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 08de54960c..567f3c7671 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -25,26 +25,32 @@
 #include <sstream>
 
 #include <glibmm/timer.h>
+#include <glibmm/pattern.h>
+#include <glibmm/module.h>
 
+#include "pbd/epa.h"
+#include "pbd/file_utils.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/stacktrace.h"
 #include "pbd/unknown_type.h"
-#include "pbd/epa.h"
 
 #include <jack/weakjack.h>
 
 #include "midi++/port.h"
-#include "midi++/jack_midi_port.h"
 #include "midi++/mmc.h"
-#include "midi++/manager.h"
 
+#include "ardour/async_midi_port.h"
 #include "ardour/audio_port.h"
+#include "ardour/audio_backend.h"
 #include "ardour/audioengine.h"
+#include "ardour/backend_search_path.h"
 #include "ardour/buffer.h"
 #include "ardour/cycle_timer.h"
 #include "ardour/internal_send.h"
 #include "ardour/meter.h"
 #include "ardour/midi_port.h"
+#include "ardour/midiport_manager.h"
+#include "ardour/mtdm.h"
 #include "ardour/port.h"
 #include "ardour/process_thread.h"
 #include "ardour/session.h"
@@ -58,60 +64,51 @@ using namespace PBD;
 gint AudioEngine::m_meter_exit;
 AudioEngine* AudioEngine::_instance = 0;
 
-#define GET_PRIVATE_JACK_POINTER(j)  jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return; }
-#define GET_PRIVATE_JACK_POINTER_RET(j,r) jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return r; }
-
-AudioEngine::AudioEngine (string client_name, string session_uuid)
-	: _jack (0)
-	, session_remove_pending (false)
+AudioEngine::AudioEngine ()
+	: session_remove_pending (false)
 	, session_removal_countdown (-1)
 	, _running (false)
-	, _has_run (false)
-	, _buffer_size (0)
-	, _frame_rate (0)
+	, _freewheeling (false)
 	, monitor_check_interval (INT32_MAX)
 	, last_monitor_check (0)
 	, _processed_frames (0)
-	, _freewheeling (false)
-	, _pre_freewheel_mmc_enabled (false)
-	, _usecs_per_cycle (0)
-	, port_remove_in_progress (false)
 	, m_meter_thread (0)
 	, _main_thread (0)
-	, ports (new Ports)
+	, _mtdm (0)
+	, _measuring_latency (false)
+	, _latency_input_port (0)
+	, _latency_output_port (0)
+	, _latency_flush_frames (0)
+	, _latency_signal_latency (0)
+	, _started_for_latency (false)
 {
-	_instance = this; /* singleton */
-
 	g_atomic_int_set (&m_meter_exit, 0);
-
-	if (connect_to_jack (client_name, session_uuid)) {
-		throw NoBackendAvailable ();
-	}
-
-	Port::set_engine (this);
+	discover_backends ();
 }
 
 AudioEngine::~AudioEngine ()
 {
+	drop_backend ();
+
 	config_connection.disconnect ();
 
 	{
 		Glib::Threads::Mutex::Lock tm (_process_lock);
 		session_removed.signal ();
-
-		if (_running) {
-			jack_client_close (_jack);
-			_jack = 0;
-		}
-
 		stop_metering_thread ();
 	}
 }
 
-jack_client_t*
-AudioEngine::jack() const
+AudioEngine*
+AudioEngine::create ()
 {
-	return _jack;
+	if (_instance) {
+		return _instance;
+	}
+
+	_instance = new AudioEngine ();
+	
+	return _instance;
 }
 
 void
@@ -128,290 +125,7 @@ _thread_init_callback (void * /*arg*/)
 
 	SessionEvent::create_per_thread_pool (X_("Audioengine"), 512);
 
-	MIDI::JackMIDIPort::set_process_thread (pthread_self());
-}
-
-static void
-ardour_jack_error (const char* msg)
-{
-	error << "JACK: " << msg << endmsg;
-}
-
-void
-AudioEngine::set_jack_callbacks ()
-{
-	GET_PRIVATE_JACK_POINTER (_jack);
-
-        if (jack_on_info_shutdown) {
-                jack_on_info_shutdown (_priv_jack, halted_info, this);
-        } else {
-                jack_on_shutdown (_priv_jack, halted, this);
-        }
-
-        jack_set_thread_init_callback (_priv_jack, _thread_init_callback, this);
-        jack_set_process_thread (_priv_jack, _process_thread, this);
-        jack_set_sample_rate_callback (_priv_jack, _sample_rate_callback, this);
-        jack_set_buffer_size_callback (_priv_jack, _bufsize_callback, this);
-        jack_set_graph_order_callback (_priv_jack, _graph_order_callback, this);
-        jack_set_port_registration_callback (_priv_jack, _registration_callback, this);
-        jack_set_port_connect_callback (_priv_jack, _connect_callback, this);
-        jack_set_xrun_callback (_priv_jack, _xrun_callback, this);
-        jack_set_sync_callback (_priv_jack, _jack_sync_callback, this);
-        jack_set_freewheel_callback (_priv_jack, _freewheel_callback, this);
-
-        if (_session && _session->config.get_jack_time_master()) {
-                jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
-        }
-
-#ifdef HAVE_JACK_SESSION
-        if( jack_set_session_callback)
-                jack_set_session_callback (_priv_jack, _session_callback, this);
-#endif
-
-        if (jack_set_latency_callback) {
-                jack_set_latency_callback (_priv_jack, _latency_callback, this);
-        }
-
-        jack_set_error_function (ardour_jack_error);
-}
-
-int
-AudioEngine::start ()
-{
-	GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
-
-	if (!_running) {
-
-                if (!jack_port_type_get_buffer_size) {
-                        warning << _("This version of JACK is old - you should upgrade to a newer version that supports jack_port_type_get_buffer_size()") << endmsg;
-		}
-
-		if (_session) {
-			BootMessage (_("Connect session to engine"));
-			_session->set_frame_rate (jack_get_sample_rate (_priv_jack));
-		}
-
-                /* a proxy for whether jack_activate() will definitely call the buffer size
-                 * callback. with older versions of JACK, this function symbol will be null.
-                 * this is reliable, but not clean.
-                 */
-
-                if (!jack_port_type_get_buffer_size) {
-			jack_bufsize_callback (jack_get_buffer_size (_priv_jack));
-                }
-		
-		_processed_frames = 0;
-		last_monitor_check = 0;
-
-                set_jack_callbacks ();
-
-		if (jack_activate (_priv_jack) == 0) {
-			_running = true;
-			_has_run = true;
-			Running(); /* EMIT SIGNAL */
-		} else {
-			// error << _("cannot activate JACK client") << endmsg;
-		}
-	}
-		
-	return _running ? 0 : -1;
-}
-
-int
-AudioEngine::stop (bool forever)
-{
-	GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
-
-	if (_priv_jack) {
-		if (forever) {
-			disconnect_from_jack ();
-		} else {
-			jack_deactivate (_priv_jack);
-			MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
-			Stopped(); /* EMIT SIGNAL */
-		}
-	}
-
-        if (forever) {
-                stop_metering_thread ();
-        }
-
-	return _running ? -1 : 0;
-}
-
-
-bool
-AudioEngine::get_sync_offset (pframes_t& offset) const
-{
-
-#ifdef HAVE_JACK_VIDEO_SUPPORT
-
-	GET_PRIVATE_JACK_POINTER_RET (_jack, false);
-
-	jack_position_t pos;
-
-	if (_priv_jack) {
-		(void) jack_transport_query (_priv_jack, &pos);
-
-		if (pos.valid & JackVideoFrameOffset) {
-			offset = pos.video_offset;
-			return true;
-		}
-	}
-#else
-	/* keep gcc happy */
-	offset = 0;
-#endif
-
-	return false;
-}
-
-void
-AudioEngine::_jack_timebase_callback (jack_transport_state_t state, pframes_t nframes,
-				      jack_position_t* pos, int new_position, void *arg)
-{
-	static_cast<AudioEngine*> (arg)->jack_timebase_callback (state, nframes, pos, new_position);
-}
-
-void
-AudioEngine::jack_timebase_callback (jack_transport_state_t state, pframes_t nframes,
-				     jack_position_t* pos, int new_position)
-{
-	if (_jack && _session && _session->synced_to_jack()) {
-		_session->jack_timebase_callback (state, nframes, pos, new_position);
-	}
-}
-
-int
-AudioEngine::_jack_sync_callback (jack_transport_state_t state, jack_position_t* pos, void* arg)
-{
-	return static_cast<AudioEngine*> (arg)->jack_sync_callback (state, pos);
-}
-
-int
-AudioEngine::jack_sync_callback (jack_transport_state_t state, jack_position_t* pos)
-{
-	if (_jack && _session) {
-		return _session->jack_sync_callback (state, pos);
-	}
-
-	return true;
-}
-
-int
-AudioEngine::_xrun_callback (void *arg)
-{
-	AudioEngine* ae = static_cast<AudioEngine*> (arg);
-	if (ae->connected()) {
-		ae->Xrun (); /* EMIT SIGNAL */
-	}
-	return 0;
-}
-
-#ifdef HAVE_JACK_SESSION
-void
-AudioEngine::_session_callback (jack_session_event_t *event, void *arg)
-{
-	AudioEngine* ae = static_cast<AudioEngine*> (arg);
-	if (ae->connected()) {
-		ae->JackSessionEvent ( event ); /* EMIT SIGNAL */
-	}
-}
-#endif
-
-int
-AudioEngine::_graph_order_callback (void *arg)
-{
-	AudioEngine* ae = static_cast<AudioEngine*> (arg);
-
-	if (ae->connected() && !ae->port_remove_in_progress) {
-		ae->GraphReordered (); /* EMIT SIGNAL */
-	}
-	
-	return 0;
-}
-
-void*
-AudioEngine::_process_thread (void *arg)
-{
-	return static_cast<AudioEngine *> (arg)->process_thread ();
-}
-
-void
-AudioEngine::_freewheel_callback (int onoff, void *arg)
-{
-	static_cast<AudioEngine*>(arg)->freewheel_callback (onoff);
-}
-
-void
-AudioEngine::freewheel_callback (int onoff)
-{
-	_freewheeling = onoff;
-
-	if (onoff) {
-		_pre_freewheel_mmc_enabled = MIDI::Manager::instance()->mmc()->send_enabled ();
-		MIDI::Manager::instance()->mmc()->enable_send (false);
-	} else {
-		MIDI::Manager::instance()->mmc()->enable_send (_pre_freewheel_mmc_enabled);
-	}
-}
-
-void
-AudioEngine::_registration_callback (jack_port_id_t /*id*/, int /*reg*/, void* arg)
-{
-	AudioEngine* ae = static_cast<AudioEngine*> (arg);
-
-	if (!ae->port_remove_in_progress) {
-		ae->PortRegisteredOrUnregistered (); /* EMIT SIGNAL */
-	}
-}
-
-void
-AudioEngine::_latency_callback (jack_latency_callback_mode_t mode, void* arg)
-{
-	return static_cast<AudioEngine *> (arg)->jack_latency_callback (mode);
-}
-
-void
-AudioEngine::_connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn, void* arg)
-{
-	AudioEngine* ae = static_cast<AudioEngine*> (arg);
-	ae->connect_callback (id_a, id_b, conn);
-}
-
-void
-AudioEngine::connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn)
-{
-	if (port_remove_in_progress) {
-		return;
-	}
-
-	GET_PRIVATE_JACK_POINTER (_jack);
-
-	jack_port_t* jack_port_a = jack_port_by_id (_priv_jack, id_a);
-	jack_port_t* jack_port_b = jack_port_by_id (_priv_jack, id_b);
-
-	boost::shared_ptr<Port> port_a;
-	boost::shared_ptr<Port> port_b;
-	Ports::iterator x;
-	boost::shared_ptr<Ports> pr = ports.reader ();
-
-
-	x = pr->find (make_port_name_relative (jack_port_name (jack_port_a)));
-	if (x != pr->end()) {
-		port_a = x->second;
-	}
-
-	x = pr->find (make_port_name_relative (jack_port_name (jack_port_b)));
-	if (x != pr->end()) {
-		port_b = x->second;
-	}
-
-	PortConnectedOrDisconnected (
-		port_a, jack_port_name (jack_port_a),
-		port_b, jack_port_name (jack_port_b),
-		conn == 0 ? false : true
-		); /* EMIT SIGNAL */
+	AsyncMIDIPort::set_process_thread (pthread_self());
 }
 
 void
@@ -430,29 +144,32 @@ AudioEngine::split_cycle (pframes_t offset)
 	}
 }
 
-void*
-AudioEngine::process_thread ()
+int
+AudioEngine::sample_rate_change (pframes_t nframes)
 {
-        /* JACK doesn't do this for us when we use the wait API
-         */
-
-        _thread_init_callback (0);
+	/* check for monitor input change every 1/10th of second */
 
-        _main_thread = new ProcessThread;
+	monitor_check_interval = nframes / 10;
+	last_monitor_check = 0;
 
-        while (1) {
-                GET_PRIVATE_JACK_POINTER_RET(_jack,0);
+	if (_session) {
+		_session->set_frame_rate (nframes);
+	}
 
-                pframes_t nframes = jack_cycle_wait (_priv_jack);
+	SampleRateChanged (nframes); /* EMIT SIGNAL */
 
-                if (process_callback (nframes)) {
-                        return 0;
-                }
+	return 0;
+}
 
-		jack_cycle_signal (_priv_jack, 0);
-        }
+int 
+AudioEngine::buffer_size_change (pframes_t bufsiz)
+{
+	if (_session) {
+		_session->set_block_size (bufsiz);
+		last_monitor_check = 0;
+	}
 
-        return 0;
+	return 0;
 }
 
 /** Method called by our ::process_thread when there is work to be done.
@@ -461,7 +178,6 @@ AudioEngine::process_thread ()
 int
 AudioEngine::process_callback (pframes_t nframes)
 {
-	GET_PRIVATE_JACK_POINTER_RET(_jack,0);
 	Glib::Threads::Mutex::Lock tm (_process_lock, Glib::Threads::TRY_LOCK);
 
 	PT_TIMING_REF;
@@ -484,6 +200,50 @@ AudioEngine::process_callback (pframes_t nframes)
 		return 0;
 	}
 
+	bool return_after_remove_check = false;
+
+	if (_measuring_latency && _mtdm) {
+		/* run a normal cycle from the perspective of the PortManager
+		   so that we get silence on all registered ports.
+		   
+		   we overwrite the silence on the two ports used for latency
+		   measurement.
+		*/
+		
+		PortManager::cycle_start (nframes);
+		PortManager::silence (nframes);
+
+		if (_latency_input_port && _latency_output_port) {
+			PortEngine& pe (port_engine());
+
+			Sample* in = (Sample*) pe.get_buffer (_latency_input_port, nframes);
+			Sample* out = (Sample*) pe.get_buffer (_latency_output_port, nframes);
+
+			_mtdm->process (nframes, in, out);
+		}
+
+		PortManager::cycle_end (nframes);
+		return_after_remove_check = true;
+
+	} else if (_latency_flush_frames) {
+		
+		/* wait for the appropriate duration for the MTDM signal to
+		 * drain from the ports before we revert to normal behaviour.
+		 */
+
+		PortManager::cycle_start (nframes);
+		PortManager::silence (nframes);
+		PortManager::cycle_end (nframes);
+		
+                if (_latency_flush_frames > nframes) {
+                        _latency_flush_frames -= nframes;
+                } else {
+                        _latency_flush_frames = 0;
+                }
+
+		return_after_remove_check = true;
+	}
+
 	if (session_remove_pending) {
 
 		/* perform the actual session removal */
@@ -491,7 +251,7 @@ AudioEngine::process_callback (pframes_t nframes)
 		if (session_removal_countdown < 0) {
 
 			/* fade out over 1 second */
-			session_removal_countdown = _frame_rate/2;
+			session_removal_countdown = sample_rate()/2;
 			session_removal_gain = 1.0;
 			session_removal_gain_step = 1.0/session_removal_countdown;
 
@@ -520,11 +280,15 @@ AudioEngine::process_callback (pframes_t nframes)
 		}
 	}
 
+	if (return_after_remove_check) {
+		return 0;
+	}
+
 	if (_session == 0) {
 
 		if (!_freewheeling) {
-			MIDI::Manager::instance()->cycle_start(nframes);
-			MIDI::Manager::instance()->cycle_end();
+			PortManager::cycle_start (nframes);
+			PortManager::cycle_end (nframes);
 		}
 
 		_processed_frames = next_processed_frames;
@@ -535,34 +299,22 @@ AudioEngine::process_callback (pframes_t nframes)
 	/* tell all relevant objects that we're starting a new cycle */
 
 	InternalSend::CycleStart (nframes);
-	Port::set_global_port_buffer_offset (0);
-        Port::set_cycle_framecnt (nframes);
 
 	/* tell all Ports that we're starting a new cycle */
 
-	boost::shared_ptr<Ports> p = ports.reader();
-
-	for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-		i->second->cycle_start (nframes);
-	}
+	PortManager::cycle_start (nframes);
 
 	/* test if we are freewheeling and there are freewheel signals connected.
            ardour should act normally even when freewheeling unless /it/ is
-           exporting 
+           exporting (which is what Freewheel.empty() tests for).
 	*/
 
 	if (_freewheeling && !Freewheel.empty()) {
-
                 Freewheel (nframes);
-
 	} else {
-		MIDI::Manager::instance()->cycle_start(nframes);
-
 		if (_session) {
 			_session->process (nframes);
 		}
-
-		MIDI::Manager::instance()->cycle_end();
 	}
 
 	if (_freewheeling) {
@@ -575,52 +327,18 @@ AudioEngine::process_callback (pframes_t nframes)
 	}
 
 	if (last_monitor_check + monitor_check_interval < next_processed_frames) {
-
-		boost::shared_ptr<Ports> p = ports.reader();
-
-		for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-
-			bool x;
-
-			if (i->second->last_monitor() != (x = i->second->jack_monitoring_input ())) {
-				i->second->set_last_monitor (x);
-				/* XXX I think this is dangerous, due to
-				   a likely mutex in the signal handlers ...
-				*/
-				i->second->MonitorInputChanged (x); /* EMIT SIGNAL */
-			}
-		}
+		
+		PortManager::check_monitoring ();
 		last_monitor_check = next_processed_frames;
 	}
 
 	if (_session->silent()) {
-
-		for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-
-			if (i->second->sends_output()) {
-				i->second->get_buffer(nframes).silence(nframes);
-			}
-		}
+		PortManager::silence (nframes);
 	}
 
 	if (session_remove_pending && session_removal_countdown) {
 
-		for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-
-			if (i->second->sends_output()) {
-
-				boost::shared_ptr<AudioPort> ap = boost::dynamic_pointer_cast<AudioPort> (i->second);
-				if (ap) {
-					Sample* s = ap->engine_get_whole_audio_buffer ();
-					gain_t g = session_removal_gain;
-					
-					for (pframes_t n = 0; n < nframes; ++n) {
-						*s++ *= g;
-						g -= session_removal_gain_step;
-					}
-				}
-			}
-		}
+		PortManager::fade_out (session_removal_gain, session_removal_gain_step, nframes);
 		
 		if (session_removal_countdown > nframes) {
 			session_removal_countdown -= nframes;
@@ -631,11 +349,7 @@ AudioEngine::process_callback (pframes_t nframes)
 		session_removal_gain -= (nframes * session_removal_gain_step);
 	}
 
-	// Finalize ports
-
-	for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-		i->second->cycle_end (nframes);
-	}
+	PortManager::cycle_end (nframes);
 
 	_processed_frames = next_processed_frames;
 
@@ -644,97 +358,6 @@ AudioEngine::process_callback (pframes_t nframes)
 	return 0;
 }
 
-int
-AudioEngine::_sample_rate_callback (pframes_t nframes, void *arg)
-{
-	return static_cast<AudioEngine *> (arg)->jack_sample_rate_callback (nframes);
-}
-
-int
-AudioEngine::jack_sample_rate_callback (pframes_t nframes)
-{
-	_frame_rate = nframes;
-	_usecs_per_cycle = (int) floor ((((double) frames_per_cycle() / nframes)) * 1000000.0);
-
-	/* check for monitor input change every 1/10th of second */
-
-	monitor_check_interval = nframes / 10;
-	last_monitor_check = 0;
-
-	if (_session) {
-		_session->set_frame_rate (nframes);
-	}
-
-	SampleRateChanged (nframes); /* EMIT SIGNAL */
-
-	return 0;
-}
-
-void
-AudioEngine::jack_latency_callback (jack_latency_callback_mode_t mode)
-{
-        if (_session) {
-                _session->update_latency (mode == JackPlaybackLatency);
-        }
-}
-
-int
-AudioEngine::_bufsize_callback (pframes_t nframes, void *arg)
-{
-	return static_cast<AudioEngine *> (arg)->jack_bufsize_callback (nframes);
-}
-
-int
-AudioEngine::jack_bufsize_callback (pframes_t nframes)
-{
-        /* if the size has not changed, this should be a no-op */
-
-        if (nframes == _buffer_size) {
-                return 0;
-        }
-
-	GET_PRIVATE_JACK_POINTER_RET (_jack, 1);
-
-	_buffer_size = nframes;
-	_usecs_per_cycle = (int) floor ((((double) nframes / frame_rate())) * 1000000.0);
-	last_monitor_check = 0;
-
-        if (jack_port_type_get_buffer_size) {
-                _raw_buffer_sizes[DataType::AUDIO] = jack_port_type_get_buffer_size (_priv_jack, JACK_DEFAULT_AUDIO_TYPE);
-                _raw_buffer_sizes[DataType::MIDI] = jack_port_type_get_buffer_size (_priv_jack, JACK_DEFAULT_MIDI_TYPE);
-        } else {
-
-                /* Old version of JACK.
-
-                   These crude guesses, see below where we try to get the right answers.
-
-                   Note that our guess for MIDI deliberatey tries to overestimate
-                   by a little. It would be nicer if we could get the actual
-                   size from a port, but we have to use this estimate in the
-                   event that there are no MIDI ports currently. If there are
-                   the value will be adjusted below.
-                */
-
-                _raw_buffer_sizes[DataType::AUDIO] = nframes * sizeof (Sample);
-                _raw_buffer_sizes[DataType::MIDI] = nframes * 4 - (nframes/2);
-        }
-
-	{
-		Glib::Threads::Mutex::Lock lm (_process_lock);
-
-		boost::shared_ptr<Ports> p = ports.reader();
-
-		for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-			i->second->reset();
-		}
-	}
-
-	if (_session) {
-		_session->set_block_size (_buffer_size);
-	}
-
-	return 0;
-}
 
 void
 AudioEngine::stop_metering_thread ()
@@ -759,8 +382,9 @@ void
 AudioEngine::meter_thread ()
 {
 	pthread_set_name (X_("meter"));
+
 	while (true) {
-		Glib::usleep (10000);
+		Glib::usleep (10000); /* 1/100th sec interval */
 		if (g_atomic_int_get(&m_meter_exit)) {
 			break;
 		}
@@ -777,19 +401,9 @@ AudioEngine::set_session (Session *s)
 
 	if (_session) {
 
-		start_metering_thread ();
-
-		pframes_t blocksize = jack_get_buffer_size (_jack);
-
-		/* page in as much of the session process code as we
-		   can before we really start running.
-		*/
-
-		boost::shared_ptr<Ports> p = ports.reader();
+		pframes_t blocksize = samples_per_cycle ();
 
-		for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-			i->second->cycle_start (blocksize);
-		}
+		PortManager::cycle_start (blocksize);
 
 		_session->process (blocksize);
 		_session->process (blocksize);
@@ -800,9 +414,7 @@ AudioEngine::set_session (Session *s)
 		_session->process (blocksize);
 		_session->process (blocksize);
 
-		for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-			i->second->cycle_end (blocksize);
-		}
+		PortManager::cycle_end (blocksize);
 	}
 }
 
@@ -813,10 +425,9 @@ AudioEngine::remove_session ()
 
 	if (_running) {
 
-		stop_metering_thread ();
-
 		if (_session) {
 			session_remove_pending = true;
+			session_removal_countdown = 0;
 			session_removed.wait(_process_lock);
 		}
 
@@ -827,793 +438,662 @@ AudioEngine::remove_session ()
 	remove_all_ports ();
 }
 
+
 void
-AudioEngine::port_registration_failure (const std::string& portname)
+AudioEngine::died ()
 {
-	GET_PRIVATE_JACK_POINTER (_jack);
-	string full_portname = jack_client_name;
-	full_portname += ':';
-	full_portname += portname;
-
-
-	jack_port_t* p = jack_port_by_name (_priv_jack, full_portname.c_str());
-	string reason;
+        /* called from a signal handler for SIGPIPE */
 
-	if (p) {
-		reason = string_compose (_("a port with the name \"%1\" already exists: check for duplicated track/bus names"), portname);
-	} else {
-		reason = string_compose (_("No more JACK ports are available. You will need to stop %1 and restart JACK with more ports if you need this many tracks."), PROGRAM_NAME);
-	}
+	stop_metering_thread ();
 
-	throw PortRegistrationFailure (string_compose (_("AudioEngine: cannot register port \"%1\": %2"), portname, reason).c_str());
+        _running = false;
 }
 
-boost::shared_ptr<Port>
-AudioEngine::register_port (DataType dtype, const string& portname, bool input)
+int
+AudioEngine::reset_timebase ()
 {
-	boost::shared_ptr<Port> newport;
-
-	try {
-		if (dtype == DataType::AUDIO) {
-			newport.reset (new AudioPort (portname, (input ? Port::IsInput : Port::IsOutput)));
-		} else if (dtype == DataType::MIDI) {
-			newport.reset (new MidiPort (portname, (input ? Port::IsInput : Port::IsOutput)));
+	if (_session) {
+		if (_session->config.get_jack_time_master()) {
+			_backend->set_time_master (true);
 		} else {
-			throw PortRegistrationFailure("unable to create port (unknown type)");
+			_backend->set_time_master (false);
 		}
-
-		RCUWriter<Ports> writer (ports);
-		boost::shared_ptr<Ports> ps = writer.get_copy ();
-		ps->insert (make_pair (make_port_name_relative (portname), newport));
-
-		/* writer goes out of scope, forces update */
-
-		return newport;
-	}
-
-	catch (PortRegistrationFailure& err) {
-		throw err;
-	} catch (std::exception& e) {
-		throw PortRegistrationFailure(string_compose(
-				_("unable to create port: %1"), e.what()).c_str());
-	} catch (...) {
-		throw PortRegistrationFailure("unable to create port (unknown error)");
 	}
+	return 0;
 }
 
-boost::shared_ptr<Port>
-AudioEngine::register_input_port (DataType type, const string& portname)
-{
-	return register_port (type, portname, true);
-}
 
-boost::shared_ptr<Port>
-AudioEngine::register_output_port (DataType type, const string& portname)
+void
+AudioEngine::destroy ()
 {
-	return register_port (type, portname, false);
+	delete _instance;
+	_instance = 0;
 }
 
 int
-AudioEngine::unregister_port (boost::shared_ptr<Port> port)
+AudioEngine::discover_backends ()
 {
-	/* caller must hold process lock */
+	vector<std::string> backend_modules;
 
-	if (!_running) {
-		/* probably happening when the engine has been halted by JACK,
-		   in which case, there is nothing we can do here.
-		   */
-		return 0;
-	}
+	_backends.clear ();
 
-	{
-		RCUWriter<Ports> writer (ports);
-		boost::shared_ptr<Ports> ps = writer.get_copy ();
-		Ports::iterator x = ps->find (make_port_name_relative (port->name()));
+	Glib::PatternSpec so_extension_pattern("*backend.so");
+	Glib::PatternSpec dylib_extension_pattern("*backend.dylib");
 
-		if (x != ps->end()) {
-			ps->erase (x);
-		}
+	find_matching_files_in_search_path (backend_search_path (),
+	                                    so_extension_pattern, backend_modules);
 
-		/* writer goes out of scope, forces update */
-	}
+	find_matching_files_in_search_path (backend_search_path (),
+	                                    dylib_extension_pattern, backend_modules);
 
-	ports.flush ();
+	DEBUG_TRACE (DEBUG::Panning, string_compose (_("looking for backends in %1\n"), backend_search_path().to_string()));
 
-	return 0;
-}
+	for (vector<std::string>::iterator i = backend_modules.begin(); i != backend_modules.end(); ++i) {
 
-int
-AudioEngine::connect (const string& source, const string& destination)
-{
-	int ret;
+		AudioBackendInfo* info;
 
-	if (!_running) {
-		if (!_has_run) {
-			fatal << _("connect called before engine was started") << endmsg;
-			/*NOTREACHED*/
-		} else {
-			return -1;
+		if ((info = backend_discover (*i)) != 0) {
+			_backends.insert (make_pair (info->name, info));
 		}
 	}
 
-	string s = make_port_name_non_relative (source);
-	string d = make_port_name_non_relative (destination);
-
+	return _backends.size();
+}
 
-	boost::shared_ptr<Port> src = get_port_by_name (s);
-	boost::shared_ptr<Port> dst = get_port_by_name (d);
+AudioBackendInfo*
+AudioEngine::backend_discover (const string& path)
+{
+	Glib::Module module (path);
+	AudioBackendInfo* info;
+	AudioBackendInfo* (*dfunc)(void);
+	void* func = 0;
 
-	if (src) {
-		ret = src->connect (d);
-	} else if (dst) {
-		ret = dst->connect (s);
-	} else {
-		/* neither port is known to us, and this API isn't intended for use as a general patch bay */
-		ret = -1;
+	if (!module) {
+		error << string_compose(_("AudioEngine: cannot load module \"%1\" (%2)"), path,
+					Glib::Module::get_last_error()) << endmsg;
+		return 0;
 	}
-
-	if (ret > 0) {
-		/* already exists - no error, no warning */
-	} else if (ret < 0) {
-		error << string_compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"),
-					source, s, destination, d)
-		      << endmsg;
+	
+	if (!module.get_symbol ("descriptor", func)) {
+		error << string_compose(_("AudioEngine: backend at \"%1\" has no descriptor function."), path) << endmsg;
+		error << Glib::Module::get_last_error() << endmsg;
+		return 0;
 	}
 
-	return ret;
+	module.make_resident ();
+	
+	dfunc = (AudioBackendInfo* (*)(void))func;
+	info = dfunc();
+	
+	return info;
 }
 
-int
-AudioEngine::disconnect (const string& source, const string& destination)
+vector<const AudioBackendInfo*>
+AudioEngine::available_backends() const
 {
-	int ret;
-
-	if (!_running) {
-		if (!_has_run) {
-			fatal << _("disconnect called before engine was started") << endmsg;
-			/*NOTREACHED*/
-		} else {
-			return -1;
-		}
+	vector<const AudioBackendInfo*> r;
+	
+	for (BackendMap::const_iterator i = _backends.begin(); i != _backends.end(); ++i) {
+		r.push_back (i->second);
 	}
 
-	string s = make_port_name_non_relative (source);
-	string d = make_port_name_non_relative (destination);
-
-	boost::shared_ptr<Port> src = get_port_by_name (s);
-	boost::shared_ptr<Port> dst = get_port_by_name (d);
-
-	if (src) {
-			ret = src->disconnect (d);
-	} else if (dst) {
-			ret = dst->disconnect (s);
-	} else {
-		/* neither port is known to us, and this API isn't intended for use as a general patch bay */
-		ret = -1;
-	}
-	return ret;
+	return r;
 }
 
-int
-AudioEngine::disconnect (boost::shared_ptr<Port> port)
+string
+AudioEngine::current_backend_name() const
 {
-	GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
-
-	if (!_running) {
-		if (!_has_run) {
-			fatal << _("disconnect called before engine was started") << endmsg;
-			/*NOTREACHED*/
-		} else {
-			return -1;
-		}
-	}
-
-	return port->disconnect_all ();
+	if (_backend) {
+		return _backend->name();
+	} 
+	return string();
 }
 
-ARDOUR::framecnt_t
-AudioEngine::frame_rate () const
+void
+AudioEngine::drop_backend ()
 {
-	GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
-	if (_frame_rate == 0) {
-		return (_frame_rate = jack_get_sample_rate (_priv_jack));
-	} else {
-		return _frame_rate;
+	if (_backend) {
+		_backend->stop ();
+		_backend.reset ();
 	}
 }
 
-size_t
-AudioEngine::raw_buffer_size (DataType t)
+boost::shared_ptr<AudioBackend>
+AudioEngine::set_backend (const std::string& name, const std::string& arg1, const std::string& arg2)
 {
-	std::map<DataType,size_t>::const_iterator s = _raw_buffer_sizes.find(t);
-	return (s != _raw_buffer_sizes.end()) ? s->second : 0;
-}
+	BackendMap::iterator b = _backends.find (name);
 
-ARDOUR::pframes_t
-AudioEngine::frames_per_cycle () const
-{
-	GET_PRIVATE_JACK_POINTER_RET (_jack,0);
-	if (_buffer_size == 0) {
-		return jack_get_buffer_size (_jack);
-	} else {
-		return _buffer_size;
+	if (b == _backends.end()) {
+		return boost::shared_ptr<AudioBackend>();
 	}
-}
-
-/** @param name Full or short name of port
- *  @return Corresponding Port or 0.
- */
 
-boost::shared_ptr<Port>
-AudioEngine::get_port_by_name (const string& portname)
-{
-	if (!_running) {
-		if (!_has_run) {
-			fatal << _("get_port_by_name() called before engine was started") << endmsg;
-			/*NOTREACHED*/
-		} else {
-			boost::shared_ptr<Port> ();
+	drop_backend ();
+	
+	try {
+		if (b->second->instantiate (arg1, arg2)) {
+			throw failed_constructor ();
 		}
-	}
-
-        if (!port_is_mine (portname)) {
-                /* not an ardour port */
-                return boost::shared_ptr<Port> ();
-        }
 
-	boost::shared_ptr<Ports> pr = ports.reader();
-	std::string rel = make_port_name_relative (portname);
-	Ports::iterator x = pr->find (rel);
+		_backend = b->second->factory (*this);
 
-	if (x != pr->end()) {
-		/* its possible that the port was renamed by some 3rd party and
-		   we don't know about it. check for this (the check is quick
-		   and cheap), and if so, rename the port (which will alter
-		   the port map as a side effect).
-		*/
-		const std::string check = make_port_name_relative (jack_port_name (x->second->jack_port()));
-		if (check != rel) {
-			x->second->set_name (check);
-		}
-		return x->second;
+	} catch (exception& e) {
+		error << string_compose (_("Could not create backend for %1: %2"), name, e.what()) << endmsg;
+		return boost::shared_ptr<AudioBackend>();
 	}
 
-        return boost::shared_ptr<Port> ();
+	return _backend;
 }
 
-void
-AudioEngine::port_renamed (const std::string& old_relative_name, const std::string& new_relative_name)
+/* BACKEND PROXY WRAPPERS */
+
+int
+AudioEngine::start ()
 {
-	RCUWriter<Ports> writer (ports);
-	boost::shared_ptr<Ports> p = writer.get_copy();
-	Ports::iterator x = p->find (old_relative_name);
+	if (!_backend) {
+		return -1;
+	}
+
+	if (_running) {
+		return 0;
+	}
+
+	_processed_frames = 0;
+	last_monitor_check = 0;
 	
-	if (x != p->end()) {
-		boost::shared_ptr<Port> port = x->second;
-		p->erase (x);
-		p->insert (make_pair (new_relative_name, port));
+	if (_backend->start()) {
+		return -1;
 	}
-}
 
-const char **
-AudioEngine::get_ports (const string& port_name_pattern, const string& type_name_pattern, uint32_t flags)
-{
-	GET_PRIVATE_JACK_POINTER_RET (_jack,0);
-	if (!_running) {
-		if (!_has_run) {
-			fatal << _("get_ports called before engine was started") << endmsg;
-			/*NOTREACHED*/
-		} else {
-			return 0;
+	_running = true;
+	
+	if (_session) {
+		_session->set_frame_rate (_backend->sample_rate());
+		
+		if (_session->config.get_jack_time_master()) {
+			_backend->set_time_master (true);
 		}
 	}
-	return jack_get_ports (_priv_jack, port_name_pattern.c_str(), type_name_pattern.c_str(), flags);
+	
+	start_metering_thread ();
+	
+	if (!_started_for_latency) {
+		Running(); /* EMIT SIGNAL */
+	}
+	
+	return 0;
 }
 
-void
-AudioEngine::halted_info (jack_status_t code, const char* reason, void *arg)
+int
+AudioEngine::stop ()
 {
-        /* called from jack shutdown handler  */
-
-        AudioEngine* ae = static_cast<AudioEngine *> (arg);
-        bool was_running = ae->_running;
-
-        ae->stop_metering_thread ();
+	if (!_backend) {
+		return 0;
+	}
 
-        ae->_running = false;
-        ae->_buffer_size = 0;
-        ae->_frame_rate = 0;
-        ae->_jack = 0;
+	Glib::Threads::Mutex::Lock lm (_process_lock);
 
-        if (was_running) {
-		MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
-#ifdef HAVE_JACK_ON_INFO_SHUTDOWN
-                switch (code) {
-                case JackBackendError:
-                        ae->Halted(reason); /* EMIT SIGNAL */
-                        break;
-                default:
-                        ae->Halted(""); /* EMIT SIGNAL */
-                }
-#else
-                ae->Halted(""); /* EMIT SIGNAL */
-#endif
-        }
+	if (_backend->stop ()) {
+		return -1;
+	}
+	
+	_running = false;
+	_processed_frames = 0;
+	_measuring_latency = false;
+	_latency_output_port = 0;
+	_latency_input_port = 0;
+	_started_for_latency = false;
+	stop_metering_thread ();
+	
+	Port::PortDrop ();
+	Stopped (); /* EMIT SIGNAL */
+	
+	return 0;
 }
 
-void
-AudioEngine::halted (void *arg)
+int
+AudioEngine::pause ()
 {
-        cerr << "HALTED by JACK\n";
+	if (!_backend) {
+		return 0;
+	}
+	
+	if (_backend->pause ()) {
+		return -1;
+	}
 
-        /* called from jack shutdown handler  */
+	_running = false;
+	
+	Stopped(); /* EMIT SIGNAL */
+	return 0;
+}
 
-	AudioEngine* ae = static_cast<AudioEngine *> (arg);
-	bool was_running = ae->_running;
+int
+AudioEngine::freewheel (bool start_stop)
+{
+	if (!_backend) {
+		return -1;
+	}
 
-	ae->stop_metering_thread ();
+	/* _freewheeling will be set when first Freewheel signal occurs */
 
-	ae->_running = false;
-	ae->_buffer_size = 0;
-	ae->_frame_rate = 0;
-        ae->_jack = 0;
+	return _backend->freewheel (start_stop);
+}
 
-	if (was_running) {
-		MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
-		ae->Halted(""); /* EMIT SIGNAL */
+float
+AudioEngine::get_cpu_load() const 
+{
+	if (!_backend) {
+		return 0.0;
 	}
+	return _backend->cpu_load ();
 }
 
-void
-AudioEngine::died ()
+bool
+AudioEngine::is_realtime() const 
 {
-        /* called from a signal handler for SIGPIPE */
-
-	stop_metering_thread ();
+	if (!_backend) {
+		return false;
+	}
 
-        _running = false;
-	_buffer_size = 0;
-	_frame_rate = 0;
-	_jack = 0;
+	return _backend->is_realtime();
 }
 
 bool
-AudioEngine::can_request_hardware_monitoring ()
+AudioEngine::connected() const 
 {
-	GET_PRIVATE_JACK_POINTER_RET (_jack,false);
-	const char ** ports;
-
-	if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) {
+	if (!_backend) {
 		return false;
 	}
 
-	free (ports);
-
-	return true;
+	return _backend->available();
 }
 
-ChanCount
-AudioEngine::n_physical (unsigned long flags) const
+void
+AudioEngine::transport_start ()
 {
-	ChanCount c;
-
-	GET_PRIVATE_JACK_POINTER_RET (_jack, c);
-
-	const char ** ports = jack_get_ports (_priv_jack, NULL, NULL, JackPortIsPhysical | flags);
-	if (ports == 0) {
-		return c;
-	}
-
-	for (uint32_t i = 0; ports[i]; ++i) {
-		if (!strstr (ports[i], "Midi-Through")) {
-			DataType t (jack_port_type (jack_port_by_name (_jack, ports[i])));
-			c.set (t, c.get (t) + 1);
-		}
+	if (!_backend) {
+		return;
 	}
-
-	free (ports);
-
-	return c;
+	return _backend->transport_start ();
 }
 
-ChanCount
-AudioEngine::n_physical_inputs () const
+void
+AudioEngine::transport_stop ()
 {
-	return n_physical (JackPortIsInput);
+	if (!_backend) {
+		return;
+	}
+	return _backend->transport_stop ();
 }
 
-ChanCount
-AudioEngine::n_physical_outputs () const
+TransportState
+AudioEngine::transport_state ()
 {
-	return n_physical (JackPortIsOutput);
+	if (!_backend) {
+		return TransportStopped;
+	}
+	return _backend->transport_state ();
 }
 
 void
-AudioEngine::get_physical (DataType type, unsigned long flags, vector<string>& phy)
+AudioEngine::transport_locate (framepos_t pos)
 {
-	GET_PRIVATE_JACK_POINTER (_jack);
-	const char ** ports;
-
-	if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical | flags)) == 0) {
+	if (!_backend) {
 		return;
 	}
-
-	if (ports) {
-		for (uint32_t i = 0; ports[i]; ++i) {
-                        if (strstr (ports[i], "Midi-Through")) {
-                                continue;
-                        }
-			phy.push_back (ports[i]);
-		}
-		free (ports);
-	}
+	return _backend->transport_locate (pos);
 }
 
-/** Get physical ports for which JackPortIsOutput is set; ie those that correspond to
- *  a physical input connector.
- */
-void
-AudioEngine::get_physical_inputs (DataType type, vector<string>& ins)
+framepos_t
+AudioEngine::transport_frame()
 {
-	get_physical (type, JackPortIsOutput, ins);
+	if (!_backend) {
+		return 0;
+	}
+	return _backend->transport_frame ();
 }
 
-/** Get physical ports for which JackPortIsInput is set; ie those that correspond to
- *  a physical output connector.
- */
-void
-AudioEngine::get_physical_outputs (DataType type, vector<string>& outs)
+framecnt_t
+AudioEngine::sample_rate () const
 {
-	get_physical (type, JackPortIsInput, outs);
+	if (!_backend) {
+		return 0;
+	}
+	return _backend->sample_rate ();
 }
 
-void
-AudioEngine::transport_stop ()
+pframes_t
+AudioEngine::samples_per_cycle () const
 {
-	GET_PRIVATE_JACK_POINTER (_jack);
-	jack_transport_stop (_priv_jack);
+	if (!_backend) {
+		return 0;
+	}
+	return _backend->buffer_size ();
 }
 
-void
-AudioEngine::transport_start ()
+int
+AudioEngine::usecs_per_cycle () const
 {
-	GET_PRIVATE_JACK_POINTER (_jack);
-	jack_transport_start (_priv_jack);
+	if (!_backend) {
+		return -1;
+	}
+	return _backend->usecs_per_cycle ();
 }
 
-void
-AudioEngine::transport_locate (framepos_t where)
+size_t
+AudioEngine::raw_buffer_size (DataType t)
 {
-	GET_PRIVATE_JACK_POINTER (_jack);
-	jack_transport_locate (_priv_jack, where);
+	if (!_backend) {
+		return -1;
+	}
+	return _backend->raw_buffer_size (t);
 }
 
-AudioEngine::TransportState
-AudioEngine::transport_state ()
+pframes_t
+AudioEngine::sample_time ()
 {
-	GET_PRIVATE_JACK_POINTER_RET (_jack, ((TransportState) JackTransportStopped));
-	jack_position_t pos;
-	return (TransportState) jack_transport_query (_priv_jack, &pos);
+	if (!_backend) {
+		return 0;
+	}
+	return _backend->sample_time ();
 }
 
-int
-AudioEngine::reset_timebase ()
+pframes_t
+AudioEngine::sample_time_at_cycle_start ()
 {
-	GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
-	if (_session) {
-		if (_session->config.get_jack_time_master()) {
-			return jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
-		} else {
-			return jack_release_timebase (_jack);
-		}
+	if (!_backend) {
+		return 0;
 	}
-	return 0;
+	return _backend->sample_time_at_cycle_start ();
 }
 
-int
-AudioEngine::freewheel (bool onoff)
+pframes_t
+AudioEngine::samples_since_cycle_start ()
 {
-	GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
-
-	if (onoff != _freewheeling) {
-                return jack_set_freewheel (_priv_jack, onoff);
-
-	} else {
-                /* already doing what has been asked for */
-                return 0;
+	if (!_backend) {
+		return 0;
 	}
+	return _backend->samples_since_cycle_start ();
 }
 
-void
-AudioEngine::remove_all_ports ()
+bool
+AudioEngine::get_sync_offset (pframes_t& offset) const
 {
-	/* make sure that JACK callbacks that will be invoked as we cleanup
-	 * ports know that they have nothing to do.
-	 */
-
-	port_remove_in_progress = true;
-
-	/* process lock MUST be held by caller
-	*/
-
-	{
-		RCUWriter<Ports> writer (ports);
-		boost::shared_ptr<Ports> ps = writer.get_copy ();
-		ps->clear ();
+	if (!_backend) {
+		return false;
 	}
-
-	/* clear dead wood list in RCU */
-
-	ports.flush ();
-
-	port_remove_in_progress = false;
+	return _backend->get_sync_offset (offset);
 }
 
 int
-AudioEngine::connect_to_jack (string client_name, string session_uuid)
+AudioEngine::create_process_thread (boost::function<void()> func, AudioBackendNativeThread* thr, size_t stacksize)
 {
-        EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
-        boost::scoped_ptr<EnvironmentalProtectionAgency> current_epa;
-	jack_status_t status;
-
-        /* revert all environment settings back to whatever they were when ardour started
-         */
-
-        if (global_epa) {
-                current_epa.reset (new EnvironmentalProtectionAgency(true)); /* will restore settings when we leave scope */
-                global_epa->restore ();
-        }
-
-	jack_client_name = client_name; /* might be reset below */
-#ifdef HAVE_JACK_SESSION
-	if (! session_uuid.empty())
-	    _jack = jack_client_open (jack_client_name.c_str(), JackSessionID, &status, session_uuid.c_str());
-	else
-#endif
-	_jack = jack_client_open (jack_client_name.c_str(), JackNullOption, &status, 0);
-
-	if (_jack == NULL) {
-		// error message is not useful here
+	if (!_backend) {
 		return -1;
 	}
+	return _backend->create_process_thread (func, thr, stacksize);
+}
 
-	GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
-
-	if (status & JackNameNotUnique) {
-		jack_client_name = jack_get_client_name (_priv_jack);
+int
+AudioEngine::wait_for_process_thread_exit (AudioBackendNativeThread thr)
+{
+	if (!_backend) {
+		return 0;
 	}
-
-	return 0;
+	return _backend->wait_for_process_thread_exit (thr);
 }
 
 int
-AudioEngine::disconnect_from_jack ()
+AudioEngine::set_device_name (const std::string& name)
 {
-	GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
-
-	if (_running) {
-		stop_metering_thread ();
+	if (!_backend) {
+		return -1;
 	}
+	return _backend->set_device_name  (name);
+}
 
-	{
-		Glib::Threads::Mutex::Lock lm (_process_lock);
-		jack_client_close (_priv_jack);
-		_jack = 0;
+int
+AudioEngine::set_sample_rate (float sr)
+{
+	if (!_backend) {
+		return -1;
 	}
+	return _backend->set_sample_rate  (sr);
+}
 
-	_buffer_size = 0;
-	_frame_rate = 0;
-	_raw_buffer_sizes.clear();
-
-	if (_running) {
-		_running = false;
-		MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
-		Stopped(); /* EMIT SIGNAL */
+int
+AudioEngine::set_buffer_size (uint32_t bufsiz)
+{
+	if (!_backend) {
+		return -1;
 	}
-
-	return 0;
+	return _backend->set_buffer_size  (bufsiz);
 }
 
 int
-AudioEngine::reconnect_to_jack ()
+AudioEngine::set_sample_format (SampleFormat sf)
 {
-	if (_running) {
-		disconnect_from_jack ();
-		/* XXX give jackd a chance */
-		Glib::usleep (250000);
+	if (!_backend) {
+		return -1;
 	}
+	return _backend->set_sample_format  (sf);
+}
 
-	if (connect_to_jack (jack_client_name, "")) {
-		error << _("failed to connect to JACK") << endmsg;
+int
+AudioEngine::set_interleaved (bool yn)
+{
+	if (!_backend) {
 		return -1;
 	}
+	return _backend->set_interleaved  (yn);
+}
 
-	Ports::iterator i;
-
-	boost::shared_ptr<Ports> p = ports.reader ();
-
-	for (i = p->begin(); i != p->end(); ++i) {
-		if (i->second->reestablish ()) {
-			break;
-		}
+int
+AudioEngine::set_input_channels (uint32_t ic)
+{
+	if (!_backend) {
+		return -1;
 	}
+	return _backend->set_input_channels  (ic);
+}
 
-	if (i != p->end()) {
-		/* failed */
-		remove_all_ports ();
+int
+AudioEngine::set_output_channels (uint32_t oc)
+{
+	if (!_backend) {
 		return -1;
 	}
+	return _backend->set_output_channels (oc);
+}
 
-	GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
-
-	MIDI::Manager::instance()->reestablish (_priv_jack);
-
-	if (_session) {
-		_session->reset_jack_connection (_priv_jack);
-                jack_bufsize_callback (jack_get_buffer_size (_priv_jack));
-		_session->set_frame_rate (jack_get_sample_rate (_priv_jack));
+int
+AudioEngine::set_systemic_input_latency (uint32_t il)
+{
+	if (!_backend) {
+		return -1;
 	}
+	return _backend->set_systemic_input_latency  (il);
+}
 
-	last_monitor_check = 0;
-
-        set_jack_callbacks ();
-
-	if (jack_activate (_priv_jack) == 0) {
-		_running = true;
-		_has_run = true;
-	} else {
+int
+AudioEngine::set_systemic_output_latency (uint32_t ol)
+{
+	if (!_backend) {
 		return -1;
 	}
+	return _backend->set_systemic_output_latency  (ol);
+}
 
-	/* re-establish connections */
+/* END OF BACKEND PROXY API */
 
-	for (i = p->begin(); i != p->end(); ++i) {
-		i->second->reconnect ();
-	}
+void
+AudioEngine::thread_init_callback (void* arg)
+{
+	/* make sure that anybody who needs to know about this thread
+	   knows about it.
+	*/
 
-	MIDI::Manager::instance()->reconnect ();
+	pthread_set_name (X_("audioengine"));
 
-	Running (); /* EMIT SIGNAL*/
+	PBD::notify_gui_about_thread_creation ("gui", pthread_self(), X_("AudioEngine"), 4096);
+	PBD::notify_gui_about_thread_creation ("midiui", pthread_self(), X_("AudioEngine"), 128);
 
-	start_metering_thread ();
+	SessionEvent::create_per_thread_pool (X_("AudioEngine"), 512);
 
-	return 0;
+	AsyncMIDIPort::set_process_thread (pthread_self());
+
+	if (arg) {
+		/* the special thread created/managed by the backend */
+		AudioEngine::instance()->_main_thread = new ProcessThread;
+	}
 }
 
 int
-AudioEngine::request_buffer_size (pframes_t nframes)
+AudioEngine::sync_callback (TransportState state, framepos_t position)
 {
-	GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
-
-	if (nframes == jack_get_buffer_size (_priv_jack)) {
-                return 0;
+	if (_session) {
+		return _session->backend_sync_callback (state, position);
 	}
-
-	return jack_set_buffer_size (_priv_jack, nframes);
+	return 0;
 }
 
-string
-AudioEngine::make_port_name_relative (string portname) const
+void
+AudioEngine::freewheel_callback (bool onoff)
 {
-	string::size_type len;
-	string::size_type n;
-
-	len = portname.length();
-
-	for (n = 0; n < len; ++n) {
-		if (portname[n] == ':') {
-			break;
-		}
-	}
-
-	if ((n != len) && (portname.substr (0, n) == jack_client_name)) {
-		return portname.substr (n+1);
-	}
-
-	return portname;
+	_freewheeling = onoff;
 }
 
-string
-AudioEngine::make_port_name_non_relative (string portname) const
+void
+AudioEngine::latency_callback (bool for_playback)
 {
-	string str;
+        if (_session) {
+                _session->update_latency (for_playback);
+        }
+}
 
-	if (portname.find_first_of (':') != string::npos) {
-		return portname;
+void
+AudioEngine::update_latencies ()
+{
+	if (_backend) {
+		_backend->update_latencies ();
 	}
+}
 
-	str  = jack_client_name;
-	str += ':';
-	str += portname;
+void
+AudioEngine::halted_callback (const char* why)
+{
+        stop_metering_thread ();
+	_running = false;
 
-	return str;
+	Port::PortDrop (); /* EMIT SIGNAL */
+	Halted (why);      /* EMIT SIGNAL */
 }
 
 bool
-AudioEngine::port_is_mine (const string& portname) const
+AudioEngine::setup_required () const
 {
-	if (portname.find_first_of (':') != string::npos) {
-		if (portname.substr (0, jack_client_name.length ()) != jack_client_name) {
-                        return false;
-                }
-        }
-        return true;
+	/* If there is only a single backend and it claims to be configured
+	 * already there is no setup to be done.
+	 *
+	 * Primarily for a case where there is only a JACK backend and
+	 * JACK is already running.
+	 */
+	 
+	if (_backends.size() == 1 && _backends.begin()->second->already_configured()) {
+		return false;
+	}
+
+	return true;
 }
 
-bool
-AudioEngine::is_realtime () const
+MTDM*
+AudioEngine::mtdm() 
 {
-	GET_PRIVATE_JACK_POINTER_RET (_jack,false);
-	return jack_is_realtime (_priv_jack);
+	return _mtdm;
 }
 
 int
-AudioEngine::create_process_thread (boost::function<void()> f, pthread_t* thread, size_t stacksize)
+AudioEngine::prepare_for_latency_measurement ()
 {
-        GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
-        ThreadData* td = new ThreadData (this, f, stacksize);
+	if (!running()) {
+		_started_for_latency = true;
 
-        if (jack_client_create_thread (_priv_jack, thread, jack_client_real_time_priority (_priv_jack),
-                                       jack_is_realtime (_priv_jack), _start_process_thread, td)) {
-                return -1;
-        }
+		if (start()) {
+			_started_for_latency = false;
+			return -1;
+		}
+	}
 
-        return 0;
+	return 0;
 }
 
-void*
-AudioEngine::_start_process_thread (void* arg)
+void
+AudioEngine::start_latency_detection ()
 {
-        ThreadData* td = reinterpret_cast<ThreadData*> (arg);
-        boost::function<void()> f = td->f;
-        delete td;
+	if (prepare_for_latency_measurement ()) {
+		return;
+	}
 
-        f ();
+	PortEngine& pe (port_engine());
 
-        return 0;
-}
+	delete _mtdm;
+	_mtdm = 0;
 
-bool
-AudioEngine::port_is_physical (const std::string& portname) const
-{
-        GET_PRIVATE_JACK_POINTER_RET(_jack, false);
+	/* create the ports we will use to read/write data */
+	
+	if ((_latency_output_port = pe.register_port ("latency_out", DataType::AUDIO, IsOutput)) == 0) {
+		return;
+	}
+	if (pe.connect (_latency_output_port, _latency_output_name)) {
+		return;
+	}
+
+	const string portname ("latency_in");
+	if ((_latency_input_port = pe.register_port (portname, DataType::AUDIO, IsInput)) == 0) {
+		pe.unregister_port (_latency_output_port);
+		return;
+	}
+	if (pe.connect (_latency_input_name, make_port_name_non_relative (portname))) {
+		pe.unregister_port (_latency_output_port);
+		return;
+	}
 
-        jack_port_t *port = jack_port_by_name (_priv_jack, portname.c_str());
+	LatencyRange lr;
+	_latency_signal_latency = 0;
+	lr = pe.get_latency_range (_latency_input_port, false);
+	_latency_signal_latency = lr.max;
+	lr = pe.get_latency_range (_latency_output_port, true);
+	_latency_signal_latency += lr.max;
 
-        if (!port) {
-                return false;
-        }
+	/* all created and connected, lets go */
+
+	_mtdm = new MTDM (sample_rate());
+	_measuring_latency = true;
+        _latency_flush_frames = samples_per_cycle();
 
-        return jack_port_flags (port) & JackPortIsPhysical;
 }
 
 void
-AudioEngine::request_jack_monitors_input (const std::string& portname, bool yn) const
+AudioEngine::stop_latency_detection ()
 {
-        GET_PRIVATE_JACK_POINTER(_jack);
-
-        jack_port_t *port = jack_port_by_name (_priv_jack, portname.c_str());
+	_measuring_latency = false;
 
-        if (!port) {
-                return;
-        }
-
-        jack_port_request_monitor (port, yn);
+	port_engine().unregister_port (_latency_output_port);
+	port_engine().unregister_port (_latency_input_port);
+	
+	if (_started_for_latency) {
+		stop ();
+	}
 }
 
 void
-AudioEngine::update_latencies ()
+AudioEngine::set_latency_output_port (const string& name)
 {
-        if (jack_recompute_total_latencies) {
-                GET_PRIVATE_JACK_POINTER (_jack);
-                jack_recompute_total_latencies (_priv_jack);
-        }
+	_latency_output_name = name;
 }
 
 void
-AudioEngine::destroy ()
+AudioEngine::set_latency_input_port (const string& name)
 {
-	delete _instance;
-	_instance = 0;
+	_latency_input_name = name;
 }
-
diff --git a/libs/ardour/backend_search_path.cc b/libs/ardour/backend_search_path.cc
new file mode 100644
index 0000000000..9a0425094b
--- /dev/null
+++ b/libs/ardour/backend_search_path.cc
@@ -0,0 +1,45 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <glibmm/miscutils.h>
+
+#include "ardour/backend_search_path.h"
+#include "ardour/directory_names.h"
+#include "ardour/filesystem_paths.h"
+
+namespace {
+	const char * const backend_env_variable_name = "ARDOUR_BACKEND_PATH";
+} // anonymous
+
+using namespace PBD;
+
+namespace ARDOUR {
+
+SearchPath
+backend_search_path ()
+{
+	SearchPath spath(user_config_directory ());
+	spath += ardour_dll_directory ();
+	spath.add_subdirectory_to_paths(backend_dir_name);
+
+	spath += SearchPath(Glib::getenv(backend_env_variable_name));
+	return spath;
+}
+
+} // namespace ARDOUR
diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index 184e23d1af..e67aee6be7 100644
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -90,7 +90,7 @@ BufferSet::clear()
 
 /** Set up this BufferSet so that its data structures mirror a PortSet's buffers.
  *  This is quite expensive and not RT-safe, so it should not be called in a process context;
- *  get_jack_port_addresses() will fill in a structure set up by this method.
+ *  get_backend_port_addresses() will fill in a structure set up by this method.
  *
  *  XXX: this *is* called in a process context; I'm not sure quite what `should not' means above.
  */
@@ -114,13 +114,13 @@ BufferSet::attach_buffers (PortSet& ports)
 	_is_mirror = true;
 }
 
-/** Write the JACK port addresses from a PortSet into our data structures.  This
+/** Write the backend port addresses from a PortSet into our data structures.  This
  *  call assumes that attach_buffers() has already been called for the same PortSet.
  *  Does not allocate, so RT-safe BUT you can only call Port::get_buffer() from
  *  the process() callback tree anyway, so this has to be called in RT context.
  */
 void
-BufferSet::get_jack_port_addresses (PortSet& ports, framecnt_t nframes)
+BufferSet::get_backend_port_addresses (PortSet& ports, framecnt_t nframes)
 {
 	assert (_count == ports.count ());
 	assert (_available == ports.count ());
diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc
index 0ac62d7076..834a98d347 100644
--- a/libs/ardour/bundle.cc
+++ b/libs/ardour/bundle.cc
@@ -443,27 +443,26 @@ Bundle::connected_to (boost::shared_ptr<Bundle> other, AudioEngine & engine)
 	return true;
 }
 
-/** This must not be called in code executed as a response to a JACK event,
- *  as it uses jack_port_get_all_connections().
+/** This must not be called in code executed as a response to a backend event,
+ *  as it uses the backend port_get_all_connections().
  *  @return true if any of this bundle's channels are connected to anything.
  */
 bool
 Bundle::connected_to_anything (AudioEngine& engine)
 {
+	PortManager& pm (engine);
+
 	for (uint32_t i = 0; i < nchannels().n_total(); ++i) {
 		Bundle::PortList const & ports = channel_ports (i);
 
 		for (uint32_t j = 0; j < ports.size(); ++j) {
-			/* ports[j] may not be an Ardour port, so use JACK directly
+
+			/* ports[j] may not be an Ardour port, so use the port manager directly
 			   rather than doing it with Port.
 			*/
-			jack_port_t* jp = jack_port_by_name (engine.jack(), ports[j].c_str());
-			if (jp) {
-				const char ** c = jack_port_get_all_connections (engine.jack(), jp);
-				if (c) {
-					jack_free (c);
-					return true;
-				}
+
+			if (pm.connected (ports[j])) {
+				return true;
 			}
 		}
 	}
diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index db1b316368..89b2cc1303 100644
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -185,7 +185,7 @@ Butler::thread_work ()
 						break;
 
 					case Request::Quit:
-						pthread_exit_pbd (0);
+						return 0;
 						/*NOTREACHED*/
 						break;
 
@@ -327,8 +327,6 @@ restart:
 		empty_pool_trash ();
 	}
 
-	pthread_exit_pbd (0);
-	/*NOTREACHED*/
 	return (0);
 }
 
@@ -403,6 +401,7 @@ Butler::empty_pool_trash ()
 void
 Butler::drop_references ()
 {
+	cerr << "Butler drops pool trash\n";
 	SessionEvent::pool->set_trash (0);
 }
 
diff --git a/libs/ardour/capturing_processor.cc b/libs/ardour/capturing_processor.cc
index 4a31d92cc8..ce4a546fb4 100644
--- a/libs/ardour/capturing_processor.cc
+++ b/libs/ardour/capturing_processor.cc
@@ -28,7 +28,7 @@ namespace ARDOUR {
 
 CapturingProcessor::CapturingProcessor (Session & session)
 	: Processor (session, X_("capture point"))
-	, block_size (session.engine().frames_per_cycle())
+	, block_size (AudioEngine::instance()->samples_per_cycle())
 {
 	realloc_buffers ();
 }
diff --git a/libs/ardour/debug.cc b/libs/ardour/debug.cc
index afd5da2169..fb122dd83c 100644
--- a/libs/ardour/debug.cc
+++ b/libs/ardour/debug.cc
@@ -60,5 +60,6 @@ uint64_t PBD::DEBUG::TempoMap = PBD::new_debug_bit ("tempomap");
 uint64_t PBD::DEBUG::OrderKeys = PBD::new_debug_bit ("orderkeys");
 uint64_t PBD::DEBUG::Automation = PBD::new_debug_bit ("automation");
 uint64_t PBD::DEBUG::WiimoteControl = PBD::new_debug_bit ("wiimotecontrol");
+uint64_t PBD::DEBUG::Ports = PBD::new_debug_bit ("Ports");
 
 
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index dfbe4c960a..79c44ce94a 100644
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -245,7 +245,7 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
 	   processing pathway that wants to use this->output_buffers() for some reason.
 	*/
 
-	output_buffers().get_jack_port_addresses (ports, nframes);
+	output_buffers().get_backend_port_addresses (ports, nframes);
 
 	// this Delivery processor is not a derived type, and thus we assume
 	// we really can modify the buffers passed in (it is almost certainly
diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc
index 0632c6f8f2..af7f7f550c 100644
--- a/libs/ardour/directory_names.cc
+++ b/libs/ardour/directory_names.cc
@@ -37,6 +37,7 @@ const char* const templates_dir_name = X_("templates");
 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");
+const char* const backend_dir_name = X_("backends");
 
 /* these should end up using variants of PROGRAM_NAME */
 #ifdef __APPLE__
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index ab181d2956..bab0e8ed15 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -509,6 +509,7 @@ setup_enum_writer ()
 	REGISTER_CLASS_ENUM (ExportFormatBase, F_RAW);
 	REGISTER_CLASS_ENUM (ExportFormatBase, F_FLAC);
 	REGISTER_CLASS_ENUM (ExportFormatBase, F_Ogg);
+	REGISTER_CLASS_ENUM (ExportFormatBase, F_CAF);
 	REGISTER (_ExportFormatBase_FormatId);
 
 	REGISTER_CLASS_ENUM (ExportFormatBase, E_FileDefault);
diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc
index 9b3f50e85d..82e5d80244 100644
--- a/libs/ardour/export_channel.cc
+++ b/libs/ardour/export_channel.cc
@@ -117,7 +117,7 @@ RegionExportChannelFactory::RegionExportChannelFactory (Session * session, Audio
 	: region (region)
 	, track (track)
 	, type (type)
-	, frames_per_cycle (session->engine().frames_per_cycle ())
+	, frames_per_cycle (session->engine().samples_per_cycle ())
 	, buffers_up_to_date (false)
 	, region_start (region.position())
 	, position (region_start)
diff --git a/libs/ardour/export_format_manager.cc b/libs/ardour/export_format_manager.cc
index 08238ff710..890623c114 100644
--- a/libs/ardour/export_format_manager.cc
+++ b/libs/ardour/export_format_manager.cc
@@ -178,6 +178,17 @@ ExportFormatManager::init_formats ()
 	fl_ptr->set_extension ("w64");
 	add_format (f_ptr);
 
+	f_ptr.reset (fl_ptr = new ExportFormatLinear ("CAF", ExportFormatBase::F_CAF));
+	fl_ptr->add_sample_format (ExportFormatBase::SF_U8);
+	fl_ptr->add_sample_format (ExportFormatBase::SF_16);
+	fl_ptr->add_sample_format (ExportFormatBase::SF_24);
+	fl_ptr->add_sample_format (ExportFormatBase::SF_32);
+	fl_ptr->add_sample_format (ExportFormatBase::SF_Float);
+	fl_ptr->add_sample_format (ExportFormatBase::SF_Double);
+	fl_ptr->set_default_sample_format (ExportFormatBase::SF_Float);
+	fl_ptr->set_extension ("caf");
+	add_format (f_ptr);
+
 	f_ptr.reset (fl_ptr = new ExportFormatLinear ("RAW", ExportFormatBase::F_RAW));
 	fl_ptr->add_sample_format (ExportFormatBase::SF_U8);
 	fl_ptr->add_sample_format (ExportFormatBase::SF_8);
diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc
index c7875c0b9b..301914b0ae 100644
--- a/libs/ardour/export_graph_builder.cc
+++ b/libs/ardour/export_graph_builder.cc
@@ -54,7 +54,7 @@ ExportGraphBuilder::ExportGraphBuilder (Session const & session)
   : session (session)
   , thread_pool (hardware_concurrency())
 {
-	process_buffer_frames = session.engine().frames_per_cycle();
+	process_buffer_frames = session.engine().samples_per_cycle();
 }
 
 ExportGraphBuilder::~ExportGraphBuilder ()
@@ -505,7 +505,7 @@ ExportGraphBuilder::ChannelConfig::ChannelConfig (ExportGraphBuilder & parent, F
 
 	config = new_config;
 
-	framecnt_t max_frames = parent.session.engine().frames_per_cycle();
+	framecnt_t max_frames = parent.session.engine().samples_per_cycle();
 	interleaver.reset (new Interleaver<Sample> ());
 	interleaver->init (new_config.channel_config->get_n_chans(), max_frames);
 
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 986d320aef..aac7709f90 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <time.h>
 
 #ifdef WINDOWS_VST_SUPPORT
 #include <fst.h>
@@ -66,11 +67,11 @@
 #include "pbd/basename.h"
 
 #include "midi++/port.h"
-#include "midi++/manager.h"
 #include "midi++/mmc.h"
 
 #include "ardour/analyser.h"
 #include "ardour/audio_library.h"
+#include "ardour/audio_backend.h"
 #include "ardour/audioengine.h"
 #include "ardour/audioplaylist.h"
 #include "ardour/audioregion.h"
@@ -78,6 +79,7 @@
 #include "ardour/control_protocol_manager.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/midi_region.h"
+#include "ardour/midiport_manager.h"
 #include "ardour/mix.h"
 #include "ardour/panner_manager.h"
 #include "ardour/plugin_manager.h"
@@ -330,6 +332,8 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 	EventTypeMap::instance().new_parameter(EnvelopeAutomation);
 	EventTypeMap::instance().new_parameter(MidiCCAutomation);
 
+	ARDOUR::AudioEngine::create ();
+
 	libardour_initialized = true;
 
 	return true;
@@ -338,9 +342,6 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir
 void
 ARDOUR::init_post_engine ()
 {
-	/* the MIDI Manager is needed by the ControlProtocolManager */
-	MIDI::Manager::create (AudioEngine::instance()->jack());
-
 	ControlProtocolManager::instance().discover_control_protocols ();
 
 	XMLNode* node;
@@ -536,3 +537,43 @@ ARDOUR::get_available_sync_options ()
 
 	return ret;
 }
+
+/** Return a monotonic value for the number of microseconds that have elapsed
+ * since an arbitrary zero origin.
+ */
+
+#ifdef __MACH__
+/* Thanks Apple for not implementing this basic SUSv2, POSIX.1-2001 function
+ */
+#include <mach/mach_time.h>
+#define CLOCK_REALTIME 0
+#define CLOCK_MONOTONIC 0
+int 
+clock_gettime (int /*clk_id*/, struct timespec *t)
+{
+        static bool initialized = false;
+        static mach_timebase_info_data_t timebase;
+        if (!initialized) {
+                mach_timebase_info(&timebase);
+                initialized = true;
+        }
+        uint64_t time;
+        time = mach_absolute_time();
+        double nseconds = ((double)time * (double)timebase.numer)/((double)timebase.denom);
+        double seconds = ((double)time * (double)timebase.numer)/((double)timebase.denom * 1e9);
+        t->tv_sec = seconds;
+        t->tv_nsec = nseconds;
+        return 0;
+}
+#endif
+ 
+microseconds_t
+ARDOUR::get_microseconds ()
+{
+	struct timespec ts;
+	if (clock_gettime (CLOCK_MONOTONIC, &ts) != 0) {
+		/* EEEK! */
+		return 0;
+	}
+	return (microseconds_t) ts.tv_sec * 1000000 + (ts.tv_nsec/1000);
+}
diff --git a/libs/ardour/graph.cc b/libs/ardour/graph.cc
index edb5ab37ee..b37de547cd 100644
--- a/libs/ardour/graph.cc
+++ b/libs/ardour/graph.cc
@@ -101,7 +101,7 @@ Graph::reset_thread_list ()
         }
 
         Glib::Threads::Mutex::Lock lm (_session.engine().process_lock());
-	pthread_t a_thread;
+	AudioBackendNativeThread a_thread;
 
         if (!_thread_list.empty()) {
                 drop_threads ();
@@ -146,9 +146,8 @@ Graph::drop_threads ()
 
         _callback_start_sem.signal ();
 
-        for (list<pthread_t>::iterator i = _thread_list.begin(); i != _thread_list.end(); ++i) {
-                void* status;
-                pthread_join (*i, &status);
+        for (list<AudioBackendNativeThread>::iterator i = _thread_list.begin(); i != _thread_list.end(); ++i) {
+		AudioEngine::instance()->wait_for_process_thread_exit (*i);
         }
 
         _thread_list.clear ();
@@ -584,8 +583,8 @@ Graph::process_one_route (Route* route)
 bool
 Graph::in_process_thread () const
 {
-	for (list<pthread_t>::const_iterator i = _thread_list.begin (); i != _thread_list.end(); ++i) {
-		if (*i == pthread_self()) {
+	for (list<AudioBackendNativeThread>::const_iterator i = _thread_list.begin (); i != _thread_list.end(); ++i) {
+		if (self_thread_equal (*i)) {
 			return true;
 		}
 	}
diff --git a/libs/ardour/iec1ppmdsp.cc b/libs/ardour/iec1ppmdsp.cc
index bed825048f..79a572da1c 100644
--- a/libs/ardour/iec1ppmdsp.cc
+++ b/libs/ardour/iec1ppmdsp.cc
@@ -45,8 +45,8 @@ void Iec1ppmdsp::process (float *p, int n)
 {
     float z1, z2, m, t;
 
-    z1 = _z1;
-    z2 = _z2;
+    z1 = _z1 > 20 ? 20 : (_z1 < 0 ? 0 : _z1);
+    z2 = _z2 > 20 ? 20 : (_z2 < 0 ? 0 : _z2);
     m = _res ? 0: _m;
     _res = false;
 
diff --git a/libs/ardour/iec2ppmdsp.cc b/libs/ardour/iec2ppmdsp.cc
index 76862cccd2..caca744c52 100644
--- a/libs/ardour/iec2ppmdsp.cc
+++ b/libs/ardour/iec2ppmdsp.cc
@@ -45,8 +45,8 @@ void Iec2ppmdsp::process (float *p, int n)
 {
     float z1, z2, m, t;
 
-    z1 = _z1;
-    z2 = _z2;
+    z1 = _z1 > 20 ? 20 : (_z1 < 0 ? 0 : _z1);
+    z2 = _z2 > 20 ? 20 : (_z2 < 0 ? 0 : _z2);
     m = _res ? 0: _m;
     _res = false;
 
diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index 029a46ce53..8136985e1f 100644
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -310,7 +310,7 @@ bool
 InternalSend::configure_io (ChanCount in, ChanCount out)
 {
 	bool ret = Send::configure_io (in, out);
-	set_block_size (_session.engine().frames_per_cycle());
+	set_block_size (_session.engine().samples_per_cycle());
 	return ret;
 }
 
diff --git a/libs/ardour/interpolation.cc b/libs/ardour/interpolation.cc
index fccc805cb0..bccaa45553 100644
--- a/libs/ardour/interpolation.cc
+++ b/libs/ardour/interpolation.cc
@@ -135,17 +135,18 @@ CubicInterpolation::interpolate (int channel, framecnt_t nframes, Sample *input,
 		    inm1 = input[i];
 	    }
 
-    } else {
-
-	    /* not sure that this is ever utilized - it implies that one of the input/output buffers is missing */
+	    i = floor(distance);
+	    phase[channel] = distance - floor(distance);
 
+    } else {
+	    /* used to calculate play-distance with acceleration (silent roll)
+	     * (use same algorithm as real playback for identical rounding/floor'ing)
+	     */
 	    for (framecnt_t outsample = 0; outsample < nframes; ++outsample) {
 		    distance += _speed + acceleration;
 	    }
+	    i = floor(distance);
     }
 
-    i = floor(distance);
-    phase[channel] = distance - floor(distance);
-
     return i;
 }
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 21fdca6e96..6f5b5a63da 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -1337,7 +1337,7 @@ IO::bundle_changed (Bundle::Change /*c*/)
 string
 IO::build_legal_port_name (DataType type)
 {
-	const int name_size = jack_port_name_size();
+	const int name_size = AudioEngine::instance()->port_name_size();
 	int limit;
 	string suffix;
 
@@ -1371,7 +1371,7 @@ IO::build_legal_port_name (DataType type)
 
 	// allow up to 4 digits for the output port number, plus the slash, suffix and extra space
 
-	limit = name_size - _session.engine().client_name().length() - (suffix.length() + 5);
+	limit = name_size - AudioEngine::instance()->my_name().length() - (suffix.length() + 5);
 
 	char buf1[name_size+1];
 	char buf2[name_size+1];
@@ -1404,10 +1404,11 @@ IO::find_port_hole (const char* base)
 	 */
 
 	for (n = 1; n < 9999; ++n) {
-		char buf[jack_port_name_size()];
+		size_t size = AudioEngine::instance()->port_name_size() + 1;
+		char buf[size];
 		PortSet::iterator i = _ports.begin();
 
-		snprintf (buf, jack_port_name_size(), _("%s %u"), base, n);
+		snprintf (buf, size, _("%s %u"), base, n);
 
 		for ( ; i != _ports.end(); ++i) {
 			if (i->name() == buf) {
@@ -1638,7 +1639,7 @@ IO::process_input (boost::shared_ptr<Processor> proc, framepos_t start_frame, fr
 		return;
 	}
 
-	_buffers.get_jack_port_addresses (_ports, nframes);
+	_buffers.get_backend_port_addresses (_ports, nframes);
 	if (proc) {
 		proc->run (_buffers, start_frame, end_frame, nframes, true);
 	}
diff --git a/libs/ardour/jack_slave.cc b/libs/ardour/jack_slave.cc
index 4c2da4c6c4..4b2f3b1860 100644
--- a/libs/ardour/jack_slave.cc
+++ b/libs/ardour/jack_slave.cc
@@ -20,16 +20,14 @@
 #include <iostream>
 #include <cerrno>
 
-#include <jack/jack.h>
-#include <jack/transport.h>
-
+#include "ardour/audioengine.h"
 #include "ardour/slave.h"
 
 using namespace std;
 using namespace ARDOUR;
 
-JACK_Slave::JACK_Slave (jack_client_t* j)
-	: jack (j)
+JACK_Slave::JACK_Slave (AudioEngine& e)
+	: engine (e)
 {
 	double x;
 	framepos_t p;
@@ -41,12 +39,6 @@ JACK_Slave::~JACK_Slave ()
 {
 }
 
-void
-JACK_Slave::reset_client (jack_client_t* j)
-{
-	jack = j;
-}
-
 bool
 JACK_Slave::locked() const
 {
@@ -62,33 +54,26 @@ JACK_Slave::ok() const
 bool
 JACK_Slave::speed_and_position (double& sp, framepos_t& position)
 {
-	jack_position_t pos;
-	jack_transport_state_t state;
-
-	state = jack_transport_query (jack, &pos);
-
-	switch (state) {
-	case JackTransportStopped:
+	switch (engine.transport_state()) {
+	case TransportStopped:
 		speed = 0;
 		_starting = false;
 		break;
-	case JackTransportRolling:
+	case TransportRolling:
 		speed = 1.0;
 		_starting = false;
 		break;
-	case JackTransportLooping:
+	case TransportLooping:
 		speed = 1.0;
 		_starting = false;
 		break;
-	case JackTransportStarting:
+	case TransportStarting:
 		_starting = true;
 		// don't adjust speed here, just leave it as it was
 		break;
-	default:
-		cerr << "WARNING: Unknown JACK transport state: " << state << endl;
 	}
 
 	sp = speed;
-	position = pos.frame;
+	position = engine.transport_frame();
 	return true;
 }
diff --git a/libs/ardour/kmeterdsp.cc b/libs/ardour/kmeterdsp.cc
index 181378cf76..35c95c2daf 100644
--- a/libs/ardour/kmeterdsp.cc
+++ b/libs/ardour/kmeterdsp.cc
@@ -52,8 +52,8 @@ void Kmeterdsp::process (float *p, int n)
     float  s, z1, z2;
 
     // Get filter state.
-    z1 = _z1;
-    z2 = _z2;
+    z1 = _z1 > 50 ? 50 : (_z1 < 0 ? 0 : _z1);
+    z2 = _z2 > 50 ? 50 : (_z2 < 0 ? 0 : _z2);
 
     // Perform filtering. The second filter is evaluated
     // only every 4th sample - this is just an optimisation.
@@ -75,6 +75,8 @@ void Kmeterdsp::process (float *p, int n)
         z2 += 4 * _omega * (z1 - z2); // Update second filter.
     }
 
+    if (isnan(z1)) z1 = 0;
+    if (isnan(z2)) z2 = 0;
     // Save filter state. The added constants avoid denormals.
     _z1 = z1 + 1e-20f;
     _z2 = z2 + 1e-20f;
diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc
index 5a6e577f2d..bc3a83799b 100644
--- a/libs/ardour/ladspa_plugin.cc
+++ b/libs/ardour/ladspa_plugin.cc
@@ -36,8 +36,6 @@
 #include "pbd/xml++.h"
 #include "pbd/stacktrace.h"
 
-#include "midi++/manager.h"
-
 #include "ardour/session.h"
 #include "ardour/ladspa_plugin.h"
 #include "ardour/buffer_set.h"
@@ -114,7 +112,9 @@ LadspaPlugin::init (void *mod, uint32_t index, framecnt_t rate)
 	port_cnt = parameter_count();
 
 	_control_data = new LADSPA_Data[port_cnt];
+	memset (_control_data, 0, sizeof (LADSPA_Data) * port_cnt);
 	_shadow_data = new LADSPA_Data[port_cnt];
+	memset (_shadow_data, 0, sizeof (LADSPA_Data) * port_cnt);
 
 	for (i = 0; i < port_cnt; ++i) {
 		if (LADSPA_IS_PORT_CONTROL(port_descriptor (i))) {
diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc
index 99dad70c94..b4c4a1446b 100644
--- a/libs/ardour/ltc_slave.cc
+++ b/libs/ardour/ltc_slave.cc
@@ -134,7 +134,7 @@ LTC_Slave::resync_latency()
 
 	if (!session.deletion_in_progress() && session.ltc_output_io()) { /* check if Port exits */
 		boost::shared_ptr<Port> ltcport = session.ltc_input_port();
-		ltcport->get_connected_latency_range(ltc_slave_latency, false);
+		ltcport->get_connected_latency_range (ltc_slave_latency, false);
 	}
 }
 
@@ -150,9 +150,9 @@ LTC_Slave::reset()
 }
 
 void
-LTC_Slave::parse_ltc(const jack_nframes_t nframes, const jack_default_audio_sample_t * const in, const framecnt_t posinfo)
+LTC_Slave::parse_ltc(const pframes_t nframes, const Sample* const in, const framecnt_t posinfo)
 {
-	jack_nframes_t i;
+	pframes_t i;
 	unsigned char sound[8192];
 	if (nframes > 8192) {
 		/* TODO warn once or wrap, loop conversion below
@@ -413,22 +413,22 @@ LTC_Slave::init_engine_dll (framepos_t pos, int32_t inc)
 }
 
 /* main entry point from session_process.cc
- * called from jack_process callback context
- * so it is OK to use jack_port_get_buffer()
+ * called from process callback context
+ * so it is OK to use get_buffer()
  */
 bool
 LTC_Slave::speed_and_position (double& speed, framepos_t& pos)
 {
 	bool engine_init_called = false;
-	framepos_t now = session.engine().frame_time_at_cycle_start();
+	framepos_t now = session.engine().sample_time_at_cycle_start();
 	framepos_t sess_pos = session.transport_frame(); // corresponds to now
-	framecnt_t nframes = session.engine().frames_per_cycle();
+	framecnt_t nframes = session.engine().samples_per_cycle();
 
-	jack_default_audio_sample_t *in;
+	Sample* in;
 
 	boost::shared_ptr<Port> ltcport = session.ltc_input_port();
 
-	in = (jack_default_audio_sample_t*) jack_port_get_buffer (ltcport->jack_port(), nframes);
+	in = (Sample*) AudioEngine::instance()->port_engine().get_buffer (ltcport->port_handle(), nframes);
 
 	frameoffset_t skip = now - (monotonic_cnt + nframes);
 	monotonic_cnt = now;
@@ -441,7 +441,7 @@ LTC_Slave::speed_and_position (double& speed, framepos_t& pos)
 	else if (engine_dll_initstate != transport_direction && ltc_speed != 0) {
 		engine_dll_initstate = transport_direction;
 		init_engine_dll(last_ltc_frame + rint(ltc_speed * double(2 * nframes + now - last_timestamp)),
-				session.engine().frames_per_cycle());
+				session.engine().samples_per_cycle());
 		engine_init_called = true;
 	}
 
@@ -521,8 +521,8 @@ LTC_Slave::speed_and_position (double& speed, framepos_t& pos)
 		t0 = t1;
 		t1 += b * e + e2;
 		e2 += c * e;
-		speed_flt = (t1 - t0) / double(session.engine().frames_per_cycle());
-		DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC engine DLL t0:%1 t1:%2 err:%3 spd:%4 ddt:%5\n", t0, t1, e, speed_flt, e2 - session.engine().frames_per_cycle() ));
+		speed_flt = (t1 - t0) / double(session.engine().samples_per_cycle());
+		DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC engine DLL t0:%1 t1:%2 err:%3 spd:%4 ddt:%5\n", t0, t1, e, speed_flt, e2 - session.engine().samples_per_cycle() ));
 	} else {
 		DEBUG_TRACE (DEBUG::LTC, string_compose ("LTC adjusting elapsed (no DLL) from %1 by %2\n", elapsed, (2 * nframes * ltc_speed)));
 		speed_flt = 0;
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 219271a7e1..9538cef8b6 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -142,6 +142,7 @@ public:
 	LilvNode* time_Position;
 	LilvNode* ui_GtkUI;
 	LilvNode* ui_external;
+	LilvNode* ui_externalkx;
 
 private:
 	bool _bundle_checked;
@@ -289,7 +290,7 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
 	_latency_control_port   = 0;
 	_next_cycle_start       = std::numeric_limits<framepos_t>::max();
 	_next_cycle_speed       = 1.0;
-	_block_length           = _engine.frames_per_cycle();
+	_block_length           = _engine.samples_per_cycle();
 	_seq_size               = _engine.raw_buffer_size(DataType::MIDI);
 	_state_version          = 0;
 	_was_activated          = false;
@@ -561,11 +562,15 @@ LV2Plugin::init(const void* c_plugin, framecnt_t rate)
 		if (!_impl->ui) {
 			LILV_FOREACH(uis, i, uis) {
 				const LilvUI* ui = lilv_uis_get(uis, i);
-				if (lilv_ui_is_a(ui, _world.ui_external)) {
+				if (lilv_ui_is_a(ui, _world.ui_externalkx)) {
 					_impl->ui      = ui;
 					_impl->ui_type = _world.ui_external;
 					break;
 				}
+				if (lilv_ui_is_a(ui, _world.ui_external)) {
+					_impl->ui      = ui;
+					_impl->ui_type = _world.ui_external;
+				}
 			}
 		}
 	}
@@ -613,7 +618,16 @@ LV2Plugin::is_external_ui() const
 	if (!_impl->ui) {
 		return false;
 	}
-	return lilv_ui_is_a(_impl->ui, _world.ui_external);
+	return lilv_ui_is_a(_impl->ui, _world.ui_external) || lilv_ui_is_a(_impl->ui, _world.ui_externalkx);
+}
+
+bool
+LV2Plugin::is_external_kx() const
+{
+	if (!_impl->ui) {
+		return false;
+	}
+	return lilv_ui_is_a(_impl->ui, _world.ui_externalkx);
 }
 
 bool
@@ -1368,11 +1382,6 @@ LV2Plugin::describe_parameter(Evoral::Parameter which)
 		}
 
 		if (lilv_port_has_property(_impl->plugin,
-					lilv_plugin_get_port_by_index(_impl->plugin, which.id()), _world.lv2_sampleRate)) {
-			return X_("hidden");
-		}
-
-		if (lilv_port_has_property(_impl->plugin,
 					lilv_plugin_get_port_by_index(_impl->plugin, which.id()), _world.lv2_reportsLatency)) {
 			return X_("latency");
 		}
@@ -1915,7 +1924,7 @@ LV2Plugin::Impl::designated_input (const char* uri, void** bufptrs[], void** buf
 	return port;
 }
 
-static bool lv2_filter (const string& str, void * /* arg*/)
+static bool lv2_filter (const string& str, void* /*arg*/)
 {
 	/* Not a dotfile, has a prefix before a period, suffix is "lv2" */
 	
@@ -1955,10 +1964,12 @@ LV2World::LV2World()
 	time_Position      = lilv_new_uri(world, LV2_TIME__Position);
 	ui_GtkUI           = lilv_new_uri(world, LV2_UI__GtkUI);
 	ui_external        = lilv_new_uri(world, "http://lv2plug.in/ns/extensions/ui#external");
+	ui_externalkx      = lilv_new_uri(world, "http://kxstudio.sf.net/ns/lv2ext/external-ui#Widget");
 }
 
 LV2World::~LV2World()
 {
+	lilv_node_free(ui_externalkx);
 	lilv_node_free(ui_external);
 	lilv_node_free(ui_GtkUI);
 	lilv_node_free(time_Position);
diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc
index b47c3ca152..d75b861ea1 100644
--- a/libs/ardour/midi_buffer.cc
+++ b/libs/ardour/midi_buffer.cc
@@ -22,6 +22,7 @@
 #include "pbd/malign.h"
 #include "pbd/compose.h"
 #include "pbd/debug.h"
+#include "pbd/stacktrace.h"
 
 #include "ardour/debug.h"
 #include "ardour/midi_buffer.h"
@@ -133,6 +134,7 @@ MidiBuffer::push_back(const Evoral::MIDIEvent<TimeType>& ev)
 
 	if (_size + stamp_size + ev.size() >= _capacity) {
 		cerr << "MidiBuffer::push_back failed (buffer is full)" << endl;
+		PBD::stacktrace (cerr, 20);
 		return false;
 	}
 
@@ -171,7 +173,9 @@ MidiBuffer::push_back(TimeType time, size_t size, const uint8_t* data)
 #endif
 
 	if (_size + stamp_size + size >= _capacity) {
-		cerr << "MidiBuffer::push_back failed (buffer is full)" << endl;
+		cerr << "MidiBuffer::push_back2 failed (buffer is full; _size = " << _size << " capacity " 
+		     << _capacity << " stamp " << stamp_size << " size = " << size << ")" << endl;
+		PBD::stacktrace (cerr, 20);
 		return false;
 	}
 
@@ -190,55 +194,6 @@ MidiBuffer::push_back(TimeType time, size_t size, const uint8_t* data)
 	return true;
 }
 
-
-/** Push an event into the buffer.
- *
- * Note that the raw MIDI pointed to by ev will be COPIED and unmodified.
- * That is, the caller still owns it, if it needs freeing it's Not My Problem(TM).
- * Realtime safe.
- * @return false if operation failed (not enough room)
- */
-bool
-MidiBuffer::push_back(const jack_midi_event_t& ev)
-{
-	const size_t stamp_size = sizeof(TimeType);
-
-	if (_size + stamp_size + ev.size >= _capacity) {
-		cerr << "MidiBuffer::push_back failed (buffer is full)" << endl;
-		return false;
-	}
-
-	if (!Evoral::midi_event_is_valid(ev.buffer, ev.size)) {
-		cerr << "WARNING: MidiBuffer ignoring illegal MIDI event" << endl;
-		return false;
-	}
-
-#ifndef NDEBUG
-	if (DEBUG::MidiIO & PBD::debug_bits) {
-		DEBUG_STR_DECL(a);
-		DEBUG_STR_APPEND(a, string_compose ("midibuffer %1 push jack event @ %2 sz %3 ", this, ev.time, ev.size));
-		for (size_t i=0; i < ev.size; ++i) {
-			DEBUG_STR_APPEND(a,hex);
-			DEBUG_STR_APPEND(a,"0x");
-			DEBUG_STR_APPEND(a,(int)ev.buffer[i]);
-			DEBUG_STR_APPEND(a,' ');
-		}
-		DEBUG_STR_APPEND(a,'\n');
-		DEBUG_TRACE (DEBUG::MidiIO, DEBUG_STR(a).str());
-	}
-#endif
-
-	uint8_t* const write_loc = _data + _size;
-	*((TimeType*)write_loc) = ev.time;
-	memcpy(write_loc + stamp_size, ev.buffer, ev.size);
-
-	_size += stamp_size + ev.size;
-	_silent = false;
-
-	return true;
-}
-
-
 /** Reserve space for a new event in the buffer.
  *
  * This call is for copying MIDI directly into the buffer, the data location
diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc
index 6f54d17d02..7eaeeb9e07 100644
--- a/libs/ardour/midi_clock_slave.cc
+++ b/libs/ardour/midi_clock_slave.cc
@@ -31,6 +31,8 @@
 #include "midi++/port.h"
 
 #include "ardour/debug.h"
+#include "ardour/midi_buffer.h"
+#include "ardour/midi_port.h"
 #include "ardour/slave.h"
 #include "ardour/tempo.h"
 
@@ -41,7 +43,7 @@ using namespace ARDOUR;
 using namespace MIDI;
 using namespace PBD;
 
-MIDIClock_Slave::MIDIClock_Slave (Session& s, MIDI::Port& p, int ppqn)
+MIDIClock_Slave::MIDIClock_Slave (Session& s, MidiPort& p, int ppqn)
 	: ppqn (ppqn)
 	, bandwidth (10.0 / 60.0) // 1 BpM = 1 / 60 Hz
 {
@@ -64,19 +66,18 @@ MIDIClock_Slave::~MIDIClock_Slave()
 }
 
 void
-MIDIClock_Slave::rebind (MIDI::Port& p)
+MIDIClock_Slave::rebind (MidiPort& port)
 {
-	port_connections.drop_connections();
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("MIDIClock_Slave: connecting to port %1\n", port.name()));
 
-	port = &p;
+	port_connections.drop_connections ();
 
-	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("MIDIClock_Slave: connecting to port %1\n", port->name()));
+	port.self_parser().timing.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::update_midi_clock, this, _1, _2));
+	port.self_parser().start.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::start, this, _1, _2));
+	port.self_parser().contineu.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::contineu, this, _1, _2));
+	port.self_parser().stop.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::stop, this, _1, _2));
+	port.self_parser().position.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::position, this, _1, _2, 3));
 
-	port->parser()->timing.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::update_midi_clock, this, _1, _2));
-	port->parser()->start.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::start, this, _1, _2));
-	port->parser()->contineu.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::contineu, this, _1, _2));
-	port->parser()->stop.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::stop, this, _1, _2));
-	port->parser()->position.connect_same_thread (port_connections, boost::bind (&MIDIClock_Slave::position, this, _1, _2, 3));
 }
 
 void
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index f059269b63..4771f7128c 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -202,8 +202,8 @@ MidiDiskstream::non_realtime_input_change ()
 		seek (_session.transport_frame());
 	}
 
-	g_atomic_int_set(const_cast<gint*>(&_frames_pending_write), 0);
-	g_atomic_int_set(const_cast<gint*>(&_num_captured_loops), 0);
+	g_atomic_int_set(const_cast<gint*> (&_frames_pending_write), 0);
+	g_atomic_int_set(const_cast<gint*> (&_num_captured_loops), 0);
 }
 
 int
@@ -376,8 +376,8 @@ MidiDiskstream::process (BufferSet& bufs, framepos_t transport_frame, pframes_t
 			}
 			_write_source->mark_write_starting_now(
 				capture_start_frame, capture_captured, loop_length);
-			g_atomic_int_set(const_cast<gint*>(&_frames_pending_write), 0);
-			g_atomic_int_set(const_cast<gint*>(&_num_captured_loops), 0);
+			g_atomic_int_set(const_cast<gint*> (&_frames_pending_write), 0);
+			g_atomic_int_set(const_cast<gint*> (&_num_captured_loops), 0);
 			was_recording = true;
 		}
 	}
@@ -799,7 +799,7 @@ MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush)
 		return 0;
 	}
 
-	const framecnt_t total = g_atomic_int_get(const_cast<gint*>(&_frames_pending_write));
+	const framecnt_t total = g_atomic_int_get(const_cast<gint*> (&_frames_pending_write));
 
 	if (total == 0 || 
 	    _capture_buf->read_space() == 0 || 
@@ -834,7 +834,7 @@ MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush)
 			error << string_compose(_("MidiDiskstream %1: cannot write to disk"), id()) << endmsg;
 			return -1;
 		} 
-		g_atomic_int_add(const_cast<gint*>(&_frames_pending_write), -to_write);
+		g_atomic_int_add(const_cast<gint*> (&_frames_pending_write), -to_write);
 	}
 
 out:
@@ -1044,7 +1044,7 @@ MidiDiskstream::transport_looped (framepos_t)
 	   the Source and/or entirely after the capture is finished.
 	*/
 	if (was_recording) {
-		g_atomic_int_add(const_cast<gint*>(&_num_captured_loops), 1);
+		g_atomic_int_add(const_cast<gint*> (&_num_captured_loops), 1);
 	}
 }
 
@@ -1111,7 +1111,7 @@ MidiDiskstream::prep_record_enable ()
 	boost::shared_ptr<MidiPort> sp = _source_port.lock ();
 	
 	if (sp && Config->get_monitoring_model() == HardwareMonitoring) {
-		sp->request_jack_monitors_input (!(_session.config.get_auto_input() && rolling));
+		sp->request_input_monitoring (!(_session.config.get_auto_input() && rolling));
 	}
 
 	return true;
@@ -1259,12 +1259,12 @@ MidiDiskstream::allocate_temporary_buffers ()
 }
 
 void
-MidiDiskstream::ensure_jack_monitors_input (bool yn)
+MidiDiskstream::ensure_input_monitoring (bool yn)
 {
 	boost::shared_ptr<MidiPort> sp = _source_port.lock ();
 	
 	if (sp) {
-		sp->ensure_jack_monitors_input (yn);
+		sp->ensure_input_monitoring (yn);
 	}
 }
 
diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
index 72150f8cfc..de2263fad6 100644
--- a/libs/ardour/midi_port.cc
+++ b/libs/ardour/midi_port.cc
@@ -26,11 +26,14 @@
 using namespace ARDOUR;
 using namespace std;
 
-MidiPort::MidiPort (const std::string& name, Flags flags)
+#define port_engine AudioEngine::instance()->port_engine()
+
+MidiPort::MidiPort (const std::string& name, PortFlags flags)
 	: Port (name, DataType::MIDI, flags)
 	, _has_been_mixed_down (false)
 	, _resolve_required (false)
 	, _input_active (true)
+	, _always_parse (false)
 {
 	_buffer = new MidiBuffer (AudioEngine::instance()->raw_buffer_size (DataType::MIDI));
 }
@@ -43,12 +46,32 @@ MidiPort::~MidiPort()
 void
 MidiPort::cycle_start (pframes_t nframes)
 {
+	framepos_t now = AudioEngine::instance()->sample_time_at_cycle_start();
+
 	Port::cycle_start (nframes);
 
 	_buffer->clear ();
 
 	if (sends_output ()) {
-		jack_midi_clear_buffer (jack_port_get_buffer (_jack_port, nframes));
+		port_engine.midi_clear (port_engine.get_buffer (_port_handle, nframes));
+	}
+
+	if (_always_parse) {
+		MidiBuffer& mb (get_midi_buffer (nframes));
+
+		/* dump incoming MIDI to parser */
+		
+		for (MidiBuffer::iterator b = mb.begin(); b != mb.end(); ++b) {
+			uint8_t* buf = (*b).buffer();
+			
+			_self_parser.set_timestamp (now + (*b).time());
+			
+			uint32_t limit = (*b).size();
+			
+			for (size_t n = 0; n < limit; ++n) {
+				_self_parser.scanner (buf[n]);
+			}
+		}
 	}
 }
 
@@ -63,31 +86,33 @@ MidiPort::get_midi_buffer (pframes_t nframes)
 
 		if (_input_active) {
 
-			void* jack_buffer = jack_port_get_buffer (_jack_port, nframes);
-			const pframes_t event_count = jack_midi_get_event_count (jack_buffer);
-			
-			/* suck all relevant MIDI events from the JACK MIDI port buffer
+			void* buffer = port_engine.get_buffer (_port_handle, nframes);
+			const pframes_t event_count = port_engine.get_midi_event_count (buffer);
+
+			/* suck all relevant MIDI events from the MIDI port buffer
 			   into our MidiBuffer
 			*/
-			
+
 			for (pframes_t i = 0; i < event_count; ++i) {
 				
-				jack_midi_event_t ev;
+				pframes_t timestamp;
+				size_t size;
+				uint8_t* buf;
 				
-				jack_midi_event_get (&ev, jack_buffer, i);
+				port_engine.midi_event_get (timestamp, size, &buf, buffer, i);
 				
-				if (ev.buffer[0] == 0xfe) {
+				if (buf[0] == 0xfe) {
 					/* throw away active sensing */
 					continue;
 				}
 				
 				/* check that the event is in the acceptable time range */
 				
-				if ((ev.time >= (_global_port_buffer_offset + _port_buffer_offset)) &&
-				    (ev.time < (_global_port_buffer_offset + _port_buffer_offset + nframes))) {
-					_buffer->push_back (ev);
+				if ((timestamp >= (_global_port_buffer_offset + _port_buffer_offset)) &&
+				    (timestamp < (_global_port_buffer_offset + _port_buffer_offset + nframes))) {
+					_buffer->push_back (timestamp, size, buf);
 				} else {
-					cerr << "Dropping incoming MIDI at time " << ev.time << "; offset="
+					cerr << "Dropping incoming MIDI at time " << timestamp << "; offset="
 					     << _global_port_buffer_offset << " limit="
 					     << (_global_port_buffer_offset + _port_buffer_offset + nframes) << "\n";
 				}
@@ -121,7 +146,7 @@ MidiPort::cycle_split ()
 }
 
 void
-MidiPort::resolve_notes (void* jack_buffer, MidiBuffer::TimeType when)
+MidiPort::resolve_notes (void* port_buffer, MidiBuffer::TimeType when)
 {
 	for (uint8_t channel = 0; channel <= 0xF; channel++) {
 
@@ -132,13 +157,13 @@ MidiPort::resolve_notes (void* jack_buffer, MidiBuffer::TimeType when)
 		 * that prioritize sustain over AllNotesOff
 		 */
 
-		if (jack_midi_event_write (jack_buffer, when, ev, 3) != 0) {
+		if (port_engine.midi_event_put (port_buffer, when, ev, 3) != 0) {
 			cerr << "failed to deliver sustain-zero on channel " << channel << " on port " << name() << endl;
 		}
 
 		ev[1] = MIDI_CTL_ALL_NOTES_OFF;
 
-		if (jack_midi_event_write (jack_buffer, 0, ev, 3) != 0) {
+		if (port_engine.midi_event_put (port_buffer, 0, ev, 3) != 0) {
 			cerr << "failed to deliver ALL NOTES OFF on channel " << channel << " on port " << name() << endl;
 		}
 	}
@@ -149,11 +174,11 @@ MidiPort::flush_buffers (pframes_t nframes)
 {
 	if (sends_output ()) {
 
-		void* jack_buffer = jack_port_get_buffer (_jack_port, nframes);
-
+		void* port_buffer = port_engine.get_buffer (_port_handle, nframes);
+		
 		if (_resolve_required) {
 			/* resolve all notes at the start of the buffer */
-			resolve_notes (jack_buffer, 0);
+			resolve_notes (port_buffer, 0);
 			_resolve_required = false;
 		}
 
@@ -166,7 +191,7 @@ MidiPort::flush_buffers (pframes_t nframes)
 			assert (ev.time() < (nframes + _global_port_buffer_offset + _port_buffer_offset));
 
 			if (ev.time() >= _global_port_buffer_offset + _port_buffer_offset) {
-				if (jack_midi_event_write (jack_buffer, (jack_nframes_t) ev.time(), ev.buffer(), ev.size()) != 0) {
+				if (port_engine.midi_event_put (port_buffer, (pframes_t) ev.time(), ev.buffer(), ev.size()) != 0) {
 					cerr << "write failed, drop flushed note off on the floor, time "
 					     << ev.time() << " > " << _global_port_buffer_offset + _port_buffer_offset << endl;
 				}
@@ -202,6 +227,7 @@ MidiPort::reset ()
 {
 	Port::reset ();
 	delete _buffer;
+	cerr << name() << " new MIDI buffer of size " << AudioEngine::instance()->raw_buffer_size (DataType::MIDI) << endl;
 	_buffer = new MidiBuffer (AudioEngine::instance()->raw_buffer_size (DataType::MIDI));
 }
 
@@ -210,3 +236,9 @@ MidiPort::set_input_active (bool yn)
 {
 	_input_active = yn;
 }
+
+void
+MidiPort::set_always_parse (bool yn)
+{
+	_always_parse = yn;
+}
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index f88c331c2c..7dff7ac639 100644
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -321,7 +321,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
 	if (!lm.locked()) {
 		boost::shared_ptr<MidiDiskstream> diskstream = midi_diskstream();
 		framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
-		if (can_internal_playback_seek(llabs(playback_distance))) {
+		if (can_internal_playback_seek(std::llabs(playback_distance))) {
 			/* TODO should declick, and/or note-off */
 			internal_playback_seek(playback_distance);
 		}
diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc
index 78da32e427..7346c0244c 100644
--- a/libs/ardour/midi_ui.cc
+++ b/libs/ardour/midi_ui.cc
@@ -22,11 +22,11 @@
 
 #include "pbd/pthread_utils.h"
 
-#include "midi++/manager.h"
-#include "midi++/port.h"
-
+#include "ardour/async_midi_port.h"
 #include "ardour/debug.h"
 #include "ardour/audioengine.h"
+#include "ardour/midi_port.h"
+#include "ardour/midiport_manager.h"
 #include "ardour/midi_ui.h"
 #include "ardour/session.h"
 #include "ardour/session_event.h"
@@ -48,7 +48,6 @@ MidiControlUI::MidiControlUI (Session& s)
 	: AbstractUI<MidiUIRequest> (X_("midiui"))
 	, _session (s)
 {
-	MIDI::Manager::instance()->PortsChanged.connect_same_thread (rebind_connection, boost::bind (&MidiControlUI::change_midi_ports, this));
 	_instance = this;
 }
 
@@ -83,20 +82,10 @@ MidiControlUI::do_request (MidiUIRequest* req)
 	}
 }
 
-void
-MidiControlUI::change_midi_ports ()
-{
-	MidiUIRequest* req = get_request (PortChange);
-	if (req == 0) {
-		return;
-	}
-	send_request (req);
-}
-
 bool
-MidiControlUI::midi_input_handler (IOCondition ioc, MIDI::Port* port)
+MidiControlUI::midi_input_handler (IOCondition ioc, AsyncMIDIPort* port)
 {
-	DEBUG_TRACE (DEBUG::MidiIO, string_compose ("something happend on  %1\n", port->name()));
+	DEBUG_TRACE (DEBUG::MidiIO, string_compose ("something happend on  %1\n", ((ARDOUR::Port*)port)->name()));
 
 	if (ioc & ~IO_IN) {
 		return false;
@@ -106,8 +95,8 @@ MidiControlUI::midi_input_handler (IOCondition ioc, MIDI::Port* port)
 
 		CrossThreadChannel::drain (port->selectable());
 
-		DEBUG_TRACE (DEBUG::MidiIO, string_compose ("data available on %1\n", port->name()));
-		framepos_t now = _session.engine().frame_time();
+		DEBUG_TRACE (DEBUG::MidiIO, string_compose ("data available on %1\n", ((ARDOUR::Port*)port)->name()));
+		framepos_t now = _session.engine().sample_time();
 		port->parse (now);
 	}
 
@@ -128,22 +117,19 @@ MidiControlUI::clear_ports ()
 void
 MidiControlUI::reset_ports ()
 {
-	clear_ports ();
-
-	boost::shared_ptr<const MIDI::Manager::PortList> plist = MIDI::Manager::instance()->get_midi_ports ();
+	if (port_sources.empty()) {
+		AsyncMIDIPort* async = dynamic_cast<AsyncMIDIPort*> (_session.midi_input_port());
 
-	for (MIDI::Manager::PortList::const_iterator i = plist->begin(); i != plist->end(); ++i) {
-
-		if (!(*i)->centrally_parsed()) {
-			continue;
+		if (!async) {
+			return;
 		}
 
 		int fd;
 
-		if ((fd = (*i)->selectable ()) >= 0) {
+		if ((fd = async->selectable ()) >= 0) {
 			Glib::RefPtr<IOSource> psrc = IOSource::create (fd, IO_IN|IO_HUP|IO_ERR);
-
-			psrc->connect (sigc::bind (sigc::mem_fun (this, &MidiControlUI::midi_input_handler), *i));
+			
+			psrc->connect (sigc::bind (sigc::mem_fun (this, &MidiControlUI::midi_input_handler), async));
 			psrc->attach (_main_loop->get_context());
 
 			// glibmm hack: for now, store only the GSource*
diff --git a/libs/ardour/midiport_manager.cc b/libs/ardour/midiport_manager.cc
new file mode 100644
index 0000000000..d17401cee8
--- /dev/null
+++ b/libs/ardour/midiport_manager.cc
@@ -0,0 +1,170 @@
+/*
+    Copyright (C) 1998-99 Paul Barton-Davis 
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+    $Id$
+*/
+
+#include "ardour/audioengine.h"
+#include "ardour/async_midi_port.h"
+#include "ardour/midiport_manager.h"
+#include "ardour/rc_configuration.h"
+
+#include "i18n.h"
+
+using namespace ARDOUR;
+using namespace std;
+using namespace MIDI;
+using namespace PBD;
+
+
+MidiPortManager::MidiPortManager ()
+{
+	create_ports ();
+}
+
+MidiPortManager::~MidiPortManager ()
+{
+	if (_midi_in) {
+		AudioEngine::instance()->unregister_port (_midi_in);
+	}
+	if (_midi_in) {
+		AudioEngine::instance()->unregister_port (_midi_in);
+	}
+	if (_mtc_input_port) {
+		AudioEngine::instance()->unregister_port (_mtc_input_port);
+	}
+	if (_mtc_output_port) {
+		AudioEngine::instance()->unregister_port (_mtc_output_port);
+	}
+	if (_midi_clock_input_port) {
+		AudioEngine::instance()->unregister_port (_midi_clock_input_port);
+	}
+	if (_midi_clock_output_port) {
+		AudioEngine::instance()->unregister_port (_midi_clock_output_port);
+	}
+
+}
+
+void
+MidiPortManager::create_ports ()
+{
+	/* this method is idempotent
+	 */
+
+	if (_midi_in) {
+		return;
+	}
+	      
+	_midi_in  = AudioEngine::instance()->register_input_port (DataType::MIDI, _("MIDI control in"), true);
+	_midi_out = AudioEngine::instance()->register_output_port (DataType::MIDI, _("MIDI control out"), true);
+
+	_mmc_in  = AudioEngine::instance()->register_input_port (DataType::MIDI, _("MMC in"), true);
+	_mmc_out = AudioEngine::instance()->register_output_port (DataType::MIDI, _("MMC out"), true);
+	
+	/* XXX nasty type conversion needed because of the mixed inheritance
+	 * required to integrate MIDI::IPMidiPort and ARDOUR::AsyncMIDIPort.
+	 *
+	 * At some point, we'll move IPMidiPort into Ardour and make it 
+	 * inherit from ARDOUR::MidiPort not MIDI::Port, and then this
+	 * mess can go away 
+	 */
+
+	_midi_input_port = boost::dynamic_pointer_cast<AsyncMIDIPort>(_midi_in).get();
+	_midi_output_port = boost::dynamic_pointer_cast<AsyncMIDIPort>(_midi_out).get();
+
+	_mmc_input_port = boost::dynamic_pointer_cast<AsyncMIDIPort>(_mmc_in).get();
+	_mmc_output_port = boost::dynamic_pointer_cast<AsyncMIDIPort>(_mmc_out).get();
+
+	/* Now register ports used for sync (MTC and MIDI Clock)
+	 */
+
+	boost::shared_ptr<ARDOUR::Port> p;
+
+	p = AudioEngine::instance()->register_input_port (DataType::MIDI, _("MTC in"));
+	_mtc_input_port = boost::dynamic_pointer_cast<MidiPort> (p);
+	p = AudioEngine::instance()->register_output_port (DataType::MIDI, _("MTC out"));
+	_mtc_output_port= boost::dynamic_pointer_cast<MidiPort> (p);
+
+	p = AudioEngine::instance()->register_input_port (DataType::MIDI, _("MIDI Clock in"));
+	_midi_clock_input_port = boost::dynamic_pointer_cast<MidiPort> (p);
+	p = AudioEngine::instance()->register_output_port (DataType::MIDI, _("MIDI Clock out"));
+	_midi_clock_output_port= boost::dynamic_pointer_cast<MidiPort> (p);
+
+	/* These ports all need their incoming data handled in
+	 * Port::cycle_start() and so ...
+	 */
+
+	_mtc_input_port->set_always_parse (true);
+	_mtc_output_port->set_always_parse (true);
+	_midi_clock_input_port->set_always_parse (true);
+	_midi_clock_output_port->set_always_parse (true);
+}
+
+void
+MidiPortManager::set_midi_port_states (const XMLNodeList&nodes)
+{
+	XMLProperty* prop;
+	typedef map<std::string,boost::shared_ptr<Port> > PortMap;
+	PortMap ports;
+	const int version = 0;
+
+	ports.insert (make_pair (_mtc_input_port->name(), _mtc_input_port));
+	ports.insert (make_pair (_mtc_output_port->name(), _mtc_output_port));
+	ports.insert (make_pair (_midi_clock_input_port->name(), _midi_clock_input_port));
+	ports.insert (make_pair (_midi_clock_output_port->name(), _midi_clock_output_port));
+	ports.insert (make_pair (_midi_input_port->name(), _midi_in));
+	ports.insert (make_pair (_midi_output_port->name(), _midi_out));
+	ports.insert (make_pair (_mmc_input_port->name(), _mmc_in));
+	ports.insert (make_pair (_mmc_output_port->name(), _mmc_out));
+	
+	for (XMLNodeList::const_iterator n = nodes.begin(); n != nodes.end(); ++n) {
+		if ((prop = (*n)->property (X_("name"))) == 0) {
+			continue;
+		}
+
+		PortMap::iterator p = ports.find (prop->value());
+		if (p == ports.end()) {
+			continue;
+		}
+		
+		p->second->set_state (**n, version);
+	}
+}
+
+list<XMLNode*>
+MidiPortManager::get_midi_port_states () const
+{
+	typedef map<std::string,boost::shared_ptr<Port> > PortMap;
+	PortMap ports;
+	list<XMLNode*> s;
+
+	ports.insert (make_pair (_mtc_input_port->name(), _mtc_input_port));
+	ports.insert (make_pair (_mtc_output_port->name(), _mtc_output_port));
+	ports.insert (make_pair (_midi_clock_input_port->name(), _midi_clock_input_port));
+	ports.insert (make_pair (_midi_clock_output_port->name(), _midi_clock_output_port));
+	ports.insert (make_pair (_midi_input_port->name(), _midi_in));
+	ports.insert (make_pair (_midi_output_port->name(), _midi_out));
+	ports.insert (make_pair (_mmc_input_port->name(), _mmc_in));
+	ports.insert (make_pair (_mmc_output_port->name(), _mmc_out));
+
+	for (PortMap::const_iterator p = ports.begin(); p != ports.end(); ++p) {
+		s.push_back (&p->second->get_state());
+	}
+
+	return s;
+}
+
+
diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index 8ce0722d8b..e9071af619 100644
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -25,11 +25,12 @@
 
 #include "pbd/error.h"
 
-#include "midi++/port.h"
+#include "ardour/audioengine.h"
 #include "ardour/debug.h"
-#include "ardour/slave.h"
+#include "ardour/midi_buffer.h"
+#include "ardour/midi_port.h"
 #include "ardour/session.h"
-#include "ardour/audioengine.h"
+#include "ardour/slave.h"
 
 #include "i18n.h"
 
@@ -48,8 +49,9 @@ using namespace Timecode;
 */
 const int MTC_Slave::frame_tolerance = 2;
 
-MTC_Slave::MTC_Slave (Session& s, MIDI::Port& p)
+MTC_Slave::MTC_Slave (Session& s, MidiPort& p)
 	: session (s)
+	, port (&p)
 {
 	can_notify_on_unknown_rate = true;
 	did_reset_tc_format = false;
@@ -70,7 +72,10 @@ MTC_Slave::MTC_Slave (Session& s, MIDI::Port& p)
 	session.config.ParameterChanged.connect_same_thread (config_connection, boost::bind (&MTC_Slave::parameter_changed, this, _1));
 	parse_timecode_offset();
 	reset (true);
-	rebind (p);
+
+	port->self_parser().mtc_time.connect_same_thread (port_connections,  boost::bind (&MTC_Slave::update_mtc_time, this, _1, _2, _3));
+	port->self_parser().mtc_qtr.connect_same_thread (port_connections, boost::bind (&MTC_Slave::update_mtc_qtr, this, _1, _2, _3));
+	port->self_parser().mtc_status.connect_same_thread (port_connections, boost::bind (&MTC_Slave::update_mtc_status, this, _1));
 }
 
 MTC_Slave::~MTC_Slave()
@@ -94,15 +99,12 @@ MTC_Slave::~MTC_Slave()
 }
 
 void
-MTC_Slave::rebind (MIDI::Port& p)
+MTC_Slave::rebind (MidiPort& p)
 {
 	port_connections.drop_connections ();
 
 	port = &p;
 
-	port->parser()->mtc_time.connect_same_thread (port_connections,  boost::bind (&MTC_Slave::update_mtc_time, this, _1, _2, _3));
-	port->parser()->mtc_qtr.connect_same_thread (port_connections, boost::bind (&MTC_Slave::update_mtc_qtr, this, _1, _2, _3));
-	port->parser()->mtc_status.connect_same_thread (port_connections, boost::bind (&MTC_Slave::update_mtc_status, this, _1));
 }
 
 void
@@ -154,7 +156,8 @@ MTC_Slave::outside_window (framepos_t pos) const
 bool
 MTC_Slave::locked () const
 {
-	return port->parser()->mtc_locked() && last_inbound_frame !=0 && engine_dll_initstate !=0;
+	DEBUG_TRACE (DEBUG::MTC, string_compose ("locked ? %1 last %2 initstate %3\n", port->self_parser().mtc_locked(), last_inbound_frame, engine_dll_initstate));
+	return port->self_parser().mtc_locked() && last_inbound_frame !=0 && engine_dll_initstate !=0;
 }
 
 bool
@@ -255,7 +258,6 @@ MTC_Slave::init_mtc_dll(framepos_t tme, double qtr)
 	DEBUG_TRACE (DEBUG::MTC, string_compose ("[re-]init MTC DLL %1 %2 %3\n", t0, t1, e2));
 }
 
-
 /* called from MIDI parser */
 void
 MTC_Slave::update_mtc_qtr (Parser& /*p*/, int which_qtr, framepos_t now)
@@ -306,7 +308,7 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now)
 	   a locate command via MMC.
 	*/
 
-	//DEBUG_TRACE (DEBUG::MTC, string_compose ("MTC::update_mtc_time - TID:%1\n", ::pthread_self()));
+	DEBUG_TRACE (DEBUG::MTC, string_compose ("MTC::update_mtc_time - TID:%1\n", ::pthread_self()));
 	TimecodeFormat tc_format;
 	bool reset_tc = true;
 
@@ -422,7 +424,7 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now)
 						 now, timecode, mtc_frame, was_full, speedup_due_to_tc_mismatch));
 
 	if (was_full || outside_window (mtc_frame)) {
-		DEBUG_TRACE (DEBUG::MTC, string_compose ("update_mtc_time: full TC or outside window. - TID:%1\n", ::pthread_self()));
+		DEBUG_TRACE (DEBUG::MTC, string_compose ("update_mtc_time: full TC %1 or outside window %2\n", was_full, outside_window (mtc_frame)));
 		session.request_locate (mtc_frame, false);
 		session.request_transport_speed (0);
 		update_mtc_status (MIDI::MTC_Stopped);
@@ -446,7 +448,7 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now)
 		DEBUG_TRACE (DEBUG::MTC, string_compose ("new mtc_frame: %1 | MTC-FpT: %2 A3-FpT:%3\n",
 							 mtc_frame, (4.0*qtr), session.frames_per_timecode_frame()));
 
-		switch (port->parser()->mtc_running()) {
+		switch (port->self_parser().mtc_running()) {
 		case MTC_Backward:
 			mtc_frame -= mtc_off;
 			qtr *= -1.0;
@@ -526,9 +528,10 @@ MTC_Slave::reset_window (framepos_t root)
 	   of acceptable MTC frames wide open. otherwise, shrink it down to just 2 video frames
 	   ahead of the window root (taking direction into account).
 	*/
+
 	framecnt_t const d = (quarter_frame_duration * 4 * frame_tolerance);
 
-	switch (port->parser()->mtc_running()) {
+	switch (port->self_parser().mtc_running()) {
 	case MTC_Forward:
 		window_begin = root;
 		transport_direction = 1;
@@ -551,7 +554,7 @@ MTC_Slave::reset_window (framepos_t root)
 		break;
 	}
 
-	DEBUG_TRACE (DEBUG::MTC, string_compose ("legal MTC window now %1 .. %2\n", window_begin, window_end));
+	DEBUG_TRACE (DEBUG::MTC, string_compose ("reset MTC window @ %3, now %1 .. %2\n", window_begin, window_end, root));
 }
 
 void
@@ -575,11 +578,11 @@ MTC_Slave::init_engine_dll (framepos_t pos, framepos_t inc)
 }
 
 /* main entry point from session_process.cc
- * in jack_process callback context */
+xo * in process callback context */
 bool
 MTC_Slave::speed_and_position (double& speed, framepos_t& pos)
 {
-	framepos_t now = session.engine().frame_time_at_cycle_start();
+	framepos_t now = session.engine().sample_time_at_cycle_start();
 	framepos_t sess_pos = session.transport_frame(); // corresponds to now
 	//sess_pos -= session.engine().frames_since_cycle_start();
 
@@ -589,11 +592,21 @@ MTC_Slave::speed_and_position (double& speed, framepos_t& pos)
 
 	read_current (&last);
 
+	DEBUG_TRACE (DEBUG::MTC, string_compose ("speed&pos: timestamp %1 speed %2 initstate %3 dir %4 tpos %5 now %6 last-in %7\n",
+						 last.timestamp, 
+						 last.speed,
+						 engine_dll_initstate,
+						 transport_direction,
+						 sess_pos,
+						 now,
+						 last_inbound_frame));
+
 	/* re-init engine DLL here when state changed (direction, first_mtc_timestamp) */
-	if (last.timestamp == 0) { engine_dll_initstate = 0; }
-	else if (engine_dll_initstate != transport_direction && last.speed != 0) {
+	if (last.timestamp == 0) { 
+		engine_dll_initstate = 0; 
+	} else if (engine_dll_initstate != transport_direction && last.speed != 0) {
 		engine_dll_initstate = transport_direction;
-		init_engine_dll(last.position, session.engine().frames_per_cycle());
+		init_engine_dll(last.position, session.engine().samples_per_cycle());
 		engine_dll_reinitialized = true;
 	}
 
@@ -625,9 +638,7 @@ MTC_Slave::speed_and_position (double& speed, framepos_t& pos)
 	/* interpolate position according to speed and time since last quarter-frame*/
 	if (speed_flt == 0.0f) {
 		elapsed = 0;
-	}
-	else
-	{
+	} else {
 		/* scale elapsed time by the current MTC speed */
 		elapsed = (framecnt_t) rint (speed_flt * (now - last.timestamp));
 		if (give_slave_full_control_over_transport_speed() && !engine_dll_reinitialized) {
@@ -643,8 +654,8 @@ MTC_Slave::speed_and_position (double& speed, framepos_t& pos)
 			te0 = te1;
 			te1 += be * e + ee2;
 			ee2 += ce * e;
-			speed_flt = (te1 - te0) / double(session.engine().frames_per_cycle());
-			DEBUG_TRACE (DEBUG::MTC, string_compose ("engine DLL t0:%1 t1:%2 err:%3 spd:%4 ddt:%5\n", te0, te1, e, speed_flt, ee2 - session.engine().frames_per_cycle() ));
+			speed_flt = (te1 - te0) / double(session.engine().samples_per_cycle());
+			DEBUG_TRACE (DEBUG::MTC, string_compose ("engine DLL t0:%1 t1:%2 err:%3 spd:%4 ddt:%5\n", te0, te1, e, speed_flt, ee2 - session.engine().samples_per_cycle() ));
 		}
 	}
 
@@ -657,14 +668,13 @@ MTC_Slave::speed_and_position (double& speed, framepos_t& pos)
 	 */
 	if (!session.actively_recording()
 	    && speed != 0
-			&& ( (pos < 0) || (labs(pos - sess_pos) > 3 * session.frame_rate()) )
-	    ) {
+	    && ((pos < 0) || (labs(pos - sess_pos) > 3 * session.frame_rate()))) {
 		engine_dll_initstate = 0;
 		queue_reset (false);
 	}
 
 	/* provide a .1% deadzone to lock the speed */
-	if (fabs(speed - 1.0) <= 0.001)
+	if (fabs (speed - 1.0) <= 0.001)
 	        speed = 1.0;
 
 	DEBUG_TRACE (DEBUG::MTC, string_compose ("MTCsync spd: %1 pos: %2 | last-pos: %3 elapsed: %4 delta: %5\n",
diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc
index c3601d41de..94e8d4ff2f 100644
--- a/libs/ardour/panner_manager.cc
+++ b/libs/ardour/panner_manager.cc
@@ -79,6 +79,7 @@ PannerManager::discover_panners ()
 		panner_discover (*i);
 	}
 }
+
 int
 PannerManager::panner_discover (string path)
 {
diff --git a/libs/ardour/po/cs.po b/libs/ardour/po/cs.po
index d41c3b5e5b..6df4ac1894 100644
--- a/libs/ardour/po/cs.po
+++ b/libs/ardour/po/cs.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
-"PO-Revision-Date: 2013-03-03 09:23+0100\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
+"PO-Revision-Date: 2013-06-13 22:47+0200\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: cs\n"
@@ -30,58 +30,58 @@ msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 "AudioDiskstream %1: není žádný seznam skladeb, který by bylo lze kopírovat!"
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: Při doplňování nelze �íst %2 ze seznamu skladeb u snímku "
 "%3"
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr "AudioDiskstream %1: Nelze �íst %2 ze seznamu skladeb u snímku %3"
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "AudioDiskstream %1: Nelze zapisovat na disk"
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "AudioDiskstream %1: Zachycená data nelze zapisovat na disk!"
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: Nepodařilo se vytvořit oblast pro úplný zvukový soubor"
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 "AudioDiskstream: Nepodařilo se vytvořit oblast pro zaznamenaný zvukový "
 "materiál!"
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "Chyba v programování: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "AudioDiskstream: Kanál %1 překro�ení rozsahu"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr "%1:%2 nový záznamový soubor neinicializován správně"
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr "%1: Nelze obnovit předběžný záznamový zdrojový soubor %2"
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 "%1: Seznam obsahuje nesprávný po�et předběžných zdrojů - všechny jsou "
 "přehlíženy"
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 "%1: Z předběžných záznamových zdrojů nelze vytvořit žádnou oblast pro úplný "
@@ -133,7 +133,7 @@ msgstr "Seznamy zvukových skladeb (nepoužívané)"
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -215,7 +215,7 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr "Spojit sezení se strojem"
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
@@ -223,7 +223,7 @@ msgstr ""
 "Přípojka s názvem \"%1\" již existuje: Prověřte na zdvojené názvy stop/"
 "sběrnic"
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
@@ -231,35 +231,35 @@ msgstr ""
 "Nejsou dostupné další přípojky JACK. Pokud potřebujete tolik stop, musíte "
 "zastavit %1 a spustit JACK znovu s více přípojkami."
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "AudioEngine: Nelze zaregistrovat přípojku \"%1\": %2"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr "Nelze vytvořit přípojku: %1"
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr "Zavolání connect (spojení) před spuštěním stroje"
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr "AudioEngine: Nelze spojit %1 (%2) s %3 (%4)"
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr "Zavolání disconnect (odpojení) před spuštěním stroje"
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr "Zavolání get_port_by_name() před spuštěním stroje"
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr "Zavolání get_ports před spuštěním stroje"
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr "Nepodařilo se spojit se s JACK"
 
@@ -545,7 +545,7 @@ msgstr "Ztrátová komprese"
 msgid "Lossless compression"
 msgstr "Bezztrátová komprese"
 
-#: export_format_manager.cc:207 export_format_specification.cc:579
+#: export_format_manager.cc:218 export_format_specification.cc:579
 msgid "Session rate"
 msgstr "Kmito�et sezení"
 
@@ -577,7 +577,7 @@ msgstr "Trojúhelníkový"
 msgid "Rectangular"
 msgstr "Obdélníkový"
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr "Žádný"
 
@@ -790,25 +790,25 @@ msgstr "Nelze ur�it nynější pracovní adresář (%1)"
 msgid "unknown file type for session %1"
 msgstr "Neznámý typ souboru pro sezení %1"
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 "Nepodařilo se nastavit systémové omezení pro otevřené soubory na \"neomezeno"
 "\""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr "Nepodařilo se nastavit systémové omezení pro otevřené soubory na %1"
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr "Vaše systémové nastavení omezuje %1 na jen %2 otevřené soubory"
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr "Nepodařilo se dostat systémové omezení pro otevřené soubory (%1)"
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr "Nahrává se nastavení"
 
@@ -961,20 +961,20 @@ msgstr "P"
 msgid "%d"
 msgstr "%d"
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr "LADSPA: Modul nemá žádnou funkci popisu"
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr "LADSPA: Přídavný modul už není více nalezitelný!"
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 "LADSPA: \"%1\" nemůže být použit, neboť nedělá žádný \"inplace processing\""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
@@ -982,35 +982,35 @@ msgstr ""
 "Špatné �íslo parametru pro přídavný modul \"%1\". To může zna�it změnu v "
 "návrhupřídavného modulu, a přednastavení jsou případně neplatná"
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr "Špatný uzel poslán LadspaPlugin::set_state"
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr "LADSPA: Žádné �íslo přípojky LADSPA"
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr "LADSPA: Žádná data přípojky LADSPA"
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr "LADSPA: Nelze nahrát modul z \"%1\""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr "Nepodařilo se najít HOME. Přednastavení neodstraněno."
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "Nepodařilo se vytvořit %1. Přednastavení neuloženo. (%2)"
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr "Chyba při ukládání souboru s přednastavením %1."
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr "Nepodařilo se najít HOME. Přednastavení neuloženo."
 
@@ -1050,7 +1050,7 @@ msgstr "Locations: Pokus o použití neznámé polohy jako vybrané polohy"
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr "Nesprávný uzel XML předán dál Locations::set_state"
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr "Sezení"
 
@@ -1134,23 +1134,23 @@ msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 "MidiDiskstream %1: není žádný seznam skladeb, který by bylo lze kopírovat!"
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr "MidiDiskstream %1: Nelze �íst %2 ze seznamu skladeb u snímku %3"
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr "MidiDiskstream %1: Nelze zapisovat na disk"
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "MidiDiskstream %1: Zachycená data nelze zapisovat na disk!"
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr "%1: Nepodařilo se vytvořit oblast pro úplný soubor MIDI"
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
 "MidiDiskstream: Nepodařilo se vytvořit oblast pro zaznamenaný materiál MIDI!"
@@ -1169,7 +1169,7 @@ msgstr "Převést"
 
 #: midi_patch_manager.cc:126
 msgid "Duplicate MIDI device `%1' in `%2' ignored"
-msgstr ""
+msgstr "Zdvojení zařízení MIDI `%1' v `%2' se přehlíží"
 
 #: midi_source.cc:125
 msgid "Missing parameter property on InterpolationStyle"
@@ -1189,7 +1189,7 @@ msgstr "Chybějící vlastnost \"state\" u AutomationState"
 
 #: midi_stretch.cc:85
 msgid "MIDI stretch created non-MIDI source"
-msgstr ""
+msgstr "Protažení MIDI vytvořilo zdroj, který není MIDI"
 
 #: monitor_processor.cc:53
 msgid "monitor dim"
@@ -1201,15 +1201,15 @@ msgstr "Přerušení sledování "
 
 #: monitor_processor.cc:55
 msgid "monitor mono"
-msgstr "Monitor Mono"
+msgstr "Mono sledování"
 
 #: monitor_processor.cc:58
 msgid "monitor dim level"
-msgstr "Síla hlasitosti pro Utlumit Monitor"
+msgstr "Síla hlasitosti pro utlumení sledování "
 
 #: monitor_processor.cc:62
 msgid "monitor solo boost level"
-msgstr "Síla hlasitosti pro Monitor Solo Boost"
+msgstr "Síla hlasitosti pro zdůraznění sóla sledování"
 
 #: monitor_processor.cc:512
 msgid "cut control %1"
@@ -1244,9 +1244,8 @@ msgid "Session framerate adjusted from %1 TO: MTC's %2."
 msgstr "Rychlost snímkování sezení změněna z %1 na MTC: %2"
 
 #: mtc_slave.cc:393
-#, fuzzy
 msgid "Session and MTC framerate mismatch: MTC:%1 %2:%3."
-msgstr "Rychlost snímkování sezení a MTC se neshodují: MTC: %1 Ardour: %2"
+msgstr "Rychlost snímkování sezení a MTC se neshodují: MTC: %1 %2:%3."
 
 #: operations.cc:24
 msgid "capture"
@@ -1350,23 +1349,35 @@ msgstr "Žádné ID seznamu skladeb v XML zdroje seznamu skladeb!"
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr "Nepodařilo se sestavit seznam skladeb ze zdrojových dat sezení!"
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "Chyba v programování:"
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr "Uzlu XML k popisu přídavného modulu chybí pole \"type\""
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr "Neznámý typ přídavného modulu %1 ve vkládacím stavu přídavného modulu"
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr "Přídavný modul nemá žádné pole pro jedine�né ID"
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
@@ -1374,15 +1385,15 @@ msgstr ""
 "Nalezen odkaz na neznámý přídavný modul (\"%1\").\n"
 "Snad byl od posledního použití odstraněn nebo přesunut."
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr "PluginInsert: Auto: Žádné �íslo přípojky LADSPA"
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr "PluginInsert: Auto: Překro�ení rozsahu ID přípojky"
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 "PluginInsert: automatizovatelný prvek ovládání %1 nenalezen - přehlíží se"
@@ -1404,22 +1415,20 @@ msgid "LADSPA: module \"%1\" has no descriptor function."
 msgstr "LADSPA: Modul \"%1\" nemá žádnou funkci popisu."
 
 #: plugin_manager.cc:602
-#, fuzzy
 msgid ""
 "VST plugin %1 does not support processReplacing, and so cannot be used in %2 "
 "at this time"
 msgstr ""
 "Přídavný modul VST %1 nepodporuje processReplacing a z toho důvodu jej nyní "
-"nelze v Ardouru použít"
+"nelze v %2 použít"
 
 #: plugin_manager.cc:709
-#, fuzzy
 msgid ""
 "linuxVST plugin %1 does not support processReplacing, and so cannot be used "
 "in %2 at this time"
 msgstr ""
 "Přídavný modul linuxVST %1 nepodporuje processReplacing a z toho důvodu jej "
-"nyní nelze v Ardouru použít"
+"nyní nelze v %2 použít"
 
 #: plugin_manager.cc:870
 msgid "unknown plugin status type \"%1\" - all entries ignored"
@@ -1535,24 +1544,24 @@ msgstr "Zavedení: Chyba v src_new() : %1"
 msgid "return %1"
 msgstr "Vrácená hodnota: %1"
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr "Neznámý typ procesoru \"%1\"; přehlíží se"
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr "Procesor se nepodařilo vytvořit. Přehlíží se."
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr "Špatný uzel poslán Route::set_state() [%1]"
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 "Nalezen stav cíle vyvážení pro cestu (%1), aniž by bylo nalezeno vyvážení!"
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 "Špatně utvořený řetězec znaků pro klí� pořadí roztřídění v souboru sezení! "
@@ -1814,7 +1823,7 @@ msgstr "%1: Polohu souboru %2 nelze vyhledat pro vyvedení"
 msgid "Export ended unexpectedly: %1"
 msgstr "Vyvedení skon�ilo neo�ekávaně: %1"
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
@@ -1822,11 +1831,11 @@ msgstr ""
 "Kodér LTC: Neplatná rychlost snímkování - Kódování LTC je pro zbývající �ást "
 "tohoto sezení zakázáno."
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr "Sezení: Nepodařilo se poslat úplný �asový kód MIDI"
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr "Sezení: Nelze poslat quarter-frame MTC (%1)"
 
@@ -1834,18 +1843,17 @@ msgstr "Sezení: Nelze poslat quarter-frame MTC (%1)"
 msgid "Session: cannot create Playlist from XML description."
 msgstr "Sezení: Nelze vytvořit seznam skladeb z popisu XML"
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr "Sezení: Chyba v no_roll pro %1"
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr "Chyba v programování: Neplatný typ události v process_event (%1)"
 
 #: session_state.cc:139
-#, fuzzy
 msgid "Could not use path %1 (%2)"
-msgstr "Nepodařilo se použít cestu %1 (%s)"
+msgstr "Nepodařilo se použít cestu %1 (%2)"
 
 #: session_state.cc:267
 msgid "solo cut control (dB)"
@@ -2210,7 +2218,7 @@ msgstr "Neznámý stav transportu JACK v Sync-Callback"
 msgid "Cannot loop - no loop range defined"
 msgstr "Nelze přehrávat ve smy�ce - Nestanovena žádná oblast smy�ky"
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
@@ -2218,7 +2226,7 @@ msgstr ""
 "Souvislé přehrávání ve smy�ce není možné, dokud %1 používá transport JACK.\n"
 "Doporu�uje se změna volby v nastavení"
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2227,25 +2235,20 @@ msgstr ""
 "dokud je %1 spojen s transportem JACK."
 
 #: smf_source.cc:252
-#, fuzzy
 msgid "Unable to read event prefix, corrupt MIDI ring"
-msgstr ""
-"Nelze pře�íst předponu události, poškozená kruhová vyrovnávací paměť MIDI"
+msgstr "Nelze pře�íst předponu události, poškozen okraj MIDI"
 
 #: smf_source.cc:265
-#, fuzzy
 msgid "Event has time and size but no body, corrupt MIDI ring"
-msgstr ""
-"Pře�teny �as/velikost, ale ne vyrovnávací paměť, poškozená kruhová "
-"vyrovnávací paměť MIDI"
+msgstr "Událost má �as a velikost, ale nemá tělo, poškozen okraj MIDI"
 
 #: smf_source.cc:271
 msgid "Event time is before MIDI source position"
-msgstr ""
+msgstr "Čas události je před polohou zdroje MIDI"
 
 #: smf_source.cc:306 smf_source.cc:345
 msgid "Skipping event with unordered time %1"
-msgstr ""
+msgstr "Přeskakuje se událost s neuspořádaným �asem %1"
 
 #: smf_source.cc:410
 msgid "cannot open MIDI file %1 for write"
@@ -2374,7 +2377,7 @@ msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 "Pokus o zápis zvukového zdrojového souboru chráněného proti zápisu (%1)"
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr "Chyba v programování: %1 %2"
 
@@ -2639,11 +2642,11 @@ msgstr "M-Clock"
 msgid "LTC"
 msgstr "LTC"
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr "Chyba v programování: neznámý nativní formát hlavi�ky: %1"
 
-#: utils.cc:604
+#: utils.cc:614
 msgid "cannot open directory %1 (%2)"
 msgstr "Nelze otevřít adresář %1 (%2)"
 
diff --git a/libs/ardour/po/de.po b/libs/ardour/po/de.po
index 564cafd434..87cd8be124 100644
--- a/libs/ardour/po/de.po
+++ b/libs/ardour/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-17 11:09+0200\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2013-07-23 15:04+0200\n"
 "Last-Translator: Edgar Aichinger <edogawa@aon.at>\n"
 "Language-Team: German <ardour-dev@lists.ardour.org>\n"
@@ -31,58 +31,58 @@ msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 "AudioDiskstream %1: es gibt keine Wiedergabeliste, die kopiert werden kann!"
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: Kann während des Befüllens %2 nicht aus Wiedergabeliste "
 "bei Frame %3 lesen"
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: Kann %2 nicht aus Wiedergabeliste bei Frame %3 lesen"
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "AudioDiskstream %1: Kann nicht auf Disk schreiben"
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "AudioDiskstream %1: Kann aufgenommene Daten nicht auf Disk schreiben!"
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: konnte keine Region für die komplette Audiodatei erzeugen"
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 "AudioDiskstream: konnte keine Region für das aufgenommene Audiomaterial "
 "erzeugen!"
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "Programmierfehler: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "AudioDiskstream: Kanal %1 Bereichsüberschreitung"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr "%1:%2 neue Aufnahmedatei nicht korrekt initialisiert"
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr "%1: kann vorläufige Aufnahme-Quelldatei %2 nicht wiederherstellen"
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 "%1: Liste enthält falsche Anzahl vorläufiger Quellen - alle werden ignoriert"
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 "%1: kann aus vorläufigen Aufnahmequellen keine Region für die komplette "
@@ -136,7 +136,7 @@ msgstr "Audio-Wiedergabelisten (unbenutzt)"
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -316,8 +316,8 @@ msgstr "AudioSource: kann Pfad für Peaks (b) \"%1\" nicht öffnen (%2)"
 msgid ""
 "AudioSource[%1]: peak read - cannot read %2 samples at offset %3 of %4 (%5)"
 msgstr ""
-"AudioSource[%1]: peak read - kann %2 Samples bei Offset %3 von %4 nicht "
-"lesen(%5)"
+"AudioSource[%1]: peak read - kann %2 Samples bei Offset %3 von %4 nicht lesen"
+"(%5)"
 
 #: audiosource.cc:667
 msgid "%1: could not write read raw data for peak computation (%2)"
@@ -550,7 +550,7 @@ msgstr "Verlustbehaftete Kompression"
 msgid "Lossless compression"
 msgstr "Verlustfreie  Kompression"
 
-#: export_format_manager.cc:207 export_format_specification.cc:579
+#: export_format_manager.cc:218 export_format_specification.cc:579
 msgid "Session rate"
 msgstr "Projektrate"
 
@@ -582,7 +582,7 @@ msgstr "Dreieck"
 msgid "Rectangular"
 msgstr "Rechteck"
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr "Kein"
 
@@ -800,24 +800,24 @@ msgstr "kann momentanes Arbeitsverzeichnis nicht bestimmen (%1)"
 msgid "unknown file type for session %1"
 msgstr "Unbekannter Dateityp für Projekt %1"
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 "Konnte die Systemgrenze für offene Dateien nicht auf \"unbeschränkt\" setzen"
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr "Konnte die Systemgrenze für offene Dateien nicht auf %1 setzen"
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr "Ihre Systemkonfiguration beschränkt %1 auf nur %2 offene Dateien"
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr "Konnte die Grenze für offene Dateien nicht erhalten (%1)"
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr "Lade Konfiguration"
 
@@ -1063,7 +1063,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr "unkorrekter XML-Modus an Locations::set_state weitergereicht"
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr "Projekt"
 
@@ -1149,25 +1149,25 @@ msgstr "MidiDiskstream: Wiedergabeliste \"%1\" ist keine MIDI-Wiedergabeliste"
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr "MidiDiskstream %1: es gibt keine Wiedergabeliste zum Kopieren!"
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 "MidiDiskstream %1: kann %2 nicht von Wiedergabeliste bei Frame %3 lesen"
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr "MidiDiskstream %1: kann nicht auf Disk schreiben"
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 "MidiDiskstream \"%1\": kann aufgenommene Daten nicht auf Disk schreiben!"
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr "%1: konnte Region für die komplette MIDI-Datei nicht erzeugen"
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr "MidiDiskstream: konnte Region für aufgenommenes MIDI nicht erzeugen"
 
@@ -1384,23 +1384,23 @@ msgstr ""
 "Das Speichern von Pluginpresets werden in diesem %1-Binärpaket nicht "
 "unterstützt. Erwägen Sie, für die Vollversion zu bezahlen"
 
-#: plugin_insert.cc:599
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "Programmierfehler:"
 
-#: plugin_insert.cc:914
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr "Dem XML-Knoten zur Beschreibung des Plugins fehlt das \"type\"-Feld"
 
-#: plugin_insert.cc:929
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr "Unbekannter Plugintyp %1 im Einfüge-Status des Plugins"
 
-#: plugin_insert.cc:957
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr "Das Plugin hat kein Feld für die eindeutige ID"
 
-#: plugin_insert.cc:966
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
@@ -1408,15 +1408,15 @@ msgstr ""
 "Referenz auf ein unbekanntes Plugin (\"%1\") gefunden.\n"
 "Vielleicht wurde es seit der letzten Verwendung entfernt oder verschoben."
 
-#: plugin_insert.cc:1082
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr "PluginInsert: Auto: keine LADSPA Portnummer"
 
-#: plugin_insert.cc:1089
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr "PluginInsert: Auto: Port-ID Bereichsüberschreitung"
 
-#: plugin_insert.cc:1125
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 "PluginInsert: automatisierbares Kontrollelement %1 nicht gefunden - ignoriert"
@@ -1566,23 +1566,23 @@ msgstr "Import: Fehler in src_new() : %1"
 msgid "return %1"
 msgstr "Rückgabewert: %1"
 
-#: route.cc:1101 route.cc:2557
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr "unbekannter Prozessortyp \"%1\"; ignoriert"
 
-#: route.cc:1113
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr "Prozessor konnte nicht erzeugt werden. Ignoriert."
 
-#: route.cc:1986 route.cc:2210
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr "Schlechter Knoten an Route::set_state() gesendet [%1]"
 
-#: route.cc:2045
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr "Pannerziel-Status für Route (%1) ohne Panner gefunden!"
 
-#: route.cc:2113 route.cc:2117 route.cc:2324 route.cc:2328
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 "schlecht geformte Zeichenkette für den Schlüssel der Sortierreihenfolge in "
@@ -1853,7 +1853,7 @@ msgstr "%1: kann für Export nicht Dateiposition %2 aufsuchen"
 msgid "Export ended unexpectedly: %1"
 msgstr "Export endet unerwartet: %1"
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
@@ -1861,11 +1861,11 @@ msgstr ""
 "LTC-Kodierer: ungültige Framerate - das Kodieren von LTC wird für den "
 "restlichen Teil dieses Projekts ausgesetzt."
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr "Session: konnte vollständigen MIDI-Timecode nicht senden"
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr "Session: kann quarter-frame MTC-Nachricht nicht senden (%1)"
 
@@ -2262,7 +2262,7 @@ msgstr "Unbekannter JACK-Transportstatus im Sync-Callback"
 msgid "Cannot loop - no loop range defined"
 msgstr "Kann nicht loopen - kein Schleifenbereich definieert"
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
@@ -2271,7 +2271,7 @@ msgstr ""
 "benutzt.\n"
 "Ändern Sie die Konfigurationsoption"
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
diff --git a/libs/ardour/po/el.po b/libs/ardour/po/el.po
index ab1195e237..5801300003 100644
--- a/libs/ardour/po/el.po
+++ b/libs/ardour/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour 0.664.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2007-04-16 00:38+0200\n"
 "Last-Translator: Klearchos Gourgourinis <muadib@in.gr>\n"
 "Language-Team: Hellenic(Greek)\n"
@@ -29,59 +29,59 @@ msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 "AudioDiskstream %1: δεν υπά�χει λίστα αναπα�/γής για να γίνει αντιγ�αφή!"
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: κατα την αναγόμωση, δεν μπό�εσα να διαβάσω %2 από τη "
 "λίστα αναπα�/γής στο frame %3"
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: δεν μπό�εσα να διαβάσω %2 από τη λίστα αναπα�/γής στο "
 "frame %3"
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "AudioDiskstream %1: δεν μπο�ώ να γ�άψω στο δίσκο"
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 "AudioDiskstream \"%1\": αδ�νατη η εκκαθά�ιση δειγματοληπτικών δεδομένων στο "
 "δίσκο!"
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: δεν μπό�εσα να δημιου�γήσω πε�ιοχή για ολόκλη�ο audio file"
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 "AudioDiskstream: δεν μπό�εσα να δημιου�γήσω πε�ιοχή για δειγματοληψίες!"
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "σφάλμα π�ογ�αμματιστή: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "AudioDiskstream: κανάλι %1 εκτός διαστήματος"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr "%1:%2 νέα δειγματοληψία δεν εκκινήθη σωστά"
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr "%1: δεν μπο�ώ να ανοίξω το α�χείο %2 από την απαιτο�μενη πηγή"
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr "%1: ετυπώθη λανθασμένος α�ιθμός απαιτο�μενων πηγών - αγνοήθηκαν όλες"
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 "%1: αδ�νατη η δημιου�γία ακέ�αιας πε�ιοχής από τις απαιτο�μενες πηγές "
@@ -131,7 +131,7 @@ msgstr ""
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -212,49 +212,49 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr ""
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
 msgstr ""
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
 msgstr ""
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 #, fuzzy
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "IO: δεν μπο�εί να καταχώ�ηθεί η θ��α εισόδου %1"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr ""
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr "η σ�νδεση εκλήθη π�ιν να εκκινηθεί η engine"
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr "AudioEngine: αδ�νατη η σ�νδεση %1 (%2) σε %3 (%4)"
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr "η αποσ�νδεση εκλήθη π�ιν να εκκινηθεί η engine"
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 #, fuzzy
 msgid "get_port_by_name() called before engine was started"
 msgstr "η �ουτίνα get_port_by_name() εκλήθη π�ιν να εκκινηθεί η engine"
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr "η �ουτίνα get_ports εκλήθη π�ιν να εκκινηθεί η engine"
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr "Αποτυχία συνδέσεως με τον JACK"
 
@@ -540,7 +540,7 @@ msgstr ""
 msgid "Lossless compression"
 msgstr ""
 
-#: export_format_manager.cc:207 export_format_specification.cc:579
+#: export_format_manager.cc:218 export_format_specification.cc:579
 msgid "Session rate"
 msgstr ""
 
@@ -574,7 +574,7 @@ msgstr ""
 msgid "Rectangular"
 msgstr ""
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr ""
 
@@ -796,25 +796,25 @@ msgstr "δεν μπο�ώ να καθο�ίσω τον τ�έχοντα ενε�
 msgid "unknown file type for session %1"
 msgstr "άγνωστος τ�πος α�χείου για την συνεδ�ία %1"
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 
-#: globals.cc:206
+#: globals.cc:207
 #, fuzzy
 msgid "Could not set system open files limit to %1"
 msgstr "αδ�νατη η επαναφο�ά του state file από backup %1"
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 #, fuzzy
 msgid "Could not get system open files limit (%1)"
 msgstr "%1: δεν μπό�εσα να γ�άψω δεδομένα του α�χείου peak (%2)"
 
-#: globals.cc:267
+#: globals.cc:266
 #, fuzzy
 msgid "Loading configuration"
 msgstr "Ανάκληση α�χείου �υθμίσεων χ�ήστη %1"
@@ -975,21 +975,21 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr "LADSPA: το module δεν έχει ενδεικτική λειτου�γία."
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr "LADSPA: το plugin την 'κοπάνισε' μετά την ανακάλυψη του!"
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 "LADSPA: \"%1\" δεν μπο�εί να χ�ησιμοποιηθεί, εφ'όσον δεν μπο�εί να κάνει επι "
 "τόπου επεξε�γασία"
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 #, fuzzy
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
@@ -999,36 +999,36 @@ msgstr ""
 "ενδείκνυται αλλαγή στο σχεδιασμό του plugin, και οι �υθμίσεις ίσως να είναι "
 "άκυ�ες"
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr "Κακός κόμβος εστάλη στο LadspaPlugin::set_state"
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr "LADSPA: κανείς α�ιθμός θ��ας ladspa"
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr "LADSPA: κανένα δεδομένο θ��ας ladspa"
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr "LADSPA: δεν μπο�ώ να φο�τώσω module από \"%1\""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 #, fuzzy
 msgid "Could not locate HOME.  Preset not removed."
 msgstr "Δεν μπό�εσα να β�ώ το HOME.  Π�ο-��θμιση δεν αποθηκε�θηκε."
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "Δεν μπό�εσα να δημιου�γήσω το %1.  Π�ο-��θμιση δεν αποθηκε�θηκε. (%2)"
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr "Σφάλμα στην αποθήκευση α�χείου π�ο-�υθμίσεων %1."
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr "Δεν μπό�εσα να β�ώ το HOME.  Π�ο-��θμιση δεν αποθηκε�θηκε."
 
@@ -1071,7 +1071,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr "λανθασμένο XML mode πέ�ασε στις Τοποθεσίες::set_state"
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr ""
 
@@ -1146,31 +1146,31 @@ msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 "AudioDiskstream %1: δεν υπά�χει λίστα αναπα�/γής για να γίνει αντιγ�αφή!"
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 #, fuzzy
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: δεν μπό�εσα να διαβάσω %2 από τη λίστα αναπα�/γής στο "
 "frame %3"
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 #, fuzzy
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr "AudioDiskstream %1: δεν μπο�ώ να γ�άψω στο δίσκο"
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 #, fuzzy
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 "AudioDiskstream \"%1\": αδ�νατη η εκκαθά�ιση δειγματοληπτικών δεδομένων στο "
 "δίσκο!"
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 #, fuzzy
 msgid "%1: could not create region for complete midi file"
 msgstr "%1: δεν μπό�εσα να δημιου�γήσω πε�ιοχή για ολόκλη�ο audio file"
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 #, fuzzy
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
@@ -1385,24 +1385,36 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "σφάλμα π�ογ�αμματισμο�: "
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 #, fuzzy
 msgid "XML node describing plugin is missing the `type' field"
 msgstr "Στον κόμβο XML που πε�ιγ�άφει το insert λείπει το πεδίο `type'"
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr "άγνωστος τ�πος plugin %1 στην κατάσταση εισαχθέντων plugins"
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr ""
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
@@ -1410,15 +1422,15 @@ msgstr ""
 "Ευ�έθη μια αναφο�ά σε plugin (\"%1\") που είναι άγνωστο.\n"
 "Ίσως έχει διαγ�αφεί ή μετακινηθεί από την τελευταία του χ�ήση."
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr "PluginInsert: Auto: χω�ίς α�ιθμό θ��ας ladspa"
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr "PluginInsert: Auto: το id θ��ας είναι εκτός πεδίου"
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 #, fuzzy
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr "αβέβαιο συμβάν αυτοματισμο� ευ�έθηκε (και αγνοήθηκε)"
@@ -1577,25 +1589,25 @@ msgstr "Εισαγωγή: src_new() απέτυχε : %1"
 msgid "return %1"
 msgstr ""
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 #, fuzzy
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr "άγνωστος τ�πος Λήψης(Insert) \"%1\"... αγνοήθηκε"
 
-#: route.cc:1112
+#: route.cc:1117
 #, fuzzy
 msgid "processor could not be created. Ignored."
 msgstr "εισαγωγή δεν μπό�εσε να δημιου�γηθεί. Αγνοήθηκε."
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr "Κακός κόμβος εστάλη στο Route::set_state() [%1]"
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 "δ�σμο�φη γ�αμμή κλειδιο� ταξινομήσεως στο α�χείο καταστάσεως ! [%1] ... "
@@ -1865,17 +1877,17 @@ msgstr "%1: δεν μποÏ�ÏŽ να αναζητήσω στο %2 για εξαγÏ
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr "Συνεδ�ία: δεν μπό�εσα να στείλω ολόκλη�ο MIDI time code"
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr "Συνεδ�ία: δεν μπο�ώ να στείλω τέτα�το-frame MTC μήνυμα (%1)"
 
@@ -1883,11 +1895,11 @@ msgstr "Συνεδ�ία: δεν μπο�ώ να στείλω τέτα�το-fra
 msgid "Session: cannot create Playlist from XML description."
 msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω την Playlist από την XML πε�ιγ�αφή."
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr "Συνεδ�ία: σφάλμα στο no roll για %1"
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 "Σφάλμα π�ογ�αμματισμο�: πα�άνομος τ�πος συμβάντος στο process_event (%1)"
@@ -2303,7 +2315,7 @@ msgstr "Άγνωστη κατάσταση του JACK transport %1 στην αν
 msgid "Cannot loop - no loop range defined"
 msgstr "Δεν γίνεται loop - κανένα διάστημα loop δεν π�οσδιο�ίστηκε"
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 #, fuzzy
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
@@ -2313,7 +2325,7 @@ msgstr ""
 "transport.\n"
 "Συνιστο�με την αλλαγή των διαμο�φωμένων �υθμίσεων"
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 #, fuzzy
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
@@ -2468,7 +2480,7 @@ msgstr "SndFileSource: δεν μπο�ο�σα να αναζητήσω στο fr
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr "σφάλμα π�ογ�αμματισμο�: %1 %2"
 
@@ -2730,12 +2742,12 @@ msgstr ""
 msgid "LTC"
 msgstr ""
 
-#: utils.cc:589
+#: utils.cc:599
 #, fuzzy
 msgid "programming error: unknown native header format: %1"
 msgstr "σφάλμα π�ογ�αμματισμο�: άγνωστος τ�πος Redirect εδημιου�γήθη!"
 
-#: utils.cc:604
+#: utils.cc:614
 #, fuzzy
 msgid "cannot open directory %1 (%2)"
 msgstr "δεν μπο�ώ να ανοίξω το π�όσφατο α�χείο συνεδ�ίας %1 (%2)"
diff --git a/libs/ardour/po/es.po b/libs/ardour/po/es.po
index 0f0e1be1f6..e8f43cea11 100644
--- a/libs/ardour/po/es.po
+++ b/libs/ardour/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Pablo Fernández <pablo.fbus@gmail.com>\n"
 "Language-Team: Grupo de Traducción al Español <traductores@teklibre.com>\n"
@@ -32,57 +32,57 @@ msgstr ""
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr "AudioDiskstream %1: ¡No hay ninguna lista de reproducción para copiar!"
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: al rellenar, no se puede leer %2 de la lista de "
 "reproducción en el cuadro %3."
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 "AudioDiskstream %1: no se puede leer %2 de la lista de reproducción en el "
 "cuadro %3."
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "AudioDiskstream %1: no se puede escribir en el disco."
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: no se pudo crear la región para el archivo de audio completo"
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr "AudioDiskstream: ¡No se pudo crear región para el audio capturado!"
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "error de programador: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "AudioDiskstream: canal %1 fuera de rango"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr "%1:%2 archivo de captura nuevo no inicializado correctamente"
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr "%1: no se puede restaurar el archivo de captura pendiente %2"
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 "%1: cantidad listada de fuentes pendientes incorrecta - se ignorarán todas"
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 "%1: no se puede crear la región del archivo entero desde las fuentes de "
@@ -130,7 +130,7 @@ msgstr ""
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -210,7 +210,7 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr "Conectar sesión al motor"
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
@@ -218,7 +218,7 @@ msgstr ""
 "ya existe un puerto con el nombre \"%1\": compruebe si hay nombres de pistas/"
 "buses duplicados"
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
@@ -226,35 +226,35 @@ msgstr ""
 "JACK no dispone de más puertos. Debes salir de %1 y reiniciar JACK con más "
 "puertos si necesitas tantas pistas."
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "AudioEngine: no se puede registrar el puerto \"%1\": %2"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr "Incapaz de crear puerto: %1"
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr "conexión invocada antes de que se inicie el motor"
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr "AudioEngine: no se puede conectar %1 (%2) a %3 (%4)"
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr "desconexión invocada antes de que se inicie el motor"
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr "get_port_by_name() invocada antes de que se inicie el motor"
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr "get_ports invocada antes de que se inicie el motor"
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr "falló la conexión a JACK"
 
@@ -536,7 +536,7 @@ msgstr ""
 msgid "Lossless compression"
 msgstr ""
 
-#: export_format_manager.cc:207 export_format_specification.cc:579
+#: export_format_manager.cc:218 export_format_specification.cc:579
 msgid "Session rate"
 msgstr ""
 
@@ -568,7 +568,7 @@ msgstr ""
 msgid "Rectangular"
 msgstr ""
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr ""
 
@@ -776,23 +776,23 @@ msgstr ""
 msgid "unknown file type for session %1"
 msgstr "tipo de archivo desconocido para la sesión %1"
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr "No se pudo establecer el límite de archivos abiertos a \"unlimited\""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr "No se pudo establecer el límite de archivos abiertos a \"unlimited\""
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr "No se pudo obtener el límite de archivos abiertos del sistema (%1) "
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr "Cargando configuración"
 
@@ -944,53 +944,53 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr ""
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr ""
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
 msgstr ""
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr ""
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr ""
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr ""
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr ""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr ""
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "No se pudo crear %1. El preset no se guardó. (%2)"
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr "Error al guardar el archivo de preset %1."
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr ""
 
@@ -1030,7 +1030,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr ""
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr "sesión"
 
@@ -1107,23 +1107,23 @@ msgstr ""
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr ""
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
 
@@ -1317,23 +1317,35 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "error de programación:"
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr ""
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr "Tipo de plugin desconocido %1 en estado de inserción de plugins"
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr "El plugin no tiene un campo de ID único."
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
@@ -1341,15 +1353,15 @@ msgstr ""
 "Se encontró una referencia a un plugin (\"%1\") que no se conoce.\n"
 "Quizás se suprimió o se movió desde la última vez que fue usado."
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr ""
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr ""
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 
@@ -1494,23 +1506,23 @@ msgstr ""
 msgid "return %1"
 msgstr "retorno %1"
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr ""
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr ""
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr ""
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 
@@ -1763,17 +1775,17 @@ msgstr ""
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr ""
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
 
@@ -1781,11 +1793,11 @@ msgstr ""
 msgid "Session: cannot create Playlist from XML description."
 msgstr ""
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr ""
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 
@@ -2141,13 +2153,13 @@ msgstr ""
 msgid "Cannot loop - no loop range defined"
 msgstr "No se puede reproducir en bucle - no se definió un rango de bucle."
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2290,7 +2302,7 @@ msgstr ""
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr "error de programación: %1 %2"
 
@@ -2536,11 +2548,11 @@ msgstr ""
 msgid "LTC"
 msgstr "LTC"
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr ""
 
-#: utils.cc:604
+#: utils.cc:614
 msgid "cannot open directory %1 (%2)"
 msgstr ""
 
diff --git a/libs/ardour/po/it.po b/libs/ardour/po/it.po
index 81ee353562..532e23c348 100644
--- a/libs/ardour/po/it.po
+++ b/libs/ardour/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour 0.664.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2003-05-21 12:50+0500\n"
 "Last-Translator: Filippo Pappalardo <filippo@email.it>\n"
 "Language-Team: Italian\n"
@@ -29,60 +29,60 @@ msgstr ""
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr "DiskStream %1: non esiste alcuna playlist di cui fare una copia!"
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 #, fuzzy
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr "DiskStream %1: impossibile leggere %2 dalla playlista al frame %3"
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 #, fuzzy
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr "DiskStream %1: impossibile leggere %2 dalla playlista al frame %3"
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 #, fuzzy
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "DiskStream %1: impossibile scrivere sul disco"
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 #, fuzzy
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "DiskStream \"%1\": impossibile scaricare i dati acquisiti sul disco!"
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: impossibile creare una regione per il file audio completo"
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 #, fuzzy
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr "DiskStream: impossibile creare una regione per l'audio registrato!"
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 #, fuzzy
 msgid "programmer error: %1"
 msgstr "errore di programmazione: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 #, fuzzy
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "DiskStream: canale fuori margine"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr "%1:%2 nuovo file di registrazione non è stato avviato correttamente"
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 #, fuzzy
 msgid "%1: cannot restore pending capture source file %2"
 msgstr "Import: impossibile aprire il file audio di input \"%1\""
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 #, fuzzy
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr "Playlist: impossibile creare la Regione dal file di stato"
@@ -131,7 +131,7 @@ msgstr ""
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -209,51 +209,51 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr ""
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
 msgstr ""
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
 msgstr ""
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 #, fuzzy
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "IO: impossibile registrare la porta %1"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr ""
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr "richiesta di connessione avvenuta prima dell'avvio dell'applicazione"
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr ""
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr ""
 "richiesta di disconnessione avvenuta prima dell'avvio dell'applicazione"
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 #, fuzzy
 msgid "get_port_by_name() called before engine was started"
 msgstr ""
 "richiesta get_port_by_name() avvenuta prima dell'avvio dell'applicazione"
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr "richiesta di get_ports avvenuta prima dell'avvio dell'applicazione"
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr ""
 
@@ -538,7 +538,7 @@ msgstr ""
 msgid "Lossless compression"
 msgstr ""
 
-#: export_format_manager.cc:207 export_format_specification.cc:579
+#: export_format_manager.cc:218 export_format_specification.cc:579
 msgid "Session rate"
 msgstr ""
 
@@ -572,7 +572,7 @@ msgstr ""
 msgid "Rectangular"
 msgstr ""
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr ""
 
@@ -797,25 +797,25 @@ msgstr "impossibile determinare la cartella di lavoro corrente (%1)"
 msgid "unknown file type for session %1"
 msgstr "tipo di fle sconosciuto per la sessione %1"
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 
-#: globals.cc:206
+#: globals.cc:207
 #, fuzzy
 msgid "Could not set system open files limit to %1"
 msgstr "Esportazione: impossibile scrivere dati sul file di output (%1)"
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 #, fuzzy
 msgid "Could not get system open files limit (%1)"
 msgstr "IO: impossibile registrare la porta %1"
 
-#: globals.cc:267
+#: globals.cc:266
 #, fuzzy
 msgid "Loading configuration"
 msgstr "Ardour: impossibile la lettura del file di configurazione \"%1\""
@@ -972,54 +972,54 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr "LADSPA: il modulo non ha alcuna funzione descriptor."
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr "LADSPA: il plugin è stato rimosso"
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
 msgstr ""
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr ""
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr ""
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr ""
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr "LADPSA: impossibile caricare il modulo da \"%1\""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 #, fuzzy
 msgid "Could not locate HOME.  Preset not removed."
 msgstr "impossibile localizzare HOME.  Preset non salvato."
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "Impossibile creare %1 . Preset non salvato. (%2)"
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr "Errore nel salvare il file di preset %1."
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr "impossibile localizzare HOME.  Preset non salvato."
 
@@ -1060,7 +1060,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr ""
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr ""
 
@@ -1134,27 +1134,27 @@ msgstr "DiskStream %1: impossibile leggere %2 dalla playlista al frame %3"
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr "DiskStream %1: non esiste alcuna playlist di cui fare una copia!"
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 #, fuzzy
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr "DiskStream %1: impossibile leggere %2 dalla playlista al frame %3"
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 #, fuzzy
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr "DiskStream %1: impossibile scrivere sul disco"
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 #, fuzzy
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "DiskStream \"%1\": impossibile scaricare i dati acquisiti sul disco!"
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 #, fuzzy
 msgid "%1: could not create region for complete midi file"
 msgstr "%1: impossibile creare una regione per il file audio completo"
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 #, fuzzy
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr "DiskStream: impossibile creare una regione per l'audio registrato!"
@@ -1360,24 +1360,36 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "errore di programmazione: "
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 #, fuzzy
 msgid "XML node describing plugin is missing the `type' field"
 msgstr "Il nodo XML descrivente l'insert manca del campo `type'"
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr ""
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr ""
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
@@ -1385,15 +1397,15 @@ msgstr ""
 "Trovato un riferimento ad un plugin (\"%1\") sconosciuto.\n"
 "Forse  stato rimosso o spostato dall'ultima volta che lo si e' usato"
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr ""
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr ""
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 
@@ -1551,25 +1563,25 @@ msgstr ""
 msgid "return %1"
 msgstr ""
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 #, fuzzy
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr "impossibile creare la cartella per la sessione %1; ignorato"
 
-#: route.cc:1112
+#: route.cc:1117
 #, fuzzy
 msgid "processor could not be created. Ignored."
 msgstr "Sessione: impossibile creare un nuovo route"
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr ""
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 
@@ -1834,17 +1846,17 @@ msgstr ""
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr ""
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
 
@@ -1852,11 +1864,11 @@ msgstr ""
 msgid "Session: cannot create Playlist from XML description."
 msgstr "Sessione: impossibile creare Playlist dalla descrizione XML"
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr ""
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 
@@ -2271,13 +2283,13 @@ msgstr ""
 msgid "Cannot loop - no loop range defined"
 msgstr ""
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2426,7 +2438,7 @@ msgstr "FileSource: impossibile aprire \"%1\": (%2)"
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 #, fuzzy
 msgid "programming error: %1 %2"
 msgstr "errore di programmazione: %1"
@@ -2681,11 +2693,11 @@ msgstr ""
 msgid "LTC"
 msgstr ""
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr ""
 
-#: utils.cc:604
+#: utils.cc:614
 #, fuzzy
 msgid "cannot open directory %1 (%2)"
 msgstr "impossibile accedere al file di sessione recente %1 (%2)"
diff --git a/libs/ardour/po/nn.po b/libs/ardour/po/nn.po
index f0fb196641..e5c22966c4 100644
--- a/libs/ardour/po/nn.po
+++ b/libs/ardour/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2011-09-13 22:43+0100\n"
 "Last-Translator: Eivind Ødegård <meinmycell-lists@yahoo.no>\n"
 "Language-Team: Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -32,54 +32,54 @@ msgstr "Lyd-diskstraum: Spelelista \"%1\" er ikkje ei lydspeleliste"
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr "Lyd-diskstraum %1: det finst inga speleliste å kopiera!"
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 "Lyd-diskstraum %1: greidde ikkje lesa %2 frå spelelista, ramme %3, ved "
 "attfylling"
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr "Lyd-diskstraum %1: greidde ikkje lesa %2 frå spelelista, ramme %3"
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "Lyd-diskstraum %1: greidde ikkje skriva til disk"
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "Lyd-diskstraum \"%1\": greier ikkje skriva opptaket til disken!"
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: greidde ikkje laga bolk for heil lydfil"
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr "Lyd-diskstraum: greidde ikkje laga bolk frå opptaket!"
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "Programmerarfeil: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "Lyd-diskstraum: kanal %1 utanfor rekkjevidd"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr "%1: ny opptaksfil %2 vart ikkje påbyrja rett"
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr "%1: greidde ikkje henta fram att den ventande opptakskjeldefila %2"
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr "%1: feil tal på ventande kjelder på lista - ser bort frå alle"
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr "%1: greidde ikkje laga heilfilbolk frå ventande opptakskjelder"
 
@@ -125,7 +125,7 @@ msgstr "Lydspelelister (ubrukte)"
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr "Kople økta til maskin"
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
@@ -215,7 +215,7 @@ msgstr ""
 "ein port med namnet \"%1\" finst frå før: sjekk opp dublettar i namn på spor "
 "eller bussar"
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 #, fuzzy
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
@@ -224,35 +224,35 @@ msgstr ""
 "Det finst ikkje fleire JACK-portar. Du må stoppa %1 og starta JACK på nytt "
 "med nok portar viss du treng så mange spor."
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "AudioEngine: greier ikkje registrera porten \"%1\": %2"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr "greidde ikkje laga port: %1"
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr "tilkoplinga vart oppkalla frø tenaren starta"
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr "Lydmaskineri: Klarte ikkje kopla %1 (%2) til %3 (%4)."
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr "fråkoplinga vart oppkalla før tenaren starta"
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr "get_port_by_name() vart oppkalla før tenaren starta"
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr "get_ports vart oppkalla før tenaren starta"
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr "greidde ikkje kopla til JACK"
 
@@ -541,7 +541,7 @@ msgstr "Komprimering med tap"
 msgid "Lossless compression"
 msgstr "Tapsfri komprimering"
 
-#: export_format_manager.cc:207 export_format_specification.cc:579
+#: export_format_manager.cc:218 export_format_specification.cc:579
 msgid "Session rate"
 msgstr "Øktrate"
 
@@ -577,7 +577,7 @@ msgstr "Trekant"
 msgid "Rectangular"
 msgstr "Firkant"
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr "Ingen"
 
@@ -795,23 +795,23 @@ msgstr "greier ikkje avgjera kva som er arbeidsmappa no (%1)"
 msgid "unknown file type for session %1"
 msgstr "ukjend filtype for økta %1"
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr "Greidde ikkje setja systemgrensa for opne filer til \"uavgrensa\""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr "Greidde ikkje setja grensa for opne systemfiler til %1"
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr "Greidde ikkje få tak i grensa for opne systemfiler (%1)"
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr "Lastar oppsettet"
 
@@ -966,20 +966,20 @@ msgstr "H"
 msgid "%d"
 msgstr "%d"
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr "LADSPA: modulen har ingen skildringsfunksjon"
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr "LADSPA: tilleggsprogrammet har vorte borte sidan det vart oppdaga!"
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 "LADSPA: kan ikkje bruka \"%1\", sidan han ikkje kan prosessera på staden"
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 #, fuzzy
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
@@ -989,35 +989,35 @@ msgstr ""
 "tyda på feil i korleis tilleggsprogrammet er utforma, og at eventuelle "
 "ferdigprogram kan vera ugyldige."
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr "Feil punkt sendt til LadspaPlugin::set_state"
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr "LADSPA: ikkje noko Ladspa-portnummer"
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr "LADSPA: ingen portdata"
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr "LADSPA: greier ikkje lasta modul frå \"%1\""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr "Greidde ikkje finna heimemappa. Har ikkje fjera ferdigoppsett."
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "Greidde ikkje laga %1. Har ikkje lagra ferdigoppsett. (%2)"
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr "Feil med å lagra ferdigoppsettfila %1."
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr "Greidde ikkje finna heimemappa. Har ikkje lagra ferdigoppsett."
 
@@ -1057,7 +1057,7 @@ msgstr "Stader: forsøk på å bruka ukjend stad som vald stad"
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr "feil XML-modus send til Locations::set_state"
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr "økt"
 
@@ -1140,23 +1140,23 @@ msgstr "MIDI-diskstraum: Spelelista \"%1\" er ikkje ei midispeleliste"
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr "MIDI-diskstraum %1: det finst inga speleliste å kopiera!"
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr "MIDI-diskstraum %1: greidde ikkje lesa %2 frå spelelista, ramme %3"
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr "MIDI-diskstraum %1: greidde ikkje skriva til disk"
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr "MIDI-diskstraum \"%1\": greier ikkje skriva opptaket til disken!"
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr "%1: greidde ikkje laga bolk for heil midifil"
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr "MIDI-diskstraum: greidde ikkje laga bolk frå midi-opptaket!"
 
@@ -1355,23 +1355,41 @@ msgstr "Fann ingen speleliste-ID i PlaylistSource-XML!"
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr "Greidde ikkje byggja speleliste for PlaylistSource frå øktdata!"
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+#, fuzzy
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+"Du kan ikkje lagra førehandsoppsett for AudioUnit i denne versjonen av "
+"Ardour. Du bør vurdera å betala for ein nyare verjson"
+
+#: plugin.cc:398
+#, fuzzy
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+"Du kan ikkje lagra AudioUnit-innstillingar i denne versjonen av Ardour. Du "
+"bør vurdera å betala for ein nyare verjson"
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "programmeringsfeil: "
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr "XML-punktet som skildrar utvidinga manglar 'type'-feltet"
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr "ukjent programtilleggstype %1 i innpluggingstilstanden"
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr "Innstikket har ikkje noko eige ID-felt"
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
@@ -1379,15 +1397,15 @@ msgstr ""
 "Fann ein referanse til det ukjende tilleggsprogrammet \"%1\".\n"
 "Kanskje det har vorte fjerna eller flytt sidan sist det vart brukt."
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr "PluginInsert:Auto: ikkje noko ladspa-portnummer"
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr "PluginInsert: Auto: port-id utanfor rekkjevidd"
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 "PluginInsert: fann ikkje den automasjonsferdige kontrollen %1, såg bort frå "
@@ -1541,23 +1559,23 @@ msgstr "Import: src_new()-funkjsonen lukkast ikkje: %1"
 msgid "return %1"
 msgstr "retur %1"
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr "\"%1\" er ein ukjend prosesseringstype, hoppa over"
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr "greidde ikkje laga prosessering. Hoppa over."
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr "Feil punkt sendt til Route::set_state()-funksjonen [%1]"
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr "Fann panoreringsstatus for ruta (%1) utan panorering!"
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr "feilforma tingingsnykjelstreng i tilstandsfil! [%1] ... hoppa over."
 
@@ -1821,17 +1839,17 @@ msgstr "%1: greier ikkje finna %2 for eksportering"
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr "Økt: greidde ikke senda full MIDI-tidskode"
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr "Økt: greidde ikkje senda kvartramme-MTC-melding (%1)"
 
@@ -1839,11 +1857,11 @@ msgstr "Økt: greidde ikkje senda kvartramme-MTC-melding (%1)"
 msgid "Session: cannot create Playlist from XML description."
 msgstr "Økt: greier ikkje laga speleliste ut frå XML-skildringa."
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr "Økt: feil på ingen rull for %1"
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr "Programmeringsfeil: ulovleg handlingstype i process-event (%1)"
 
@@ -2225,7 +2243,7 @@ msgstr "Ukjend JACK-transporttilstand %1 i synk-tilbakekallet"
 msgid "Cannot loop - no loop range defined"
 msgstr "Greidde ikkje spela i lykkje - du har ikkje gjeve noko lykkjeområde"
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
@@ -2233,7 +2251,7 @@ msgstr ""
 "Samanhengande lykkjespeling er ikkje støtta når %1 bruker JACK-transporten.\n"
 "Me rår til at du endrar innstillingane."
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2384,7 +2402,7 @@ msgstr "SndFileSource: @ %1 greidde ikkje lesa %2 i %3 (%4) (len = %5)"
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr "prøvde å skriva til ei ikkje-skrivbar lydkjeldefil (%1)"
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr "programmeringsfeil: %1 %2"
 
@@ -2650,11 +2668,11 @@ msgstr "MIDI-klokke"
 msgid "LTC"
 msgstr "MTC"
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr "programmeringsfeil: ukjent opphavleg hovudformat: \"%1\""
 
-#: utils.cc:604
+#: utils.cc:614
 msgid "cannot open directory %1 (%2)"
 msgstr "greier ikkje opna mappa %1 (%2)"
 
@@ -3267,13 +3285,6 @@ msgstr "greier ikkje opna mappa %1 (%2)"
 #~ msgid "AUPlugin: render callback called illegally!"
 #~ msgstr "AUPlugin: oppteiknings-tilbakekall påkalla ulovleg!"
 
-#~ msgid ""
-#~ "Saving AudioUnit settings is not supported in this build of Ardour. "
-#~ "Consider paying for a newer version"
-#~ msgstr ""
-#~ "Du kan ikkje lagra AudioUnit-innstillingar i denne versjonen av Ardour. "
-#~ "Du bør vurdera å betala for ein nyare verjson"
-
 #~ msgid "Bad node sent to AUPlugin::set_state"
 #~ msgstr "Feil punkt sendt til AUPlugin::set_state"
 
@@ -3297,13 +3308,6 @@ msgstr "greier ikkje opna mappa %1 (%2)"
 #~ msgid "Saving plugin state to %1 failed"
 #~ msgstr "Greidde ikkje lagra innstikkstatus til %1"
 
-#~ msgid ""
-#~ "Saving AudioUnit presets is not supported in this build of Ardour. "
-#~ "Consider paying for a newer version"
-#~ msgstr ""
-#~ "Du kan ikkje lagra førehandsoppsett for AudioUnit i denne versjonen av "
-#~ "Ardour. Du bør vurdera å betala for ein nyare verjson"
-
 #~ msgid "Discovering AudioUnit plugins (could take some time ...)"
 #~ msgstr "Finn AudioUnit-innstikk (dette kan ta litt tid...)"
 
diff --git a/libs/ardour/po/pl.po b/libs/ardour/po/pl.po
index cb14bc358f..c9a01282a5 100644
--- a/libs/ardour/po/pl.po
+++ b/libs/ardour/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2008-04-10 10:51+0100\n"
 "Last-Translator: Piotr Zaryk <pzaryk@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -28,52 +28,52 @@ msgstr ""
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr ""
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "błąd programisty: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr ""
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr ""
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr ""
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 
@@ -119,7 +119,7 @@ msgstr ""
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -195,47 +195,47 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr ""
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
 msgstr ""
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
 msgstr ""
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr ""
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr ""
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr ""
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr "nie udało się połączyć z JACK"
 
@@ -499,7 +499,7 @@ msgstr ""
 msgid "Lossless compression"
 msgstr ""
 
-#: export_format_manager.cc:207 export_format_specification.cc:579
+#: export_format_manager.cc:218 export_format_specification.cc:579
 msgid "Session rate"
 msgstr ""
 
@@ -532,7 +532,7 @@ msgstr ""
 msgid "Rectangular"
 msgstr ""
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr ""
 
@@ -739,23 +739,23 @@ msgstr ""
 msgid "unknown file type for session %1"
 msgstr ""
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr ""
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr ""
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr ""
 
@@ -907,53 +907,53 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr ""
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr ""
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
 msgstr ""
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr ""
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr ""
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr ""
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr ""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr ""
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr ""
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr ""
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr ""
 
@@ -993,7 +993,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr ""
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr ""
 
@@ -1065,23 +1065,23 @@ msgstr ""
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr ""
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
 
@@ -1280,37 +1280,49 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr ""
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr ""
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr ""
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr ""
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
 msgstr ""
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr ""
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr ""
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 
@@ -1450,23 +1462,23 @@ msgstr ""
 msgid "return %1"
 msgstr ""
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr ""
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr ""
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr ""
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 
@@ -1720,17 +1732,17 @@ msgstr ""
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr ""
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
 
@@ -1738,11 +1750,11 @@ msgstr ""
 msgid "Session: cannot create Playlist from XML description."
 msgstr ""
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr ""
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 
@@ -2110,13 +2122,13 @@ msgstr ""
 msgid "Cannot loop - no loop range defined"
 msgstr ""
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2262,7 +2274,7 @@ msgstr ""
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr ""
 
@@ -2512,11 +2524,11 @@ msgstr ""
 msgid "LTC"
 msgstr "MTC"
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr ""
 
-#: utils.cc:604
+#: utils.cc:614
 #, fuzzy
 msgid "cannot open directory %1 (%2)"
 msgstr "nie można otworzyć pliku dźwiękowego metronomu %1 (%2)"
diff --git a/libs/ardour/po/ru.po b/libs/ardour/po/ru.po
index 81ed0e47c5..1dfd367b68 100644
--- a/libs/ardour/po/ru.po
+++ b/libs/ardour/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-14 03:23+0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2013-06-14 02:14+0300\n"
 "Last-Translator: �лек�андр Прокудин <alexandre.prokoudine@gmail.com>\n"
 "Language-Team: ру��кий <>\n"
@@ -32,52 +32,52 @@ msgstr ""
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr ""
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr ""
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr ""
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr ""
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr ""
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 
@@ -123,7 +123,7 @@ msgstr ""
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -203,47 +203,47 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr ""
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
 msgstr ""
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
 msgstr ""
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "AudioEngine: cannot register port \"%1\": %2"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr ""
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr ""
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr ""
 
@@ -509,7 +509,7 @@ msgstr "Сжатие � потер�ми"
 msgid "Lossless compression"
 msgstr "Сжатие без потерь"
 
-#: export_format_manager.cc:207 export_format_specification.cc:579
+#: export_format_manager.cc:218 export_format_specification.cc:579
 msgid "Session rate"
 msgstr "Ча�тота �еан�а"
 
@@ -541,7 +541,7 @@ msgstr "Треугольное"
 msgid "Rectangular"
 msgstr "Пр�моугольное"
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr "�ет"
 
@@ -746,23 +746,23 @@ msgstr ""
 msgid "unknown file type for session %1"
 msgstr ""
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr ""
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr ""
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr ""
 
@@ -914,53 +914,53 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr ""
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr ""
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
 msgstr ""
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr ""
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr ""
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr ""
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr ""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr ""
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr ""
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr ""
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr ""
 
@@ -1000,7 +1000,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr ""
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr ""
 
@@ -1076,23 +1076,23 @@ msgstr ""
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr ""
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
 
@@ -1286,37 +1286,49 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "ошибка программы: "
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr ""
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr ""
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr ""
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
 msgstr ""
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr ""
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr ""
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 
@@ -1459,23 +1471,23 @@ msgstr ""
 msgid "return %1"
 msgstr ""
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr ""
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr ""
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr ""
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 
@@ -1728,17 +1740,17 @@ msgstr ""
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr ""
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
 
@@ -1746,11 +1758,11 @@ msgstr ""
 msgid "Session: cannot create Playlist from XML description."
 msgstr ""
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr ""
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 
@@ -2103,13 +2115,13 @@ msgstr ""
 msgid "Cannot loop - no loop range defined"
 msgstr ""
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2253,7 +2265,7 @@ msgstr ""
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr "programming error: %1 %2"
 
@@ -2499,11 +2511,11 @@ msgstr ""
 msgid "LTC"
 msgstr "LTC"
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr "programming error: unknown native header format: %1"
 
-#: utils.cc:604
+#: utils.cc:614
 msgid "cannot open directory %1 (%2)"
 msgstr "cannot open directory %1 (%2)"
 
diff --git a/libs/ardour/po/sv.po b/libs/ardour/po/sv.po
index 4987189bd3..2e7c6e0ddc 100644
--- a/libs/ardour/po/sv.po
+++ b/libs/ardour/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ardour\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2006-10-03 01:09+GMT+1\n"
 "Last-Translator: Petter Sundlöf <petter.sundlof@findus.dhs.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -28,52 +28,52 @@ msgstr ""
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr ""
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr ""
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr ""
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr ""
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr ""
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 
@@ -119,7 +119,7 @@ msgstr ""
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -198,48 +198,48 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr "Ansluter till ljudmotorn"
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
 msgstr ""
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
 msgstr ""
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 #, fuzzy
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr "AudioEngine: kan inte ansluta %1 (%2) till %3 (%4)"
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr ""
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr "AudioEngine: kan inte ansluta %1 (%2) till %3 (%4)"
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr ""
 
@@ -505,7 +505,7 @@ msgstr ""
 msgid "Lossless compression"
 msgstr ""
 
-#: export_format_manager.cc:207 export_format_specification.cc:579
+#: export_format_manager.cc:218 export_format_specification.cc:579
 msgid "Session rate"
 msgstr ""
 
@@ -537,7 +537,7 @@ msgstr ""
 msgid "Rectangular"
 msgstr ""
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr ""
 
@@ -744,23 +744,23 @@ msgstr ""
 msgid "unknown file type for session %1"
 msgstr ""
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr ""
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr ""
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr ""
 
@@ -915,53 +915,53 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr ""
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr ""
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
 "in the plugin design, and presets may be invalid"
 msgstr ""
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr ""
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr ""
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr ""
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr ""
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr ""
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr ""
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr ""
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr ""
 
@@ -1001,7 +1001,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr ""
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr ""
 
@@ -1073,23 +1073,23 @@ msgstr ""
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr ""
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr ""
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
 
@@ -1283,37 +1283,49 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr ""
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr ""
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr ""
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr ""
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
 msgstr ""
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr ""
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr ""
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 
@@ -1453,23 +1465,23 @@ msgstr ""
 msgid "return %1"
 msgstr ""
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr ""
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr ""
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr ""
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 
@@ -1722,17 +1734,17 @@ msgstr ""
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr ""
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
 
@@ -1740,11 +1752,11 @@ msgstr ""
 msgid "Session: cannot create Playlist from XML description."
 msgstr ""
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr ""
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 
@@ -2095,13 +2107,13 @@ msgstr ""
 msgid "Cannot loop - no loop range defined"
 msgstr ""
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2244,7 +2256,7 @@ msgstr ""
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr ""
 
@@ -2490,11 +2502,11 @@ msgstr ""
 msgid "LTC"
 msgstr ""
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr ""
 
-#: utils.cc:604
+#: utils.cc:614
 msgid "cannot open directory %1 (%2)"
 msgstr ""
 
diff --git a/libs/ardour/po/zh.po b/libs/ardour/po/zh.po
index 07620505a1..1d0e8f3d44 100644
--- a/libs/ardour/po/zh.po
+++ b/libs/ardour/po/zh.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ardour 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-11 08:49-0400\n"
+"POT-Creation-Date: 2013-09-03 07:59-0400\n"
 "PO-Revision-Date: 2012-08-26 13:43+0800\n"
 "Last-Translator: Rui-huai Zhang <zrhzrh>\n"
 "Language-Team: zrhzrh <zrhzrh@mail.ustc.edu.cn>\n"
@@ -29,52 +29,52 @@ msgstr ""
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: audio_diskstream.cc:823 audio_diskstream.cc:833
+#: audio_diskstream.cc:848 audio_diskstream.cc:858
 msgid ""
 "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:989
+#: audio_diskstream.cc:1014
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: audio_diskstream.cc:1358 audio_diskstream.cc:1375
+#: audio_diskstream.cc:1383 audio_diskstream.cc:1400
 msgid "AudioDiskstream %1: cannot write to disk"
 msgstr "音频�盘� %1: 无法�入到硬盘"
 
-#: audio_diskstream.cc:1418
+#: audio_diskstream.cc:1443
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: audio_diskstream.cc:1512
+#: audio_diskstream.cc:1537
 msgid "%1: could not create region for complete audio file"
 msgstr ""
 
-#: audio_diskstream.cc:1546
+#: audio_diskstream.cc:1571
 msgid "AudioDiskstream: could not create region for captured audio!"
 msgstr ""
 
-#: audio_diskstream.cc:1654
+#: audio_diskstream.cc:1679
 msgid "programmer error: %1"
 msgstr "程�错误: %1"
 
-#: audio_diskstream.cc:1880
+#: audio_diskstream.cc:1905
 msgid "AudioDiskstream: channel %1 out of range"
 msgstr "音频�盘�: 声� %1 超出范围"
 
-#: audio_diskstream.cc:1894 midi_diskstream.cc:1196
+#: audio_diskstream.cc:1919 midi_diskstream.cc:1210
 msgid "%1:%2 new capture file not initialized correctly"
 msgstr ""
 
-#: audio_diskstream.cc:2175
+#: audio_diskstream.cc:2200
 msgid "%1: cannot restore pending capture source file %2"
 msgstr ""
 
-#: audio_diskstream.cc:2197
+#: audio_diskstream.cc:2222
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
 msgstr ""
 
-#: audio_diskstream.cc:2221
+#: audio_diskstream.cc:2246
 msgid "%1: cannot create whole-file region from pending capture sources"
 msgstr ""
 
@@ -120,7 +120,7 @@ msgstr "音频播放列表(未使用)"
 
 #: audio_playlist_source.cc:171 audiosource.cc:913 file_source.cc:529
 #: midi_playlist_source.cc:144 midi_playlist_source.cc:152
-#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:644
+#: midi_playlist_source.cc:159 midi_source.cc:371 plugin_insert.cc:643
 #: rb_effect.cc:332 session.cc:2465 session.cc:2498 session.cc:3643
 #: session_handle.cc:87 sndfilesource.cc:121
 msgid "programming error: %1"
@@ -200,47 +200,47 @@ msgstr ""
 msgid "Connect session to engine"
 msgstr "连接会�到引擎"
 
-#: audioengine.cc:844
+#: audioengine.cc:843
 msgid ""
 "a port with the name \"%1\" already exists: check for duplicated track/bus "
 "names"
 msgstr ""
 
-#: audioengine.cc:846 session.cc:1698
+#: audioengine.cc:845 session.cc:1698
 msgid ""
 "No more JACK ports are available. You will need to stop %1 and restart JACK "
 "with more ports if you need this many tracks."
 msgstr ""
 
-#: audioengine.cc:849
+#: audioengine.cc:848
 msgid "AudioEngine: cannot register port \"%1\": %2"
 msgstr ""
 
-#: audioengine.cc:879
+#: audioengine.cc:878
 msgid "unable to create port: %1"
 msgstr "无法创建端�: %1"
 
-#: audioengine.cc:933
+#: audioengine.cc:932
 msgid "connect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:959
+#: audioengine.cc:958
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
 msgstr "音频引擎: 无法连接 %1 (%2) 到 %3 (%4)"
 
-#: audioengine.cc:974 audioengine.cc:1005
+#: audioengine.cc:973 audioengine.cc:1004
 msgid "disconnect called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1053
+#: audioengine.cc:1052
 msgid "get_port_by_name() called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1105
+#: audioengine.cc:1104
 msgid "get_ports called before engine was started"
 msgstr ""
 
-#: audioengine.cc:1428
+#: audioengine.cc:1427
 msgid "failed to connect to JACK"
 msgstr "连接JACK失败"
 
@@ -505,7 +505,7 @@ msgstr "有�压缩"
 msgid "Lossless compression"
 msgstr "无�压缩"
 
-#: export_format_manager.cc:207 export_format_specification.cc:579
+#: export_format_manager.cc:218 export_format_specification.cc:579
 msgid "Session rate"
 msgstr ""
 
@@ -537,7 +537,7 @@ msgstr "三角形"
 msgid "Rectangular"
 msgstr "长方形"
 
-#: export_formats.cc:52 session.cc:4854 session.cc:4870
+#: export_formats.cc:52 session.cc:4861 session.cc:4877
 msgid "None"
 msgstr ""
 
@@ -748,23 +748,23 @@ msgstr ""
 msgid "unknown file type for session %1"
 msgstr ""
 
-#: globals.cc:204
+#: globals.cc:205
 msgid "Could not set system open files limit to \"unlimited\""
 msgstr ""
 
-#: globals.cc:206
+#: globals.cc:207
 msgid "Could not set system open files limit to %1"
 msgstr ""
 
-#: globals.cc:210
+#: globals.cc:211
 msgid "Your system is configured to limit %1 to only %2 open files"
 msgstr ""
 
-#: globals.cc:214
+#: globals.cc:215
 msgid "Could not get system open files limit (%1)"
 msgstr ""
 
-#: globals.cc:267
+#: globals.cc:266
 msgid "Loading configuration"
 msgstr "载入�置"
 
@@ -917,19 +917,19 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
-#: ladspa_plugin.cc:87
+#: ladspa_plugin.cc:88
 msgid "LADSPA: module has no descriptor function."
 msgstr "LADSPA: 模�没有�述符函数."
 
-#: ladspa_plugin.cc:92
+#: ladspa_plugin.cc:93
 msgid "LADSPA: plugin has gone away since discovery!"
 msgstr "LADSPA: 当�现�件时, �件已���了."
 
-#: ladspa_plugin.cc:99
+#: ladspa_plugin.cc:100
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
 msgstr ""
 
-#: ladspa_plugin.cc:296
+#: ladspa_plugin.cc:297
 #, fuzzy
 msgid ""
 "illegal parameter number used with plugin \"%1\". This may indicate a change "
@@ -937,35 +937,35 @@ msgid ""
 msgstr ""
 "�件\"%1\"使用�法�数数�. 这�能�味��件的设计有所�动, 而且预设失效了."
 
-#: ladspa_plugin.cc:373 ladspa_plugin.cc:418
+#: ladspa_plugin.cc:376 ladspa_plugin.cc:426
 msgid "Bad node sent to LadspaPlugin::set_state"
 msgstr "�的符���至 LadspaPlugin::set_state"
 
-#: ladspa_plugin.cc:386 ladspa_plugin.cc:431
+#: ladspa_plugin.cc:391 ladspa_plugin.cc:440
 msgid "LADSPA: no ladspa port number"
 msgstr "LADSPA: 没有 ladspa 端�数�"
 
-#: ladspa_plugin.cc:392 ladspa_plugin.cc:437
+#: ladspa_plugin.cc:397 ladspa_plugin.cc:446
 msgid "LADSPA: no ladspa port data"
 msgstr "LADSPA: 没有LADSPA端�数�"
 
-#: ladspa_plugin.cc:707
+#: ladspa_plugin.cc:717
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr "LADSPA: 无法从 \"%1\" 载入模�"
 
-#: ladspa_plugin.cc:817
+#: ladspa_plugin.cc:827
 msgid "Could not locate HOME.  Preset not removed."
 msgstr "无法定�HOME. 预设没被移除."
 
-#: ladspa_plugin.cc:854 ladspa_plugin.cc:860
+#: ladspa_plugin.cc:864 ladspa_plugin.cc:870
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "�能创建 %1. 预设没�存. (%2)"
 
-#: ladspa_plugin.cc:867
+#: ladspa_plugin.cc:877
 msgid "Error saving presets file %1."
 msgstr ""
 
-#: ladspa_plugin.cc:905
+#: ladspa_plugin.cc:915
 msgid "Could not locate HOME.  Preset not saved."
 msgstr "无法定�HOME. 预设没�存."
 
@@ -1005,7 +1005,7 @@ msgstr ""
 msgid "incorrect XML mode passed to Locations::set_state"
 msgstr ""
 
-#: location.cc:842 session.cc:4355 session_state.cc:1114
+#: location.cc:842 session.cc:4362 session_state.cc:1114
 msgid "session"
 msgstr "会�"
 
@@ -1077,23 +1077,23 @@ msgstr ""
 msgid "MidiDiskstream %1: there is no existing playlist to make a copy of!"
 msgstr ""
 
-#: midi_diskstream.cc:685
+#: midi_diskstream.cc:699
 msgid "MidiDiskstream %1: cannot read %2 from playlist at frame %3"
 msgstr ""
 
-#: midi_diskstream.cc:820
+#: midi_diskstream.cc:834
 msgid "MidiDiskstream %1: cannot write to disk"
 msgstr "MIDI�盘� %1: 无法写入硬盘"
 
-#: midi_diskstream.cc:854
+#: midi_diskstream.cc:868
 msgid "MidiDiskstream \"%1\": cannot flush captured data to disk!"
 msgstr ""
 
-#: midi_diskstream.cc:941
+#: midi_diskstream.cc:955
 msgid "%1: could not create region for complete midi file"
 msgstr ""
 
-#: midi_diskstream.cc:978
+#: midi_diskstream.cc:992
 msgid "MidiDiskstream: could not create region for captured midi!"
 msgstr ""
 
@@ -1287,37 +1287,49 @@ msgstr ""
 msgid "Could not construct playlist for PlaylistSource from session data!"
 msgstr ""
 
-#: plugin_insert.cc:599
+#: plugin.cc:324
+msgid ""
+"Plugin presets are not supported in this build of %1. Consider paying for a "
+"full version"
+msgstr ""
+
+#: plugin.cc:398
+msgid ""
+"Saving plugin settings is not supported in this build of %1. Consider paying "
+"for the full version"
+msgstr ""
+
+#: plugin_insert.cc:598
 msgid "programming error: "
 msgstr "程�错误:"
 
-#: plugin_insert.cc:908
+#: plugin_insert.cc:926
 msgid "XML node describing plugin is missing the `type' field"
 msgstr ""
 
-#: plugin_insert.cc:923
+#: plugin_insert.cc:941
 msgid "unknown plugin type %1 in plugin insert state"
 msgstr ""
 
-#: plugin_insert.cc:951
+#: plugin_insert.cc:969
 msgid "Plugin has no unique ID field"
 msgstr ""
 
-#: plugin_insert.cc:960
+#: plugin_insert.cc:978
 msgid ""
 "Found a reference to a plugin (\"%1\") that is unknown.\n"
 "Perhaps it was removed or moved since it was last used."
 msgstr ""
 
-#: plugin_insert.cc:1076
+#: plugin_insert.cc:1094
 msgid "PluginInsert: Auto: no ladspa port number"
 msgstr ""
 
-#: plugin_insert.cc:1083
+#: plugin_insert.cc:1101
 msgid "PluginInsert: Auto: port id out of range"
 msgstr ""
 
-#: plugin_insert.cc:1119
+#: plugin_insert.cc:1137
 msgid "PluginInsert: automatable control %1 not found - ignored"
 msgstr ""
 
@@ -1457,23 +1469,23 @@ msgstr "导入: src_new() 失败 : %1"
 msgid "return %1"
 msgstr "返回 %1"
 
-#: route.cc:1100 route.cc:2550
+#: route.cc:1105 route.cc:2581
 msgid "unknown Processor type \"%1\"; ignored"
 msgstr ""
 
-#: route.cc:1112
+#: route.cc:1117
 msgid "processor could not be created. Ignored."
 msgstr ""
 
-#: route.cc:1983 route.cc:2203
+#: route.cc:2007 route.cc:2234
 msgid "Bad node sent to Route::set_state() [%1]"
 msgstr "��的符���至 Route::set_state() [%1]"
 
-#: route.cc:2042
+#: route.cc:2067
 msgid "Pannable state found for route (%1) without a panner!"
 msgstr ""
 
-#: route.cc:2106 route.cc:2110 route.cc:2317 route.cc:2321
+#: route.cc:2137 route.cc:2141 route.cc:2348 route.cc:2352
 msgid "badly formed order key string in state file! [%1] ... ignored."
 msgstr ""
 
@@ -1727,17 +1739,17 @@ msgstr ""
 msgid "Export ended unexpectedly: %1"
 msgstr ""
 
-#: session_ltc.cc:220
+#: session_ltc.cc:222
 msgid ""
 "LTC encoder: invalid framerate - LTC encoding is disabled for the remainder "
 "of this session."
 msgstr ""
 
-#: session_midi.cc:427
+#: session_midi.cc:428
 msgid "Session: could not send full MIDI time code"
 msgstr ""
 
-#: session_midi.cc:519
+#: session_midi.cc:520
 msgid "Session: cannot send quarter-frame MTC message (%1)"
 msgstr ""
 
@@ -1745,11 +1757,11 @@ msgstr ""
 msgid "Session: cannot create Playlist from XML description."
 msgstr "会�: 无法从XML�述符创建播放列表."
 
-#: session_process.cc:135
+#: session_process.cc:133
 msgid "Session: error in no roll for %1"
 msgstr ""
 
-#: session_process.cc:1160
+#: session_process.cc:1158
 msgid "Programming error: illegal event type in process_event (%1)"
 msgstr ""
 
@@ -2112,13 +2124,13 @@ msgstr ""
 msgid "Cannot loop - no loop range defined"
 msgstr ""
 
-#: session_transport.cc:727
+#: session_transport.cc:728
 msgid ""
 "Seamless looping cannot be supported while %1 is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
 
-#: session_transport.cc:1092
+#: session_transport.cc:1094
 msgid ""
 "Global varispeed cannot be supported while %1 is connected to JACK transport "
 "control"
@@ -2261,7 +2273,7 @@ msgstr ""
 msgid "attempt to write a non-writable audio file source (%1)"
 msgstr ""
 
-#: sndfilesource.cc:396 utils.cc:497 utils.cc:521 utils.cc:535 utils.cc:554
+#: sndfilesource.cc:396 utils.cc:507 utils.cc:531 utils.cc:545 utils.cc:564
 msgid "programming error: %1 %2"
 msgstr "程�错误: %1 %2"
 
@@ -2511,11 +2523,11 @@ msgstr "MIDI时钟"
 msgid "LTC"
 msgstr "MTC"
 
-#: utils.cc:589
+#: utils.cc:599
 msgid "programming error: unknown native header format: %1"
 msgstr ""
 
-#: utils.cc:604
+#: utils.cc:614
 msgid "cannot open directory %1 (%2)"
 msgstr "无法打开目录 %1 (%2)"
 
diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index 3473b73617..cf961d6828 100644
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -30,6 +30,7 @@
 #include "ardour/audioengine.h"
 #include "ardour/debug.h"
 #include "ardour/port.h"
+#include "ardour/port_engine.h"
 
 #include "i18n.h"
 
@@ -40,13 +41,19 @@ using namespace PBD;
 PBD::Signal2<void,boost::shared_ptr<Port>, boost::shared_ptr<Port> > Port::PostDisconnect;
 PBD::Signal0<void> Port::PortDrop;
 
-AudioEngine* Port::_engine = 0;
 bool         Port::_connecting_blocked = false;
 pframes_t    Port::_global_port_buffer_offset = 0;
 pframes_t    Port::_cycle_nframes = 0;
+std::string  Port::state_node_name = X_("Port");
+
+/* a handy define to shorten what would otherwise be a needlessly verbose
+ * repeated phrase
+ */
+#define port_engine AudioEngine::instance()->port_engine()
+#define port_manager AudioEngine::instance()
 
 /** @param n Port short name */
-Port::Port (std::string const & n, DataType t, Flags f)
+Port::Port (std::string const & n, DataType t, PortFlags f)
 	: _port_buffer_offset (0)
 	, _name (n)
 	, _flags (f)
@@ -58,21 +65,17 @@ Port::Port (std::string const & n, DataType t, Flags f)
 	_private_capture_latency.max = 0;
 
 	/* Unfortunately we have to pass the DataType into this constructor so that
-	   we can create the right kind of JACK port; aside from this we'll use the
+	   we can create the right kind of port; aside from this we'll use the
 	   virtual function type () to establish type.
 	*/
 
 	assert (_name.find_first_of (':') == std::string::npos);
 
-	if (!_engine->connected()) {
+	if ((_port_handle = port_engine.register_port (_name, t, _flags)) == 0) {
+		cerr << "Failed to register port \"" << _name << "\", reason is unknown from here\n";
 		throw failed_constructor ();
 	}
-
-	if ((_jack_port = jack_port_register (_engine->jack (), _name.c_str (), t.to_jack_type (), _flags, 0)) == 0) {
-		cerr << "Failed to register JACK port \"" << _name << "\", reason is unknown from here\n";
-		throw failed_constructor ();
-	}
-
+	
 	PortDrop.connect_same_thread (drop_connection, boost::bind (&Port::drop, this));
 }
 
@@ -85,11 +88,10 @@ Port::~Port ()
 void
 Port::drop ()
 {
-	if (_jack_port) {
-		if (_engine->jack ()) {
-			jack_port_unregister (_engine->jack (), _jack_port);
-		}
-		_jack_port = 0;
+	if (_port_handle) {
+		DEBUG_TRACE (DEBUG::Ports, string_compose ("drop handle for port %1\n", name()));
+		port_engine.unregister_port (_port_handle);
+		_port_handle = 0;
 	}
 }
 
@@ -97,18 +99,18 @@ Port::drop ()
 bool
 Port::connected () const
 {
-	return (jack_port_connected (_jack_port) != 0);
+	return (port_engine.connected (_port_handle) != 0);
 }
 
 int
 Port::disconnect_all ()
 {
-	jack_port_disconnect (_engine->jack(), _jack_port);
+	port_engine.disconnect_all (_port_handle);
 	_connections.clear ();
 
 	/* a cheaper, less hacky way to do boost::shared_from_this() ... 
 	 */
-	boost::shared_ptr<Port> pself = _engine->get_port_by_name (name());
+	boost::shared_ptr<Port> pself = port_manager->get_port_by_name (name());
 	PostDisconnect (pself, boost::shared_ptr<Port>()); // emit signal
 
 	return 0;
@@ -120,48 +122,29 @@ Port::disconnect_all ()
 bool
 Port::connected_to (std::string const & o) const
 {
-	if (!_engine->connected()) {
-		/* in some senses, this answer isn't the right one all the time,
-		   because we know about our connections and will re-establish
-		   them when we reconnect to JACK.
-		*/
+	if (!port_engine.available()) {
 		return false;
 	}
 
-	return jack_port_connected_to (_jack_port,
-	                               _engine->make_port_name_non_relative(o).c_str ());
+	return port_engine.connected_to (_port_handle, AudioEngine::instance()->make_port_name_non_relative (o));
 }
 
-/** @param o Filled in with port full names of ports that we are connected to */
 int
 Port::get_connections (std::vector<std::string> & c) const
 {
-	int n = 0;
-
-	if (_engine->connected()) {
-		const char** jc = jack_port_get_connections (_jack_port);
-		if (jc) {
-			for (int i = 0; jc[i]; ++i) {
-				c.push_back (jc[i]);
-				++n;
-			}
-
-                        if (jack_free) {
-                                jack_free (jc);
-                        } else {
-                                free (jc);
-                        }
-		}
+	if (!port_engine.available()) {
+		c.insert (c.end(), _connections.begin(), _connections.end());
+		return c.size();
 	}
 
-	return n;
+	return port_engine.get_connections (_port_handle, c);
 }
 
 int
 Port::connect (std::string const & other)
 {
-	std::string const other_shrt = _engine->make_port_name_non_relative (other);
-	std::string const this_shrt = _engine->make_port_name_non_relative (_name);
+	std::string const other_name = AudioEngine::instance()->make_port_name_non_relative (other);
+	std::string const our_name = AudioEngine::instance()->make_port_name_non_relative (_name);
 
 	int r = 0;
 
@@ -170,9 +153,11 @@ Port::connect (std::string const & other)
 	}
 
 	if (sends_output ()) {
-		r = jack_connect (_engine->jack (), this_shrt.c_str (), other_shrt.c_str ());
+		DEBUG_TRACE (DEBUG::Ports, string_compose ("Connect %1 to %2\n", our_name, other_name));
+		r = port_engine.connect (our_name, other_name);
 	} else {
-		r = jack_connect (_engine->jack (), other_shrt.c_str (), this_shrt.c_str());
+		DEBUG_TRACE (DEBUG::Ports, string_compose ("Connect %1 to %2\n", other_name, our_name));
+		r = port_engine.connect (other_name, our_name);
 	}
 
 	if (r == 0) {
@@ -185,15 +170,15 @@ Port::connect (std::string const & other)
 int
 Port::disconnect (std::string const & other)
 {
-	std::string const other_fullname = _engine->make_port_name_non_relative (other);
-	std::string const this_fullname = _engine->make_port_name_non_relative (_name);
+	std::string const other_fullname = port_manager->make_port_name_non_relative (other);
+	std::string const this_fullname = port_manager->make_port_name_non_relative (_name);
 
 	int r = 0;
 
 	if (sends_output ()) {
-		r = jack_disconnect (_engine->jack (), this_fullname.c_str (), other_fullname.c_str ());
+		r = port_engine.disconnect (this_fullname, other_fullname);
 	} else {
-		r = jack_disconnect (_engine->jack (), other_fullname.c_str (), this_fullname.c_str ());
+		r = port_engine.disconnect (other_fullname, this_fullname);
 	}
 
 	if (r == 0) {
@@ -202,8 +187,8 @@ Port::disconnect (std::string const & other)
 
 	/* a cheaper, less hacky way to do boost::shared_from_this() ... 
 	 */
-	boost::shared_ptr<Port> pself = _engine->get_port_by_name (name());
-	boost::shared_ptr<Port> pother = _engine->get_port_by_name (other);
+	boost::shared_ptr<Port> pself = AudioEngine::instance()->get_port_by_name (name());
+	boost::shared_ptr<Port> pother = AudioEngine::instance()->get_port_by_name (other);
 
 	if (pself && pother) {
 		/* Disconnecting from another Ardour port: need to allow
@@ -236,21 +221,22 @@ Port::disconnect (Port* o)
 }
 
 void
-Port::set_engine (AudioEngine* e)
+Port::request_input_monitoring (bool yn)
 {
-	_engine = e;
+	port_engine.request_input_monitoring (_port_handle, yn);
 }
 
 void
-Port::ensure_jack_monitors_input (bool yn)
+Port::ensure_input_monitoring (bool yn)
 {
-	jack_port_ensure_monitor (_jack_port, yn);
+	port_engine.ensure_input_monitoring (_port_handle, yn);
 }
 
 bool
-Port::jack_monitoring_input () const
+Port::monitoring_input () const
 {
-	return jack_port_monitoring_input (_jack_port);
+	
+	return port_engine.monitoring_input (_port_handle);
 }
 
 void
@@ -272,28 +258,23 @@ Port::increment_port_buffer_offset (pframes_t nframes)
 }
 
 void
-Port::set_public_latency_range (jack_latency_range_t& range, bool playback) const
+Port::set_public_latency_range (LatencyRange& range, bool playback) const
 {
-	/* this sets the visible latency that the rest of JACK sees. because we do latency
-	   compensation, all (most) of our visible port latency values are identical.
+	/* this sets the visible latency that the rest of the port system
+	   sees. because we do latency compensation, all (most) of our visible
+	   port latency values are identical.
 	*/
 
-	if (!jack_port_set_latency_range) {
-		return;
-	}
-
 	DEBUG_TRACE (DEBUG::Latency,
 	             string_compose ("SET PORT %1 %4 PUBLIC latency now [%2 - %3]\n",
 	                             name(), range.min, range.max,
 	                             (playback ? "PLAYBACK" : "CAPTURE")));;
 
-	jack_port_set_latency_range (_jack_port,
-	                             (playback ? JackPlaybackLatency : JackCaptureLatency),
-	                             &range);
+	port_engine.set_latency_range (_port_handle, playback, range);
 }
 
 void
-Port::set_private_latency_range (jack_latency_range_t& range, bool playback)
+Port::set_private_latency_range (LatencyRange& range, bool playback)
 {
 	if (playback) {
 		_private_playback_latency = range;
@@ -311,12 +292,12 @@ Port::set_private_latency_range (jack_latency_range_t& range, bool playback)
 			             _private_capture_latency.max));
 	}
 
-	/* push to public (JACK) location so that everyone else can see it */
+	/* push to public (port system) location so that everyone else can see it */
 
 	set_public_latency_range (range, playback);
 }
 
-const jack_latency_range_t&
+const LatencyRange&
 Port::private_latency_range (bool playback) const
 {
 	if (playback) {
@@ -336,14 +317,13 @@ Port::private_latency_range (bool playback) const
 	}
 }
 
-jack_latency_range_t
+LatencyRange
 Port::public_latency_range (bool /*playback*/) const
 {
-	jack_latency_range_t r;
+	LatencyRange r;
+
+	r = port_engine.get_latency_range (_port_handle, sends_output() ? true : false);
 
-	jack_port_get_latency_range (_jack_port,
-	                             sends_output() ? JackPlaybackLatency : JackCaptureLatency,
-	                             &r);
 	DEBUG_TRACE (DEBUG::Latency, string_compose (
 		             "GET PORT %1: %4 PUBLIC latency range %2 .. %3\n",
 		             name(), r.min, r.max,
@@ -352,27 +332,15 @@ Port::public_latency_range (bool /*playback*/) const
 }
 
 void
-Port::get_connected_latency_range (jack_latency_range_t& range, bool playback) const
+Port::get_connected_latency_range (LatencyRange& range, bool playback) const
 {
-	if (!jack_port_get_latency_range) {
-		return;
-	}
-
 	vector<string> connections;
-	jack_client_t* jack = _engine->jack();
-
-	if (!jack) {
-		range.min = 0;
-		range.max = 0;
-		PBD::warning << _("get_connected_latency_range() called while disconnected from JACK") << endmsg;
-		return;
-	}
 
 	get_connections (connections);
 
 	if (!connections.empty()) {
 
-		range.min = ~((jack_nframes_t) 0);
+		range.min = ~((pframes_t) 0);
 		range.max = 0;
 
 		DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: %2 connections to check for latency range\n", name(), connections.size()));
@@ -380,21 +348,18 @@ Port::get_connected_latency_range (jack_latency_range_t& range, bool playback) c
 		for (vector<string>::const_iterator c = connections.begin();
 		     c != connections.end(); ++c) {
 
-                        jack_latency_range_t lr;
+                        LatencyRange lr;
 
                         if (!AudioEngine::instance()->port_is_mine (*c)) {
 
-                                /* port belongs to some other JACK client, use
-                                 * JACK to lookup its latency information.
+                                /* port belongs to some other port-system client, use
+                                 * the port engine to lookup its latency information.
                                  */
 
-                                jack_port_t* remote_port = jack_port_by_name (_engine->jack(), (*c).c_str());
+				PortEngine::PortHandle remote_port = port_engine.get_port_by_name (*c);
 
                                 if (remote_port) {
-                                        jack_port_get_latency_range (
-                                                remote_port,
-                                                (playback ? JackPlaybackLatency : JackCaptureLatency),
-                                                &lr);
+                                        lr = port_engine.get_latency_range (remote_port, playback);
 
                                         DEBUG_TRACE (DEBUG::Latency, string_compose (
                                                              "\t%1 <-> %2 : latter has latency range %3 .. %4\n",
@@ -438,15 +403,10 @@ Port::get_connected_latency_range (jack_latency_range_t& range, bool playback) c
 int
 Port::reestablish ()
 {
-	jack_client_t* jack = _engine->jack();
+	DEBUG_TRACE (DEBUG::Ports, string_compose ("re-establish %1 port %2\n", type().to_string(), _name));
+	_port_handle = port_engine.register_port (_name, type(), _flags);
 
-	if (!jack) {
-		return -1;
-	}
-
-	_jack_port = jack_port_register (jack, _name.c_str(), type().to_jack_type(), _flags, 0);
-
-	if (_jack_port == 0) {
+	if (_port_handle == 0) {
 		PBD::error << string_compose (_("could not reregister %1"), _name) << endmsg;
 		return -1;
 	}
@@ -462,6 +422,8 @@ Port::reconnect ()
 {
 	/* caller must hold process lock; intended to be used only after reestablish() */
 
+	DEBUG_TRACE (DEBUG::Ports, string_compose ("Connect %1 to %2 destinations\n",name(), _connections.size()));
+
 	for (std::set<string>::iterator i = _connections.begin(); i != _connections.end(); ++i) {
 		if (connect (*i)) {
 			return -1;
@@ -471,7 +433,7 @@ Port::reconnect ()
 	return 0;
 }
 
-/** @param n Short port name (no JACK client name) */
+/** @param n Short port name (no port-system client name) */
 int
 Port::set_name (std::string const & n)
 {
@@ -479,10 +441,10 @@ Port::set_name (std::string const & n)
 		return 0;
 	}
 
-	int const r = jack_port_set_name (_jack_port, n.c_str());
+	int const r = port_engine.set_port_name (_port_handle, n);
 
 	if (r == 0) {
-		_engine->port_renamed (_name, n);
+		AudioEngine::instance()->port_renamed (_name, n);
 		_name = n;
 	}
 
@@ -490,38 +452,67 @@ Port::set_name (std::string const & n)
 	return r;
 }
 
-void
-Port::request_jack_monitors_input (bool yn)
+bool
+Port::physically_connected () const
 {
-	jack_port_request_monitor (_jack_port, yn);
+	return port_engine.physically_connected (_port_handle);
 }
 
-bool
-Port::physically_connected () const
+XMLNode&
+Port::get_state () const
 {
-	const char** jc = jack_port_get_connections (_jack_port);
+	XMLNode* root = new XMLNode (state_node_name);
 
-	if (jc) {
-		for (int i = 0; jc[i]; ++i) {
+	root->add_property (X_("name"), AudioEngine::instance()->make_port_name_relative (name()));
 
-			jack_port_t* port = jack_port_by_name (_engine->jack(), jc[i]);
+	if (receives_input()) {
+		root->add_property (X_("direction"), X_("input"));
+	} else {
+		root->add_property (X_("direction"), X_("output"));
+	}
 
-			if (port && (jack_port_flags (port) & JackPortIsPhysical)) {
-                                if (jack_free) {
-                                        jack_free (jc);
-                                } else {
-                                        free (jc);
-                                }
-				return true;
-			}
-		}
-                if (jack_free) {
-                        jack_free (jc);
-                } else {
-                        free (jc);
-                }
+	vector<string> c;
+	
+	get_connections (c);
+
+	for (vector<string>::const_iterator i = c.begin(); i != c.end(); ++i) {
+		XMLNode* child = new XMLNode (X_("Connection"));
+		child->add_property (X_("other"), *i);
+		root->add_child_nocopy (*child);
 	}
 
-	return false;
+	return *root;
 }
 
+int
+Port::set_state (const XMLNode& node, int)
+{
+	const XMLProperty* prop;
+
+	if (node.name() != state_node_name) {
+		return -1;
+	}
+
+	if ((prop = node.property (X_("name"))) != 0) {
+		set_name (prop->value());
+	}
+
+	const XMLNodeList& children (node.children());
+
+	_connections.clear ();
+
+	for (XMLNodeList::const_iterator c = children.begin(); c != children.end(); ++c) {
+
+		if ((*c)->name() != X_("Connection")) {
+			continue;
+		}
+		
+		if ((prop = (*c)->property (X_("other"))) == 0) {
+			continue;
+		}
+
+		_connections.insert (prop->value());
+	}
+
+	return 0;
+}
diff --git a/libs/ardour/port_insert.cc b/libs/ardour/port_insert.cc
index 411d8d1e19..97fe082c81 100644
--- a/libs/ardour/port_insert.cc
+++ b/libs/ardour/port_insert.cc
@@ -49,7 +49,7 @@ PortInsert::PortInsert (Session& s, boost::shared_ptr<Pannable> pannable, boost:
 {
         _mtdm = 0;
         _latency_detect = false;
-        _latency_flush_frames = false;
+        _latency_flush_frames = 0;
         _measured_latency = 0;
 }
 
@@ -64,7 +64,7 @@ PortInsert::start_latency_detection ()
 {
 	delete _mtdm;
         _mtdm = new MTDM (_session.frame_rate());
-        _latency_flush_frames = false;
+        _latency_flush_frames = 0;
         _latency_detect = true;
         _measured_latency = 0;
 }
@@ -72,7 +72,7 @@ PortInsert::start_latency_detection ()
 void
 PortInsert::stop_latency_detection ()
 {
-        _latency_flush_frames = signal_latency() + _session.engine().frames_per_cycle();
+        _latency_flush_frames = signal_latency() + _session.engine().samples_per_cycle();
         _latency_detect = false;
 }
 
@@ -93,7 +93,7 @@ PortInsert::latency() const
 	*/
 
 	if (_measured_latency == 0) {
-		return _session.engine().frames_per_cycle() + _input->latency();
+		return _session.engine().samples_per_cycle() + _input->latency();
 	} else {
 		return _measured_latency;
 	}
@@ -240,7 +240,7 @@ PortInsert::signal_latency() const
 	*/
 
         if (_measured_latency == 0) {
-                return _session.engine().frames_per_cycle() + _input->signal_latency();
+                return _session.engine().samples_per_cycle() + _input->signal_latency();
         } else {
                 return _measured_latency;
         }
diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc
new file mode 100644
index 0000000000..c7adefc531
--- /dev/null
+++ b/libs/ardour/port_manager.cc
@@ -0,0 +1,667 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "pbd/error.h"
+
+#include "ardour/async_midi_port.h"
+#include "ardour/audio_backend.h"
+#include "ardour/audio_port.h"
+#include "ardour/debug.h"
+#include "ardour/midi_port.h"
+#include "ardour/midiport_manager.h"
+#include "ardour/port_manager.h"
+
+#include "i18n.h"
+
+using namespace ARDOUR;
+using namespace PBD;
+using std::string;
+using std::vector;
+
+PortManager::PortManager ()
+	: ports (new Ports)
+	, _port_remove_in_progress (false)
+{
+}
+
+void
+PortManager::remove_all_ports ()
+{
+	/* make sure that JACK callbacks that will be invoked as we cleanup
+	 * ports know that they have nothing to do.
+	 */
+
+	_port_remove_in_progress = true;
+
+	/* process lock MUST be held by caller
+	*/
+
+	{
+		RCUWriter<Ports> writer (ports);
+		boost::shared_ptr<Ports> ps = writer.get_copy ();
+		ps->clear ();
+	}
+
+	/* clear dead wood list in RCU */
+
+	ports.flush ();
+
+	_port_remove_in_progress = false;
+}
+
+
+string
+PortManager::make_port_name_relative (const string& portname) const
+{
+	if (!_backend) {
+		return portname;
+	}
+
+	string::size_type len;
+	string::size_type n;
+	string self = _backend->my_name();
+
+	len = portname.length();
+
+	for (n = 0; n < len; ++n) {
+		if (portname[n] == ':') {
+			break;
+		}
+	}
+
+	if ((n != len) && (portname.substr (0, n) == self)) {
+		return portname.substr (n+1);
+	}
+
+	return portname;
+}
+
+string
+PortManager::make_port_name_non_relative (const string& portname) const
+{
+	string str;
+
+	if (portname.find_first_of (':') != string::npos) {
+		return portname;
+	}
+
+	str  = _backend->my_name();
+	str += ':';
+	str += portname;
+
+	return str;
+}
+
+bool
+PortManager::port_is_mine (const string& portname) const
+{
+	if (!_backend) {
+		return true;
+	}
+
+	string self = _backend->my_name();
+
+	if (portname.find_first_of (':') != string::npos) {
+		if (portname.substr (0, self.length ()) != self) {
+                        return false;
+                }
+        }
+
+        return true;
+}
+
+bool
+PortManager::port_is_physical (const std::string& portname) const
+{
+	if (!_backend) {
+		return false;
+	}
+
+	PortEngine::PortHandle ph = _backend->get_port_by_name (portname);
+	if (!ph) {
+		return false;
+	}
+
+	return _backend->port_is_physical (ph);
+}
+
+void
+PortManager::get_physical_outputs (DataType type, std::vector<std::string>& s)
+{
+	if (!_backend) {
+		return;
+	}
+	_backend->get_physical_outputs (type, s);
+}
+ 
+void
+PortManager::get_physical_inputs (DataType type, std::vector<std::string>& s)
+{
+	if (!_backend) {
+		return;
+	}
+
+	_backend->get_physical_inputs (type, s);
+}
+ 
+ChanCount
+PortManager::n_physical_outputs () const
+{
+	if (!_backend) {
+		return ChanCount::ZERO;
+	}
+
+	return _backend->n_physical_outputs ();
+}
+ 
+ChanCount
+PortManager::n_physical_inputs () const
+{
+	if (!_backend) {
+		return ChanCount::ZERO;
+	}
+	return _backend->n_physical_inputs ();
+}
+
+/** @param name Full or short name of port
+ *  @return Corresponding Port or 0.
+ */
+
+boost::shared_ptr<Port>
+PortManager::get_port_by_name (const string& portname)
+{
+	if (!_backend) {
+		return boost::shared_ptr<Port>();
+	}
+
+        if (!port_is_mine (portname)) {
+                /* not an ardour port */
+                return boost::shared_ptr<Port> ();
+        }
+
+	boost::shared_ptr<Ports> pr = ports.reader();
+	std::string rel = make_port_name_relative (portname);
+	Ports::iterator x = pr->find (rel);
+
+	if (x != pr->end()) {
+		/* its possible that the port was renamed by some 3rd party and
+		   we don't know about it. check for this (the check is quick
+		   and cheap), and if so, rename the port (which will alter
+		   the port map as a side effect).
+		*/
+		const std::string check = make_port_name_relative (_backend->get_port_name (x->second->port_handle()));
+		if (check != rel) {
+			x->second->set_name (check);
+		}
+		return x->second;
+	}
+
+        return boost::shared_ptr<Port> ();
+}
+
+void
+PortManager::port_renamed (const std::string& old_relative_name, const std::string& new_relative_name)
+{
+	RCUWriter<Ports> writer (ports);
+	boost::shared_ptr<Ports> p = writer.get_copy();
+	Ports::iterator x = p->find (old_relative_name);
+	
+	if (x != p->end()) {
+		boost::shared_ptr<Port> port = x->second;
+		p->erase (x);
+		p->insert (make_pair (new_relative_name, port));
+	}
+}
+
+int
+PortManager::get_ports (DataType type, PortList& pl)
+{
+	boost::shared_ptr<Ports> plist = ports.reader();
+	for (Ports::iterator p = plist->begin(); p != plist->end(); ++p) {
+		if (p->second->type() == type) {
+			pl.push_back (p->second);
+		}
+	}
+	return pl.size();
+}
+
+int
+PortManager::get_ports (const string& port_name_pattern, DataType type, PortFlags flags, vector<string>& s)
+{
+	if (!_backend) {
+		return 0;
+	}
+
+	return _backend->get_ports (port_name_pattern, type, flags, s);
+}
+
+void
+PortManager::port_registration_failure (const std::string& portname)
+{
+	if (!_backend) {
+		return;
+	}
+
+	string full_portname = _backend->my_name();
+	full_portname += ':';
+	full_portname += portname;
+
+
+	PortEngine::PortHandle p = _backend->get_port_by_name (full_portname);
+	string reason;
+
+	if (p) {
+		reason = string_compose (_("a port with the name \"%1\" already exists: check for duplicated track/bus names"), portname);
+	} else {
+		reason = string_compose (_("No more ports are available. You will need to stop %1 and restart with more ports if you need this many tracks."), PROGRAM_NAME);
+	}
+
+	throw PortRegistrationFailure (string_compose (_("AudioEngine: cannot register port \"%1\": %2"), portname, reason).c_str());
+}
+
+boost::shared_ptr<Port>
+PortManager::register_port (DataType dtype, const string& portname, bool input, bool async)
+{
+	boost::shared_ptr<Port> newport;
+
+	try {
+		if (dtype == DataType::AUDIO) {
+			DEBUG_TRACE (DEBUG::Ports, string_compose ("registering AUDIO port %1, input %2\n",
+								   portname, input));
+			newport.reset (new AudioPort (portname, (input ? IsInput : IsOutput)));
+		} else if (dtype == DataType::MIDI) {
+			if (async) {
+				DEBUG_TRACE (DEBUG::Ports, string_compose ("registering ASYNC MIDI port %1, input %2\n",
+									   portname, input));
+				newport.reset (new AsyncMIDIPort (portname, (input ? IsInput : IsOutput)));
+			} else {
+				DEBUG_TRACE (DEBUG::Ports, string_compose ("registering MIDI port %1, input %2\n",
+									   portname, input));
+				newport.reset (new MidiPort (portname, (input ? IsInput : IsOutput)));
+			}
+		} else {
+			throw PortRegistrationFailure("unable to create port (unknown type)");
+		}
+
+		RCUWriter<Ports> writer (ports);
+		boost::shared_ptr<Ports> ps = writer.get_copy ();
+		ps->insert (make_pair (make_port_name_relative (portname), newport));
+
+		/* writer goes out of scope, forces update */
+
+	}
+
+	catch (PortRegistrationFailure& err) {
+		throw err;
+	} catch (std::exception& e) {
+		throw PortRegistrationFailure(string_compose(
+				_("unable to create port: %1"), e.what()).c_str());
+	} catch (...) {
+		throw PortRegistrationFailure("unable to create port (unknown error)");
+	}
+
+	DEBUG_TRACE (DEBUG::Ports, string_compose ("\t%2 port registration success, ports now = %1\n", ports.reader()->size(), this));
+	return newport;
+}
+
+boost::shared_ptr<Port>
+PortManager::register_input_port (DataType type, const string& portname, bool async)
+{
+	return register_port (type, portname, true, async);
+}
+
+boost::shared_ptr<Port>
+PortManager::register_output_port (DataType type, const string& portname, bool async)
+{
+	return register_port (type, portname, false, async);
+}
+
+int
+PortManager::unregister_port (boost::shared_ptr<Port> port)
+{
+	/* caller must hold process lock */
+
+	{
+		RCUWriter<Ports> writer (ports);
+		boost::shared_ptr<Ports> ps = writer.get_copy ();
+		Ports::iterator x = ps->find (make_port_name_relative (port->name()));
+
+		if (x != ps->end()) {
+			ps->erase (x);
+		}
+
+		/* writer goes out of scope, forces update */
+	}
+
+	ports.flush ();
+
+	return 0;
+}
+
+bool
+PortManager::connected (const string& port_name)
+{
+	if (!_backend) {
+		return false;
+	}
+
+	PortEngine::PortHandle handle = _backend->get_port_by_name (port_name);
+
+	if (!handle) {
+		return false;
+	}
+
+	return _backend->connected (handle);
+}
+
+int
+PortManager::connect (const string& source, const string& destination)
+{
+	int ret;
+
+	string s = make_port_name_non_relative (source);
+	string d = make_port_name_non_relative (destination);
+
+	boost::shared_ptr<Port> src = get_port_by_name (s);
+	boost::shared_ptr<Port> dst = get_port_by_name (d);
+
+	if (src) {
+		ret = src->connect (d);
+	} else if (dst) {
+		ret = dst->connect (s);
+	} else {
+		/* neither port is known to us ...hand-off to the PortEngine
+		 */
+		if (_backend) {
+			ret = _backend->connect (s, d);
+		} else {
+			ret = -1;
+		}
+	}
+
+	if (ret > 0) {
+		/* already exists - no error, no warning */
+	} else if (ret < 0) {
+		error << string_compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"),
+					source, s, destination, d)
+		      << endmsg;
+	}
+
+	return ret;
+}
+
+int
+PortManager::disconnect (const string& source, const string& destination)
+{
+	int ret;
+
+	string s = make_port_name_non_relative (source);
+	string d = make_port_name_non_relative (destination);
+
+	boost::shared_ptr<Port> src = get_port_by_name (s);
+	boost::shared_ptr<Port> dst = get_port_by_name (d);
+
+	if (src) {
+		ret = src->disconnect (d);
+	} else if (dst) {
+		ret = dst->disconnect (s);
+	} else {
+		/* neither port is known to us ...hand-off to the PortEngine
+		 */
+		if (_backend) {
+			ret = _backend->disconnect (s, d);
+		} else {
+			ret = -1;
+		}
+	}
+	return ret;
+}
+
+int
+PortManager::disconnect (boost::shared_ptr<Port> port)
+{
+	return port->disconnect_all ();
+}
+
+int
+PortManager::reestablish_ports ()
+{
+	Ports::iterator i;
+
+	boost::shared_ptr<Ports> p = ports.reader ();
+
+	DEBUG_TRACE (DEBUG::Ports, string_compose ("reestablish %1 ports\n", p->size()));
+
+	for (i = p->begin(); i != p->end(); ++i) {
+		if (i->second->reestablish ()) {
+			error << string_compose (_("Re-establising port %1 failed"), i->second->name()) << endmsg;
+			cerr << string_compose (_("Re-establising port %1 failed"), i->second->name()) << endl;
+			break;
+		}
+	}
+
+	if (i != p->end()) {
+		/* failed */
+		remove_all_ports ();
+		return -1;
+	}
+
+	return 0;
+}
+
+int
+PortManager::reconnect_ports ()
+{
+	boost::shared_ptr<Ports> p = ports.reader ();
+
+	/* re-establish connections */
+
+	DEBUG_TRACE (DEBUG::Ports, string_compose ("reconnect %1 ports\n", p->size()));
+
+	for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+		i->second->reconnect ();
+	}
+
+	return 0;
+}
+
+void
+PortManager::connect_callback (const string& a, const string& b, bool conn)
+{
+	boost::shared_ptr<Port> port_a;
+	boost::shared_ptr<Port> port_b;
+	Ports::iterator x;
+	boost::shared_ptr<Ports> pr = ports.reader ();
+
+	x = pr->find (make_port_name_relative (a));
+	if (x != pr->end()) {
+		port_a = x->second;
+	}
+
+	x = pr->find (make_port_name_relative (b));
+	if (x != pr->end()) {
+		port_b = x->second;
+	}
+
+	PortConnectedOrDisconnected (
+		port_a, a,
+		port_b, b,
+		conn
+		); /* EMIT SIGNAL */
+}	
+
+void
+PortManager::registration_callback ()
+{
+	if (!_port_remove_in_progress) {
+		PortRegisteredOrUnregistered (); /* EMIT SIGNAL */
+	}
+}
+
+bool
+PortManager::can_request_input_monitoring () const
+{
+	if (!_backend) {
+		return false;
+	}
+
+	return _backend->can_monitor_input ();
+}
+ 
+void
+PortManager::request_input_monitoring (const string& name, bool yn) const
+{
+	if (!_backend) {
+		return;
+	}
+
+	PortEngine::PortHandle ph = _backend->get_port_by_name (name);
+
+	if (ph) {
+		_backend->request_input_monitoring (ph, yn);
+	}
+}
+ 
+void
+PortManager::ensure_input_monitoring (const string& name, bool yn) const
+{
+	if (!_backend) {
+		return;
+	}
+
+	PortEngine::PortHandle ph = _backend->get_port_by_name (name);
+
+	if (ph) {
+		_backend->ensure_input_monitoring (ph, yn);
+	}
+}
+
+uint32_t
+PortManager::port_name_size() const
+{
+	if (!_backend) {
+		return 0;
+	}
+	
+	return _backend->port_name_size ();
+}
+
+string
+PortManager::my_name() const
+{
+	if (!_backend) {
+		return string();
+	}
+	
+	return _backend->my_name();
+}
+
+int
+PortManager::graph_order_callback ()
+{
+	if (!_port_remove_in_progress) {
+		GraphReordered(); /* EMIT SIGNAL */
+	}
+
+	return 0;
+}
+
+void
+PortManager::cycle_start (pframes_t nframes)
+{
+	Port::set_global_port_buffer_offset (0);
+        Port::set_cycle_framecnt (nframes);
+
+	_cycle_ports = ports.reader ();
+
+	for (Ports::iterator p = _cycle_ports->begin(); p != _cycle_ports->end(); ++p) {
+		p->second->cycle_start (nframes);
+	}
+}
+
+void
+PortManager::cycle_end (pframes_t nframes)
+{
+	for (Ports::iterator p = _cycle_ports->begin(); p != _cycle_ports->end(); ++p) {
+		p->second->cycle_end (nframes);
+	}
+
+	for (Ports::iterator p = _cycle_ports->begin(); p != _cycle_ports->end(); ++p) {
+		p->second->flush_buffers (nframes);
+	}
+
+	_cycle_ports.reset ();
+
+	/* we are done */
+}
+
+void
+PortManager::silence (pframes_t nframes)
+{
+	for (Ports::iterator i = _cycle_ports->begin(); i != _cycle_ports->end(); ++i) {
+		if (i->second->sends_output()) {
+			i->second->get_buffer(nframes).silence(nframes);
+		}
+	}
+}
+
+void
+PortManager::check_monitoring ()
+{
+	for (Ports::iterator i = _cycle_ports->begin(); i != _cycle_ports->end(); ++i) {
+		
+		bool x;
+		
+		if (i->second->last_monitor() != (x = i->second->monitoring_input ())) {
+			i->second->set_last_monitor (x);
+			/* XXX I think this is dangerous, due to
+			   a likely mutex in the signal handlers ...
+			*/
+			i->second->MonitorInputChanged (x); /* EMIT SIGNAL */
+		}
+	}
+}
+
+void
+PortManager::fade_out (gain_t base_gain, gain_t gain_step, pframes_t nframes)
+{
+	for (Ports::iterator i = _cycle_ports->begin(); i != _cycle_ports->end(); ++i) {
+		
+		if (i->second->sends_output()) {
+			
+			boost::shared_ptr<AudioPort> ap = boost::dynamic_pointer_cast<AudioPort> (i->second);
+			if (ap) {
+				Sample* s = ap->engine_get_whole_audio_buffer ();
+				gain_t g = base_gain;
+				
+				for (pframes_t n = 0; n < nframes; ++n) {
+					*s++ *= g;
+					g -= gain_step;
+				}
+			}
+		}
+	}
+}
+
+PortEngine&
+PortManager::port_engine()
+{
+	assert (_backend);
+	return *_backend;
+}
diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index 8127267975..f4612699d4 100644
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -27,11 +27,11 @@
 #include "pbd/xml++.h"
 #include "pbd/file_utils.h"
 
-#include "midi++/manager.h"
-
+#include "ardour/audioengine.h"
 #include "ardour/control_protocol_manager.h"
 #include "ardour/diskstream.h"
 #include "ardour/filesystem_paths.h"
+#include "ardour/port.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/session_metadata.h"
 
@@ -63,13 +63,8 @@ RCConfiguration::RCConfiguration ()
 {
 }
 
-
 RCConfiguration::~RCConfiguration ()
 {
-	for (list<XMLNode*>::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
-		delete *i;
-	}
-
 	delete _control_protocol_state;
 }
 
@@ -177,16 +172,6 @@ RCConfiguration::get_state ()
 
 	root = new XMLNode("Ardour");
 
-        MIDI::Manager* mm = MIDI::Manager::instance();
-
-        if (mm) {
-		boost::shared_ptr<const MIDI::Manager::PortList> ports = mm->get_midi_ports();
-
-                for (MIDI::Manager::PortList::const_iterator i = ports->begin(); i != ports->end(); ++i) {
-                        root->add_child_nocopy((*i)->get_state());
-                }
-        }
-
 	root->add_child_nocopy (get_variables ());
 
 	root->add_child_nocopy (SessionMetadata::Metadata()->get_user_state());
@@ -232,12 +217,6 @@ RCConfiguration::set_state (const XMLNode& root, int version)
 	XMLNodeConstIterator niter;
 	XMLNode *node;
 
-	for (list<XMLNode*>::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
-		delete *i;
-	}
-
-	_midi_port_states.clear ();
-
 	Stateful::save_extra_xml (root);
 
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
@@ -250,8 +229,6 @@ RCConfiguration::set_state (const XMLNode& root, int version)
 			SessionMetadata::Metadata()->set_state (*node, version);
 		} else if (node->name() == ControlProtocolManager::state_node_name) {
 			_control_protocol_state = new XMLNode (*node);
-		} else if (node->name() == MIDI::Port::state_node_name) {
-			_midi_port_states.push_back (new XMLNode (*node));
 		}
 	}
 
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index 847a72b23f..1784cdbf3c 100644
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -1490,6 +1490,20 @@ Region::uses_source (boost::shared_ptr<const Source> source) const
 		}
 	}
 
+	for (SourceList::const_iterator i = _master_sources.begin(); i != _master_sources.end(); ++i) {
+		if (*i == source) {
+			return true;
+		}
+
+		boost::shared_ptr<PlaylistSource> ps = boost::dynamic_pointer_cast<PlaylistSource> (*i);
+
+		if (ps) {
+			if (ps->playlist()->uses_source (source)) {
+				return true;
+			}
+		}
+	}
+
 	return false;
 }
 
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 2e1517fe21..d0b2260c3d 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -971,7 +971,7 @@ Route::add_processor (boost::shared_ptr<Processor> processor, boost::shared_ptr<
 	DEBUG_TRACE (DEBUG::Processors, string_compose (
 		             "%1 adding processor %2\n", name(), processor->name()));
 
-	if (!_session.engine().connected() || !processor) {
+	if (!AudioEngine::instance()->connected() || !processor) {
 		return 1;
 	}
 
@@ -3814,13 +3814,13 @@ Route::update_port_latencies (PortSet& from, PortSet& to, bool playback, framecn
 	   universally true, but the alternative is way too corner-case to worry about.
 	*/
 
-	jack_latency_range_t all_connections;
+	LatencyRange all_connections;
 
 	if (from.empty()) {
 		all_connections.min = 0;
 		all_connections.max = 0;
 	} else {
-		all_connections.min = ~((jack_nframes_t) 0);
+		all_connections.min = ~((pframes_t) 0);
 		all_connections.max = 0;
 		
 		/* iterate over all "from" ports and determine the latency range for all of their
@@ -3829,7 +3829,7 @@ Route::update_port_latencies (PortSet& from, PortSet& to, bool playback, framecn
 		
 		for (PortSet::iterator p = from.begin(); p != from.end(); ++p) {
 			
-			jack_latency_range_t range;
+			LatencyRange range;
 			
 			p->get_connected_latency_range (range, playback);
 			
@@ -3894,7 +3894,7 @@ Route::set_public_port_latencies (framecnt_t value, bool playback) const
 	   latency compensation into account.
 	*/
 
-	jack_latency_range_t range;
+	LatencyRange range;
 
 	range.min = value;
 	range.max = value;
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index ce82f79bb5..cad869a577 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -49,6 +49,7 @@
 
 #include "ardour/amp.h"
 #include "ardour/analyser.h"
+#include "ardour/async_midi_port.h"
 #include "ardour/audio_buffer.h"
 #include "ardour/audio_diskstream.h"
 #include "ardour/audio_port.h"
@@ -66,6 +67,7 @@
 #include "ardour/debug.h"
 #include "ardour/filename_extensions.h"
 #include "ardour/graph.h"
+#include "ardour/midiport_manager.h"
 #include "ardour/midi_track.h"
 #include "ardour/midi_ui.h"
 #include "ardour/operations.h"
@@ -85,12 +87,11 @@
 #include "ardour/session_playlists.h"
 #include "ardour/smf_source.h"
 #include "ardour/source_factory.h"
+#include "ardour/speakers.h"
 #include "ardour/utils.h"
 
 #include "midi++/port.h"
-#include "midi++/jack_midi_port.h"
 #include "midi++/mmc.h"
-#include "midi++/manager.h"
 
 #include "i18n.h"
 
@@ -106,6 +107,7 @@ using namespace PBD;
 
 bool Session::_disable_all_loaded_plugins = false;
 
+PBD::Signal1<int,uint32_t> Session::AudioEngineSetupRequired;
 PBD::Signal1<void,std::string> Session::Dialog;
 PBD::Signal0<int> Session::AskAboutPendingState;
 PBD::Signal2<int, framecnt_t, framecnt_t> Session::AskAboutSampleRateMismatch;
@@ -130,70 +132,171 @@ Session::Session (AudioEngine &eng,
                   const string& snapshot_name,
                   BusProfile* bus_profile,
                   string mix_template)
-	: _engine (eng)
+	: playlists (new SessionPlaylists)
+	, _engine (eng)
+	, process_function (&Session::process_with_events)
+	, waiting_for_sync_offset (false)
+	, _base_frame_rate (0)
+	, _current_frame_rate (0)
+	, _nominal_frame_rate (0)
+	, transport_sub_state (0)
+	, _record_status (Disabled)
+	, _transport_frame (0)
+	, _session_range_location (0)
+	, _slave (0)
+	, _silent (false)
+	, _transport_speed (0)
+	, _default_transport_speed (1.0)
+	, _last_transport_speed (0)
 	, _target_transport_speed (0.0)
+	, auto_play_legal (false)
+	, _last_slave_transport_frame (0)
+	, maximum_output_latency (0)
 	, _requested_return_frame (-1)
+	, current_block_size (0)
+	, _worst_output_latency (0)
+	, _worst_input_latency (0)
+ 	, _worst_track_latency (0)
+	, _have_captured (false)
+	, _meter_hold (0)
+	, _meter_falloff (0)
+	, _non_soloed_outs_muted (false)
+	, _listen_cnt (0)
+	, _solo_isolated_cnt (0)
+	, _writable (false)
+	, _was_seamless (Config->get_seamless_loop ())
 	, _under_nsm_control (false)
-	, _session_dir (new SessionDirectory(fullpath))
+	, delta_accumulator_cnt (0)
+	, average_slave_delta (1800) // !!! why 1800 ???
+	, average_dir (0)
+	, have_first_delta_accumulator (false)
+	, _slave_state (Stopped)
+	, post_export_sync (false)
+	, post_export_position (0)
+	, _exporting (false)
+	, _export_started (false)
+	, _export_rolling (false)
+	, _pre_export_mmc_enabled (false)
+	, _name (snapshot_name)
+	, _is_new (true)
+	, _send_qf_mtc (false)
+	, _pframes_since_last_mtc (0)
+	, session_midi_feedback (0)
+	, play_loop (false)
+	, loop_changing (false)
+	, last_loopend (0)
+	, _session_dir (new SessionDirectory (fullpath))
+	, _current_snapshot_name (snapshot_name)	  
 	, state_tree (0)
-	, _state_of_the_state (Clean)
+	, state_was_pending (false)
+	, _state_of_the_state (StateOfTheState(CannotSave|InitialConnecting|Loading))
+	, _last_roll_location (0)
+	, _last_roll_or_reversal_location (0)
+	, _last_record_location (0)
+	, pending_locate_roll (false)
+	, pending_locate_frame (0)
+	, pending_locate_flush (false)
+	, pending_abort (false)
+	, pending_auto_loop (false)
 	, _butler (new Butler (*this))
 	, _post_transport_work (0)
+	,  cumulative_rf_motion (0)
+	, rf_scale (1.0)
+	, _locations (new Locations (*this))
+	, step_speed (0)
+	, outbound_mtc_timecode_frame (0)
+	, next_quarter_frame_to_send (-1)
+	, _frames_per_timecode_frame (0)
+	, _frames_per_hour (0)
+	, _timecode_frames_per_hour (0)
+	, last_timecode_valid (false)
+	, last_timecode_when (0)
 	, _send_timecode_update (false)
+	, ltc_encoder (0)
 	, ltc_enc_buf(0)
+	, ltc_buf_off (0)
+	, ltc_buf_len (0)
+	, ltc_speed (0)
+	, ltc_enc_byte (0)
+	, ltc_enc_pos (0)
+	, ltc_enc_cnt (0)
+	, ltc_enc_off (0)
+	, restarting (false)
+	, ltc_prev_cycle (0)
+	, ltc_timecode_offset (0)
+	, ltc_timecode_negative_offset (false)
+	, midi_control_ui (0)
+	, _tempo_map (0)
 	, _all_route_group (new RouteGroup (*this, "all"))
 	, routes (new RouteList)
+	, _adding_routes_in_progress (false)
+	, destructive_index (0)
+	, solo_update_disabled (false)
+	, default_fade_steepness (0)
+	, default_fade_msecs (0)
 	, _total_free_4k_blocks (0)
 	, _total_free_4k_blocks_uncertain (false)
+	, no_questions_about_missing_files (false)
+	, _playback_load (0)
+	, _capture_load (0)
 	, _bundles (new BundleList)
 	, _bundle_xml_node (0)
 	, _current_trans (0)
+	, _clicking (false)
 	, click_data (0)
 	, click_emphasis_data (0)
+	, click_length (0)
+	, click_emphasis_length (0)
+	, _clicks_cleared (0)
+	, _play_range (false)
 	, main_outs (0)
+	, first_file_data_format_reset (true)
+	, first_file_header_format_reset (true)
+	, have_looped (false)
 	, _have_rec_enabled_track (false)
+	, _step_editors (0)
 	, _suspend_timecode_transmission (0)
+	,  _speakers (new Speakers)
+	, ignore_route_processor_changes (false)
 {
-	_locations = new Locations (*this);
-	ltc_encoder = NULL;
-
-	if (how_many_dsp_threads () > 1) {
-		/* For now, only create the graph if we are using >1 DSP threads, as
-		   it is a bit slower than the old code with 1 thread.
-		*/
-		_process_graph.reset (new Graph (*this));
-	}
-
-	playlists.reset (new SessionPlaylists);
-
-	_all_route_group->set_active (true, this);
-
-	interpolation.add_channel_to (0, 0);
-
-	if (!eng.connected()) {
-		throw failed_constructor();
-	}
-
-	n_physical_outputs = _engine.n_physical_outputs ();
-	n_physical_inputs =  _engine.n_physical_inputs ();
-
-	first_stage_init (fullpath, snapshot_name);
-
-	_is_new = !Glib::file_test (_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
+	uint32_t sr = 0;
 
+	pre_engine_init (fullpath);
+	
 	if (_is_new) {
 		if (create (mix_template, bus_profile)) {
 			destroy ();
 			throw failed_constructor ();
 		}
+	} else {
+		if (load_state (_current_snapshot_name)) {
+			throw failed_constructor ();
+		}
+	
+		/* try to get sample rate from XML state so that we
+		 * can influence the SR if we set up the audio
+		 * engine.
+		 */
+
+		if (state_tree) {
+			const XMLProperty* prop;
+			if ((prop = state_tree->root()->property (X_("sample-rate"))) != 0) {		
+				sr = atoi (prop->value());
+			}
+		}
+	}
+
+	if (ensure_engine (sr)) {
+		destroy ();
+		throw failed_constructor ();
 	}
 
-	if (second_stage_init ()) {
+	if (post_engine_init ()) {
 		destroy ();
 		throw failed_constructor ();
 	}
 
-	store_recent_sessions(_name, _path);
+	store_recent_sessions (_name, _path);
 
 	bool was_dirty = dirty();
 
@@ -210,6 +313,16 @@ Session::Session (AudioEngine &eng,
 	EndTimeChanged.connect_same_thread (*this, boost::bind (&Session::end_time_changed, this, _1));
 
 	_is_new = false;
+
+	/* hook us up to the engine since we are now completely constructed */
+
+	BootMessage (_("Connect to engine"));
+
+	_engine.set_session (this);
+	_engine.reset_timebase ();
+
+	BootMessage (_("Session loading complete"));
+
 }
 
 Session::~Session ()
@@ -220,6 +333,37 @@ Session::~Session ()
 	destroy ();
 }
 
+int
+Session::ensure_engine (uint32_t desired_sample_rate)
+{
+	if (_engine.current_backend() == 0) {
+		/* backend is unknown ... */
+		boost::optional<int> r = AudioEngineSetupRequired (desired_sample_rate);
+		if (r.get_value_or (-1) != 0) {
+			return -1;
+		}
+	} else if (_engine.setup_required()) {
+		/* backend is known, but setup is needed */
+		boost::optional<int> r = AudioEngineSetupRequired (desired_sample_rate);
+		if (r.get_value_or (-1) != 0) {
+			return -1;
+		}
+	} else if (!_engine.running()) {
+		if (_engine.start()) {
+			return -1;
+		}
+	}
+
+	/* at this point the engine should be running
+	*/
+
+	if (!_engine.running()) {
+		return -1;
+	}
+
+	return 0;
+}
+
 void
 Session::destroy ()
 {
@@ -330,6 +474,8 @@ Session::destroy ()
 	/* not strictly necessary, but doing it here allows the shared_ptr debugging to work */
 	playlists.reset ();
 
+	delete _mmc;
+	delete _midi_ports;
 	delete _locations;
 
 	DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n");
@@ -340,135 +486,103 @@ Session::destroy ()
 }
 
 void
-Session::when_engine_running ()
+Session::setup_ltc ()
 {
-	string first_physical_output;
-
-	BootMessage (_("Set block size and sample rate"));
-
-	set_block_size (_engine.frames_per_cycle());
-	set_frame_rate (_engine.frame_rate());
-
-	BootMessage (_("Using configuration"));
-
-	boost::function<void (std::string)> ff (boost::bind (&Session::config_changed, this, _1, false));
-	boost::function<void (std::string)> ft (boost::bind (&Session::config_changed, this, _1, true));
-
-	Config->map_parameters (ff);
-	config.map_parameters (ft);
-
-	/* every time we reconnect, recompute worst case output latencies */
-
-	_engine.Running.connect_same_thread (*this, boost::bind (&Session::initialize_latencies, this));
-
-	if (synced_to_jack()) {
-		_engine.transport_stop ();
+	XMLNode* child = 0;
+	
+	_ltc_input.reset (new IO (*this, _("LTC In"), IO::Input));
+	_ltc_output.reset (new IO (*this, _("LTC Out"), IO::Output));
+	
+	if (state_tree && (child = find_named_node (*state_tree->root(), "LTC-In")) != 0) {
+		_ltc_input->set_state (*(child->children().front()), Stateful::loading_state_version);
+	} else {
+		{
+			Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+			_ltc_input->ensure_io (ChanCount (DataType::AUDIO, 1), true, this);
+		}
+		reconnect_ltc_input ();
 	}
-
-	if (config.get_jack_time_master()) {
-		_engine.transport_locate (_transport_frame);
+	
+	if (state_tree && (child = find_named_node (*state_tree->root(), "LTC-Out")) != 0) {
+		_ltc_output->set_state (*(child->children().front()), Stateful::loading_state_version);
+	} else {
+		{
+			Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+			_ltc_output->ensure_io (ChanCount (DataType::AUDIO, 1), true, this);
+		}
+		reconnect_ltc_output ();
 	}
+	
+	/* fix up names of LTC ports because we don't want the normal
+	 * IO style of NAME/TYPE-{in,out}N
+	 */
+	
+	_ltc_input->nth (0)->set_name (_("LTC-in"));
+	_ltc_output->nth (0)->set_name (_("LTC-out"));
+}
 
-	_clicking = false;
+void
+Session::setup_click ()
+{
+	XMLNode* child = 0;
 
-	try {
-		XMLNode* child = 0;
+	_clicking = false;
+	_click_io.reset (new ClickIO (*this, "click"));
+	_click_gain.reset (new Amp (*this));
+	_click_gain->activate ();
+	
+	if (state_tree && (child = find_named_node (*state_tree->root(), "Click")) != 0) {
 		
-		_ltc_input.reset (new IO (*this, _("LTC In"), IO::Input));
-		_ltc_output.reset (new IO (*this, _("LTC Out"), IO::Output));
+		/* existing state for Click */
+		int c = 0;
 
-		if (state_tree && (child = find_named_node (*state_tree->root(), "LTC-In")) != 0) {
-			_ltc_input->set_state (*(child->children().front()), Stateful::loading_state_version);
+		if (Stateful::loading_state_version < 3000) {
+			c = _click_io->set_state_2X (*child->children().front(), Stateful::loading_state_version, false);
 		} else {
-			{
-				Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
-				_ltc_input->ensure_io (ChanCount (DataType::AUDIO, 1), true, this);
-			}
-			reconnect_ltc_input ();
-		}
-
-		if (state_tree && (child = find_named_node (*state_tree->root(), "LTC-Out")) != 0) {
-			_ltc_output->set_state (*(child->children().front()), Stateful::loading_state_version);
-		} else {
-			{
-				Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
-				_ltc_output->ensure_io (ChanCount (DataType::AUDIO, 1), true, this);
-			}
-			reconnect_ltc_output ();
-		}
-						
-		/* fix up names of LTC ports because we don't want the normal
-		 * IO style of NAME/TYPE-{in,out}N
-		 */
-		
-		_ltc_input->nth (0)->set_name (_("LTC-in"));
-		_ltc_output->nth (0)->set_name (_("LTC-out"));
-
-		_click_io.reset (new ClickIO (*this, "click"));
-		_click_gain.reset (new Amp (*this));
-		_click_gain->activate ();
-
-		if (state_tree && (child = find_named_node (*state_tree->root(), "Click")) != 0) {
-
-			/* existing state for Click */
-			int c = 0;
-
-			if (Stateful::loading_state_version < 3000) {
-				c = _click_io->set_state_2X (*child->children().front(), Stateful::loading_state_version, false);
-			} else {
-				const XMLNodeList& children (child->children());
-				XMLNodeList::const_iterator i = children.begin();
-				if ((c = _click_io->set_state (**i, Stateful::loading_state_version)) == 0) {
-					++i;
-					if (i != children.end()) {
-						c = _click_gain->set_state (**i, Stateful::loading_state_version);
-					}
+			const XMLNodeList& children (child->children());
+			XMLNodeList::const_iterator i = children.begin();
+			if ((c = _click_io->set_state (**i, Stateful::loading_state_version)) == 0) {
+				++i;
+				if (i != children.end()) {
+					c = _click_gain->set_state (**i, Stateful::loading_state_version);
 				}
 			}
+		}
 			
-			if (c == 0) {
-				_clicking = Config->get_clicking ();
+		if (c == 0) {
+			_clicking = Config->get_clicking ();
 
-			} else {
+		} else {
 
-				error << _("could not setup Click I/O") << endmsg;
-				_clicking = false;
-			}
+			error << _("could not setup Click I/O") << endmsg;
+			_clicking = false;
+		}
 
 
-		} else {
+	} else {
 
-			/* default state for Click: dual-mono to first 2 physical outputs */
+		/* default state for Click: dual-mono to first 2 physical outputs */
 
-			vector<string> outs;
-			_engine.get_physical_outputs (DataType::AUDIO, outs);
+		vector<string> outs;
+		_engine.get_physical_outputs (DataType::AUDIO, outs);
 
-			for (uint32_t physport = 0; physport < 2; ++physport) {
-				if (outs.size() > physport) {
-					if (_click_io->add_port (outs[physport], this)) {
-						// relax, even though its an error
-					}
+		for (uint32_t physport = 0; physport < 2; ++physport) {
+			if (outs.size() > physport) {
+				if (_click_io->add_port (outs[physport], this)) {
+					// relax, even though its an error
 				}
 			}
-
-			if (_click_io->n_ports () > ChanCount::ZERO) {
-				_clicking = Config->get_clicking ();
-			}
 		}
-	}
-
-	catch (failed_constructor& err) {
-		error << _("cannot setup Click I/O") << endmsg;
-	}
-
-	BootMessage (_("Compute I/O Latencies"));
 
-	if (_clicking) {
-		// XXX HOW TO ALERT UI TO THIS ? DO WE NEED TO?
+		if (_click_io->n_ports () > ChanCount::ZERO) {
+			_clicking = Config->get_clicking ();
+		}
 	}
+}
 
-	BootMessage (_("Set up standard connections"));
-
+void
+Session::setup_bundles ()
+{
 	vector<string> inputs[DataType::num_types];
 	vector<string> outputs[DataType::num_types];
 	for (uint32_t i = 0; i < DataType::num_types; ++i) {
@@ -567,6 +681,37 @@ Session::when_engine_running ()
 		add_bundle (c);
 	}
 
+}
+
+int
+Session::when_engine_running ()
+{
+	/* every time we reconnect, recompute worst case output latencies */
+
+	_engine.Running.connect_same_thread (*this, boost::bind (&Session::initialize_latencies, this));
+
+	if (synced_to_jack()) {
+		_engine.transport_stop ();
+	}
+
+	if (config.get_jack_time_master()) {
+		_engine.transport_locate (_transport_frame);
+	}
+
+
+	try {
+		BootMessage (_("Set up LTC"));
+		setup_ltc ();
+		BootMessage (_("Set up Click"));
+		setup_click ();
+		BootMessage (_("Set up standard connections"));
+		setup_bundles ();
+	}
+
+	catch (failed_constructor& err) {
+		return -1;
+	}
+
 	BootMessage (_("Setup signal flow and plugins"));
 
 	/* Reset all panners */
@@ -584,7 +729,8 @@ Session::when_engine_running ()
 	   as it will set states for ports which the ControlProtocolManager creates.
 	*/
 
-	MIDI::Manager::instance()->set_port_states (Config->midi_port_states ());
+	// XXX set state of MIDI::Port's
+	// MidiPortManager::instance()->set_port_states (Config->midi_port_states ());
 
 	/* And this must be done after the MIDI::Manager::set_port_states as
 	 * it will try to make connections whose details are loaded by set_port_states.
@@ -609,11 +755,7 @@ Session::when_engine_running ()
 
         initialize_latencies ();
 
-	/* hook us up to the engine */
-
-	BootMessage (_("Connect to engine"));
-	_engine.set_session (this);
-	_engine.reset_timebase ();
+	return 0;
 }
 
 void
@@ -874,7 +1016,12 @@ Session::hookup_io ()
 	/* Tell all IO objects to connect themselves together */
 
 	IO::enable_connecting ();
-	MIDI::JackMIDIPort::MakeConnections ();
+
+	/* Now tell all "floating" ports to connect to whatever
+	   they should be connected to.
+	*/
+
+	AudioEngine::instance()->reconnect_ports ();
 
 	/* Anyone who cares about input state, wake up and do something */
 
@@ -936,7 +1083,7 @@ Session::set_track_monitor_input_status (bool yn)
 		boost::shared_ptr<AudioTrack> tr = boost::dynamic_pointer_cast<AudioTrack> (*i);
 		if (tr && tr->record_enabled ()) {
 			//cerr << "switching to input = " << !auto_input << __FILE__ << __LINE__ << endl << endl;
-			tr->request_jack_monitors_input (yn);
+			tr->request_input_monitoring (yn);
 		}
 	}
 }
@@ -1169,7 +1316,7 @@ Session::enable_record ()
 		if (g_atomic_int_compare_and_exchange (&_record_status, rs, Recording)) {
 
 			_last_record_location = _transport_frame;
-			MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordStrobe));
+			_mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordStrobe));
 
 			if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) {
 				set_track_monitor_input_status (true);
@@ -1190,7 +1337,7 @@ Session::disable_record (bool rt_context, bool force)
 
 		if ((!Config->get_latched_record_enable () && !play_loop) || force) {
 			g_atomic_int_set (&_record_status, Disabled);
-			MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordExit));
+			_mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordExit));
 		} else {
 			if (rs == Recording) {
 				g_atomic_int_set (&_record_status, Enabled);
@@ -1244,7 +1391,7 @@ Session::maybe_enable_record ()
 			enable_record ();
 		}
 	} else {
-		MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordPause));
+		_mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordPause));
 		RecordStateChanged (); /* EMIT SIGNAL */
 	}
 
@@ -1341,6 +1488,7 @@ Session::set_frame_rate (framecnt_t frames_per_second)
 	*/
 
 	_base_frame_rate = frames_per_second;
+	_nominal_frame_rate = frames_per_second;
 
 	sync_time_vars();
 
diff --git a/libs/ardour/session_export.cc b/libs/ardour/session_export.cc
index 0db4fc33bb..62eb61ab83 100644
--- a/libs/ardour/session_export.cc
+++ b/libs/ardour/session_export.cc
@@ -21,7 +21,6 @@
 #include "pbd/error.h"
 #include <glibmm/threads.h>
 
-#include <midi++/manager.h>
 #include <midi++/mmc.h>
 
 #include "ardour/audioengine.h"
@@ -93,8 +92,8 @@ Session::pre_export ()
 	
 	/* disable MMC output early */
 
-	_pre_export_mmc_enabled = MIDI::Manager::instance()->mmc()->send_enabled ();
-	MIDI::Manager::instance()->mmc()->enable_send (false);
+	_pre_export_mmc_enabled = _mmc->send_enabled ();
+	_mmc->enable_send (false);
 
 	return 0;
 }
@@ -237,7 +236,7 @@ Session::finalize_audio_export ()
 
 	export_freewheel_connection.disconnect();
 	
-	MIDI::Manager::instance()->mmc()->enable_send (_pre_export_mmc_enabled);
+	_mmc->enable_send (_pre_export_mmc_enabled);
 
 	/* maybe write CUE/TOC */
 
diff --git a/libs/ardour/session_jack.cc b/libs/ardour/session_jack.cc
new file mode 100644
index 0000000000..af8a93fec3
--- /dev/null
+++ b/libs/ardour/session_jack.cc
@@ -0,0 +1,185 @@
+/*
+  Copyright (C) 1999-2013 Paul Davis
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
+#include <time.h>
+
+#include <glibmm/miscutils.h>
+
+#include "jack/jack.h"
+#include "jack/session.h"
+
+#include "ardour/audioengine.h"
+#include "ardour/filename_extensions.h"
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/tempo.h"
+
+using namespace ARDOUR;
+using std::string;
+
+#ifdef HAVE_JACK_SESSION
+void
+Session::jack_session_event (jack_session_event_t* event)
+{
+        char timebuf[128], *tmp;
+        time_t n;
+        struct tm local_time;
+
+        time (&n);
+        localtime_r (&n, &local_time);
+        strftime (timebuf, sizeof(timebuf), "JS_%FT%T", &local_time);
+
+        while ((tmp = strchr(timebuf, ':'))) { *tmp = '.'; }
+
+        if (event->type == JackSessionSaveTemplate)
+        {
+                if (save_template( timebuf )) {
+                        event->flags = JackSessionSaveError;
+                } else {
+                        string cmd ("ardour3 -P -U ");
+                        cmd += event->client_uuid;
+                        cmd += " -T ";
+                        cmd += timebuf;
+
+                        event->command_line = strdup (cmd.c_str());
+                }
+        }
+        else
+        {
+                if (save_state (timebuf)) {
+                        event->flags = JackSessionSaveError;
+                } else {
+			std::string xml_path (_session_dir->root_path());
+			std::string legalized_filename = legalize_for_path (timebuf) + statefile_suffix;
+			xml_path = Glib::build_filename (xml_path, legalized_filename);
+
+                        string cmd ("ardour3 -P -U ");
+                        cmd += event->client_uuid;
+                        cmd += " \"";
+                        cmd += xml_path;
+                        cmd += '\"';
+
+                        event->command_line = strdup (cmd.c_str());
+                }
+        }
+
+	/* this won't be called if the port engine in use is not JACK, so we do 
+	   not have to worry about the type of PortEngine::private_handle()
+	*/
+
+	jack_client_t* jack_client = (jack_client_t*) AudioEngine::instance()->port_engine().private_handle();
+	
+	if (jack_client) {
+		jack_session_reply (jack_client, event);
+	}
+
+	if (event->type == JackSessionSaveAndQuit) {
+		Quit (); /* EMIT SIGNAL */
+	}
+
+	jack_session_event_free( event );
+}
+#endif
+
+void
+Session::jack_timebase_callback (jack_transport_state_t /*state*/,
+				 pframes_t /*nframes*/,
+				 jack_position_t* pos,
+				 int /*new_position*/)
+{
+	Timecode::BBT_Time bbt;
+
+	/* BBT info */
+
+	if (_tempo_map) {
+
+		TempoMetric metric (_tempo_map->metric_at (_transport_frame));
+
+		try {
+			_tempo_map->bbt_time_rt (_transport_frame, bbt);
+
+			pos->bar = bbt.bars;
+			pos->beat = bbt.beats;
+			pos->tick = bbt.ticks;
+			
+			// XXX still need to set bar_start_tick
+			
+			pos->beats_per_bar = metric.meter().divisions_per_bar();
+			pos->beat_type = metric.meter().note_divisor();
+			pos->ticks_per_beat = Timecode::BBT_Time::ticks_per_beat;
+			pos->beats_per_minute = metric.tempo().beats_per_minute();
+			
+			pos->valid = jack_position_bits_t (pos->valid | JackPositionBBT);
+
+		} catch (...) {
+			/* no message */
+		}
+	}
+
+#ifdef HAVE_JACK_VIDEO_SUPPORT
+	//poke audio video ratio so Ardour can track Video Sync
+	pos->audio_frames_per_video_frame = frame_rate() / timecode_frames_per_second();
+	pos->valid = jack_position_bits_t (pos->valid | JackAudioVideoRatio);
+#endif
+
+#if 0
+	/* Timecode info */
+
+	pos->timecode_offset = config.get_timecode_offset();
+	t.timecode_frame_rate = timecode_frames_per_second();
+	pos->valid = jack_position_bits_t (pos->valid | JackPositionTimecode;
+
+	if (_transport_speed) {
+
+		if (play_loop) {
+
+			Location* location = _locations.auto_loop_location();
+
+			if (location) {
+
+				t.transport_state = JackTransportLooping;
+				t.loop_start = location->start();
+				t.loop_end = location->end();
+				t.valid = jack_transport_bits_t (t.valid | JackTransportLoop);
+
+			} else {
+
+				t.loop_start = 0;
+				t.loop_end = 0;
+				t.transport_state = JackTransportRolling;
+
+			}
+
+		} else {
+
+			t.loop_start = 0;
+			t.loop_end = 0;
+			t.transport_state = JackTransportRolling;
+
+		}
+
+	}
+#endif
+}
+
diff --git a/libs/ardour/session_ltc.cc b/libs/ardour/session_ltc.cc
index d6cc201a5c..b2fbaf602c 100644
--- a/libs/ardour/session_ltc.cc
+++ b/libs/ardour/session_ltc.cc
@@ -56,7 +56,7 @@ using namespace Timecode;
  * This filter is adaptive so that fast vari-speed signals
  * will not be affected by it.
  */
-#define LTC_RISE_TIME(speed) MIN (100, MAX(40, (4000000 / ((speed==0)?1:speed) / engine().frame_rate())))
+#define LTC_RISE_TIME(speed) MIN (100, MAX(40, (4000000 / ((speed==0)?1:speed) / engine().sample_rate())))
 
 #define TV_STANDARD(tcf) \
 	(timecode_to_frames_per_second(tcf)==25.0 ? LTC_TV_625_50 : \
@@ -565,7 +565,7 @@ Session::ltc_tx_send_time_code_for_cycle (framepos_t start_frame, framepos_t end
 		 * To do better than this, resampling (or a rewrite of the
 		 * encoder) is required.
 		 */
-		ltc_speed -= ((ltc_enc_pos + ltc_enc_cnt - poff) - cycle_start_frame) / engine().frame_rate();
+		ltc_speed -= ((ltc_enc_pos + ltc_enc_cnt - poff) - cycle_start_frame) / engine().sample_rate();
 	}
 
 
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index d137e5167c..6d3083df77 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -31,7 +31,6 @@
 
 #include "midi++/mmc.h"
 #include "midi++/port.h"
-#include "midi++/manager.h"
 
 #include "pbd/error.h"
 #include "pbd/pthread_utils.h"
@@ -41,6 +40,7 @@
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/debug.h"
+#include "ardour/midi_port.h"
 #include "ardour/midi_track.h"
 #include "ardour/midi_ui.h"
 #include "ardour/session.h"
@@ -349,7 +349,7 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled)
  * @param t time to send.
  */
 int
-Session::send_full_time_code (framepos_t const t)
+Session::send_full_time_code (framepos_t const t, pframes_t nframes)
 {
 	/* This function could easily send at a given frame offset, but would
 	 * that be useful?  Does ardour do sub-block accurate locating? [DR] */
@@ -424,10 +424,9 @@ Session::send_full_time_code (framepos_t const t)
 	msg[8] = timecode.frames;
 
 	// Send message at offset 0, sent time is for the start of this cycle
-	if (MIDI::Manager::instance()->mtc_output_port()->midimsg (msg, sizeof (msg), 0)) {
-		error << _("Session: could not send full MIDI time code") << endmsg;
-		return -1;
-	}
+	
+	MidiBuffer& mb (_midi_ports->mtc_output_port()->get_midi_buffer (nframes));
+	mb.push_back (0, sizeof (msg), msg);
 
 	_pframes_since_last_mtc = 0;
 	return 0;
@@ -470,7 +469,7 @@ Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_f
 				next_quarter_frame_to_send, quarter_frame_duration));
 
 	if (rint(outbound_mtc_timecode_frame + (next_quarter_frame_to_send * quarter_frame_duration)) < _transport_frame) {
-		send_full_time_code (_transport_frame);
+		send_full_time_code (_transport_frame, nframes);
 		return 0;
 	}
 
@@ -516,9 +515,10 @@ Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_f
 		pframes_t const out_stamp = (msg_time - start_frame) / _transport_speed;
 		assert (out_stamp < nframes);
 
-		if (MIDI::Manager::instance()->mtc_output_port()->midimsg (mtc_msg, 2, out_stamp)) {
+		MidiBuffer& mb (_midi_ports->mtc_output_port()->get_midi_buffer(nframes));
+		if (!mb.push_back (out_stamp, 2, mtc_msg)) {
 			error << string_compose(_("Session: cannot send quarter-frame MTC message (%1)"), strerror (errno))
-						<< endmsg;
+			      << endmsg;
 			return -1;
 		}
 
@@ -588,7 +588,7 @@ Session::mmc_step_timeout ()
 
 
 void
-Session::send_song_position_pointer (framepos_t t)
+Session::send_song_position_pointer (framepos_t)
 {
 	if (midi_clock) {
 		/* Do nothing for the moment */
@@ -603,3 +603,45 @@ Session::start_midi_thread ()
 	return 0;
 }
 
+MIDI::Port* 
+Session::midi_input_port () const
+{
+	return _midi_ports->midi_input_port ();
+}
+MIDI::Port* 
+Session::midi_output_port () const
+{
+	return _midi_ports->midi_output_port ();
+}
+boost::shared_ptr<MidiPort> 
+Session::midi_clock_output_port () const
+{
+	return _midi_ports->midi_clock_output_port ();
+}
+boost::shared_ptr<MidiPort> 
+Session::midi_clock_input_port () const
+{
+	return _midi_ports->midi_clock_input_port ();
+}
+boost::shared_ptr<MidiPort> 
+Session::mtc_output_port () const
+{
+	return _midi_ports->mtc_output_port ();
+}
+boost::shared_ptr<MidiPort> 
+Session::mtc_input_port () const
+{
+	return _midi_ports->mtc_input_port ();
+}
+
+MIDI::Port*
+Session::mmc_output_port () const
+{
+	return _midi_ports->mmc_output_port ();
+}
+
+MIDI::Port*
+Session::mmc_input_port () const
+{
+	return _midi_ports->mmc_input_port ();
+}
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index cecbd88f65..3c46a2e0a6 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -40,7 +40,6 @@
 #include "ardour/ticker.h"
 #include "ardour/types.h"
 
-#include "midi++/manager.h"
 #include "midi++/mmc.h"
 
 #include "i18n.h"
@@ -85,7 +84,7 @@ Session::process (pframes_t nframes)
 
 	try {
 		if (!_engine.freewheeling() && Config->get_send_midi_clock() && transport_speed() == 1.0f && midi_clock->has_midi_port()) {
-			midi_clock->tick (transport_at_start);
+			midi_clock->tick (transport_at_start, nframes);
 		}
 	} catch (...) {
 		/* don't bother with a message */
@@ -325,7 +324,7 @@ Session::process_with_events (pframes_t nframes)
 	 * and prepare for rolling)
 	 */
 	if (_send_timecode_update) {
-		send_full_time_code (_transport_frame);
+		send_full_time_code (_transport_frame, nframes);
 	}
 
 	if (!process_can_proceed()) {
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 49a0eed559..e847ba45ce 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1999-2002 Paul Davis
+  Copyright (C) 1999-2013 Paul Davis
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -60,7 +60,6 @@
 
 #include "midi++/mmc.h"
 #include "midi++/port.h"
-#include "midi++/manager.h"
 
 #include "evoral/SMF.hpp"
 
@@ -87,6 +86,7 @@
 #include "ardour/control_protocol_manager.h"
 #include "ardour/directory_names.h"
 #include "ardour/filename_extensions.h"
+#include "ardour/graph.h"
 #include "ardour/location.h"
 #include "ardour/midi_model.h"
 #include "ardour/midi_patch_manager.h"
@@ -125,15 +125,16 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-/** @param snapshot_name Snapshot name, without the .ardour prefix */
 void
-Session::first_stage_init (string fullpath, string snapshot_name)
+Session::pre_engine_init (string fullpath)
 {
-	if (fullpath.length() == 0) {
+	if (fullpath.empty()) {
 		destroy ();
 		throw failed_constructor();
 	}
 
+	/* discover canonical fullpath */
+
 	char buf[PATH_MAX+1];
 	if (!realpath (fullpath.c_str(), buf) && (errno != ENOENT)) {
 		error << string_compose(_("Could not use path %1 (%2)"), buf, strerror(errno)) << endmsg;
@@ -142,102 +143,29 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	}
 
 	_path = string(buf);
+	
+	/* we require _path to end with a dir separator */
 
 	if (_path[_path.length()-1] != G_DIR_SEPARATOR) {
 		_path += G_DIR_SEPARATOR;
 	}
 
-	/* these two are just provisional settings. set_state()
-	   will likely override them.
-	*/
-
-	_name = _current_snapshot_name = snapshot_name;
-
-	set_history_depth (Config->get_history_depth());
-
-	_current_frame_rate = _engine.frame_rate ();
-	_nominal_frame_rate = _current_frame_rate;
-	_base_frame_rate = _current_frame_rate;
+	/* is it new ? */
 
-	_tempo_map = new TempoMap (_current_frame_rate);
-	_tempo_map->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1));
+	_is_new = !Glib::file_test (_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR));
 
+	/* finish initialization that can't be done in a normal C++ constructor
+	   definition.
+	*/
 
-	_non_soloed_outs_muted = false;
-	_listen_cnt = 0;
-	_solo_isolated_cnt = 0;
+	timerclear (&last_mmc_step);
 	g_atomic_int_set (&processing_prohibited, 0);
-	_transport_speed = 0;
-	_default_transport_speed = 1.0;
-	_last_transport_speed = 0;
-	_target_transport_speed = 0;
-	auto_play_legal = false;
-	transport_sub_state = 0;
-	_transport_frame = 0;
-	_requested_return_frame = -1;
-	_session_range_location = 0;
 	g_atomic_int_set (&_record_status, Disabled);
-	loop_changing = false;
-	play_loop = false;
-	have_looped = false;
-	_last_roll_location = 0;
-	_last_roll_or_reversal_location = 0;
-	_last_record_location = 0;
-	pending_locate_frame = 0;
-	pending_locate_roll = false;
-	pending_locate_flush = false;
-	state_was_pending = false;
-	set_next_event ();
-	outbound_mtc_timecode_frame = 0;
-	next_quarter_frame_to_send = -1;
-	current_block_size = 0;
-	solo_update_disabled = false;
-	_have_captured = false;
-	_worst_output_latency = 0;
-	_worst_input_latency = 0;
- 	_worst_track_latency = 0;
-	_state_of_the_state = StateOfTheState(CannotSave|InitialConnecting|Loading);
-	_was_seamless = Config->get_seamless_loop ();
-	_slave = 0;
-	_send_qf_mtc = false;
-	_pframes_since_last_mtc = 0;
 	g_atomic_int_set (&_playback_load, 100);
 	g_atomic_int_set (&_capture_load, 100);
-	_play_range = false;
-	_exporting = false;
-	pending_abort = false;
-	_adding_routes_in_progress = false;
-	destructive_index = 0;
-	first_file_data_format_reset = true;
-	first_file_header_format_reset = true;
-	post_export_sync = false;
-	midi_control_ui = 0;
-        _step_editors = 0;
-        no_questions_about_missing_files = false;
-        _speakers.reset (new Speakers);
-	_clicks_cleared = 0;
-	ignore_route_processor_changes = false;
-	_pre_export_mmc_enabled = false;
-
-	AudioDiskstream::allocate_working_buffers();
-
-	/* default short fade = 15ms */
-
-	SndFileSource::setup_standard_crossfades (*this, frame_rate());
-
-	last_mmc_step.tv_sec = 0;
-	last_mmc_step.tv_usec = 0;
-	step_speed = 0.0;
-
-	/* click sounds are unset by default, which causes us to internal
-	   waveforms for clicks.
-	*/
-
-	click_length = 0;
-	click_emphasis_length = 0;
-	_clicking = false;
-
-	process_function = &Session::process_with_events;
+	set_next_event ();
+	_all_route_group->set_active (true, this);
+	interpolation.add_channel_to (0, 0);
 
 	if (config.get_use_video_sync()) {
 		waiting_for_sync_offset = true;
@@ -245,32 +173,19 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 		waiting_for_sync_offset = false;
 	}
 
-	last_timecode_when = 0;
-	last_timecode_valid = false;
-
-	sync_time_vars ();
-
 	last_rr_session_dir = session_dirs.begin();
-	refresh_disk_space ();
 
+	set_history_depth (Config->get_history_depth());
+	
         /* default: assume simple stereo speaker configuration */
 
         _speakers->setup_default_speakers (2);
 
-	/* slave stuff */
-
-	average_slave_delta = 1800; // !!! why 1800 ????
-	have_first_delta_accumulator = false;
-	delta_accumulator_cnt = 0;
-	_slave_state = Stopped;
-
         _solo_cut_control.reset (new ProxyControllable (_("solo cut control (dB)"), PBD::Controllable::GainLike,
                                                         boost::bind (&RCConfiguration::set_solo_mute_gain, Config, _1),
                                                         boost::bind (&RCConfiguration::get_solo_mute_gain, Config)));
         add_controllable (_solo_cut_control);
 
-	_engine.GraphReordered.connect_same_thread (*this, boost::bind (&Session::graph_reordered, this));
-
 	/* These are all static "per-class" signals */
 
 	SourceFactory::SourceCreated.connect_same_thread (*this, boost::bind (&Session::add_source, this, _1));
@@ -283,87 +198,108 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 
 	Delivery::disable_panners ();
 	IO::disable_connecting ();
+
+	AudioFileSource::set_peak_dir (_session_dir->peak_path());
 }
 
 int
-Session::second_stage_init ()
+Session::post_engine_init ()
 {
-	AudioFileSource::set_peak_dir (_session_dir->peak_path());
+	BootMessage (_("Set block size and sample rate"));
 
-	if (!_is_new) {
-		if (load_state (_current_snapshot_name)) {
-			return -1;
-		}
+	set_block_size (_engine.samples_per_cycle());
+	set_frame_rate (_engine.sample_rate());
+
+	if (how_many_dsp_threads () > 1) {
+		/* For now, only create the graph if we are using >1 DSP threads, as
+		   it is a bit slower than the old code with 1 thread.
+		*/
+		_process_graph.reset (new Graph (*this));
 	}
 
+	n_physical_outputs = _engine.n_physical_outputs ();
+	n_physical_inputs =  _engine.n_physical_inputs ();
+
+	BootMessage (_("Using configuration"));
+
+	_midi_ports = new MidiPortManager;
+	setup_midi_machine_control ();
+	
 	if (_butler->start_thread()) {
 		return -1;
 	}
-
+	
 	if (start_midi_thread ()) {
 		return -1;
 	}
+	
+	setup_click_sounds (0);
+	setup_midi_control ();
 
-	setup_midi_machine_control ();
-
-	// set_state() will call setup_raid_path(), but if it's a new session we need
-	// to call setup_raid_path() here.
+	_engine.Halted.connect_same_thread (*this, boost::bind (&Session::engine_halted, this));
+	_engine.Xrun.connect_same_thread (*this, boost::bind (&Session::xrun_recovery, this));
 
-	if (state_tree) {
-		if (set_state (*state_tree->root(), Stateful::loading_state_version)) {
-			return -1;
-		}
-	} else {
-		setup_raid_path(_path);
-	}
+	try {
+		/* tempo map requires sample rate knowledge */
 
-	/* we can't save till after ::when_engine_running() is called,
-	   because otherwise we save state with no connections made.
-	   therefore, we reset _state_of_the_state because ::set_state()
-	   will have cleared it.
+		_tempo_map = new TempoMap (_current_frame_rate);
+		_tempo_map->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1));
+		
+		/* MidiClock requires a tempo map */
 
-	   we also have to include Loading so that any events that get
-	   generated between here and the end of ::when_engine_running()
-	   will be processed directly rather than queued.
-	*/
+		midi_clock = new MidiClockTicker ();
+		midi_clock->set_session (this);
 
-	_state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave|Loading);
+		/* crossfades require sample rate knowledge */
 
-	_locations->changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this));
-	_locations->added.connect_same_thread (*this, boost::bind (&Session::locations_added, this, _1));
-	setup_click_sounds (0);
-	setup_midi_control ();
-
-	/* Pay attention ... */
+		SndFileSource::setup_standard_crossfades (*this, frame_rate());
+		_engine.GraphReordered.connect_same_thread (*this, boost::bind (&Session::graph_reordered, this));
+		
+		AudioDiskstream::allocate_working_buffers();
+		refresh_disk_space ();
+		
+		/* we're finally ready to call set_state() ... all objects have
+		 * been created, the engine is running.
+		 */
+		
+		if (state_tree) {
+			if (set_state (*state_tree->root(), Stateful::loading_state_version)) {
+				return -1;
+			}
+		} else {
+			// set_state() will call setup_raid_path(), but if it's a new session we need
+			// to call setup_raid_path() here.
+			setup_raid_path (_path);
+		}
 
-	_engine.Halted.connect_same_thread (*this, boost::bind (&Session::engine_halted, this));
-	_engine.Xrun.connect_same_thread (*this, boost::bind (&Session::xrun_recovery, this));
+		/* ENGINE */
 
-	midi_clock = new MidiClockTicker ();
-	midi_clock->set_session (this);
+		boost::function<void (std::string)> ff (boost::bind (&Session::config_changed, this, _1, false));
+		boost::function<void (std::string)> ft (boost::bind (&Session::config_changed, this, _1, true));
+		
+		Config->map_parameters (ff);
+		config.map_parameters (ft);
 
-	try {
 		when_engine_running ();
-	}
-
-	/* handle this one in a different way than all others, so that its clear what happened */
 
-	catch (AudioEngine::PortRegistrationFailure& err) {
+		_locations->changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this));
+		_locations->added.connect_same_thread (*this, boost::bind (&Session::locations_added, this, _1));
+		
+	} catch (AudioEngine::PortRegistrationFailure& err) {
+		/* handle this one in a different way than all others, so that its clear what happened */
 		error << err.what() << endmsg;
 		return -1;
-	}
-
-	catch (...) {
+	} catch (...) {
 		return -1;
 	}
 
 	BootMessage (_("Reset Remote Controls"));
 
-	send_full_time_code (0);
+	// send_full_time_code (0);
 	_engine.transport_locate (0);
 
-	MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdMmcReset));
-	MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (Timecode::Time ()));
+	_mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdMmcReset));
+	_mmc->send (MIDI::MachineControlCommand (Timecode::Time ()));
 
 	MIDI::Name::MidiPatchManager::instance().set_session (this);
 
@@ -376,14 +312,14 @@ Session::second_stage_init ()
 
 	DirtyChanged (); /* EMIT SIGNAL */
 
-	if (state_was_pending) {
-		save_state (_current_snapshot_name);
+	if (_is_new) {
+		save_state ("");
+	} else if (state_was_pending) {
+		save_state ("");
 		remove_pending_capture_state ();
 		state_was_pending = false;
 	}
 
-	BootMessage (_("Session loading complete"));
-
 	return 0;
 }
 
@@ -610,8 +546,6 @@ Session::create (const string& session_template, BusProfile* bus_profile)
 		add_monitor_section ();
 	}
 
-	save_state ("");
-
 	return 0;
 }
 
@@ -690,62 +624,6 @@ Session::remove_state (string snapshot_name)
 	}
 }
 
-#ifdef HAVE_JACK_SESSION
-void
-Session::jack_session_event (jack_session_event_t * event)
-{
-        char timebuf[128], *tmp;
-        time_t n;
-        struct tm local_time;
-
-        time (&n);
-        localtime_r (&n, &local_time);
-        strftime (timebuf, sizeof(timebuf), "JS_%FT%T", &local_time);
-
-        while ((tmp = strchr(timebuf, ':'))) { *tmp = '.'; }
-
-        if (event->type == JackSessionSaveTemplate)
-        {
-                if (save_template( timebuf )) {
-                        event->flags = JackSessionSaveError;
-                } else {
-                        string cmd ("ardour3 -P -U ");
-                        cmd += event->client_uuid;
-                        cmd += " -T ";
-                        cmd += timebuf;
-
-                        event->command_line = strdup (cmd.c_str());
-                }
-        }
-        else
-        {
-                if (save_state (timebuf)) {
-                        event->flags = JackSessionSaveError;
-                } else {
-			std::string xml_path (_session_dir->root_path());
-			std::string legalized_filename = legalize_for_path (timebuf) + statefile_suffix;
-			xml_path = Glib::build_filename (xml_path, legalized_filename);
-
-                        string cmd ("ardour3 -P -U ");
-                        cmd += event->client_uuid;
-                        cmd += " \"";
-                        cmd += xml_path;
-                        cmd += '\"';
-
-                        event->command_line = strdup (cmd.c_str());
-                }
-        }
-
-	jack_session_reply (_engine.jack(), event);
-
-	if (event->type == JackSessionSaveAndQuit) {
-		Quit (); /* EMIT SIGNAL */
-	}
-
-	jack_session_event_free( event );
-}
-#endif
-
 /** @param snapshot_name Name to save under, without .ardour / .pending prefix */
 int
 Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot)
@@ -1040,6 +918,15 @@ Session::state (bool full_state)
 
 	/* various options */
 
+	list<XMLNode*> midi_port_nodes = _midi_ports->get_midi_port_states();
+	if (!midi_port_nodes.empty()) {
+		XMLNode* midi_port_stuff = new XMLNode ("MIDIPorts");
+		for (list<XMLNode*>::const_iterator n = midi_port_nodes.begin(); n != midi_port_nodes.end(); ++n) {
+			midi_port_stuff->add_child_nocopy (**n);
+		}
+		node->add_child_nocopy (*midi_port_stuff);
+	}
+
 	node->add_child_nocopy (config.get_variables ());
 
 	node->add_child_nocopy (ARDOUR::SessionMetadata::Metadata()->get_state());
@@ -1245,6 +1132,11 @@ Session::set_state (const XMLNode& node, int version)
                 Evoral::init_event_id_counter (atoi (prop->value()));
         }
 
+
+	if ((child = find_named_node (node, "MIDIPorts")) != 0) {
+		_midi_ports->set_midi_port_states (child->children());
+	}
+
 	IO::disable_connecting ();
 
 	Stateful::save_extra_xml (node);
@@ -3421,11 +3313,11 @@ Session::config_changed (std::string p, bool ours)
 
 	} else if (p == "mmc-device-id" || p == "mmc-receive-id" || p == "mmc-receive-device-id") {
 
-		MIDI::Manager::instance()->mmc()->set_receive_device_id (Config->get_mmc_receive_device_id());
+		_mmc->set_receive_device_id (Config->get_mmc_receive_device_id());
 
 	} else if (p == "mmc-send-id" || p == "mmc-send-device-id") {
 
-		MIDI::Manager::instance()->mmc()->set_send_device_id (Config->get_mmc_send_device_id());
+		_mmc->set_send_device_id (Config->get_mmc_send_device_id());
 
 	} else if (p == "midi-control") {
 
@@ -3488,7 +3380,7 @@ Session::config_changed (std::string p, bool ours)
 
 	} else if (p == "send-mmc") {
 
-		MIDI::Manager::instance()->mmc()->enable_send (Config->get_send_mmc ());
+		_mmc->enable_send (Config->get_send_mmc ());
 
 	} else if (p == "midi-feedback") {
 
@@ -3546,13 +3438,13 @@ Session::config_changed (std::string p, bool ours)
 			
 	} else if (p == "initial-program-change") {
 
-		if (MIDI::Manager::instance()->mmc()->output_port() && Config->get_initial_program_change() >= 0) {
+		if (_mmc->output_port() && Config->get_initial_program_change() >= 0) {
 			MIDI::byte buf[2];
 
 			buf[0] = MIDI::program; // channel zero by default
 			buf[1] = (Config->get_initial_program_change() & 0x7f);
 
-			MIDI::Manager::instance()->mmc()->output_port()->midimsg (buf, sizeof (buf), 0);
+			_mmc->output_port()->midimsg (buf, sizeof (buf), 0);
 		}
 	} else if (p == "solo-mute-override") {
 		// catch_up_on_solo_mute_override ();
@@ -3616,27 +3508,28 @@ Session::load_diskstreams_2X (XMLNode const & node, int)
 void
 Session::setup_midi_machine_control ()
 {
-	MIDI::MachineControl* mmc = MIDI::Manager::instance()->mmc ();
-
-	mmc->Play.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1));
-	mmc->DeferredPlay.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1));
-	mmc->Stop.connect_same_thread (*this, boost::bind (&Session::mmc_stop, this, _1));
-	mmc->FastForward.connect_same_thread (*this, boost::bind (&Session::mmc_fast_forward, this, _1));
-	mmc->Rewind.connect_same_thread (*this, boost::bind (&Session::mmc_rewind, this, _1));
-	mmc->Pause.connect_same_thread (*this, boost::bind (&Session::mmc_pause, this, _1));
-	mmc->RecordPause.connect_same_thread (*this, boost::bind (&Session::mmc_record_pause, this, _1));
-	mmc->RecordStrobe.connect_same_thread (*this, boost::bind (&Session::mmc_record_strobe, this, _1));
-	mmc->RecordExit.connect_same_thread (*this, boost::bind (&Session::mmc_record_exit, this, _1));
-	mmc->Locate.connect_same_thread (*this, boost::bind (&Session::mmc_locate, this, _1, _2));
-	mmc->Step.connect_same_thread (*this, boost::bind (&Session::mmc_step, this, _1, _2));
-	mmc->Shuttle.connect_same_thread (*this, boost::bind (&Session::mmc_shuttle, this, _1, _2, _3));
-	mmc->TrackRecordStatusChange.connect_same_thread (*this, boost::bind (&Session::mmc_record_enable, this, _1, _2, _3));
+	_mmc = new MIDI::MachineControl;
+	_mmc->set_ports (_midi_ports->mmc_input_port(), _midi_ports->mmc_output_port());
+
+	_mmc->Play.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1));
+	_mmc->DeferredPlay.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1));
+	_mmc->Stop.connect_same_thread (*this, boost::bind (&Session::mmc_stop, this, _1));
+	_mmc->FastForward.connect_same_thread (*this, boost::bind (&Session::mmc_fast_forward, this, _1));
+	_mmc->Rewind.connect_same_thread (*this, boost::bind (&Session::mmc_rewind, this, _1));
+	_mmc->Pause.connect_same_thread (*this, boost::bind (&Session::mmc_pause, this, _1));
+	_mmc->RecordPause.connect_same_thread (*this, boost::bind (&Session::mmc_record_pause, this, _1));
+	_mmc->RecordStrobe.connect_same_thread (*this, boost::bind (&Session::mmc_record_strobe, this, _1));
+	_mmc->RecordExit.connect_same_thread (*this, boost::bind (&Session::mmc_record_exit, this, _1));
+	_mmc->Locate.connect_same_thread (*this, boost::bind (&Session::mmc_locate, this, _1, _2));
+	_mmc->Step.connect_same_thread (*this, boost::bind (&Session::mmc_step, this, _1, _2));
+	_mmc->Shuttle.connect_same_thread (*this, boost::bind (&Session::mmc_shuttle, this, _1, _2, _3));
+	_mmc->TrackRecordStatusChange.connect_same_thread (*this, boost::bind (&Session::mmc_record_enable, this, _1, _2, _3));
 
 	/* also handle MIDI SPP because its so common */
 
-	mmc->SPPStart.connect_same_thread (*this, boost::bind (&Session::spp_start, this));
-	mmc->SPPContinue.connect_same_thread (*this, boost::bind (&Session::spp_continue, this));
-	mmc->SPPStop.connect_same_thread (*this, boost::bind (&Session::spp_stop, this));
+	_mmc->SPPStart.connect_same_thread (*this, boost::bind (&Session::spp_start, this));
+	_mmc->SPPContinue.connect_same_thread (*this, boost::bind (&Session::spp_continue, this));
+	_mmc->SPPStop.connect_same_thread (*this, boost::bind (&Session::spp_stop, this));
 }
 
 boost::shared_ptr<Controllable>
diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 18805afa90..0f2186c09b 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -180,31 +180,30 @@ Session::timecode_time (Timecode::Time &t)
 }
 
 int
-Session::jack_sync_callback (jack_transport_state_t state,
-			     jack_position_t* pos)
+Session::backend_sync_callback (TransportState state, framepos_t pos)
 {
 	bool slave = synced_to_jack();
 
 	switch (state) {
-	case JackTransportStopped:
-		if (slave && _transport_frame != pos->frame && post_transport_work() == 0) {
-			request_locate (pos->frame, false);
+	case TransportStopped:
+		if (slave && _transport_frame != pos && post_transport_work() == 0) {
+			request_locate (pos, false);
 			// cerr << "SYNC: stopped, locate to " << pos->frame << " from " << _transport_frame << endl;
 			return false;
 		} else {
 			return true;
 		}
 
-	case JackTransportStarting:
+	case TransportStarting:
 		// cerr << "SYNC: starting @ " << pos->frame << " a@ " << _transport_frame << " our work = " <<  post_transport_work() << " pos matches ? " << (_transport_frame == pos->frame) << endl;
 		if (slave) {
-			return _transport_frame == pos->frame && post_transport_work() == 0;
+			return _transport_frame == pos && post_transport_work() == 0;
 		} else {
 			return true;
 		}
 		break;
 
-	case JackTransportRolling:
+	case TransportRolling:
 		// cerr << "SYNC: rolling slave = " << slave << endl;
 		if (slave) {
 			start_transport ();
@@ -212,93 +211,13 @@ Session::jack_sync_callback (jack_transport_state_t state,
 		break;
 
 	default:
-		error << string_compose (_("Unknown JACK transport state %1 in sync callback"), state)
+		error << string_compose (_("Unknown transport state %1 in sync callback"), state)
 		      << endmsg;
 	}
 
 	return true;
 }
 
-void
-Session::jack_timebase_callback (jack_transport_state_t /*state*/,
-				 pframes_t /*nframes*/,
-				 jack_position_t* pos,
-				 int /*new_position*/)
-{
-	Timecode::BBT_Time bbt;
-
-	/* BBT info */
-
-	if (_tempo_map) {
-
-		TempoMetric metric (_tempo_map->metric_at (_transport_frame));
-
-		try {
-			_tempo_map->bbt_time_rt (_transport_frame, bbt);
-
-			pos->bar = bbt.bars;
-			pos->beat = bbt.beats;
-			pos->tick = bbt.ticks;
-			
-			// XXX still need to set bar_start_tick
-			
-			pos->beats_per_bar = metric.meter().divisions_per_bar();
-			pos->beat_type = metric.meter().note_divisor();
-			pos->ticks_per_beat = Timecode::BBT_Time::ticks_per_beat;
-			pos->beats_per_minute = metric.tempo().beats_per_minute();
-			
-			pos->valid = jack_position_bits_t (pos->valid | JackPositionBBT);
-
-		} catch (...) {
-			/* no message */
-		}
-	}
-
-#ifdef HAVE_JACK_VIDEO_SUPPORT
-	//poke audio video ratio so Ardour can track Video Sync
-	pos->audio_frames_per_video_frame = frame_rate() / timecode_frames_per_second();
-	pos->valid = jack_position_bits_t (pos->valid | JackAudioVideoRatio);
-#endif
-
-#if 0
-	/* Timecode info */
-
-	pos->timecode_offset = config.get_timecode_offset();
-	t.timecode_frame_rate = timecode_frames_per_second();
-	pos->valid = jack_position_bits_t (pos->valid | JackPositionTimecode;
-
-	if (_transport_speed) {
-
-		if (play_loop) {
-
-			Location* location = _locations.auto_loop_location();
-
-			if (location) {
-
-				t.transport_state = JackTransportLooping;
-				t.loop_start = location->start();
-				t.loop_end = location->end();
-				t.valid = jack_transport_bits_t (t.valid | JackTransportLoop);
-
-			} else {
-
-				t.loop_start = 0;
-				t.loop_end = 0;
-				t.transport_state = JackTransportRolling;
-
-			}
-
-		} else {
-
-			t.loop_start = 0;
-			t.loop_end = 0;
-			t.transport_state = JackTransportRolling;
-
-		}
-
-	}
-#endif
-}
 
 ARDOUR::framecnt_t
 Session::convert_to_frames (AnyTime const & position)
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 51d8d2c369..ab6d68fd67 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -33,7 +33,6 @@
 
 #include "midi++/mmc.h"
 #include "midi++/port.h"
-#include "midi++/manager.h"
 
 #include "ardour/audioengine.h"
 #include "ardour/auditioner.h"
@@ -610,11 +609,23 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
 
 	have_looped = false;
 
-	if (!_engine.freewheeling()) {
-		send_full_time_code (_transport_frame);
+	/* don't bother with this stuff if we're disconnected from the engine,
+	   because there will be no process callbacks to deliver stuff from
+	*/
+
+	if (_engine.connected() && !_engine.freewheeling()) {
+		// need to queue this in the next RT cycle
+		_send_timecode_update = true;
 		
 		if (!dynamic_cast<MTC_Slave*>(_slave)) {
-			MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdStop));
+			_mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdStop));
+
+			/* This (::non_realtime_stop()) gets called by main
+			   process thread, which will lead to confusion
+			   when calling AsyncMIDIPort::write().
+			   
+			   Something must be done. XXX
+			*/
 			send_mmc_locate (_transport_frame);
 		}
 	}
@@ -1260,7 +1271,7 @@ Session::start_transport ()
 		Timecode::Time time;
 		timecode_time_subframes (_transport_frame, time);
 		if (!dynamic_cast<MTC_Slave*>(_slave)) {
-			MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdDeferredPlay));
+			_mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdDeferredPlay));
 		}
 	}
 
@@ -1338,8 +1349,9 @@ Session::use_sync_source (Slave* new_slave)
 	_slave = new_slave;
 
 	DEBUG_TRACE (DEBUG::Slave, string_compose ("set new slave to %1\n", _slave));
-
-	send_full_time_code (_transport_frame);
+	
+	// need to queue this for next process() cycle
+	_send_timecode_update = true;
 
 	boost::shared_ptr<RouteList> rl = routes.reader();
 	for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
@@ -1380,7 +1392,7 @@ Session::switch_to_sync_source (SyncSource src)
 		}
 
 		try {
-			new_slave = new MTC_Slave (*this, *MIDI::Manager::instance()->mtc_input_port());
+			new_slave = new MTC_Slave (*this, *_midi_ports->mtc_input_port());
 		}
 
 		catch (failed_constructor& err) {
@@ -1409,7 +1421,7 @@ Session::switch_to_sync_source (SyncSource src)
 		}
 
 		try {
-			new_slave = new MIDIClock_Slave (*this, *MIDI::Manager::instance()->midi_clock_input_port(), 24);
+			new_slave = new MIDIClock_Slave (*this, *_midi_ports->midi_clock_input_port(), 24);
 		}
 
 		catch (failed_constructor& err) {
@@ -1426,7 +1438,7 @@ Session::switch_to_sync_source (SyncSource src)
 			return;
 		}
 
-		new_slave = new JACK_Slave (_engine.jack());
+		new_slave = new JACK_Slave (*AudioEngine::instance());
 		break;
 
 	default:
@@ -1616,16 +1628,6 @@ Session::allow_auto_play (bool yn)
 	auto_play_legal = yn;
 }
 
-void
-Session::reset_jack_connection (jack_client_t* jack)
-{
-	JACK_Slave* js;
-
-	if (_slave && ((js = dynamic_cast<JACK_Slave*> (_slave)) != 0)) {
-		js->reset_client (jack);
-	}
-}
-
 bool
 Session::maybe_stop (framepos_t limit)
 {
@@ -1646,7 +1648,7 @@ Session::send_mmc_locate (framepos_t t)
 	if (!_engine.freewheeling()) {
 		Timecode::Time time;
 		timecode_time_subframes (t, time);
-		MIDI::Manager::instance()->mmc()->send (MIDI::MachineControlCommand (time));
+		_mmc->send (MIDI::MachineControlCommand (time));
 	}
 }
 
diff --git a/libs/ardour/slave.cc b/libs/ardour/slave.cc
index 1cbcba8ee6..e8c63b43c1 100644
--- a/libs/ardour/slave.cc
+++ b/libs/ardour/slave.cc
@@ -50,13 +50,13 @@ SlaveSessionProxy::transport_frame() const
 pframes_t
 SlaveSessionProxy::frames_since_cycle_start() const
 {
-	return session.engine().frames_since_cycle_start();
+	return session.engine().samples_since_cycle_start();
 }
 
 framepos_t
 SlaveSessionProxy::frame_time() const
 {
-	return session.engine().frame_time();
+	return session.engine().sample_time();
 }
 
 void
diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index f32cdf9415..9a29df2641 100644
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -19,13 +19,12 @@
 #include "pbd/compose.h"
 #include "pbd/stacktrace.h"
 
-#include "midi++/port.h"
-#include "midi++/jack_midi_port.h"
-#include "midi++/manager.h"
-
 #include "evoral/midi_events.h"
 
+#include "ardour/async_midi_port.h"
 #include "ardour/audioengine.h"
+#include "ardour/midi_buffer.h"
+#include "ardour/midi_port.h"
 #include "ardour/ticker.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"
@@ -95,16 +94,16 @@ public:
 
 
 MidiClockTicker::MidiClockTicker ()
-	: _midi_port (0)
-	, _ppqn (24)
+	: _ppqn (24)
 	, _last_tick (0.0)
+	, _send_pos (false)
+	, _send_state (false)
 {
 	_pos.reset (new Position());
 }
 
 MidiClockTicker::~MidiClockTicker()
 {
-	_midi_port = 0;
 	_pos.reset (0);
 }
 
@@ -115,7 +114,6 @@ MidiClockTicker::set_session (Session* s)
 	
 	 if (_session) {
 		 _session->TransportStateChange.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_state_changed, this));
-		 _session->PositionChanged.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::position_changed, this, _1));
 		 _session->TransportLooped.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_looped, this));
 		 _session->Located.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::session_located, this));
 
@@ -139,41 +137,20 @@ MidiClockTicker::session_located()
 		return;
 	}
 
-	if (_pos->speed == 0.0f) {
-		uint32_t where = llrint (_pos->midi_beats);
-		send_position_event (where, 0);
-	} else if (_pos->speed == 1.0f) {
-#if 1
-		/* Experimental.  To really do this and have accuracy, the
-		   stop/locate/continue sequence would need queued to send immediately
-		   before the next midi clock. */
-
-		send_stop_event (0);
-
-		if (_pos->frame == 0) {
-			send_start_event (0);
-		} else {
-			uint32_t where = llrint (_pos->midi_beats);
-			send_position_event (where, 0);
-			send_continue_event (0);
-		}
-#endif
-	} else {
-		/* Varispeed not supported */
-	}
+	_send_pos = true;
 }
 
 void
 MidiClockTicker::session_going_away ()
 {
 	SessionHandlePtr::session_going_away();
-	_midi_port = 0;
+	_midi_port.reset ();
 }
 
 void
 MidiClockTicker::update_midi_clock_port()
 {
-	_midi_port = MIDI::Manager::instance()->midi_clock_output_port();
+	_midi_port = _session->midi_clock_output_port();
 }
 
 void
@@ -204,49 +181,12 @@ MidiClockTicker::transport_state_changed()
 		return;
 	}
 
-	if (_pos->speed == 1.0f) {
-
-		if (_session->get_play_loop()) {
-			assert(_session->locations()->auto_loop_location());
-
-			if (_pos->frame == _session->locations()->auto_loop_location()->start()) {
-				send_start_event(0);
-			} else {
-				send_continue_event(0);
-			}
-
-		} else if (_pos->frame == 0) {
-			send_start_event(0);
-		} else {
-			send_continue_event(0);
-		}
-
-		// send_midi_clock_event (0);
-
-	} else if (_pos->speed == 0.0f) {
-		send_stop_event (0);
-		send_position_event (llrint (_pos->midi_beats), 0);
-	}
+	_send_state = true;
 
 	// tick (_pos->frame);
 }
 
 void
-MidiClockTicker::position_changed (framepos_t)
-{
-#if 0
-	const double speed = _session->transport_speed();
-	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Transport Position Change: %1, speed: %2\n", position, speed));
-
-	if (speed == 0.0f && Config->get_send_midi_clock()) {
-		send_position_event (position, 0);
-	}
-
-	_last_tick = position;
-#endif
-}
-
-void
 MidiClockTicker::transport_looped()
 {
 	Location* loop_location = _session->locations()->auto_loop_location();
@@ -270,18 +210,68 @@ MidiClockTicker::transport_looped()
 }
 
 void
-MidiClockTicker::tick (const framepos_t& /* transport_frame */)
+MidiClockTicker::tick (const framepos_t& /* transport_frame */, pframes_t nframes)
 {
 	if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0) {
 		return;
 	}
 
-	MIDI::JackMIDIPort* mp = dynamic_cast<MIDI::JackMIDIPort*> (_midi_port);
-	if (! mp) {
-		return;
+	if (_send_pos) {
+		if (_pos->speed == 0.0f) {
+			uint32_t where = llrint (_pos->midi_beats);
+			send_position_event (where, 0, nframes);
+		} else if (_pos->speed == 1.0f) {
+#if 1
+			/* Experimental.  To really do this and have accuracy, the
+			   stop/locate/continue sequence would need queued to send immediately
+			   before the next midi clock. */
+			
+			send_stop_event (0, nframes);
+			
+			if (_pos->frame == 0) {
+				send_start_event (0, nframes);
+			} else {
+				uint32_t where = llrint (_pos->midi_beats);
+				send_position_event (where, 0, nframes);
+				send_continue_event (0, nframes);
+			}
+#endif
+		} else {
+			/* Varispeed not supported */
+		}
+
+		_send_pos = true;
 	}
 
-	const framepos_t end = _pos->frame + mp->nframes_this_cycle();
+	if (_send_state) {
+		if (_pos->speed == 1.0f) {
+			if (_session->get_play_loop()) {
+				assert(_session->locations()->auto_loop_location());
+				
+				if (_pos->frame == _session->locations()->auto_loop_location()->start()) {
+					send_start_event (0, nframes);
+				} else {
+					send_continue_event (0, nframes);
+				}
+				
+			} else if (_pos->frame == 0) {
+				send_start_event (0, nframes);
+			} else {
+				send_continue_event (0, nframes);
+			}
+			
+			// send_midi_clock_event (0);
+			
+		} else if (_pos->speed == 0.0f) {
+			send_stop_event (0, nframes);
+			send_position_event (llrint (_pos->midi_beats), 0, nframes);
+		}
+
+		_send_state = false;
+	}
+
+
+	const framepos_t end = _pos->frame + nframes;
 	double iter = _last_tick;
 
 	while (true) {
@@ -291,14 +281,14 @@ MidiClockTicker::tick (const framepos_t& /* transport_frame */)
 
 		DEBUG_TRACE (DEBUG::MidiClock,
 				 string_compose ("Tick: iter: %1, last tick time: %2, next tick time: %3, offset: %4, cycle length: %5\n",
-						 iter, _last_tick, next_tick, next_tick_offset, mp ? mp->nframes_this_cycle() : 0));
+						 iter, _last_tick, next_tick, next_tick_offset, nframes));
 
-		if (!mp || (next_tick_offset >= mp->nframes_this_cycle())) {
+		if (next_tick_offset >= nframes) {
 			break;
 		}
 
 		if (next_tick_offset >= 0) {
-			send_midi_clock_event (next_tick_offset);
+			send_midi_clock_event (next_tick_offset, nframes);
 		}
 
 		iter = next_tick;
@@ -308,7 +298,6 @@ MidiClockTicker::tick (const framepos_t& /* transport_frame */)
 	_pos->frame = end;
 }
 
-
 double
 MidiClockTicker::one_ppqn_in_frames (framepos_t transport_position)
 {
@@ -322,7 +311,7 @@ MidiClockTicker::one_ppqn_in_frames (framepos_t transport_position)
 }
 
 void
-MidiClockTicker::send_midi_clock_event (pframes_t offset)
+MidiClockTicker::send_midi_clock_event (pframes_t offset, pframes_t nframes)
 {
 	if (!_midi_port) {
 		return;
@@ -330,12 +319,13 @@ MidiClockTicker::send_midi_clock_event (pframes_t offset)
 
 	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Tick with offset %1\n", offset));
 
-	static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CLOCK };
-	_midi_port->write (_midi_clock_tick, 1, offset);
+	static uint8_t tick_byte = { MIDI_CMD_COMMON_CLOCK };
+	MidiBuffer& mb (_midi_port->get_midi_buffer (nframes));
+	mb.push_back (offset, 1, &tick_byte);
 }
 
 void
-MidiClockTicker::send_start_event (pframes_t offset)
+MidiClockTicker::send_start_event (pframes_t offset, pframes_t nframes)
 {
 	if (!_midi_port) {
 		return;
@@ -343,12 +333,13 @@ MidiClockTicker::send_start_event (pframes_t offset)
 
 	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Start %1\n", _last_tick));
 
-	static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_START };
-	_midi_port->write (_midi_clock_tick, 1, offset);
+	static uint8_t tick_byte = { MIDI_CMD_COMMON_START };
+	MidiBuffer& mb (_midi_port->get_midi_buffer (nframes));
+	mb.push_back (offset, 1, &tick_byte);
 }
 
 void
-MidiClockTicker::send_continue_event (pframes_t offset)
+MidiClockTicker::send_continue_event (pframes_t offset, pframes_t nframes)
 {
 	if (!_midi_port) {
 		return;
@@ -356,12 +347,13 @@ MidiClockTicker::send_continue_event (pframes_t offset)
 
 	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Continue %1\n", _last_tick));
 
-	static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CONTINUE };
-	_midi_port->write (_midi_clock_tick, 1, offset);
+	static uint8_t tick_byte = { MIDI_CMD_COMMON_CONTINUE };
+	MidiBuffer& mb (_midi_port->get_midi_buffer (nframes));
+	mb.push_back (offset, 1, &tick_byte);
 }
 
 void
-MidiClockTicker::send_stop_event (pframes_t offset)
+MidiClockTicker::send_stop_event (pframes_t offset, pframes_t nframes)
 {
 	if (!_midi_port) {
 		return;
@@ -369,12 +361,13 @@ MidiClockTicker::send_stop_event (pframes_t offset)
 
 	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Stop %1\n", _last_tick));
 
-	static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_STOP };
-	_midi_port->write (_midi_clock_tick, 1, offset);
+	static uint8_t tick_byte = { MIDI_CMD_COMMON_STOP };
+	MidiBuffer& mb (_midi_port->get_midi_buffer (nframes));
+	mb.push_back (offset, 1, &tick_byte);
 }
 
 void
-MidiClockTicker::send_position_event (uint32_t midi_beats, pframes_t offset)
+MidiClockTicker::send_position_event (uint32_t midi_beats, pframes_t offset, pframes_t nframes)
 {
 	if (!_midi_port) {
 		return;
@@ -391,7 +384,8 @@ MidiClockTicker::send_position_event (uint32_t midi_beats, pframes_t offset)
 	msg[1] = midi_beats & 0x007f;
 	msg[2] = midi_beats >> 7;
 
-	_midi_port->midimsg (msg, sizeof (msg), offset);
+	MidiBuffer& mb (_midi_port->get_midi_buffer (nframes));
+	mb.push_back (offset, 3, &msg[0]);
 
 	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Song Position Sent: %1\n", midi_beats));
 }
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index f02863393e..57239cb841 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -550,15 +550,15 @@ Track::playlist ()
 }
 
 void
-Track::request_jack_monitors_input (bool m)
+Track::request_input_monitoring (bool m)
 {
-	_diskstream->request_jack_monitors_input (m);
+	_diskstream->request_input_monitoring (m);
 }
 
 void
-Track::ensure_jack_monitors_input (bool m)
+Track::ensure_input_monitoring (bool m)
 {
-	_diskstream->ensure_jack_monitors_input (m);
+	_diskstream->ensure_input_monitoring (m);
 }
 
 bool
diff --git a/libs/ardour/vumeterdsp.cc b/libs/ardour/vumeterdsp.cc
index 67d48f6c54..a3d0ec23c1 100644
--- a/libs/ardour/vumeterdsp.cc
+++ b/libs/ardour/vumeterdsp.cc
@@ -43,8 +43,8 @@ void Vumeterdsp::process (float *p, int n)
 {
     float z1, z2, m, t1, t2;
 
-    z1 = _z1;
-    z2 = _z2;
+    z1 = _z1 > 20 ? 20 : (_z1 < -20 ? -20 : _z1);
+    z2 = _z2 > 20 ? 20 : (_z2 < -20 ? -20 : _z2);
     m = _res ? 0: _m;
     _res = false;
 
@@ -64,6 +64,8 @@ void Vumeterdsp::process (float *p, int n)
 	if (z2 > m) m = z2;
     }
 
+    if (isnan(z1)) z1 = 0;
+    if (isnan(z2)) z2 = 0;
     _z1 = z1;
     _z2 = z2 + 1e-10f;
     _m = m;
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index f81f2c848e..733900e3f6 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -1,9 +1,10 @@
-#!/usr/bin/env python
+1#!/usr/bin/env python
 from waflib.extras import autowaf as autowaf
 from waflib import Options
 import os
 import re
 import subprocess
+import sys
 
 # default state file version for this build
 CURRENT_SESSION_FILE_VERSION = 3001
@@ -21,6 +22,7 @@ path_prefix = 'libs/ardour/'
 libardour_sources = [
         'amp.cc',
         'analyser.cc',
+        'async_midi_port.cc',
         'audio_buffer.cc',
         'audio_diskstream.cc',
         'audio_library.cc',
@@ -43,6 +45,7 @@ libardour_sources = [
         'automation_control.cc',
         'automation_list.cc',
         'automation_watch.cc',
+        'backend_search_path.cc',
         'beats_frames_converter.cc',
         'broadcast_info.cc',
         'buffer.cc',
@@ -125,6 +128,7 @@ libardour_sources = [
         'midi_stretch.cc',
         'midi_track.cc',
         'midi_ui.cc',
+        'midiport_manager.cc',
         'mix.cc',
         'monitor_processor.cc',
         'mtc_slave.cc',
@@ -148,6 +152,7 @@ libardour_sources = [
         'plugin_manager.cc',
         'port.cc',
         'port_insert.cc',
+        'port_manager.cc',
         'port_set.cc',
         'process_thread.cc',
         'processor.cc',
@@ -175,6 +180,7 @@ libardour_sources = [
         'session_events.cc',
         'session_export.cc',
         'session_handle.cc',
+        'session_jack.cc',
         'session_ltc.cc',
         'session_metadata.cc',
         'session_midi.cc',
@@ -249,6 +255,10 @@ def configure(conf):
                       atleast_version='0.1.0')
     autowaf.check_pkg(conf, 'sigc++-2.0', uselib_store='SIGCPP',
                       atleast_version='2.0')
+
+    if re.search ("linux", sys.platform) != None:
+        autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA')
+
     if Options.options.lv2:
         autowaf.check_pkg(conf, 'lv2', uselib_store='LV2',
                           atleast_version='1.0.0', mandatory=True)
@@ -293,60 +303,6 @@ def configure(conf):
 
     conf.check(header_name='unistd.h', define_name='HAVE_UNISTD',mandatory=False)
 
-    conf.check_cc(fragment = '''
-#include <jack/jack.h>
-void callback(jack_status_t code, const char* reason, void* arg) { return; }
-int main(int argc, char **argv) {
-    jack_client_t* c;
-    jack_on_info_shutdown(c, callback, (void*) 0);
-    return 0;
-}''',
-                  uselib= [ 'JACK' ],
-                  msg = 'Checking for jack_on_info_shutdown',
-                  define_name = 'HAVE_JACK_ON_INFO_SHUTDOWN',
-                  okmsg = 'present')
-
-    missing_jack_message = 'missing - a version of JACK that supports jack_port_set_latency_range() is required to compile Ardour3.'
-
-    conf.check_cc(fragment = '''
-#include <jack/jack.h>
-int main(int argc, char **argv) {
-    jack_port_t* p;
-    jack_latency_range_t r;
-    jack_port_set_latency_range(p, JackCaptureLatency, &r);
-    return 0;
-}''',
-                  uselib = [ 'JACK' ],
-                  msg = 'Checking for new JACK latency API',
-                  okmsg = 'present',
-                  mandatory = True,
-                  errmsg = missing_jack_message)
-
-    conf.check_cc(fragment = '''
-#include <jack/jack.h>
-int main(int argc, char **argv) {
-   jack_port_type_get_buffer_size((jack_client_t*)0, "");
-   return 0;
-}''',
-                  uselib = [ 'JACK' ],
-                  msg = 'Checking for new jack_port_type_get_buffer_size',
-                  okmsg = 'present',
-                  mandatory = True,
-                  errmsg = missing_jack_message)
-
-    conf.check_cc(fragment = '''
-#include <jack/transport.h>
-int main(int argc, char** argv) {
-  jack_position_t pos;
-  pos.valid & JackVideoFrameOffset;
-  return 0;
-}''',
-                  uselib= [ 'JACK' ],
-                  msg = 'Checking for JackVideoFrameOffset',
-                  define_name = 'HAVE_JACK_VIDEO_SUPPORT',
-                  mandatory = False,
-                  okmsg = 'present')
-
     if flac_supported():
         conf.define ('HAVE_FLAC', 1)
     if ogg_supported():
diff --git a/libs/backends/jack/jack_api.cc b/libs/backends/jack/jack_api.cc
new file mode 100644
index 0000000000..836acfda11
--- /dev/null
+++ b/libs/backends/jack/jack_api.cc
@@ -0,0 +1,78 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include "jack_connection.h"
+#include "jack_audiobackend.h"
+
+using namespace ARDOUR;
+
+static boost::shared_ptr<JACKAudioBackend> backend;
+static boost::shared_ptr<JackConnection> jack_connection;
+
+static boost::shared_ptr<AudioBackend>
+backend_factory (AudioEngine& ae)
+{
+	if (!jack_connection) {
+		return boost::shared_ptr<AudioBackend>();
+	}
+
+	if (!backend) {
+		backend.reset (new JACKAudioBackend (ae, jack_connection));
+	}
+
+	return backend;
+}
+
+static int
+instantiate (const std::string& arg1, const std::string& arg2)
+{
+	try {
+		jack_connection.reset (new JackConnection (arg1, arg2));
+	} catch (...) {
+		return -1;
+	}
+
+	return 0;
+}
+
+static int 
+deinstantiate ()
+{
+	backend.reset ();
+	jack_connection.reset ();
+
+	return 0;
+}
+
+static bool
+already_configured ()
+{
+	return JackConnection::server_running ();
+}
+
+static ARDOUR::AudioBackendInfo _descriptor = {
+	"JACK",
+	instantiate,
+	deinstantiate,
+	backend_factory,
+	already_configured,
+};
+
+extern "C" ARDOURBACKEND_API ARDOUR::AudioBackendInfo* descriptor() { return &_descriptor; }
+
diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc
new file mode 100644
index 0000000000..b3dbdcae71
--- /dev/null
+++ b/libs/backends/jack/jack_audiobackend.cc
@@ -0,0 +1,1012 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <string>
+#include <list>
+#include <math.h>
+
+#include <boost/scoped_ptr.hpp>
+#include <glibmm/timer.h>
+#include <glibmm/spawn.h>
+
+#include "pbd/error.h"
+
+#include "jack/jack.h"
+#include "jack/thread.h"
+
+#include "ardour/audioengine.h"
+#include "ardour/session.h"
+#include "ardour/types.h"
+
+#include "jack_audiobackend.h"
+#include "jack_connection.h"
+#include "jack_utils.h"
+
+#include "i18n.h"
+
+using namespace ARDOUR;
+using namespace PBD;
+using std::string;
+using std::vector;
+
+#define GET_PRIVATE_JACK_POINTER(localvar)  jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return; }
+#define GET_PRIVATE_JACK_POINTER_RET(localvar,r) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return r; }
+
+JACKAudioBackend::JACKAudioBackend (AudioEngine& e, boost::shared_ptr<JackConnection> jc)
+	: AudioBackend (e)
+	, _jack_connection (jc)
+	, _running (false)
+	, _freewheeling (false)
+	, _target_sample_rate (48000)
+	, _target_buffer_size (1024)
+	, _target_sample_format (FormatFloat)
+	, _target_interleaved (false)
+	, _target_input_channels (-1)
+	, _target_output_channels (-1)
+	, _target_systemic_input_latency (0)
+	, _target_systemic_output_latency (0)
+	, _current_sample_rate (0)
+	, _current_buffer_size (0)
+{
+	_jack_connection->Connected.connect_same_thread (jack_connection_connection, boost::bind (&JACKAudioBackend::when_connected_to_jack, this));
+	_jack_connection->Disconnected.connect_same_thread (disconnect_connection, boost::bind (&JACKAudioBackend::disconnected, this, _1));
+}
+
+JACKAudioBackend::~JACKAudioBackend()
+{
+}
+
+string
+JACKAudioBackend::name() const 
+{
+	return X_("JACK");
+}
+
+void*
+JACKAudioBackend::private_handle() const
+{
+	return _jack_connection->jack();
+}
+
+bool
+JACKAudioBackend::available() const
+{
+	return (private_handle() != 0);
+}
+
+bool
+JACKAudioBackend::is_realtime () const
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack,false);
+	return jack_is_realtime (_priv_jack);
+}
+
+bool
+JACKAudioBackend::requires_driver_selection() const
+{
+	return true;
+}
+
+vector<string>
+JACKAudioBackend::enumerate_drivers () const
+{
+	vector<string> currently_available;
+	get_jack_audio_driver_names (currently_available);
+	return currently_available;
+}
+
+int
+JACKAudioBackend::set_driver (const std::string& name)
+{
+	_target_driver = name;
+	return 0;
+}
+
+vector<AudioBackend::DeviceStatus>
+JACKAudioBackend::enumerate_devices () const
+{
+	vector<string> currently_available = get_jack_device_names_for_audio_driver (_target_driver);
+	vector<DeviceStatus> statuses;
+
+	if (all_devices.find (_target_driver) == all_devices.end()) {
+		all_devices.insert (make_pair (_target_driver, std::set<string>()));
+	}
+	
+	/* store every device we've found, by driver name. 
+	 *
+	 * This is so we do not confuse ALSA, FFADO, netjack etc. devices
+	 * with each other.
+	 */
+
+	DeviceList& all (all_devices[_target_driver]);
+
+	for (vector<string>::const_iterator d = currently_available.begin(); d != currently_available.end(); ++d) {
+		all.insert (*d);
+	}
+	
+	for (DeviceList::const_iterator d = all.begin(); d != all.end(); ++d) {
+		if (find (currently_available.begin(), currently_available.end(), *d) == currently_available.end()) {
+			statuses.push_back (DeviceStatus (*d, false));
+		} else {
+			statuses.push_back (DeviceStatus (*d, false));
+		}
+	}
+	
+	return statuses;
+}
+
+vector<float>
+JACKAudioBackend::available_sample_rates (const string& /*device*/) const
+{
+	vector<float> f;
+	
+	if (available()) {
+		f.push_back (sample_rate());
+		return f;
+	}
+
+	/* if JACK is not already running, just list a bunch of reasonable 
+	   values and let the future sort it all out.
+	*/
+
+	f.push_back (8000.0);
+	f.push_back (16000.0);
+	f.push_back (24000.0);
+	f.push_back (32000.0);
+	f.push_back (44100.0);
+	f.push_back (48000.0);
+	f.push_back (88200.0);
+	f.push_back (96000.0);
+	f.push_back (192000.0);
+	f.push_back (384000.0);
+	
+	return f;
+}
+
+vector<uint32_t>
+JACKAudioBackend::available_buffer_sizes (const string& /*device*/) const
+{
+	vector<uint32_t> s;
+	
+	if (available()) {
+		s.push_back (buffer_size());
+		return s;
+	}
+
+	s.push_back (8);
+	s.push_back (16);
+	s.push_back (32);
+	s.push_back (64);
+	s.push_back (128);
+	s.push_back (256);
+	s.push_back (512);
+	s.push_back (1024);
+	s.push_back (2048);
+	s.push_back (4096);
+	s.push_back (8192);
+
+	return s;
+}
+
+uint32_t
+JACKAudioBackend::available_input_channel_count (const string& /*device*/) const
+{
+	return 128;
+}
+
+uint32_t
+JACKAudioBackend::available_output_channel_count (const string& /*device*/) const
+{
+	return 128;
+}
+
+/* -- parameter setting -- */
+
+int
+JACKAudioBackend::set_device_name (const string& dev)
+{
+	if (available()) {
+		/* need to stop and restart JACK for this to work, at present */
+		return -1;
+	}
+
+	_target_device = dev;
+	return 0;
+}
+
+int
+JACKAudioBackend::set_sample_rate (float sr)
+{
+	if (!available()) {
+		_target_sample_rate = sr;
+		return 0;
+	}
+
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+
+	if (sr == jack_get_sample_rate (_priv_jack)) {
+                return 0;
+	}
+
+	return -1;
+}
+
+int
+JACKAudioBackend::set_buffer_size (uint32_t nframes)
+{
+	if (!available()) {
+		_target_buffer_size = nframes;
+		return 0;
+	}
+
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+
+	if (nframes == jack_get_buffer_size (_priv_jack)) {
+                return 0;
+	}
+
+	return jack_set_buffer_size (_priv_jack, nframes);
+}
+
+int
+JACKAudioBackend::set_sample_format (SampleFormat sf)
+{
+	/* as far as JACK clients are concerned, the hardware is always
+	 * floating point format.
+	 */
+	if (sf == FormatFloat) {
+		return 0;
+	}
+	return -1;
+}
+
+int
+JACKAudioBackend::set_interleaved (bool yn)
+{
+	/* as far as JACK clients are concerned, the hardware is always
+	 * non-interleaved
+	 */
+	if (!yn) {
+		return 0;
+	}
+	return -1;
+}
+
+int
+JACKAudioBackend::set_input_channels (uint32_t cnt)
+{
+	if (available()) {
+		return -1;
+	}
+
+	_target_input_channels = cnt;
+	
+	return 0;
+}
+
+int
+JACKAudioBackend::set_output_channels (uint32_t cnt)
+{
+	if (available()) {
+		return -1;
+	}
+
+	_target_output_channels = cnt;
+
+	return 0;
+}
+
+int
+JACKAudioBackend::set_systemic_input_latency (uint32_t l)
+{
+	if (available()) {
+		return -1;
+	}
+
+	_target_systemic_input_latency = l;
+
+	return 0;
+}
+
+int
+JACKAudioBackend::set_systemic_output_latency (uint32_t l)
+{
+	if (available()) {
+		return -1;
+	}
+
+	_target_systemic_output_latency = l;
+
+	return 0;
+}
+
+/* --- Parameter retrieval --- */
+
+std::string
+JACKAudioBackend::device_name () const
+{
+	if (available()) {
+		return "???";
+	} 
+
+	return _target_device;
+}
+
+float
+JACKAudioBackend::sample_rate () const
+{
+	if (available()) {
+		return _current_sample_rate;
+	}
+	return _target_sample_rate;
+}
+
+uint32_t
+JACKAudioBackend::buffer_size () const
+{
+	if (available()) {
+		return _current_buffer_size;
+	}
+	return _target_buffer_size;
+}
+
+SampleFormat
+JACKAudioBackend::sample_format () const
+{
+	return FormatFloat;
+}
+
+bool
+JACKAudioBackend::interleaved () const
+{
+	return false;
+}
+
+uint32_t
+JACKAudioBackend::input_channels () const
+{
+	if (available()) {
+		return n_physical (JackPortIsInput).n_audio();
+	} 
+	return _target_input_channels;
+}
+
+uint32_t
+JACKAudioBackend::output_channels () const
+{
+	if (available()) {
+		return n_physical (JackPortIsOutput).n_audio();
+	} 
+	return _target_output_channels;
+}
+
+uint32_t
+JACKAudioBackend::systemic_input_latency () const
+{
+	return _target_systemic_output_latency;
+}
+
+uint32_t
+JACKAudioBackend::systemic_output_latency () const
+{
+	return _target_systemic_output_latency;
+}
+
+size_t 
+JACKAudioBackend::raw_buffer_size(DataType t)
+{
+	std::map<DataType,size_t>::const_iterator s = _raw_buffer_sizes.find(t);
+	return (s != _raw_buffer_sizes.end()) ? s->second : 0;
+}
+
+void
+JACKAudioBackend::setup_jack_startup_command ()
+{
+	/* first we map the parameters that have been set onto a
+	 * JackCommandLineOptions object.
+	 */
+
+	JackCommandLineOptions options;
+
+	get_jack_default_server_path (options.server_path);
+	options.driver = _target_driver;
+	options.samplerate = _target_sample_rate;
+	options.period_size = _target_buffer_size;
+	options.num_periods = 2;
+	options.input_device = _target_device;
+	options.output_device = _target_device;
+	options.input_latency = _target_systemic_input_latency;
+	options.output_latency = _target_systemic_output_latency;
+	options.input_channels = _target_input_channels;
+	options.output_channels = _target_output_channels;
+	if (_target_sample_format == FormatInt16) {
+		options.force16_bit = _target_sample_format;
+	}
+	options.realtime = true;
+	options.ports_max = 2048;
+	
+	/* this must always be true for any server instance we start ourselves
+	 */
+
+	options.temporary = true;
+
+	string cmdline;
+
+	if (!get_jack_command_line_string (options, cmdline)) {
+		/* error, somehow - we will still try to start JACK
+		 * automatically but it will be without our preferred options
+		 */
+		return;
+	}
+
+	std::cerr << "JACK command line will be: " << cmdline << std::endl;
+
+	write_jack_config_file (get_jack_server_user_config_file_path(), cmdline);
+}
+
+/* ---- BASIC STATE CONTROL API: start/stop/pause/freewheel --- */
+
+int
+JACKAudioBackend::start ()
+{
+	if (!available()) {
+
+		if (!_jack_connection->server_running()) {
+			setup_jack_startup_command ();
+		}
+
+		if (_jack_connection->open ()) {
+			return -1;
+		}
+	}
+	
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+
+	/* get the buffer size and sample rates established */
+
+	jack_sample_rate_callback (jack_get_sample_rate (_priv_jack));
+	jack_bufsize_callback (jack_get_buffer_size (_priv_jack));
+	
+	/* Now that we have buffer size and sample rate established, the engine 
+	   can go ahead and do its stuff
+	*/
+	
+	engine.reestablish_ports ();
+
+	if (!jack_port_type_get_buffer_size) {
+		warning << _("This version of JACK is old - you should upgrade to a newer version that supports jack_port_type_get_buffer_size()") << endmsg;
+	}
+	
+	set_jack_callbacks ();
+	
+	if (jack_activate (_priv_jack) == 0) {
+		_running = true;
+	} else {
+		// error << _("cannot activate JACK client") << endmsg;
+	}
+
+	engine.reconnect_ports ();
+
+	return 0;
+}
+
+int
+JACKAudioBackend::stop ()
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+	
+	_jack_connection->close ();
+
+	_current_buffer_size = 0;
+	_current_sample_rate = 0;
+
+	_raw_buffer_sizes.clear();
+
+	return 0;
+}
+
+int
+JACKAudioBackend::pause ()
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+
+	if (_priv_jack) {
+		jack_deactivate (_priv_jack);
+	}
+
+	return 0;
+}
+
+int
+JACKAudioBackend::freewheel (bool onoff)
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+
+	if (onoff == _freewheeling) {
+		/* already doing what has been asked for */
+		
+		return 0;
+	}
+
+	if (jack_set_freewheel (_priv_jack, onoff) == 0) {
+		_freewheeling = true;
+		return 0;
+	}
+
+	return -1;
+}
+
+/* --- TRANSPORT STATE MANAGEMENT --- */
+
+void
+JACKAudioBackend::transport_stop ()
+{
+	GET_PRIVATE_JACK_POINTER (_priv_jack);
+	jack_transport_stop (_priv_jack);
+}
+
+void
+JACKAudioBackend::transport_start ()
+{
+	GET_PRIVATE_JACK_POINTER (_priv_jack);
+	jack_transport_start (_priv_jack);
+}
+
+void
+JACKAudioBackend::transport_locate (framepos_t where)
+{
+	GET_PRIVATE_JACK_POINTER (_priv_jack);
+	jack_transport_locate (_priv_jack, where);
+}
+
+framepos_t 
+JACKAudioBackend::transport_frame () const 
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
+	return jack_get_current_transport_frame (_priv_jack);
+}
+
+TransportState
+JACKAudioBackend::transport_state () const
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, ((TransportState) JackTransportStopped));
+	jack_position_t pos;
+	return (TransportState) jack_transport_query (_priv_jack, &pos);
+}
+
+int
+JACKAudioBackend::set_time_master (bool yn)
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+	if (yn) {
+		return jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
+	} else {
+		return jack_release_timebase (_priv_jack);
+	}
+}
+
+/* process-time */
+
+bool
+JACKAudioBackend::get_sync_offset (pframes_t& offset) const
+{
+
+#ifdef HAVE_JACK_VIDEO_SUPPORT
+
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, false);
+
+	jack_position_t pos;
+
+	if (_priv_jack) {
+		(void) jack_transport_query (_priv_jack, &pos);
+
+		if (pos.valid & JackVideoFrameOffset) {
+			offset = pos.video_offset;
+			return true;
+		}
+	}
+#else
+	/* keep gcc happy */
+	offset = 0;
+#endif
+
+	return false;
+}
+
+pframes_t
+JACKAudioBackend::sample_time ()
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
+	return jack_frame_time (_priv_jack);
+}
+
+pframes_t
+JACKAudioBackend::sample_time_at_cycle_start ()
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
+	return jack_last_frame_time (_priv_jack);
+}
+
+pframes_t
+JACKAudioBackend::samples_since_cycle_start ()
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
+	return jack_frames_since_cycle_start (_priv_jack);
+}
+
+/* JACK Callbacks */
+
+static void
+ardour_jack_error (const char* msg)
+{
+	error << "JACK: " << msg << endmsg;
+}
+
+void
+JACKAudioBackend::set_jack_callbacks ()
+{
+	GET_PRIVATE_JACK_POINTER (_priv_jack);
+
+        jack_set_thread_init_callback (_priv_jack, AudioEngine::thread_init_callback, 0);
+
+        jack_set_process_thread (_priv_jack, _process_thread, this);
+        jack_set_sample_rate_callback (_priv_jack, _sample_rate_callback, this);
+        jack_set_buffer_size_callback (_priv_jack, _bufsize_callback, this);
+        jack_set_xrun_callback (_priv_jack, _xrun_callback, this);
+        jack_set_sync_callback (_priv_jack, _jack_sync_callback, this);
+        jack_set_freewheel_callback (_priv_jack, _freewheel_callback, this);
+
+#ifdef HAVE_JACK_SESSION
+        if( jack_set_session_callback)
+                jack_set_session_callback (_priv_jack, _session_callback, this);
+#endif
+
+        if (jack_set_latency_callback) {
+                jack_set_latency_callback (_priv_jack, _latency_callback, this);
+        }
+
+        jack_set_error_function (ardour_jack_error);
+}
+
+void
+JACKAudioBackend::_jack_timebase_callback (jack_transport_state_t state, pframes_t nframes,
+				      jack_position_t* pos, int new_position, void *arg)
+{
+	static_cast<JACKAudioBackend*> (arg)->jack_timebase_callback (state, nframes, pos, new_position);
+}
+
+void
+JACKAudioBackend::jack_timebase_callback (jack_transport_state_t state, pframes_t nframes,
+					  jack_position_t* pos, int new_position)
+{
+	ARDOUR::Session* session = engine.session();
+
+	if (session) {
+		session->jack_timebase_callback (state, nframes, pos, new_position);
+	}
+}
+
+int
+JACKAudioBackend::_jack_sync_callback (jack_transport_state_t state, jack_position_t* pos, void* arg)
+{
+	return static_cast<JACKAudioBackend*> (arg)->jack_sync_callback (state, pos);
+}
+
+int
+JACKAudioBackend::jack_sync_callback (jack_transport_state_t state, jack_position_t* pos)
+{
+	TransportState tstate;
+
+	switch (state) {
+	case JackTransportStopped:
+		tstate = TransportStopped;
+		break;
+	case JackTransportRolling:
+		tstate = TransportRolling;
+		break;
+	case JackTransportLooping:
+		tstate = TransportLooping;
+		break;
+	case JackTransportStarting:
+		tstate = TransportStarting;
+		break;
+	}
+
+	return engine.sync_callback (tstate, pos->frame);
+
+	return true;
+}
+
+int
+JACKAudioBackend::_xrun_callback (void *arg)
+{
+	JACKAudioBackend* jab = static_cast<JACKAudioBackend*> (arg);
+	if (jab->available()) {
+		jab->engine.Xrun (); /* EMIT SIGNAL */
+	}
+	return 0;
+}
+
+#ifdef HAVE_JACK_SESSION
+void
+JACKAudioBackend::_session_callback (jack_session_event_t *event, void *arg)
+{
+	JACKAudioBackend* jab = static_cast<JACKAudioBackend*> (arg);
+	ARDOUR::Session* session = jab->engine.session();
+
+	if (session) {
+		session->jack_session_event (event);
+	}
+}
+#endif
+
+void
+JACKAudioBackend::_freewheel_callback (int onoff, void *arg)
+{
+	static_cast<JACKAudioBackend*>(arg)->freewheel_callback (onoff);
+}
+
+void
+JACKAudioBackend::freewheel_callback (int onoff)
+{
+	_freewheeling = onoff;
+	engine.freewheel_callback (onoff);
+}
+
+void
+JACKAudioBackend::_latency_callback (jack_latency_callback_mode_t mode, void* arg)
+{
+	return static_cast<JACKAudioBackend*> (arg)->jack_latency_callback (mode);
+}
+
+int
+JACKAudioBackend::create_process_thread (boost::function<void()> f, pthread_t* thread, size_t stacksize)
+{
+        GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+        ThreadData* td = new ThreadData (this, f, stacksize);
+
+        if (jack_client_create_thread (_priv_jack, thread, jack_client_real_time_priority (_priv_jack),
+                                       jack_is_realtime (_priv_jack), _start_process_thread, td)) {
+                return -1;
+        }
+
+        return 0;
+}
+
+int
+JACKAudioBackend::wait_for_process_thread_exit (AudioBackendNativeThread thr)
+{
+	void* status;
+	/* this doesn't actively try to stop the thread, it just waits till it exits */
+	return pthread_join (thr, &status);
+}
+
+void*
+JACKAudioBackend::_start_process_thread (void* arg)
+{
+        ThreadData* td = reinterpret_cast<ThreadData*> (arg);
+        boost::function<void()> f = td->f;
+        delete td;
+
+        f ();
+
+        return 0;
+}
+
+void*
+JACKAudioBackend::_process_thread (void *arg)
+{
+	return static_cast<JACKAudioBackend*> (arg)->process_thread ();
+}
+
+void*
+JACKAudioBackend::process_thread ()
+{
+        /* JACK doesn't do this for us when we use the wait API
+         */
+
+        AudioEngine::thread_init_callback (this);
+
+        while (1) {
+                GET_PRIVATE_JACK_POINTER_RET(_priv_jack,0);
+
+                pframes_t nframes = jack_cycle_wait (_priv_jack);
+		
+                if (engine.process_callback (nframes)) {
+                        return 0;
+                }
+
+		jack_cycle_signal (_priv_jack, 0);
+        }
+
+        return 0;
+}
+
+int
+JACKAudioBackend::_sample_rate_callback (pframes_t nframes, void *arg)
+{
+	return static_cast<JACKAudioBackend*> (arg)->jack_sample_rate_callback (nframes);
+}
+
+int
+JACKAudioBackend::jack_sample_rate_callback (pframes_t nframes)
+{
+	_current_sample_rate = nframes;
+	return engine.sample_rate_change (nframes);
+}
+
+void
+JACKAudioBackend::jack_latency_callback (jack_latency_callback_mode_t mode)
+{
+	engine.latency_callback (mode == JackPlaybackLatency);
+}
+
+int
+JACKAudioBackend::_bufsize_callback (pframes_t nframes, void *arg)
+{
+	return static_cast<JACKAudioBackend*> (arg)->jack_bufsize_callback (nframes);
+}
+
+int
+JACKAudioBackend::jack_bufsize_callback (pframes_t nframes)
+{
+        /* if the size has not changed, this should be a no-op */
+
+        if (nframes == _current_buffer_size) {
+                return 0;
+        }
+
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 1);
+
+	_current_buffer_size = nframes;
+
+        if (jack_port_type_get_buffer_size) {
+                _raw_buffer_sizes[DataType::AUDIO] = jack_port_type_get_buffer_size (_priv_jack, JACK_DEFAULT_AUDIO_TYPE);
+                _raw_buffer_sizes[DataType::MIDI] = jack_port_type_get_buffer_size (_priv_jack, JACK_DEFAULT_MIDI_TYPE);
+        } else {
+
+                /* Old version of JACK.
+
+                   These crude guesses, see below where we try to get the right answers.
+
+                   Note that our guess for MIDI deliberatey tries to overestimate
+                   by a little. It would be nicer if we could get the actual
+                   size from a port, but we have to use this estimate in the
+                   event that there are no MIDI ports currently. If there are
+                   the value will be adjusted below.
+                */
+
+                _raw_buffer_sizes[DataType::AUDIO] = nframes * sizeof (Sample);
+                _raw_buffer_sizes[DataType::MIDI] = nframes * 4 - (nframes/2);
+        }
+
+	engine.buffer_size_change (nframes);
+
+	return 0;
+}
+
+void
+JACKAudioBackend::disconnected (const char* why)
+{
+	bool was_running = _running;
+
+        _running = false;
+        _current_buffer_size = 0;
+        _current_sample_rate = 0;
+
+        if (was_running) {
+		engine.halted_callback (why); /* EMIT SIGNAL */
+        }
+}
+float 
+JACKAudioBackend::cpu_load() const 
+{
+	GET_PRIVATE_JACK_POINTER_RET(_priv_jack,0);
+	return jack_cpu_load (_priv_jack);
+}
+
+void
+JACKAudioBackend::update_latencies ()
+{
+	GET_PRIVATE_JACK_POINTER (_priv_jack);
+	jack_recompute_total_latencies (_priv_jack);
+}
+
+ChanCount
+JACKAudioBackend::n_physical (unsigned long flags) const
+{
+	ChanCount c;
+
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, c);
+
+	const char ** ports = jack_get_ports (_priv_jack, NULL, NULL, JackPortIsPhysical | flags);
+
+	if (ports) {
+		for (uint32_t i = 0; ports[i]; ++i) {
+			if (!strstr (ports[i], "Midi-Through")) {
+				DataType t = port_data_type (jack_port_by_name (_priv_jack, ports[i]));
+				if (t != DataType::NIL) {
+					c.set (t, c.get (t) + 1);
+				}
+			}
+		}
+		
+		jack_free (ports);
+	}
+
+	return c;
+}
+
+bool
+JACKAudioBackend::can_change_sample_rate_when_running () const
+{
+	return false;
+}
+
+bool
+JACKAudioBackend::can_change_buffer_size_when_running () const
+{
+	return true;
+}
+
+string
+JACKAudioBackend::control_app_name () const
+{
+	/* Since JACK/ALSA really don't provide particularly integrated support
+	   for the idea of a control app to be used to control a device,
+	   allow the user to take some control themselves if necessary.
+	*/
+
+	const char* env_value  = g_getenv ("ARDOUR_DEVICE_CONTROL_APP");
+	string appname;
+
+	if (!env_value) {
+		if (_target_driver.empty() || _target_device.empty()) {
+			return appname;
+		}
+		
+		if (_target_driver == "ALSA") {
+			
+			if (_target_device == "Hammerfall DSP") {
+				appname = "hdspconf";
+			} else if (_target_device == "M Audio Delta 1010") {
+				appname = "mudita24";
+			}
+		}
+	} else {
+		appname = env_value;
+	}
+
+	return appname;
+}
+
+void
+JACKAudioBackend::launch_control_app ()
+{
+	string appname = control_app_name();
+
+	if (appname.empty()) {
+		error << string_compose (_("There is no control application for the device \"%1\""), _target_device) << endmsg;
+		return;
+	}
+
+	std::list<string> args;
+	args.push_back (appname);
+	Glib::spawn_async ("", args, Glib::SPAWN_SEARCH_PATH);
+}
diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h
new file mode 100644
index 0000000000..655c939c51
--- /dev/null
+++ b/libs/backends/jack/jack_audiobackend.h
@@ -0,0 +1,264 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __libardour_jack_audiobackend_h__
+#define __libardour_jack_audiobackend_h__
+
+#include <string>
+#include <vector>
+#include <map>
+#include <set>
+
+#include <stdint.h>
+
+#include <boost/shared_ptr.hpp>
+
+#include <jack/jack.h>
+#ifdef HAVE_JACK_SESSION
+#include <jack/session.h>
+#endif
+
+#include "ardour/audio_backend.h"
+
+namespace ARDOUR {
+
+class JackConnection;
+
+class JACKAudioBackend : public AudioBackend {
+  public:
+    JACKAudioBackend (AudioEngine& e, boost::shared_ptr<JackConnection>);
+    ~JACKAudioBackend ();
+    
+    /* AUDIOBACKEND API */
+
+    std::string name() const;
+    void* private_handle() const;
+    bool available() const;
+    bool is_realtime () const;
+
+    bool requires_driver_selection() const;
+    std::vector<std::string> enumerate_drivers () const;
+    int set_driver (const std::string&);
+
+    std::vector<DeviceStatus> enumerate_devices () const;
+
+    std::vector<float> available_sample_rates (const std::string& device) const;
+    std::vector<uint32_t> available_buffer_sizes (const std::string& device) const;
+    uint32_t available_input_channel_count (const std::string& device) const;
+    uint32_t available_output_channel_count (const std::string& device) const;
+
+    bool can_change_sample_rate_when_running() const;
+    bool can_change_buffer_size_when_running() const;
+
+    int set_device_name (const std::string&);
+    int set_sample_rate (float);
+    int set_buffer_size (uint32_t);
+    int set_sample_format (SampleFormat);
+    int set_interleaved (bool yn);
+    int set_input_channels (uint32_t);
+    int set_output_channels (uint32_t);
+    int set_systemic_input_latency (uint32_t);
+    int set_systemic_output_latency (uint32_t);
+
+    std::string  device_name () const;
+    float        sample_rate () const;
+    uint32_t     buffer_size () const;
+    SampleFormat sample_format () const;
+    bool         interleaved () const;
+    uint32_t     input_channels () const;
+    uint32_t     output_channels () const;
+    uint32_t     systemic_input_latency () const;
+    uint32_t     systemic_output_latency () const;
+
+    std::string control_app_name () const;
+    void launch_control_app ();
+
+    int start ();
+    int stop ();
+    int pause ();
+    int freewheel (bool);
+
+    float cpu_load() const;
+
+    pframes_t sample_time ();
+    pframes_t sample_time_at_cycle_start ();
+    pframes_t samples_since_cycle_start ();
+
+    size_t raw_buffer_size (DataType t);
+
+    int create_process_thread (boost::function<void()> func, AudioBackendNativeThread*, size_t stacksize);
+    int wait_for_process_thread_exit (AudioBackendNativeThread);
+
+    void transport_start ();
+    void transport_stop ();
+    void transport_locate (framepos_t /*pos*/);
+    TransportState transport_state () const;
+    framepos_t transport_frame() const;
+
+    int set_time_master (bool /*yn*/);
+    bool get_sync_offset (pframes_t& /*offset*/) const;
+
+    void update_latencies ();
+
+    static bool already_configured();
+    
+    /* PORTENGINE API */
+
+    const std::string& my_name() const;
+    uint32_t port_name_size() const;
+
+    int         set_port_name (PortHandle, const std::string&);
+    std::string get_port_name (PortHandle) const;
+    PortHandle* get_port_by_name (const std::string&) const;
+
+    int get_ports (const std::string& port_name_pattern, DataType type, PortFlags flags, std::vector<std::string>&) const;
+
+    DataType port_data_type (PortHandle) const;
+
+    PortHandle register_port (const std::string& shortname, ARDOUR::DataType, ARDOUR::PortFlags);
+    void  unregister_port (PortHandle);
+
+    bool  connected (PortHandle, bool process_callback_safe);
+    bool  connected_to (PortHandle, const std::string&, bool process_callback_safe);
+    bool  physically_connected (PortHandle, bool process_callback_safe);
+    int   get_connections (PortHandle, std::vector<std::string>&, bool process_callback_safe);
+    int   connect (PortHandle, const std::string&);
+
+    int   disconnect (PortHandle, const std::string&);
+    int   disconnect_all (PortHandle);
+    int   connect (const std::string& src, const std::string& dst);
+    int   disconnect (const std::string& src, const std::string& dst);
+    
+    /* MIDI */
+
+    int      midi_event_get (pframes_t& timestamp, size_t& size, uint8_t** buf, void* port_buffer, uint32_t event_index);
+    int      midi_event_put (void* port_buffer, pframes_t timestamp, const uint8_t* buffer, size_t size);
+    uint32_t get_midi_event_count (void* port_buffer);
+    void     midi_clear (void* port_buffer);
+
+    /* Monitoring */
+
+    bool  can_monitor_input() const;
+    int   request_input_monitoring (PortHandle, bool);
+    int   ensure_input_monitoring (PortHandle, bool);
+    bool  monitoring_input (PortHandle);
+
+    /* Latency management
+     */
+    
+    void          set_latency_range (PortHandle, bool for_playback, LatencyRange);
+    LatencyRange  get_latency_range (PortHandle, bool for_playback);
+
+    /* Physical ports */
+
+    bool      port_is_physical (PortHandle) const;
+    void      get_physical_outputs (DataType type, std::vector<std::string>&);
+    void      get_physical_inputs (DataType type, std::vector<std::string>&);
+    ChanCount n_physical_outputs () const;
+    ChanCount n_physical_inputs () const;
+
+    /* Getting access to the data buffer for a port */
+
+    void* get_buffer (PortHandle, pframes_t);
+
+  private:
+    boost::shared_ptr<JackConnection>  _jack_connection;
+    bool            _running;
+    bool            _freewheeling;
+    std::map<DataType,size_t> _raw_buffer_sizes;
+
+    static int  _xrun_callback (void *arg);
+    static void* _process_thread (void *arg);
+    static int  _sample_rate_callback (pframes_t nframes, void *arg);
+    static int  _bufsize_callback (pframes_t nframes, void *arg);
+    static void _jack_timebase_callback (jack_transport_state_t, pframes_t, jack_position_t*, int, void*);
+    static int  _jack_sync_callback (jack_transport_state_t, jack_position_t*, void *arg);
+    static void _freewheel_callback (int , void *arg);
+    static void _latency_callback (jack_latency_callback_mode_t, void*);
+#ifdef HAVE_JACK_SESSION
+    static void _session_callback (jack_session_event_t *event, void *arg);
+#endif
+    
+    void jack_timebase_callback (jack_transport_state_t, pframes_t, jack_position_t*, int);
+    int  jack_sync_callback (jack_transport_state_t, jack_position_t*);
+    int  jack_bufsize_callback (pframes_t);
+    int  jack_sample_rate_callback (pframes_t);
+    void freewheel_callback (int);
+    int  process_callback (pframes_t nframes);
+    void jack_latency_callback (jack_latency_callback_mode_t);
+    void disconnected (const char*);
+
+    void set_jack_callbacks ();
+    int reconnect_to_jack ();
+    
+    struct ThreadData {
+	JACKAudioBackend* engine;
+	boost::function<void()> f;
+	size_t stacksize;
+	
+	ThreadData (JACKAudioBackend* e, boost::function<void()> fp, size_t stacksz)
+		: engine (e) , f (fp) , stacksize (stacksz) {}
+    };
+    
+    void*  process_thread ();
+    static void* _start_process_thread (void*);
+
+    void setup_jack_startup_command ();
+
+    /* pffooo */
+
+    std::string  _target_driver;
+    std::string  _target_device;
+    float        _target_sample_rate;
+    uint32_t     _target_buffer_size;
+    SampleFormat _target_sample_format;
+    bool         _target_interleaved;
+    uint32_t     _target_input_channels;
+    uint32_t     _target_output_channels;
+    uint32_t     _target_systemic_input_latency;
+    uint32_t     _target_systemic_output_latency;
+    uint32_t     _current_sample_rate;
+    uint32_t     _current_buffer_size;
+
+    typedef std::set<std::string> DeviceList;
+    typedef std::map<std::string,DeviceList> DriverDeviceMap;
+    
+    mutable DriverDeviceMap all_devices;
+
+    PBD::ScopedConnection disconnect_connection;
+
+    /* PORTENGINE RELATED */
+
+    static int  _graph_order_callback (void *arg);
+    static void _registration_callback (jack_port_id_t, int, void *);
+    static void _connect_callback (jack_port_id_t, jack_port_id_t, int, void *);
+
+    void connect_callback (jack_port_id_t, jack_port_id_t, int);
+
+    ChanCount n_physical (unsigned long flags) const;
+    void get_physical (DataType type, unsigned long flags, std::vector<std::string>& phy) const;
+
+    void when_connected_to_jack ();
+    PBD::ScopedConnection jack_connection_connection;
+};
+
+} // namespace
+
+#endif /* __ardour_audiobackend_h__ */
+    
diff --git a/libs/backends/jack/jack_connection.cc b/libs/backends/jack/jack_connection.cc
new file mode 100644
index 0000000000..07af4b8ade
--- /dev/null
+++ b/libs/backends/jack/jack_connection.cc
@@ -0,0 +1,168 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/scoped_ptr.hpp>
+#include <jack/session.h>
+
+#include "pbd/epa.h"
+
+#include "jack_connection.h"
+#include "jack_utils.h"
+
+#define GET_PRIVATE_JACK_POINTER(j)  jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return; }
+#define GET_PRIVATE_JACK_POINTER_RET(j,r) jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return r; }
+
+using namespace ARDOUR;
+using namespace PBD;
+using std::string;
+using std::vector;
+using std::cerr;
+using std::endl;
+
+static void jack_halted_callback (void* arg)
+{
+	JackConnection* jc = static_cast<JackConnection*> (arg);
+	jc->halted_callback ();
+}
+
+static void jack_halted_info_callback (jack_status_t code, const char* reason, void* arg)
+{
+	JackConnection* jc = static_cast<JackConnection*> (arg);
+	jc->halted_info_callback (code, reason);
+}
+
+
+JackConnection::JackConnection (const std::string& arg1, const std::string& arg2)
+	: _jack (0)
+	, _client_name (arg1)
+	, session_uuid (arg2)
+{
+}
+
+JackConnection::~JackConnection ()
+{
+	close ();
+}
+
+bool
+JackConnection::server_running ()
+{
+        EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
+        boost::scoped_ptr<EnvironmentalProtectionAgency> current_epa;
+
+        /* revert all environment settings back to whatever they were when
+	 * ardour started, because ardour's startup script may have reset
+	 * something in ways that interfere with finding/starting JACK.
+         */
+
+        if (global_epa) {
+                current_epa.reset (new EnvironmentalProtectionAgency(true)); /* will restore settings when we leave scope */
+                global_epa->restore ();
+        }
+
+	jack_status_t status;
+	jack_client_t* c = jack_client_open ("ardourprobe", JackNoStartServer, &status);
+
+	if (status == 0) {
+		jack_client_close (c);
+		return true;
+	}
+
+	return false;
+}
+
+int
+JackConnection::open ()
+{
+        EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
+        boost::scoped_ptr<EnvironmentalProtectionAgency> current_epa;
+	jack_status_t status;
+
+	close ();
+
+        /* revert all environment settings back to whatever they were when ardour started
+         */
+
+        if (global_epa) {
+                current_epa.reset (new EnvironmentalProtectionAgency(true)); /* will restore settings when we leave scope */
+                global_epa->restore ();
+        }
+
+	/* ensure that PATH or equivalent includes likely locations of the JACK
+	 * server, in case the user's default does not.
+	 */
+
+	vector<string> dirs;
+	get_jack_server_dir_paths (dirs);
+	set_path_env_for_jack_autostart (dirs);
+
+	if ((_jack = jack_client_open (_client_name.c_str(), JackSessionID, &status, session_uuid.c_str())) == 0) {
+		return -1;
+	}
+
+	if (status & JackNameNotUnique) {
+		_client_name = jack_get_client_name (_jack);
+	}
+
+	/* attach halted handler */
+
+        if (jack_on_info_shutdown) {
+                jack_on_info_shutdown (_jack, jack_halted_info_callback, this);
+        } else {
+                jack_on_shutdown (_jack, jack_halted_callback, this);
+        }
+
+
+	Connected(); /* EMIT SIGNAL */
+
+	return 0;
+}
+
+int
+JackConnection::close ()
+{
+	GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+
+	if (_priv_jack) {	
+		int ret = jack_client_close (_priv_jack);
+		_jack = 0;
+		Disconnected (""); /* EMIT SIGNAL */
+		return ret;
+	}
+
+	return 0;
+}
+
+void
+JackConnection::halted_callback ()
+{
+	_jack = 0;
+	cerr << "JACK HALTED\n";
+	Disconnected ("");
+}
+
+void
+JackConnection::halted_info_callback (jack_status_t /*status*/, const char* reason)
+{
+	_jack = 0;
+	cerr << "JACK HALTED: " << reason << endl;
+	Disconnected (reason);
+}
+
+
diff --git a/libs/backends/jack/jack_connection.h b/libs/backends/jack/jack_connection.h
new file mode 100644
index 0000000000..cd45f3b9ba
--- /dev/null
+++ b/libs/backends/jack/jack_connection.h
@@ -0,0 +1,40 @@
+#ifndef __libardour_jack_connection_h__
+#define __libardour_jack_connection_h__
+
+#include <string>
+#include <jack/jack.h>
+
+#include "pbd/signals.h"
+
+namespace ARDOUR {
+
+class JackConnection {
+  public:
+    JackConnection (const std::string& client_name, const std::string& session_uuid);
+    ~JackConnection ();
+
+    const std::string& client_name() const { return _client_name; }
+
+    int open ();
+    int close ();
+    bool connected () const { return _jack != 0; }
+
+    jack_client_t* jack() const { return _jack; }
+
+    PBD::Signal0<void> Connected;
+    PBD::Signal1<void,const char*> Disconnected;
+
+    void halted_callback ();
+    void halted_info_callback (jack_status_t, const char*);
+
+    static bool server_running();
+
+  private:
+    jack_client_t* volatile _jack;
+    std::string _client_name;
+    std::string session_uuid;
+};
+
+} // namespace 
+
+#endif /* __libardour_jack_connection_h__ */
diff --git a/libs/backends/jack/jack_portengine.cc b/libs/backends/jack/jack_portengine.cc
new file mode 100644
index 0000000000..0d66f50448
--- /dev/null
+++ b/libs/backends/jack/jack_portengine.cc
@@ -0,0 +1,508 @@
+/*
+    Copyright (C) 2013 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <string.h>
+#include <stdint.h>
+
+#include "pbd/error.h"
+
+#include "jack_audiobackend.h"
+#include "jack_connection.h"
+#include "jack/midiport.h"
+
+#include "ardour/port_manager.h"
+
+#include "i18n.h"
+
+using namespace ARDOUR;
+using namespace PBD;
+using std::string;
+using std::vector;
+
+#define GET_PRIVATE_JACK_POINTER(localvar)  jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return; }
+#define GET_PRIVATE_JACK_POINTER_RET(localvar,r) jack_client_t* localvar = _jack_connection->jack(); if (!(localvar)) { return r; }
+
+static uint32_t
+ardour_port_flags_to_jack_flags (PortFlags flags)
+{
+	uint32_t jack_flags = 0;
+	
+	if (flags & IsInput) {
+		jack_flags |= JackPortIsInput;
+	}
+	if (flags & IsOutput) {
+		jack_flags |= JackPortIsOutput;
+	}
+	if (flags & IsTerminal) {
+		jack_flags |= JackPortIsTerminal;
+	}
+	if (flags & IsPhysical) {
+		jack_flags |= JackPortIsPhysical;
+	}
+	if (flags & CanMonitor) {
+		jack_flags |= JackPortCanMonitor;
+	}
+
+	return jack_flags;
+}
+
+static DataType
+jack_port_type_to_ardour_data_type (const char* jack_type)
+{
+	if (strcmp (jack_type, JACK_DEFAULT_AUDIO_TYPE) == 0) {
+		return DataType::AUDIO;
+	} else if (strcmp (jack_type, JACK_DEFAULT_MIDI_TYPE) == 0) {
+		return DataType::MIDI;
+	}
+	return DataType::NIL;
+}
+
+static const char*
+ardour_data_type_to_jack_port_type (DataType d)
+{
+	switch (d) {
+	case DataType::AUDIO:
+		return JACK_DEFAULT_AUDIO_TYPE;
+	case DataType::MIDI:
+		return JACK_DEFAULT_MIDI_TYPE;
+	}
+
+	return "";
+}
+
+void
+JACKAudioBackend::when_connected_to_jack ()
+{
+	/* register callbacks for stuff that is our responsibility */
+
+	jack_client_t* client = _jack_connection->jack();
+
+	if (!client) {
+		/* how could this happen? it could ... */
+		error << _("Already disconnected from JACK before PortEngine could register callbacks") << endmsg;
+		return;
+	}
+
+        jack_set_port_registration_callback (client, _registration_callback, this);
+        jack_set_port_connect_callback (client, _connect_callback, this);
+        jack_set_graph_order_callback (client, _graph_order_callback, this);
+}
+
+int
+JACKAudioBackend::set_port_name (PortHandle port, const std::string& name)
+{
+	return jack_port_set_name ((jack_port_t*) port, name.c_str());
+}
+
+string
+JACKAudioBackend::get_port_name (PortHandle port) const
+{
+	return jack_port_name ((jack_port_t*) port);
+}
+
+PortEngine::PortHandle*
+JACKAudioBackend:: get_port_by_name (const std::string& name) const
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
+	return (PortHandle*) jack_port_by_name (_priv_jack, name.c_str());
+}
+
+void
+JACKAudioBackend::_registration_callback (jack_port_id_t /*id*/, int /*reg*/, void* arg)
+{
+	static_cast<JACKAudioBackend*> (arg)->manager.registration_callback ();
+}
+
+int
+JACKAudioBackend::_graph_order_callback (void *arg)
+{
+	return static_cast<JACKAudioBackend*> (arg)->manager.graph_order_callback ();
+}
+
+void
+JACKAudioBackend::_connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn, void* arg)
+{
+	static_cast<JACKAudioBackend*> (arg)->connect_callback (id_a, id_b, conn);
+}
+
+void
+JACKAudioBackend::connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn)
+{
+	if (manager.port_remove_in_progress()) {
+		return;
+	}
+
+	GET_PRIVATE_JACK_POINTER (_priv_jack);
+
+	jack_port_t* a = jack_port_by_id (_priv_jack, id_a);
+	jack_port_t* b = jack_port_by_id (_priv_jack, id_b);
+
+	manager.connect_callback (jack_port_name (a), jack_port_name (b), conn == 0 ? false : true);
+}
+
+bool
+JACKAudioBackend::connected (PortHandle port, bool process_callback_safe)
+{
+	bool ret = false;
+
+	const char** ports;
+
+	if (process_callback_safe) {
+		ports = jack_port_get_connections ((jack_port_t*)port);
+	} else {
+		GET_PRIVATE_JACK_POINTER_RET (_priv_jack, false);
+		ports = jack_port_get_all_connections (_priv_jack, (jack_port_t*)port);
+	}
+
+	if (ports) {
+		ret = true;
+	}
+
+	jack_free (ports);
+
+	return ret;
+}
+
+bool
+JACKAudioBackend::connected_to (PortHandle port, const std::string& other, bool process_callback_safe)
+{
+	bool ret = false;
+	const char** ports;
+
+	if (process_callback_safe) {
+		ports = jack_port_get_connections ((jack_port_t*)port);
+	} else {
+		GET_PRIVATE_JACK_POINTER_RET (_priv_jack, false);
+		ports = jack_port_get_all_connections (_priv_jack, (jack_port_t*)port);
+	}
+
+	if (ports) {
+		for (int i = 0; ports[i]; ++i) {
+			if (other == ports[i]) {
+				ret = true;
+			}
+		}
+		jack_free (ports);
+	}
+
+	return ret;
+}
+
+bool
+JACKAudioBackend::physically_connected (PortHandle p, bool process_callback_safe)
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, false);
+	jack_port_t* port = (jack_port_t*) p;
+
+	const char** ports;
+	
+	if (process_callback_safe) {
+		ports = jack_port_get_connections ((jack_port_t*)port);
+	} else {
+		GET_PRIVATE_JACK_POINTER_RET (_priv_jack, false);
+		ports = jack_port_get_all_connections (_priv_jack, (jack_port_t*)port);
+	}
+
+	if (ports) {
+		for (int i = 0; ports[i]; ++i) {
+
+			jack_port_t* other = jack_port_by_name (_priv_jack, ports[i]);
+
+			if (other && (jack_port_flags (other) & JackPortIsPhysical)) {
+				return true;
+			}
+		}
+		jack_free (ports);
+	}
+
+	return false;
+}
+
+int
+JACKAudioBackend::get_connections (PortHandle port, vector<string>& s, bool process_callback_safe)
+{
+	const char** ports;
+
+	if (process_callback_safe) {
+		ports = jack_port_get_connections ((jack_port_t*)port);
+	} else {
+		GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
+		ports = jack_port_get_all_connections (_priv_jack, (jack_port_t*)port);
+	}
+
+	if (ports) {
+		for (int i = 0; ports[i]; ++i) {
+			s.push_back (ports[i]);
+		}
+		jack_free (ports);
+	}
+
+	return s.size();
+}
+
+DataType
+JACKAudioBackend::port_data_type (PortHandle p) const
+{
+	return jack_port_type_to_ardour_data_type (jack_port_type ((jack_port_t*) p));
+}
+
+const string&
+JACKAudioBackend::my_name() const
+{
+	return _jack_connection->client_name();
+}
+
+bool
+JACKAudioBackend::port_is_physical (PortHandle ph) const
+{
+	if (!ph) {
+                return false;
+        }
+
+        return jack_port_flags ((jack_port_t*) ph) & JackPortIsPhysical;
+}
+
+int
+JACKAudioBackend::get_ports (const string& port_name_pattern, DataType type, PortFlags flags, vector<string>& s) const
+{
+
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack,0);
+
+	const char** ports =  jack_get_ports (_priv_jack, port_name_pattern.c_str(), 
+					      ardour_data_type_to_jack_port_type (type), 
+					      ardour_port_flags_to_jack_flags (flags));
+
+	if (ports == 0) {
+		return 0;
+	}
+
+	for (uint32_t i = 0; ports[i]; ++i) {
+		s.push_back (ports[i]);
+	}
+
+	jack_free (ports);
+	
+	return s.size();
+}
+
+ChanCount
+JACKAudioBackend::n_physical_inputs () const
+{
+	return n_physical (JackPortIsInput);
+}
+
+ChanCount
+JACKAudioBackend::n_physical_outputs () const
+{
+	return n_physical (JackPortIsOutput);
+}
+
+void
+JACKAudioBackend::get_physical (DataType type, unsigned long flags, vector<string>& phy) const
+{
+	GET_PRIVATE_JACK_POINTER (_priv_jack);
+	const char ** ports;
+
+	if ((ports = jack_get_ports (_priv_jack, NULL, ardour_data_type_to_jack_port_type (type), JackPortIsPhysical | flags)) == 0) {
+		return;
+	}
+
+	if (ports) {
+		for (uint32_t i = 0; ports[i]; ++i) {
+                        if (strstr (ports[i], "Midi-Through")) {
+                                continue;
+                        }
+			phy.push_back (ports[i]);
+		}
+		jack_free (ports);
+	}
+}
+
+/** Get physical ports for which JackPortIsOutput is set; ie those that correspond to
+ *  a physical input connector.
+ */
+void
+JACKAudioBackend::get_physical_inputs (DataType type, vector<string>& ins)
+{
+	get_physical (type, JackPortIsOutput, ins);
+}
+
+/** Get physical ports for which JackPortIsInput is set; ie those that correspond to
+ *  a physical output connector.
+ */
+void
+JACKAudioBackend::get_physical_outputs (DataType type, vector<string>& outs)
+{
+	get_physical (type, JackPortIsInput, outs);
+}
+
+
+bool
+JACKAudioBackend::can_monitor_input () const
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack,false);
+	const char ** ports;
+
+	if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) {
+		return false;
+	}
+
+	jack_free (ports);
+
+	return true;
+}
+
+int
+JACKAudioBackend::request_input_monitoring (PortHandle port, bool yn)
+{
+	return jack_port_request_monitor ((jack_port_t*) port, yn);
+}
+int
+JACKAudioBackend::ensure_input_monitoring (PortHandle port, bool yn)
+{
+	return jack_port_ensure_monitor ((jack_port_t*) port, yn);
+}
+bool
+JACKAudioBackend::monitoring_input (PortHandle port)
+{
+	return jack_port_monitoring_input ((jack_port_t*) port);
+}
+
+PortEngine::PortHandle
+JACKAudioBackend::register_port (const std::string& shortname, ARDOUR::DataType type, ARDOUR::PortFlags flags)
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, 0);
+	return jack_port_register (_priv_jack, shortname.c_str(), 
+				   ardour_data_type_to_jack_port_type (type),
+				   ardour_port_flags_to_jack_flags (flags),
+				   0);
+}
+
+void
+JACKAudioBackend::unregister_port (PortHandle port)
+{
+	GET_PRIVATE_JACK_POINTER (_priv_jack);
+	(void) jack_port_unregister (_priv_jack, (jack_port_t*) port);
+}
+
+int
+JACKAudioBackend::connect (PortHandle port, const std::string& other)
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+	return jack_connect (_priv_jack, jack_port_name ((jack_port_t*) port), other.c_str());
+}
+int
+JACKAudioBackend::connect (const std::string& src, const std::string& dst)
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+	
+	int r = jack_connect (_priv_jack, src.c_str(), dst.c_str());
+	return r;
+}
+
+int
+JACKAudioBackend::disconnect (PortHandle port, const std::string& other)
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+	return jack_disconnect (_priv_jack, jack_port_name ((jack_port_t*) port), other.c_str());
+}
+
+int
+JACKAudioBackend::disconnect (const std::string& src, const std::string& dst)
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+	return jack_disconnect (_priv_jack, src.c_str(), dst.c_str());
+}
+
+int
+JACKAudioBackend::disconnect_all (PortHandle port)
+{
+	GET_PRIVATE_JACK_POINTER_RET (_priv_jack, -1);
+	return jack_port_disconnect (_priv_jack, (jack_port_t*) port);
+}
+
+int
+JACKAudioBackend::midi_event_get (pframes_t& timestamp, size_t& size, uint8_t** buf, void* port_buffer, uint32_t event_index)
+{
+	jack_midi_event_t ev;
+	int ret;
+
+	if ((ret = jack_midi_event_get (&ev, port_buffer, event_index)) == 0) {
+		timestamp = ev.time;
+		size = ev.size;
+		*buf = ev.buffer;
+	}
+
+	return ret;
+}
+
+int
+JACKAudioBackend::midi_event_put (void* port_buffer, pframes_t timestamp, const uint8_t* buffer, size_t size)
+{
+	return jack_midi_event_write (port_buffer, timestamp, buffer, size);
+}
+
+uint32_t
+JACKAudioBackend::get_midi_event_count (void* port_buffer)
+{
+	return jack_midi_get_event_count (port_buffer);
+}
+
+void
+JACKAudioBackend::midi_clear (void* port_buffer)
+{
+	jack_midi_clear_buffer (port_buffer);
+}
+
+void
+JACKAudioBackend::set_latency_range (PortHandle port, bool for_playback, LatencyRange r)
+{
+	jack_latency_range_t range;
+	
+	range.min = r.min;
+	range.max = r.max;
+
+	jack_port_set_latency_range ((jack_port_t*) port, for_playback ? JackPlaybackLatency : JackCaptureLatency, &range);
+}
+
+LatencyRange
+JACKAudioBackend::get_latency_range (PortHandle port, bool for_playback)
+{
+	jack_latency_range_t range;
+	LatencyRange ret;
+	
+	jack_port_get_latency_range ((jack_port_t*) port, for_playback ? JackPlaybackLatency : JackCaptureLatency, &range);
+
+	ret.min = range.min;
+	ret.max = range.max;
+
+	return ret;
+}
+
+void*
+JACKAudioBackend::get_buffer (PortHandle port, pframes_t nframes)
+{
+	return jack_port_get_buffer ((jack_port_t*) port, nframes);
+}
+
+uint32_t
+JACKAudioBackend::port_name_size() const
+{
+	return jack_port_name_size ();
+}
diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc
new file mode 100644
index 0000000000..93fc3d440a
--- /dev/null
+++ b/libs/backends/jack/jack_utils.cc
@@ -0,0 +1,902 @@
+/*
+    Copyright (C) 2010 Paul Davis
+    Copyright (C) 2011 Tim Mayberry
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifdef HAVE_ALSA
+#include <alsa/asoundlib.h>
+#endif
+
+#ifdef __APPLE__
+#include <CoreAudio/CoreAudio.h>
+#include <CoreFoundation/CFString.h>
+#include <sys/param.h>
+#include <mach-o/dyld.h>
+#endif
+
+#ifdef HAVE_PORTAUDIO
+#include <portaudio.h>
+#endif
+
+#include <jack/jack.h>
+
+#include <fstream>
+
+#include <boost/scoped_ptr.hpp>
+
+#include <glibmm/miscutils.h>
+
+#include "pbd/epa.h"
+#include "pbd/error.h"
+#include "pbd/convert.h"
+#include "pbd/file_utils.h"
+#include "pbd/search_path.h"
+
+#include "jack_utils.h"
+
+#ifdef __APPLE
+#include <CFBundle.h>
+#endif
+
+#include "i18n.h"
+
+using namespace std;
+using namespace PBD;
+
+namespace ARDOUR {
+	// The pretty driver names
+	const char * const portaudio_driver_name = X_("Portaudio");
+	const char * const coreaudio_driver_name = X_("CoreAudio");
+	const char * const alsa_driver_name = X_("ALSA");
+	const char * const oss_driver_name = X_("OSS");
+	const char * const freebob_driver_name = X_("FreeBoB");
+	const char * const ffado_driver_name = X_("FFADO");
+	const char * const netjack_driver_name = X_("NetJACK");
+	const char * const dummy_driver_name = X_("Dummy");
+}
+
+namespace {
+
+	// The real driver names
+	const char * const portaudio_driver_command_line_name = X_("portaudio");
+	const char * const coreaudio_driver_command_line_name = X_("coreaudio");
+	const char * const alsa_driver_command_line_name = X_("alsa");
+	const char * const oss_driver_command_line_name = X_("oss");
+	const char * const freebob_driver_command_line_name = X_("freebob");
+	const char * const ffado_driver_command_line_name = X_("firewire");
+	const char * const netjack_driver_command_line_name = X_("netjack");
+	const char * const dummy_driver_command_line_name = X_("dummy");
+
+	// should we provide more "pretty" names like above?
+	const char * const alsaseq_midi_driver_name = X_("seq");
+	const char * const alsaraw_midi_driver_name = X_("raw");
+	const char * const winmme_midi_driver_name = X_("winmme");
+	const char * const coremidi_midi_driver_name = X_("coremidi");
+
+	// this should probably be translated
+	const char * const default_device_name = X_("Default");
+}
+
+std::string
+get_none_string ()
+{
+	return _("None");
+}
+
+void
+ARDOUR::get_jack_audio_driver_names (vector<string>& audio_driver_names)
+{
+#ifdef WIN32
+	audio_driver_names.push_back (portaudio_driver_name);
+#elif __APPLE__
+	audio_driver_names.push_back (coreaudio_driver_name);
+#else
+#ifdef HAVE_ALSA
+	audio_driver_names.push_back (alsa_driver_name);
+#endif
+	audio_driver_names.push_back (oss_driver_name);
+	audio_driver_names.push_back (freebob_driver_name);
+	audio_driver_names.push_back (ffado_driver_name);
+#endif
+	audio_driver_names.push_back (netjack_driver_name);
+	audio_driver_names.push_back (dummy_driver_name);
+}
+
+void
+ARDOUR::get_jack_default_audio_driver_name (string& audio_driver_name)
+{
+	vector<string> drivers;
+	get_jack_audio_driver_names (drivers);
+	audio_driver_name = drivers.front ();
+}
+
+void
+ARDOUR::get_jack_sample_rate_strings (vector<string>& samplerates)
+{
+	// do these really need to be translated?
+	samplerates.push_back (_("8000Hz"));
+	samplerates.push_back (_("22050Hz"));
+	samplerates.push_back (_("44100Hz"));
+	samplerates.push_back (_("48000Hz"));
+	samplerates.push_back (_("88200Hz"));
+	samplerates.push_back (_("96000Hz"));
+	samplerates.push_back (_("192000Hz"));
+}
+
+string
+ARDOUR::get_jack_default_sample_rate ()
+{
+	return _("48000Hz");
+}
+
+void
+ARDOUR::get_jack_period_size_strings (std::vector<std::string>& period_sizes)
+{
+	period_sizes.push_back ("32");
+	period_sizes.push_back ("64");
+	period_sizes.push_back ("128");
+	period_sizes.push_back ("256");
+	period_sizes.push_back ("512");
+	period_sizes.push_back ("1024");
+	period_sizes.push_back ("2048");
+	period_sizes.push_back ("4096");
+	period_sizes.push_back ("8192");
+}
+
+string
+ARDOUR::get_jack_default_period_size ()
+{
+	return "1024";
+}
+
+void
+ARDOUR::get_jack_dither_mode_strings (const string& driver, vector<string>& dither_modes)
+{
+	dither_modes.push_back (get_none_string ());
+
+	if (driver == alsa_driver_name ) {
+		dither_modes.push_back (_("Triangular"));
+		dither_modes.push_back (_("Rectangular"));
+		dither_modes.push_back (_("Shaped"));
+	}
+}
+
+string
+ARDOUR::get_jack_default_dither_mode (const string& /*driver*/)
+{
+	return get_none_string ();
+}
+
+string
+ARDOUR::get_jack_latency_string (string samplerate, float periods, string period_size)
+{
+	uint32_t rate = atoi (samplerate);
+	float psize = atof (period_size);
+
+	char buf[32];
+	snprintf (buf, sizeof(buf), "%.1fmsec", (periods * psize) / (rate/1000.0));
+
+	return buf;
+}
+
+bool
+get_jack_command_line_audio_driver_name (const string& driver_name, string& command_line_name)
+{
+	using namespace ARDOUR;
+	if (driver_name == portaudio_driver_name) {
+		command_line_name = portaudio_driver_command_line_name;
+		return true;
+	} else if (driver_name == coreaudio_driver_name) {
+		command_line_name = coreaudio_driver_command_line_name;
+		return true;
+	} else if (driver_name == alsa_driver_name) {
+		command_line_name = alsa_driver_command_line_name;
+		return true;
+	} else if (driver_name == oss_driver_name) {
+		command_line_name = oss_driver_command_line_name;
+		return true;
+	} else if (driver_name == freebob_driver_name) {
+		command_line_name = freebob_driver_command_line_name;
+		return true;
+	} else if (driver_name == ffado_driver_name) {
+		command_line_name = ffado_driver_command_line_name;
+		return true;
+	} else if (driver_name == netjack_driver_name) {
+		command_line_name = netjack_driver_command_line_name;
+		return true;
+	} else if (driver_name == dummy_driver_name) {
+		command_line_name = dummy_driver_command_line_name;
+		return true;
+	}
+	return false;
+}
+
+bool
+get_jack_command_line_audio_device_name (const string& driver_name,
+		const string& device_name, string& command_line_device_name)
+{
+	using namespace ARDOUR;
+	device_map_t devices;
+
+	get_jack_device_names_for_audio_driver (driver_name, devices);
+
+	for (device_map_t::const_iterator i = devices.begin (); i != devices.end(); ++i) {
+		if (i->first == device_name) {
+			command_line_device_name = i->second;
+			return true;
+		}
+	}
+	return false;
+}
+
+bool
+get_jack_command_line_dither_mode (const string& dither_mode, string& command_line_dither_mode)
+{
+	using namespace ARDOUR;
+
+	if (dither_mode == _("Triangular")) {
+		command_line_dither_mode = "triangular";
+		return true;
+	} else if (dither_mode == _("Rectangular")) {
+		command_line_dither_mode = "rectangular";
+		return true;
+	} else if (dither_mode == _("Shaped")) {
+		command_line_dither_mode = "shaped";
+		return true;
+	}
+
+	return false;
+}
+
+void
+ARDOUR::get_jack_alsa_device_names (device_map_t& devices)
+{
+#ifdef HAVE_ALSA
+	snd_ctl_t *handle;
+	snd_ctl_card_info_t *info;
+	snd_pcm_info_t *pcminfo;
+	snd_ctl_card_info_alloca(&info);
+	snd_pcm_info_alloca(&pcminfo);
+	string devname;
+	int cardnum = -1;
+	int device = -1;
+
+	while (snd_card_next (&cardnum) >= 0 && cardnum >= 0) {
+
+		devname = "hw:";
+		devname += PBD::to_string (cardnum, std::dec);
+
+		if (snd_ctl_open (&handle, devname.c_str(), 0) >= 0 && snd_ctl_card_info (handle, info) >= 0) {
+
+			if (snd_ctl_card_info (handle, info) < 0) {
+				continue;
+			}
+			
+			string card_name = snd_ctl_card_info_get_name (info);
+
+			/* change devname to use ID, not number */
+
+			devname = "hw:";
+			devname += snd_ctl_card_info_get_id (info);
+
+			while (snd_ctl_pcm_next_device (handle, &device) >= 0 && device >= 0) {
+				
+				/* only detect duplex devices here. more
+				 * complex arrangements are beyond our scope
+				 */
+
+				snd_pcm_info_set_device (pcminfo, device);
+				snd_pcm_info_set_subdevice (pcminfo, 0);
+				snd_pcm_info_set_stream (pcminfo, SND_PCM_STREAM_CAPTURE);
+				
+				if (snd_ctl_pcm_info (handle, pcminfo) >= 0) {
+
+					snd_pcm_info_set_device (pcminfo, device);
+					snd_pcm_info_set_subdevice (pcminfo, 0);
+					snd_pcm_info_set_stream (pcminfo, SND_PCM_STREAM_PLAYBACK);
+
+					if (snd_ctl_pcm_info (handle, pcminfo) >= 0) {
+						devname += ',';
+						devname += PBD::to_string (device, std::dec);
+						devices.insert (std::make_pair (card_name, devname));
+					}
+				}
+			}
+
+			snd_ctl_close(handle);
+		}
+	}
+#else
+	/* silence a compiler unused variable warning */
+	(void) devices;
+#endif
+}
+
+#ifdef __APPLE__
+static OSStatus
+getDeviceUIDFromID( AudioDeviceID id, char *name, size_t nsize)
+{
+	UInt32 size = sizeof(CFStringRef);
+	CFStringRef UI;
+	OSStatus res = AudioDeviceGetProperty(id, 0, false,
+		kAudioDevicePropertyDeviceUID, &size, &UI);
+	if (res == noErr)
+		CFStringGetCString(UI,name,nsize,CFStringGetSystemEncoding());
+	CFRelease(UI);
+	return res;
+}
+#endif
+
+void
+ARDOUR::get_jack_coreaudio_device_names (device_map_t& devices)
+{
+#ifdef __APPLE__
+	// Find out how many Core Audio devices are there, if any...
+	// (code snippet gently "borrowed" from St?hane Letz jackdmp;)
+	OSStatus err;
+	Boolean isWritable;
+	UInt32 outSize = sizeof(isWritable);
+
+	err = AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices,
+					   &outSize, &isWritable);
+	if (err == noErr) {
+		// Calculate the number of device available...
+		int numCoreDevices = outSize / sizeof(AudioDeviceID);
+		// Make space for the devices we are about to get...
+		AudioDeviceID *coreDeviceIDs = new AudioDeviceID [numCoreDevices];
+		err = AudioHardwareGetProperty(kAudioHardwarePropertyDevices,
+					       &outSize, (void *) coreDeviceIDs);
+		if (err == noErr) {
+			// Look for the CoreAudio device name...
+			char coreDeviceName[256];
+			UInt32 nameSize;
+
+			for (int i = 0; i < numCoreDevices; i++) {
+
+				nameSize = sizeof (coreDeviceName);
+
+				/* enforce duplex devices only */
+
+				err = AudioDeviceGetPropertyInfo(coreDeviceIDs[i],
+								 0, true, kAudioDevicePropertyStreams,
+								 &outSize, &isWritable);
+
+				if (err != noErr || outSize == 0) {
+					continue;
+				}
+
+				err = AudioDeviceGetPropertyInfo(coreDeviceIDs[i],
+								 0, false, kAudioDevicePropertyStreams,
+								 &outSize, &isWritable);
+
+				if (err != noErr || outSize == 0) {
+					continue;
+				}
+
+				err = AudioDeviceGetPropertyInfo(coreDeviceIDs[i],
+								 0, true, kAudioDevicePropertyDeviceName,
+								 &outSize, &isWritable);
+				if (err == noErr) {
+					err = AudioDeviceGetProperty(coreDeviceIDs[i],
+								     0, true, kAudioDevicePropertyDeviceName,
+								     &nameSize, (void *) coreDeviceName);
+					if (err == noErr) {
+						char drivername[128];
+
+						// this returns the unique id for the device
+						// that must be used on the commandline for jack
+
+						if (getDeviceUIDFromID(coreDeviceIDs[i], drivername, sizeof (drivername)) == noErr) {
+							devices.insert (make_pair (coreDeviceName, drivername));
+						}
+					}
+				}
+			}
+		}
+		delete [] coreDeviceIDs;
+	}
+#else
+	/* silence a compiler unused variable warning */
+	(void) devices;
+#endif
+}
+
+void
+ARDOUR::get_jack_portaudio_device_names (device_map_t& devices)
+{
+#ifdef HAVE_PORTAUDIO
+	if (Pa_Initialize() != paNoError) {
+		return;
+	}
+
+	for (PaDeviceIndex i = 0; i < Pa_GetDeviceCount (); ++i) {
+		string api_name;
+		string readable_name;
+		string jack_device_name;
+		const PaDeviceInfo* device_info = Pa_GetDeviceInfo(i);
+
+		if (device_info != NULL) { // it should never be ?
+			api_name = Pa_GetHostApiInfo (device_info->hostApi)->name;
+			readable_name = api_name + " " + device_info->name;
+			jack_device_name = api_name + "::" + device_info->name;
+			devices.insert (make_pair (readable_name, jack_device_name));
+		}
+	}
+	Pa_Terminate();
+#else
+	/* silence a compiler unused variable warning */
+	(void) devices;
+#endif
+}
+
+void
+ARDOUR::get_jack_oss_device_names (device_map_t& devices)
+{
+	devices.insert (make_pair (default_device_name, default_device_name));
+}
+
+void
+ARDOUR::get_jack_freebob_device_names (device_map_t& devices)
+{
+	devices.insert (make_pair (default_device_name, default_device_name));
+}
+
+void
+ARDOUR::get_jack_ffado_device_names (device_map_t& devices)
+{
+	devices.insert (make_pair (default_device_name, default_device_name));
+}
+
+void
+ARDOUR::get_jack_netjack_device_names (device_map_t& devices)
+{
+	devices.insert (make_pair (default_device_name, default_device_name));
+}
+
+void
+ARDOUR::get_jack_dummy_device_names (device_map_t& devices)
+{
+	devices.insert (make_pair (default_device_name, default_device_name));
+}
+
+bool
+ARDOUR::get_jack_device_names_for_audio_driver (const string& driver_name, device_map_t& devices)
+{
+	devices.clear();
+
+	if (driver_name == portaudio_driver_name) {
+		get_jack_portaudio_device_names (devices);
+	} else if (driver_name == coreaudio_driver_name) {
+		get_jack_coreaudio_device_names (devices);
+	} else if (driver_name == alsa_driver_name) {
+		get_jack_alsa_device_names (devices);
+	} else if (driver_name == oss_driver_name) {
+		get_jack_oss_device_names (devices);
+	} else if (driver_name == freebob_driver_name) {
+		get_jack_freebob_device_names (devices);
+	} else if (driver_name == ffado_driver_name) {
+		get_jack_ffado_device_names (devices);
+	} else if (driver_name == netjack_driver_name) {
+		get_jack_netjack_device_names (devices);
+	} else if (driver_name == dummy_driver_name) {
+		get_jack_dummy_device_names (devices);
+	}
+
+	return !devices.empty();
+}
+
+
+std::vector<std::string>
+ARDOUR::get_jack_device_names_for_audio_driver (const string& driver_name)
+{
+	std::vector<std::string> readable_names;
+	device_map_t devices;
+
+	get_jack_device_names_for_audio_driver (driver_name, devices);
+
+	for (device_map_t::const_iterator i = devices.begin (); i != devices.end(); ++i) {
+		readable_names.push_back (i->first);
+	}
+
+	return readable_names;
+}
+
+bool
+ARDOUR::get_jack_audio_driver_supports_two_devices (const string& driver)
+{
+	return (driver == alsa_driver_name || driver == oss_driver_name);
+}
+
+bool
+ARDOUR::get_jack_audio_driver_supports_latency_adjustment (const string& driver)
+{
+	return (driver == alsa_driver_name || driver == coreaudio_driver_name ||
+			driver == ffado_driver_name || driver == portaudio_driver_name);
+}
+
+bool
+ARDOUR::get_jack_audio_driver_supports_setting_period_count (const string& driver)
+{
+	return !(driver == dummy_driver_name || driver == coreaudio_driver_name ||
+			driver == portaudio_driver_name);
+}
+
+bool
+ARDOUR::get_jack_server_application_names (std::vector<std::string>& server_names)
+{
+#ifdef WIN32
+	server_names.push_back ("jackd.exe");
+#else
+	server_names.push_back ("jackd");
+	server_names.push_back ("jackdmp");
+#endif
+	return !server_names.empty();
+}
+
+void
+ARDOUR::set_path_env_for_jack_autostart (const vector<std::string>& dirs)
+{
+#ifdef __APPLE__
+	// push it back into the environment so that auto-started JACK can find it.
+	// XXX why can't we just expect OS X users to have PATH set correctly? we can't ...
+	setenv ("PATH", SearchPath(dirs).to_string().c_str(), 1);
+#else
+	/* silence a compiler unused variable warning */
+	(void) dirs;
+#endif
+}
+
+bool
+ARDOUR::get_jack_server_dir_paths (vector<std::string>& server_dir_paths)
+{
+#ifdef __APPLE__
+	/* this magic lets us finds the path to the OSX bundle, and then
+	   we infer JACK's location from there
+	*/
+
+	char execpath[MAXPATHLEN+1];
+	uint32_t pathsz = sizeof (execpath);
+
+	_NSGetExecutablePath (execpath, &pathsz);
+
+	server_dir_paths.push_back (Glib::path_get_dirname (execpath));
+#endif
+
+	SearchPath sp(string(g_getenv("PATH")));
+
+#ifdef WIN32
+	gchar *install_dir = g_win32_get_package_installation_directory_of_module (NULL);
+	if (install_dir) {
+		sp.push_back (install_dir);
+		g_free (install_dir);
+	}
+	// don't try and use a system wide JACK install yet.
+#else
+	if (sp.empty()) {
+		sp.push_back ("/usr/bin");
+		sp.push_back ("/bin");
+		sp.push_back ("/usr/local/bin");
+		sp.push_back ("/opt/local/bin");
+	}
+#endif
+
+	std::copy (sp.begin(), sp.end(), std::back_inserter(server_dir_paths));
+
+	return !server_dir_paths.empty();
+}
+
+bool
+ARDOUR::get_jack_server_paths (const vector<std::string>& server_dir_paths,
+		const vector<string>& server_names,
+		vector<std::string>& server_paths)
+{
+	for (vector<string>::const_iterator i = server_names.begin(); i != server_names.end(); ++i) {
+                Glib::PatternSpec ps (*i);
+		find_matching_files_in_directories (server_dir_paths, ps, server_paths);
+	}
+	return !server_paths.empty();
+}
+
+bool
+ARDOUR::get_jack_server_paths (vector<std::string>& server_paths)
+{
+	vector<std::string> server_dirs;
+
+	if (!get_jack_server_dir_paths (server_dirs)) {
+		return false;
+	}
+
+	vector<string> server_names;
+
+	if (!get_jack_server_application_names (server_names)) {
+		return false;
+	}
+
+	if (!get_jack_server_paths (server_dirs, server_names, server_paths)) {
+		return false;
+	}
+
+	return !server_paths.empty();
+}
+
+bool
+ARDOUR::get_jack_default_server_path (std::string& server_path)
+{
+	vector<std::string> server_paths;
+
+	if (!get_jack_server_paths (server_paths)) {
+		return false;
+	}
+
+	server_path = server_paths.front ();
+	return true;
+}
+
+string
+quote_string (const string& str)
+{
+	return "\"" + str + "\"";
+}
+
+ARDOUR::JackCommandLineOptions::JackCommandLineOptions ()
+	: server_path ()
+	, timeout(0)
+	, no_mlock(false)
+	, ports_max(128)
+	, realtime(true)
+	, priority(0)
+	, unlock_gui_libs(false)
+	, verbose(false)
+	, temporary(true)
+	, driver()
+	, input_device()
+	, output_device()
+	, num_periods(2)
+	, period_size(1024)
+	, samplerate(48000)
+	, input_latency(0)
+	, output_latency(0)
+	, hardware_metering(false)
+	, hardware_monitoring(false)
+	, dither_mode()
+	, force16_bit(false)
+	, soft_mode(false)
+	, midi_driver()
+{
+
+}
+
+bool
+ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& command_line)
+{
+	vector<string> args;
+
+	args.push_back (options.server_path);
+
+#ifdef WIN32
+	// must use sync mode on windows
+	args.push_back ("-S");
+
+	// this needs to be added now on windows
+	if (!options.midi_driver.empty () && options.midi_driver != get_none_string ()) {
+		args.push_back ("-X");
+		args.push_back (options.midi_driver);
+	}
+#endif
+
+	/* XXX hack to enforce qjackctl-like behaviour */
+	if (options.timeout == 0) {
+		options.timeout = 200;
+	}
+
+	if (options.timeout) {
+		args.push_back ("-t");
+		args.push_back (to_string (options.timeout, std::dec));
+	}
+
+	if (options.no_mlock) {
+		args.push_back ("-m");
+	}
+
+	args.push_back ("-p");
+	args.push_back (to_string(options.ports_max, std::dec));
+
+	if (options.realtime) {
+		args.push_back ("-R");
+		if (options.priority != 0) {
+			args.push_back ("-P");
+			args.push_back (to_string(options.priority, std::dec));
+		}
+	} else {
+		args.push_back ("-r");
+	}
+
+	if (options.unlock_gui_libs) {
+		args.push_back ("-u");
+	}
+
+	if (options.verbose) {
+		args.push_back ("-v");
+	}
+
+#ifndef WIN32
+	if (options.temporary) {
+		args.push_back ("-T");
+	}
+#endif
+
+	string command_line_driver_name;
+
+	if (!get_jack_command_line_audio_driver_name (options.driver, command_line_driver_name)) {
+		return false;
+	}
+
+	args.push_back ("-d");
+	args.push_back (command_line_driver_name);
+
+	if (options.output_device.empty() && options.input_device.empty()) {
+		return false;
+	}
+
+	string command_line_input_device_name;
+	string command_line_output_device_name;
+
+	if (!get_jack_command_line_audio_device_name (options.driver,
+		options.input_device, command_line_input_device_name)) {
+		return false;
+	}
+
+	if (!get_jack_command_line_audio_device_name (options.driver,
+		options.output_device, command_line_output_device_name)) {
+		return false;
+	}
+
+	if (options.input_device.empty()) {
+		// playback only
+		if (options.output_device.empty()) {
+			return false;
+		}
+		args.push_back ("-P");
+	} else if (options.output_device.empty()) {
+		// capture only
+		if (options.input_device.empty()) {
+			return false;
+		}
+		args.push_back ("-C");
+	} else if (options.input_device != options.output_device) {
+		// capture and playback on two devices if supported
+		if (get_jack_audio_driver_supports_two_devices (options.driver)) {
+			args.push_back ("-C");
+			args.push_back (command_line_input_device_name);
+			args.push_back ("-P");
+			args.push_back (command_line_output_device_name);
+		} else {
+			return false;
+		}
+	}
+
+	if (options.input_channels) {
+		args.push_back ("-i");
+		args.push_back (to_string (options.input_channels, std::dec));
+	}
+
+	if (options.output_channels) {
+		args.push_back ("-o");
+		args.push_back (to_string (options.output_channels, std::dec));
+	}
+
+	if (get_jack_audio_driver_supports_setting_period_count (options.driver)) {
+		args.push_back ("-n");
+		args.push_back (to_string (options.num_periods, std::dec));
+	}
+
+	args.push_back ("-r");
+	args.push_back (to_string (options.samplerate, std::dec));
+
+	args.push_back ("-p");
+	args.push_back (to_string (options.period_size, std::dec));
+
+	if (get_jack_audio_driver_supports_latency_adjustment (options.driver)) {
+		if (options.input_latency) {
+			args.push_back ("-I");
+			args.push_back (to_string (options.input_latency, std::dec));
+		}
+		if (options.output_latency) {
+			args.push_back ("-O");
+			args.push_back (to_string (options.output_latency, std::dec));
+		}
+	}
+
+	if (options.input_device == options.output_device && options.input_device != default_device_name) {
+		args.push_back ("-d");
+		args.push_back (command_line_input_device_name);
+	}
+
+	if (options.driver == alsa_driver_name) {
+		if (options.hardware_metering) {
+			args.push_back ("-M");
+		}
+		if (options.hardware_monitoring) {
+			args.push_back ("-H");
+		}
+
+		string command_line_dither_mode;
+		if (get_jack_command_line_dither_mode (options.dither_mode, command_line_dither_mode)) {
+			args.push_back ("-z");
+			args.push_back (command_line_dither_mode);
+		}
+		if (options.force16_bit) {
+			args.push_back ("-S");
+		}
+		if (options.soft_mode) {
+			args.push_back ("-s");
+		}
+
+		if (!options.midi_driver.empty() && options.midi_driver != get_none_string ()) {
+			args.push_back ("-X");
+			args.push_back (options.midi_driver);
+		}
+	}
+
+	ostringstream oss;
+
+	for (vector<string>::const_iterator i = args.begin(); i != args.end();) {
+#ifdef WIN32
+		oss << quote_string (*i);
+#else
+		oss << *i;
+#endif
+		if (++i != args.end()) oss << ' ';
+	}
+
+	command_line = oss.str();
+	return true;
+}
+
+string
+ARDOUR::get_jack_server_config_file_name ()
+{
+	return ".jackdrc";
+}
+
+std::string
+ARDOUR::get_jack_server_user_config_dir_path ()
+{
+	return Glib::get_home_dir ();
+}
+
+std::string
+ARDOUR::get_jack_server_user_config_file_path ()
+{
+	return Glib::build_filename (get_jack_server_user_config_dir_path (), get_jack_server_config_file_name ());
+}
+
+bool
+ARDOUR::write_jack_config_file (const std::string& config_file_path, const string& command_line)
+{
+	ofstream jackdrc (config_file_path.c_str());
+
+	if (!jackdrc) {
+		error << string_compose (_("cannot open JACK rc file %1 to store parameters"), config_file_path) << endmsg;
+		return false;
+	}
+
+	jackdrc << command_line << endl;
+	jackdrc.close ();
+	return true;
+}
diff --git a/libs/backends/jack/jack_utils.h b/libs/backends/jack/jack_utils.h
new file mode 100644
index 0000000000..a7521ad1c4
--- /dev/null
+++ b/libs/backends/jack/jack_utils.h
@@ -0,0 +1,235 @@
+/*
+    Copyright (C) 2011 Tim Mayberry
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <stdint.h>
+
+#include <vector>
+#include <map>
+#include <string>
+
+namespace ARDOUR {
+
+	// Names for the drivers on all possible systems
+	extern const char * const portaudio_driver_name;
+	extern const char * const coreaudio_driver_name;
+	extern const char * const alsa_driver_name;
+	extern const char * const oss_driver_name;
+	extern const char * const freebob_driver_name;
+	extern const char * const ffado_driver_name;
+	extern const char * const netjack_driver_name;
+	extern const char * const dummy_driver_name;
+
+	/**
+	 * Get a list of possible JACK audio driver names based on platform
+	 */
+	void get_jack_audio_driver_names (std::vector<std::string>& driver_names);
+
+	/**
+	 * Get the default JACK audio driver based on platform
+	 */
+	void get_jack_default_audio_driver_name (std::string& driver_name);
+
+	/**
+	 * Get a list of possible samplerates supported be JACK
+	 */
+	void get_jack_sample_rate_strings (std::vector<std::string>& sample_rates);
+
+	/**
+	 * @return The default samplerate
+	 */
+	std::string get_jack_default_sample_rate ();
+
+	/**
+	 * @return true if sample rate string was able to be converted
+	 */
+	bool get_jack_sample_rate_value_from_string (const std::string& srs, uint32_t& srv);
+
+	/**
+	 * Get a list of possible period sizes supported be JACK
+	 */
+	void get_jack_period_size_strings (std::vector<std::string>& samplerates);
+
+	/**
+	 * @return The default period size
+	 */
+	std::string get_jack_default_period_size ();
+
+	/**
+	 * @return true if period size string was able to be converted
+	 */
+	bool get_jack_period_size_value_from_string (const std::string& pss, uint32_t& psv);
+
+	/**
+	 * These are driver specific I think, so it may require a driver arg
+	 * in future
+	 */
+	void get_jack_dither_mode_strings (const std::string& driver, std::vector<std::string>& dither_modes);
+
+	/**
+	 * @return The default dither mode
+	 */
+	std::string get_jack_default_dither_mode (const std::string& driver);
+
+	/**
+	 * @return Estimate of latency
+	 *
+	 * API matches current use in GUI
+	 */
+	std::string get_jack_latency_string (std::string samplerate, float periods, std::string period_size);
+
+	/**
+	 * Key being a readable name to display in a GUI
+	 * Value being name used in a jack commandline
+	 */
+	typedef std::map<std::string, std::string> device_map_t;
+
+	/**
+	 * Use library specific code to find out what what devices exist for a given
+	 * driver that might work in JACK. There is no easy way to find out what
+	 * modules the JACK server supports so guess based on platform. For instance
+	 * portaudio is cross-platform but we only return devices if built for
+	 * windows etc
+	 */
+	void get_jack_alsa_device_names (device_map_t& devices);
+	void get_jack_portaudio_device_names (device_map_t& devices);
+	void get_jack_coreaudio_device_names (device_map_t& devices);
+	void get_jack_oss_device_names (device_map_t& devices);
+	void get_jack_freebob_device_names (device_map_t& devices);
+	void get_jack_ffado_device_names (device_map_t& devices);
+	void get_jack_netjack_device_names (device_map_t& devices);
+	void get_jack_dummy_device_names (device_map_t& devices);
+
+	/*
+	 * @return true if there were devices found for the driver
+	 *
+	 * @param driver The driver name returned by get_jack_audio_driver_names
+	 * @param devices The map used to insert the drivers into, devices will be cleared before
+	 * adding the available drivers
+	 */
+	bool get_jack_device_names_for_audio_driver (const std::string& driver, device_map_t& devices);
+
+	/*
+	 * @return a list of readable device names for a specific driver.
+	 */
+	std::vector<std::string> get_jack_device_names_for_audio_driver (const std::string& driver);
+
+	/**
+	 * @return true if the driver supports playback and recording
+	 * on separate devices
+	 */
+	bool get_jack_audio_driver_supports_two_devices (const std::string& driver);
+
+	bool get_jack_audio_driver_supports_latency_adjustment (const std::string& driver);
+
+	bool get_jack_audio_driver_supports_setting_period_count (const std::string& driver);
+
+	/**
+	 * The possible names to use to try and find servers, this includes
+	 * any file extensions like .exe on Windows
+	 *
+	 * @return true if the JACK application names for this platform could be guessed
+	 */
+	bool get_jack_server_application_names (std::vector<std::string>& server_names);
+
+	/**
+	 * Sets the PATH environment variable to contain directories likely to contain
+	 * JACK servers so that if the JACK server is auto-started it can find the server
+	 * executable.
+	 *
+	 * This is only modifies PATH on the mac at the moment.
+	 */
+	void set_path_env_for_jack_autostart (const std::vector<std::string>&);
+
+	/**
+	 * Get absolute paths to directories that might contain JACK servers on the system
+	 *
+	 * @return true if !server_paths.empty()
+	 */
+	bool get_jack_server_dir_paths (std::vector<std::string>& server_dir_paths);
+
+	/**
+	 * Get absolute paths to JACK servers on the system
+	 *
+	 * @return true if a server was found
+	 */
+	bool get_jack_server_paths (const std::vector<std::string>& server_dir_paths,
+			const std::vector<std::string>& server_names,
+			std::vector<std::string>& server_paths);
+
+
+	bool get_jack_server_paths (std::vector<std::string>& server_paths);
+
+	/**
+	 * Get absolute path to default JACK server
+	 */
+	bool get_jack_default_server_path (std::string& server_path);
+
+	/**
+	 * @return The name of the jack server config file
+	 */
+	std::string get_jack_server_config_file_name ();
+
+	std::string get_jack_server_user_config_dir_path ();
+
+	std::string get_jack_server_user_config_file_path ();
+
+	bool write_jack_config_file (const std::string& config_file_path, const std::string& command_line);
+
+	struct JackCommandLineOptions {
+
+		// see implementation for defaults
+		JackCommandLineOptions ();
+
+		//operator bool
+		//operator ostream
+
+		std::string      server_path;
+		uint32_t         timeout;
+		bool             no_mlock;
+		uint32_t         ports_max;
+		bool             realtime;
+		uint32_t         priority;
+		bool             unlock_gui_libs;
+		bool             verbose;
+		bool             temporary;
+		bool             playback_only;
+		bool             capture_only;
+		std::string      driver;
+		std::string      input_device;
+		std::string      output_device;
+		uint32_t         num_periods;
+		uint32_t         period_size;
+		uint32_t         samplerate;
+		uint32_t         input_channels;
+		uint32_t         output_channels;
+		uint32_t         input_latency;
+		uint32_t         output_latency;
+		bool             hardware_metering;
+		bool             hardware_monitoring;
+		std::string      dither_mode;
+		bool             force16_bit;
+		bool             soft_mode;
+		std::string      midi_driver;
+	};
+
+	/**
+	 * @return true if able to build a valid command line based on options
+	 */
+	bool get_jack_command_line_string (JackCommandLineOptions& options, std::string& command_line);
+}
diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript
new file mode 100644
index 0000000000..98c39c7b16
--- /dev/null
+++ b/libs/backends/jack/wscript
@@ -0,0 +1,52 @@
+#!/usr/bin/env python
+from waflib.extras import autowaf as autowaf
+import os
+import sys
+import re
+
+# Library version (UNIX style major, minor, micro)
+# major increment <=> incompatible changes
+# minor increment <=> compatible changes (additions)
+# micro increment <=> no interface changes
+JACKBACKEND_VERSION = '1.0.0'
+I18N_PACKAGE = 'jack-backend'
+
+# Mandatory variables
+top = '.'
+out = 'build'
+
+def options(opt):
+    autowaf.set_options(opt)
+
+def configure(conf):
+    autowaf.configure(conf)
+
+def build(bld):
+    obj = bld(features = 'cxx cxxshlib')
+    obj.source = [ 
+            'jack_api.cc',
+            'jack_connection.cc',
+            'jack_audiobackend.cc',
+            'jack_portengine.cc',
+            'jack_utils.cc'
+            ]
+    obj.includes = ['.']
+    obj.cxxflags = [ '-fPIC' ]
+    obj.name     = 'jack_audiobackend'
+    obj.target   = 'jack_audiobackend'
+    obj.uselib   = [ 'JACK' ]
+    obj.use      = 'ardour libpbd'
+    obj.vnum     = JACKBACKEND_VERSION
+    obj.install_path  = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')
+    obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"', 
+                   'ARDOURBACKEND_DLL_EXPORTS'
+                   ]
+
+    #
+    # device discovery code in the jack backend needs ALSA
+    # on Linux.
+    # 
+
+    if re.search ("linux", sys.platform) != None:
+       obj.uselib += [ 'ALSA' ]
+
diff --git a/libs/backends/wscript b/libs/backends/wscript
new file mode 100644
index 0000000000..b8779b7713
--- /dev/null
+++ b/libs/backends/wscript
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+from waflib.extras import autowaf as autowaf
+import os
+
+# Mandatory variables
+top = '.'
+out = 'build'
+
+backends = [ 'jack' ]
+
+def options(opt):
+    autowaf.set_options(opt)
+
+def sub_config_and_use(conf, name, has_objects = True):
+    conf.recurse(name)
+    autowaf.set_local_lib(conf, name, has_objects)
+
+def configure(conf):
+    autowaf.set_recursive()
+    autowaf.configure(conf)
+
+    for i in backends:
+        sub_config_and_use(conf, i)
+
+def build(bld):
+    for i in backends:
+        bld.recurse(i)
diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc
index 44fb3e5f47..ead2b26885 100644
--- a/libs/gtkmm2ext/motionfeedback.cc
+++ b/libs/gtkmm2ext/motionfeedback.cc
@@ -298,7 +298,7 @@ MotionFeedback::pixwin_key_press_event (GdkEventKey *ev)
 
 	case GDK_Page_Down:
 	        retval = true;
-		_controllable->set_value (adjust (multiplier * page_inc));
+		_controllable->set_value (adjust (-multiplier * page_inc));
 		break;
 
 	case GDK_Up:
@@ -308,7 +308,7 @@ MotionFeedback::pixwin_key_press_event (GdkEventKey *ev)
 
 	case GDK_Down:
 	        retval = true;
-		_controllable->set_value (adjust (multiplier * step_inc));
+		_controllable->set_value (adjust (-multiplier * step_inc));
 		break;
 
 	case GDK_Home:
@@ -389,10 +389,10 @@ MotionFeedback::pixwin_scroll_event (GdkEventScroll* ev)
 		if (ev->state & Keyboard::GainExtraFineScaleModifier) {
 			scale = 0.01;
 		} else {
-			scale = 0.05;
+			scale = 0.10;
 		}
 	} else {
-		scale = 0.25;
+		scale = 0.20;
 	}
 
 	switch (ev->direction) {
diff --git a/libs/gtkmm2ext/po/cs.po b/libs/gtkmm2ext/po/cs.po
index 83f23f46f3..fa282e4ed5 100644
--- a/libs/gtkmm2ext/po/cs.po
+++ b/libs/gtkmm2ext/po/cs.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-09 09:28-0400\n"
-"PO-Revision-Date: 2013-02-22 21:09+0100\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
+"PO-Revision-Date: 2013-06-13 22:33+0200\n"
 "Last-Translator: Pavel Fric <pavelfric@seznam.cz>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: cs\n"
@@ -75,16 +75,14 @@ msgstr "Alt"
 msgid "Meta"
 msgstr "Meta"
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: keyboard.cc:534
-#, fuzzy
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
-"Soubor s přiřazením kláves pro Ardour \"%1\"se nepodařilo najít, nebo "
-"obsahuje chyby."
+"Soubor s přiřazením kláves \"%2\"se nepodařilo najít, nebo obsahuje chyby."
 
 #: tearoff.cc:57
 msgid "Click to tear this into its own window"
diff --git a/libs/gtkmm2ext/po/de.po b/libs/gtkmm2ext/po/de.po
index b803d2e600..4c032c8b15 100644
--- a/libs/gtkmm2ext/po/de.po
+++ b/libs/gtkmm2ext/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-05 19:32+0100\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2013-02-05 19:50+0100\n"
 "Last-Translator: Edgar Aichinger <edogawa@aon.at>\n"
 "Language-Team: German <ardour-dev@lists.ardour.org>\n"
@@ -77,11 +77,11 @@ msgstr "Alt"
 msgid "Meta"
 msgstr "Meta"
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 "Die Tastenkürzel-Datei \"%1\" konnte nicht gefunden werden oder enthält "
@@ -98,4 +98,3 @@ msgstr "Klicken, um an das Hauptfenster anzudocken"
 #: textviewer.cc:34
 msgid "Close"
 msgstr "Schließen"
-
diff --git a/libs/gtkmm2ext/po/el.po b/libs/gtkmm2ext/po/el.po
index 99334ea004..62b4303bbf 100644
--- a/libs/gtkmm2ext/po/el.po
+++ b/libs/gtkmm2ext/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.99beta23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-03 11:35-0500\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2005-01-11\n"
 "Last-Translator: Muadibas\n"
 "Language-Team: Hellenic(Greek) <LL@li.org>\n"
@@ -72,11 +72,11 @@ msgstr ""
 msgid "Meta"
 msgstr ""
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr ""
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 
diff --git a/libs/gtkmm2ext/po/es.po b/libs/gtkmm2ext/po/es.po
index 83f1910c3f..220c7501ee 100644
--- a/libs/gtkmm2ext/po/es.po
+++ b/libs/gtkmm2ext/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtkmm2ext\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-09 12:26+0100\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2013-02-09 16:21+0100\n"
 "Last-Translator: Pablo Fernández <pablo.fbus@gmail.com>\n"
 "Language-Team: Spanish\n"
@@ -53,17 +53,11 @@ msgstr "Lo siento %1, no puedo hacer eso"
 msgid "Command"
 msgstr ""
 
-#: keyboard.cc:69
-#: keyboard.cc:72
-#: keyboard.cc:85
-#: keyboard.cc:89
+#: keyboard.cc:69 keyboard.cc:72 keyboard.cc:85 keyboard.cc:89
 msgid "Control"
 msgstr ""
 
-#: keyboard.cc:70
-#: keyboard.cc:73
-#: keyboard.cc:87
-#: keyboard.cc:90
+#: keyboard.cc:70 keyboard.cc:73 keyboard.cc:87 keyboard.cc:90
 msgid "Key|Shift"
 msgstr ""
 
@@ -79,14 +73,15 @@ msgstr ""
 msgid "Meta"
 msgstr ""
 
-#: keyboard.cc:134
-#: keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr ""
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
-msgstr "El archivo de combinaciones de teclado no se encontró en \"%2\" o contiene errores."
+msgstr ""
+"El archivo de combinaciones de teclado no se encontró en \"%2\" o contiene "
+"errores."
 
 #: tearoff.cc:57
 msgid "Click to tear this into its own window"
diff --git a/libs/gtkmm2ext/po/fr.po b/libs/gtkmm2ext/po/fr.po
index 6535007132..b9ad99d844 100644
--- a/libs/gtkmm2ext/po/fr.po
+++ b/libs/gtkmm2ext/po/fr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-03 11:35-0500\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2011-06-13 00:30+0200\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: en_US\n"
@@ -71,11 +71,11 @@ msgstr "Alt"
 msgid "Meta"
 msgstr "Meta"
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 #, fuzzy
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr "Raccourcis clavier pour %1 introuvable dans \"%1\" ou corrompu."
diff --git a/libs/gtkmm2ext/po/nn.po b/libs/gtkmm2ext/po/nn.po
index 43907a4525..7e3d72bed1 100644
--- a/libs/gtkmm2ext/po/nn.po
+++ b/libs/gtkmm2ext/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-03 11:35-0500\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2013-01-01 20:30+0100\n"
 "Last-Translator: Eivind Ødegård <meinmycell-lists@yahoo.no>\n"
 "Language-Team: Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -76,11 +76,11 @@ msgstr ""
 msgid "Meta"
 msgstr ""
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 
diff --git a/libs/gtkmm2ext/po/pl.po b/libs/gtkmm2ext/po/pl.po
index a102ccdb2d..da5720a331 100644
--- a/libs/gtkmm2ext/po/pl.po
+++ b/libs/gtkmm2ext/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libgtkmm2ext\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-03 11:35-0500\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2008-04-10 10:54+0100\n"
 "Last-Translator: Piotr Zaryk <pzaryk@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -71,11 +71,11 @@ msgstr ""
 msgid "Meta"
 msgstr ""
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr ""
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 
diff --git a/libs/gtkmm2ext/po/pt.po b/libs/gtkmm2ext/po/pt.po
index f72dd54d86..3c0633240d 100644
--- a/libs/gtkmm2ext/po/pt.po
+++ b/libs/gtkmm2ext/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtkmm2ext\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-03 11:35-0500\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2004-05-17 20:36+0200\n"
 "Last-Translator: Chris Ross <chris.ross@tebibyte.org>\n"
 "Language-Team: Portuguese\n"
@@ -72,11 +72,11 @@ msgstr ""
 msgid "Meta"
 msgstr ""
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr ""
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 
diff --git a/libs/gtkmm2ext/po/ru.po b/libs/gtkmm2ext/po/ru.po
index 6e0c91cb5c..6be73a3b88 100644
--- a/libs/gtkmm2ext/po/ru.po
+++ b/libs/gtkmm2ext/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtkmm2ext\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-03 11:35-0500\n"
+"POT-Creation-Date: 2013-08-15 15:09-0400\n"
 "PO-Revision-Date: 2012-12-31 01:38+0300\n"
 "Last-Translator: �лек�андр Прокудин <alexandre.prokoudine@gmail.com>\n"
 "Language-Team: ру��кий <>\n"
@@ -78,11 +78,11 @@ msgstr "Alt"
 msgid "Meta"
 msgstr "Meta"
 
-#: keyboard.cc:134 keyboard.cc:523
+#: keyboard.cc:139 keyboard.cc:531
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: keyboard.cc:534
+#: keyboard.cc:542
 msgid "key bindings file not found at \"%2\" or contains errors."
 msgstr ""
 
diff --git a/libs/gtkmm2ext/prolooks_helpers.c b/libs/gtkmm2ext/prolooks_helpers.c
index 1489a8cb3e..cdac2dbafe 100644
--- a/libs/gtkmm2ext/prolooks_helpers.c
+++ b/libs/gtkmm2ext/prolooks_helpers.c
@@ -891,7 +891,7 @@ GType prolooks_hsl_get_type (void) {
 gpointer prolooks_hsl_ref (gpointer instance) {
 	ProlooksHSL* self;
 	self = instance;
-	g_atomic_int_inc (&self->ref_count);
+        g_atomic_int_inc (&self->ref_count);
 	return instance;
 }
 
diff --git a/libs/midi++2/jack_midi_port.cc b/libs/midi++2/jack_midi_port.cc
deleted file mode 100644
index 05df3171fa..0000000000
--- a/libs/midi++2/jack_midi_port.cc
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
-    Copyright (C) 1998 Paul Barton-Davis
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
-*/
-#include <iostream>
-#include <cstdio>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <jack/jack.h>
-#include <jack/midiport.h>
-
-#include "pbd/xml++.h"
-#include "pbd/error.h"
-#include "pbd/failed_constructor.h"
-#include "pbd/convert.h"
-#include "pbd/strsplit.h"
-#include "pbd/stacktrace.h"
-
-#include "midi++/types.h"
-#include "midi++/jack_midi_port.h"
-#include "midi++/channel.h"
-
-using namespace MIDI;
-using namespace std;
-using namespace PBD;
-
-namespace Evoral {
-template class EventRingBuffer<timestamp_t>;
-}
-
-pthread_t JackMIDIPort::_process_thread;
-Signal0<void> JackMIDIPort::JackHalted;
-Signal0<void> JackMIDIPort::MakeConnections;
-
-JackMIDIPort::JackMIDIPort (string const & name, Flags flags, jack_client_t* jack_client)
-	: Port (name, flags)
-	, _currently_in_cycle (false)
-	, _nframes_this_cycle (0)
-	, _jack_client (jack_client)
-	, _jack_port (0)
-	, _last_write_timestamp (0)
-	, output_fifo (512)
-	, input_fifo (1024)
-	, xthread (true)
-{
-	assert (jack_client);
-	init (name, flags);
-}
-
-JackMIDIPort::JackMIDIPort (const XMLNode& node, jack_client_t* jack_client)
-	: Port (node)
-	, _currently_in_cycle (false)
-	, _nframes_this_cycle (0)
-	, _jack_client (jack_client)
-	, _jack_port (0)
-	, _last_write_timestamp (0)
-	, output_fifo (512)
-	, input_fifo (1024)
-	, xthread (true)
-{
-	assert (jack_client);
-
-	Descriptor desc (node);
-	init (desc.tag, desc.flags);
-	set_state (node);
-}
-
-void
-JackMIDIPort::init (const string& /*name*/, Flags /*flags*/)
-{
-	if (!create_port ()) {
-		_ok = true;
-	}
-
-	MakeConnections.connect_same_thread (connect_connection, boost::bind (&JackMIDIPort::make_connections, this));
-	JackHalted.connect_same_thread (halt_connection, boost::bind (&JackMIDIPort::jack_halted, this));
-}
-
-
-JackMIDIPort::~JackMIDIPort ()
-{
-	if (_jack_port) {
-		if (_jack_client) {
-			jack_port_unregister (_jack_client, _jack_port);
-			_jack_port = 0;
-		}
-	}
-}
-
-void
-JackMIDIPort::parse (framecnt_t timestamp)
-{
-	byte buf[512];
-
-	/* NOTE: parsing is done (if at all) by initiating a read from 
-	   the port. Each port implementation calls on the parser
-	   once it has data ready.
-	*/
-	
-	_parser->set_timestamp (timestamp);
-
-	while (1) {
-		
-		// cerr << "+++ READ ON " << name() << endl;
-
-		int nread = read (buf, sizeof (buf));
-
-		// cerr << "-- READ (" << nread << " ON " << name() << endl;
-		
-		if (nread > 0) {
-			if ((size_t) nread < sizeof (buf)) {
-				break;
-			} else {
-				continue;
-			}
-		} else if (nread == 0) {
-			break;
-		} else if (errno == EAGAIN) {
-			break;
-		} else {
-			fatal << "Error reading from MIDI port " << name() << endmsg;
-			/*NOTREACHED*/
-		}
-	}
-}
-
-void
-JackMIDIPort::cycle_start (pframes_t nframes)
-{
-	assert (_jack_port);
-	
-	_currently_in_cycle = true;
-	_nframes_this_cycle = nframes;
-
-	assert(_nframes_this_cycle == nframes);
-
-	if (sends_output()) {
-		void *buffer = jack_port_get_buffer (_jack_port, nframes);
-		jack_midi_clear_buffer (buffer);
-		flush (buffer);	
-	}
-	
-	if (receives_input()) {
-		void* jack_buffer = jack_port_get_buffer(_jack_port, nframes);
-		const pframes_t event_count = jack_midi_get_event_count(jack_buffer);
-
-		jack_midi_event_t ev;
-		timestamp_t cycle_start_frame = jack_last_frame_time (_jack_client);
-
-		for (pframes_t i = 0; i < event_count; ++i) {
-			jack_midi_event_get (&ev, jack_buffer, i);
-			input_fifo.write (cycle_start_frame + ev.time, (Evoral::EventType) 0, ev.size, ev.buffer);
-		}	
-		
-		if (event_count) {
-			xthread.wakeup ();
-		}
-	}
-}
-
-void
-JackMIDIPort::cycle_end ()
-{
-	if (sends_output()) {
-		flush (jack_port_get_buffer (_jack_port, _nframes_this_cycle));
-	}
-
-	_currently_in_cycle = false;
-	_nframes_this_cycle = 0;
-}
-
-void
-JackMIDIPort::jack_halted ()
-{
-	_jack_client = 0;
-	_jack_port = 0;
-}
-
-void
-JackMIDIPort::drain (int check_interval_usecs)
-{
-	RingBuffer< Evoral::Event<double> >::rw_vector vec = { { 0, 0 }, { 0, 0} };
-
-	if (is_process_thread()) {
-		error << "Process thread called MIDI::JackMIDIPort::drain() - this cannot work" << endmsg;
-		return;
-	}
-
-	while (1) {
-		output_fifo.get_write_vector (&vec);
-		if (vec.len[0] + vec.len[1] >= output_fifo.bufsize() - 1) {
-			break;
-		}
-		usleep (check_interval_usecs);
-	}
-}
-
-int
-JackMIDIPort::write (const byte * msg, size_t msglen, timestamp_t timestamp)
-{
-	int ret = 0;
-
-	if (!_jack_client || !_jack_port) {
-		/* poof ! make it just vanish into thin air, since we are no
-		   longer connected to JACK.
-		*/
-		return msglen;
-	}
-
-	if (!sends_output()) {
-		return ret;
-	}
-	
-	if (!is_process_thread()) {
-
-		Glib::Threads::Mutex::Lock lm (output_fifo_lock);
-		RingBuffer< Evoral::Event<double> >::rw_vector vec = { { 0, 0 }, { 0, 0} };
-		
-		output_fifo.get_write_vector (&vec);
-
-		if (vec.len[0] + vec.len[1] < 1) {
-			error << "no space in FIFO for non-process thread MIDI write" << endmsg;
-			return 0;
-		}
-
-		if (vec.len[0]) {
-                        if (!vec.buf[0]->owns_buffer()) {
-                                vec.buf[0]->set_buffer (0, 0, true);
-                        }
-			vec.buf[0]->set (msg, msglen, timestamp);
-		} else {
-                        if (!vec.buf[1]->owns_buffer()) {
-                                vec.buf[1]->set_buffer (0, 0, true);
-                        }
-			vec.buf[1]->set (msg, msglen, timestamp);
-		}
-
-		output_fifo.increment_write_idx (1);
-		
-		ret = msglen;
-
-	} else {
-
-		if (timestamp >= _nframes_this_cycle) {
-			std::cerr << "attempting to write MIDI event of " << msglen << " bytes at time "
-				  << timestamp << " of " << _nframes_this_cycle
-				  << " (this will not work - needs a code fix)"
-				  << std::endl;
-		}
-
-		if (_currently_in_cycle) {
-			if (timestamp == 0) {
-				timestamp = _last_write_timestamp;
-			} 
-
-			if ((ret = jack_midi_event_write (jack_port_get_buffer (_jack_port, _nframes_this_cycle), 
-							  timestamp, msg, msglen)) == 0) {
-				ret = msglen;
-				_last_write_timestamp = timestamp;
-
-			} else {
-				cerr << "write of " << msglen << " @ " << timestamp << " failed, port holds "
-					<< jack_midi_get_event_count (jack_port_get_buffer (_jack_port, _nframes_this_cycle))
-				     << " port is " << _jack_port
-				     << " ntf = " << _nframes_this_cycle
-				     << " buf = " << jack_port_get_buffer (_jack_port, _nframes_this_cycle)
-				     << " ret = " << ret
-				     << endl;
-				PBD::stacktrace (cerr, 20);
-				ret = 0;
-			}
-		} else {
-			cerr << "write to JACK midi port failed: not currently in a process cycle." << endl;
-			PBD::stacktrace (cerr, 20);
-		}
-	}
-
-	if (ret > 0 && _parser) {
-		// ardour doesn't care about this and neither should your app, probably
-		// output_parser->raw_preparse (*output_parser, msg, ret);
-		for (int i = 0; i < ret; i++) {
-			_parser->scanner (msg[i]);
-		}
-		// ardour doesn't care about this and neither should your app, probably
-		// output_parser->raw_postparse (*output_parser, msg, ret);
-	}	
-
-	return ret;
-}
-
-void
-JackMIDIPort::flush (void* jack_port_buffer)
-{
-	RingBuffer< Evoral::Event<double> >::rw_vector vec = { { 0, 0 }, { 0, 0 } };
-	size_t written;
-
-	output_fifo.get_read_vector (&vec);
-
-	if (vec.len[0] + vec.len[1]) {
-		// cerr << "Flush " << vec.len[0] + vec.len[1] << " events from non-process FIFO\n";
-	}
-
-	if (vec.len[0]) {
-		Evoral::Event<double>* evp = vec.buf[0];
-		
-		for (size_t n = 0; n < vec.len[0]; ++n, ++evp) {
-			jack_midi_event_write (jack_port_buffer,
-					       (timestamp_t) evp->time(), evp->buffer(), evp->size());
-		}
-	}
-	
-	if (vec.len[1]) {
-		Evoral::Event<double>* evp = vec.buf[1];
-
-		for (size_t n = 0; n < vec.len[1]; ++n, ++evp) {
-			jack_midi_event_write (jack_port_buffer,
-					       (timestamp_t) evp->time(), evp->buffer(), evp->size());
-		}
-	}
-	
-	if ((written = vec.len[0] + vec.len[1]) != 0) {
-		output_fifo.increment_read_idx (written);
-	}
-}
-
-int
-JackMIDIPort::read (byte *, size_t)
-{
-	if (!receives_input()) {
-		return 0;
-	}
-	
-	timestamp_t time;
-	Evoral::EventType type;
-	uint32_t size;
-	byte buffer[input_fifo.capacity()];
-
-	while (input_fifo.read (&time, &type, &size, buffer)) {
-		_parser->set_timestamp (time);
-		for (uint32_t i = 0; i < size; ++i) {
-			_parser->scanner (buffer[i]);
-		}
-	}
-
-	return 0;
-}
-
-int
-JackMIDIPort::create_port ()
-{
-	_jack_port = jack_port_register(_jack_client, _tagname.c_str(), JACK_DEFAULT_MIDI_TYPE, _flags, 0);
-	return _jack_port == 0 ? -1 : 0;
-}
-
-XMLNode& 
-JackMIDIPort::get_state () const
-{
-	XMLNode& root = Port::get_state ();
-	
-#if 0
-	byte device_inquiry[6];
-
-	device_inquiry[0] = 0xf0;
-	device_inquiry[0] = 0x7e;
-	device_inquiry[0] = 0x7f;
-	device_inquiry[0] = 0x06;
-	device_inquiry[0] = 0x02;
-	device_inquiry[0] = 0xf7;
-	
-	write (device_inquiry, sizeof (device_inquiry), 0);
-#endif
-
-	if (_jack_port) {
-		
-		const char** jc = jack_port_get_connections (_jack_port);
-		string connection_string;
-		if (jc) {
-			for (int i = 0; jc[i]; ++i) {
-				if (i > 0) {
-					connection_string += ',';
-				}
-				connection_string += jc[i];
-			}
-			free (jc);
-		}
-		
-		if (!connection_string.empty()) {
-			root.add_property ("connections", connection_string);
-		}
-	} else {
-		if (!_connections.empty()) {
-			root.add_property ("connections", _connections);
-		}
-	}
-
-	return root;
-}
-
-void
-JackMIDIPort::set_state (const XMLNode& node)
-{
-	const XMLProperty* prop;
-
-	if ((prop = node.property ("tag")) == 0 || prop->value() != _tagname) {
-		return;
-	}
-	
-	Port::set_state (node);
-
-	if ((prop = node.property ("connections")) != 0) {
-		_connections = prop->value ();
-	}
-}
-
-void
-JackMIDIPort::make_connections ()
-{
-	if (!_connections.empty()) {
-		vector<string> ports;
-		split (_connections, ports, ',');
-		for (vector<string>::iterator x = ports.begin(); x != ports.end(); ++x) {
-			if (_jack_client) {
-				if (receives_input()) {
-					jack_connect (_jack_client, (*x).c_str(), jack_port_name (_jack_port));
-				} else {
-					jack_connect (_jack_client, jack_port_name (_jack_port), (*x).c_str());
-				}
-				/* ignore failures */
-			}
-		}
-	}
-
-	connect_connection.disconnect ();
-}
-
-void
-JackMIDIPort::set_process_thread (pthread_t thr)
-{
-	_process_thread = thr;
-}
-
-bool
-JackMIDIPort::is_process_thread()
-{
-	return (pthread_self() == _process_thread);
-}
-
-void
-JackMIDIPort::reestablish (jack_client_t* jack)
-{
-	_jack_client = jack;
-	int const r = create_port ();
-
-	if (r) {
-		PBD::error << "could not reregister ports for " << name() << endmsg;
-	}
-}
-
-void
-JackMIDIPort::reconnect ()
-{
-	make_connections ();
-}
diff --git a/libs/midi++2/manager.cc b/libs/midi++2/manager.cc
deleted file mode 100644
index 822c74e125..0000000000
--- a/libs/midi++2/manager.cc
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-    Copyright (C) 1998-99 Paul Barton-Davis 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
-*/
-
-#include <fcntl.h>
-
-#include <glib.h>
-
-#include "pbd/error.h"
-
-#include "midi++/types.h"
-#include "midi++/manager.h"
-#include "midi++/channel.h"
-#include "midi++/port.h"
-#include "midi++/jack_midi_port.h"
-#include "midi++/mmc.h"
-
-using namespace std;
-using namespace MIDI;
-using namespace PBD;
-
-Manager *Manager::theManager = 0;
-
-Manager::Manager (jack_client_t* jack)
-	: _ports (new PortList)
-{
-	_mmc = new MachineControl (this, jack);
-	
-	_mtc_input_port = add_port (new MIDI::JackMIDIPort ("MTC in", Port::IsInput, jack));
-	_mtc_output_port = add_port (new MIDI::JackMIDIPort ("MTC out", Port::IsOutput, jack));
-	_midi_input_port = add_port (new MIDI::JackMIDIPort ("MIDI control in", Port::IsInput, jack));
-	_midi_output_port = add_port (new MIDI::JackMIDIPort ("MIDI control out", Port::IsOutput, jack));
-	_midi_clock_input_port = add_port (new MIDI::JackMIDIPort ("MIDI clock in", Port::IsInput, jack));
-	_midi_clock_output_port = add_port (new MIDI::JackMIDIPort ("MIDI clock out", Port::IsOutput, jack));
-}
-
-Manager::~Manager ()
-{
-	delete _mmc;
-	
-	/* This will delete our MTC etc. ports */
-
-	boost::shared_ptr<PortList> pr = _ports.reader ();
-	for (PortList::iterator p = pr->begin(); p != pr->end(); ++p) {
-		delete *p;
-	}
-
-	if (theManager == this) {
-		theManager = 0;
-	}
-}
-
-Port *
-Manager::add_port (Port* p)
-{
-	{
-		RCUWriter<PortList> writer (_ports);
-		boost::shared_ptr<PortList> pw = writer.get_copy ();
-		pw->push_back (p);
-	}
-
-	PortsChanged (); /* EMIT SIGNAL */
-
-	return p;
-}
-
-void
-Manager::remove_port (Port* p)
-{
-	{
-		RCUWriter<PortList> writer (_ports);
-		boost::shared_ptr<PortList> pw = writer.get_copy ();
-		pw->remove (p);
-	}
-
-	PortsChanged (); /* EMIT SIGNAL */
-}
-
-void
-Manager::cycle_start (pframes_t nframes)
-{
-	boost::shared_ptr<PortList> pr = _ports.reader ();
-	
-	for (PortList::iterator p = pr->begin(); p != pr->end(); ++p) {
-		(*p)->cycle_start (nframes);
-	}
-}
-
-void
-Manager::cycle_end()
-{
-	boost::shared_ptr<PortList> pr = _ports.reader ();
-	
-	for (PortList::iterator p = pr->begin(); p != pr->end(); ++p) {
-		(*p)->cycle_end ();
-	}
-}
-
-/** Re-register ports that disappear on JACK shutdown */
-void
-Manager::reestablish (jack_client_t* jack)
-{
-	boost::shared_ptr<PortList> pr = _ports.reader ();
-
-	for (PortList::const_iterator p = pr->begin(); p != pr->end(); ++p) {
-		JackMIDIPort* pp = dynamic_cast<JackMIDIPort*> (*p);
-		if (pp) {
-			pp->reestablish (jack);
-		}
-	}
-}
-
-/** Re-connect ports after a reestablish () */
-void
-Manager::reconnect ()
-{
-	boost::shared_ptr<PortList> pr = _ports.reader ();
-
-	for (PortList::const_iterator p = pr->begin(); p != pr->end(); ++p) {
-		JackMIDIPort* pp = dynamic_cast<JackMIDIPort*> (*p);
-		if (pp) {
-			pp->reconnect ();
-		}
-	}
-}
-
-Port*
-Manager::port (string const & n)
-{
-	boost::shared_ptr<PortList> pr = _ports.reader ();
-	
-	PortList::const_iterator p = pr->begin();
-	while (p != pr->end() && (*p)->name() != n) {
-		++p;
-	}
-
-	if (p == pr->end()) {
-		return 0;
-	}
-
-	return *p;
-}
-
-void
-Manager::create (jack_client_t* jack)
-{
-	assert (theManager == 0);
-	theManager = new Manager (jack);
-}
-
-void
-Manager::set_port_states (list<XMLNode*> s)
-{
-	boost::shared_ptr<PortList> pr = _ports.reader ();
-	
-	for (list<XMLNode*>::iterator i = s.begin(); i != s.end(); ++i) {
-		for (PortList::const_iterator j = pr->begin(); j != pr->end(); ++j) {
-			(*j)->set_state (**i);
-		}
-	}
-}
-
-void
-Manager::destroy ()
-{
-	delete theManager;
-	theManager = 0;
-}
diff --git a/libs/midi++2/midi++/manager.h b/libs/midi++2/midi++/manager.h
deleted file mode 100644
index c37ba392b4..0000000000
--- a/libs/midi++2/midi++/manager.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-    Copyright (C) 1998 Paul Barton-Davis
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#ifndef __midi_manager_h__
-#define __midi_manager_h__
-
-#include <list>
-
-#include <string>
-
-#include "pbd/rcu.h"
-
-#include "midi++/types.h"
-#include "midi++/port.h"
-
-namespace MIDI {
-
-class MachineControl;	
-
-class Manager {
-  public:
-	~Manager ();
-	
-	/** Signal the start of an audio cycle.
-	 * This MUST be called before any reading/writing for this cycle.
-	 * Realtime safe.
-	 */
-	void cycle_start (pframes_t nframes);
-	
-	/** Signal the end of an audio cycle.
-	 * This signifies that the cycle began with @ref cycle_start has ended.
-	 * This MUST be called at the end of each cycle.
-	 * Realtime safe.
-	 */
-	void cycle_end ();
-
-	MachineControl* mmc () const { return _mmc; }
-	Port *mtc_input_port() const { return _mtc_input_port; }
-	Port *mtc_output_port() const { return _mtc_output_port; }
-	Port *midi_input_port() const { return _midi_input_port; }
-	Port *midi_output_port() const { return _midi_output_port; }
-	Port *midi_clock_input_port() const { return _midi_clock_input_port; }
-	Port *midi_clock_output_port() const { return _midi_clock_output_port; }
-
-	Port* add_port (Port *);
-	void remove_port (Port *);
-
-	Port* port (std::string const &);
-
-	void set_port_states (std::list<XMLNode*>);
-
-	typedef std::list<Port *> PortList;
-
-	boost::shared_ptr<const PortList> get_midi_ports() const { return _ports.reader (); } 
-
-	static void create (jack_client_t* jack);
-	
-	static Manager *instance () {
-		return theManager;
-	}
-	static void destroy ();
-
-	void reestablish (jack_client_t *);
-	void reconnect ();
-
-	PBD::Signal0<void> PortsChanged;
-
-  private:
-	/* This is a SINGLETON pattern */
-	
-	Manager (jack_client_t *);
-	static Manager *theManager;
-
-	MIDI::MachineControl*   _mmc;
-	MIDI::Port*         _mtc_input_port;
-	MIDI::Port*         _mtc_output_port;
-	MIDI::Port*         _midi_input_port;
-	MIDI::Port*         _midi_output_port;
-	MIDI::Port*         _midi_clock_input_port;
-	MIDI::Port*         _midi_clock_output_port;
-
-	SerializedRCUManager<PortList> _ports;
-};
-
-} // namespace MIDI
-
-#endif  // __midi_manager_h__
diff --git a/libs/midi++2/midi++/mmc.h b/libs/midi++2/midi++/mmc.h
index 18204e3fa8..01f8bf3b8a 100644
--- a/libs/midi++2/midi++/mmc.h
+++ b/libs/midi++2/midi++/mmc.h
@@ -22,17 +22,22 @@
 
 #include <jack/types.h>
 #include "timecode/time.h"
+
 #include "pbd/signals.h"
 #include "pbd/ringbuffer.h"
+
 #include "midi++/types.h"
 #include "midi++/parser.h"
 
+namespace ARDOUR {
+	class PortEngine;
+}
+
 namespace MIDI {
 
 class Port;
 class Parser;
 class MachineControlCommand;
-class Manager;	
 
 /** Class to handle incoming and outgoing MIDI machine control messages */
 class MachineControl 
@@ -89,7 +94,9 @@ class MachineControl
 		cmdResume = 0x7F
 	};
 	
-	MachineControl (Manager *, jack_client_t *);
+        MachineControl ();
+    
+        void set_ports (MIDI::Port* input, MIDI::Port* output);
 
 	Port* input_port() { return _input_port; }
 	Port* output_port() { return _output_port; }
diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h
index f5f343e952..44897f9d8e 100644
--- a/libs/midi++2/midi++/parser.h
+++ b/libs/midi++2/midi++/parser.h
@@ -41,7 +41,7 @@ typedef PBD::Signal3<void,Parser &, byte *, size_t>  Signal;
 
 class Parser {
  public:
-	Parser (Port &p);
+	Parser ();
 	~Parser ();
 
 	/* sets the time that will be reported for any MTC or MIDI Clock
@@ -105,7 +105,6 @@ class Parser {
 	const char *midi_event_type_name (MIDI::eventType);
 	void trace (bool onoff, std::ostream *o, const std::string &prefix = "");
 	bool tracing() { return trace_stream != 0; }
-	Port &port() { return _port; }
 
 	void set_offline (bool);
 	bool offline() const { return _offline; }
@@ -136,7 +135,6 @@ class Parser {
 	void reset_mtc_state ();
 	
   private:
-	Port&_port;
 	/* tracing */
 	
 	std::ostream *trace_stream;
diff --git a/libs/midi++2/midi++/port.h b/libs/midi++2/midi++/port.h
index 599fabaa87..6d778beab2 100644
--- a/libs/midi++2/midi++/port.h
+++ b/libs/midi++2/midi++/port.h
@@ -51,13 +51,6 @@ class Port {
 	virtual XMLNode& get_state () const;
 	virtual void set_state (const XMLNode&);
 
-	// FIXME: make Manager a friend of port so these can be hidden?
-
-	/* Only for use by MidiManager.  Don't ever call this. */
-	virtual void cycle_start (pframes_t) {}
-	/* Only for use by MidiManager.  Don't ever call this. */
-	virtual void cycle_end () {}
-
 	/** Write a message to port.
 	 * @param msg Raw MIDI message to send
 	 * @param msglen Size of @a msg
diff --git a/libs/midi++2/mmc.cc b/libs/midi++2/mmc.cc
index 06eadb5b34..b93dc0f260 100644
--- a/libs/midi++2/mmc.cc
+++ b/libs/midi++2/mmc.cc
@@ -22,12 +22,12 @@
 #include <map>
 
 #include "timecode/time.h"
+
 #include "pbd/error.h"
+
 #include "midi++/mmc.h"
 #include "midi++/port.h"
-#include "midi++/jack_midi_port.h"
 #include "midi++/parser.h"
-#include "midi++/manager.h"
 
 using namespace std;
 using namespace MIDI;
@@ -195,16 +195,21 @@ static void build_mmc_cmd_map ()
 	mmc_cmd_map.insert (newpair);
 }
 
-
-MachineControl::MachineControl (Manager* m, jack_client_t* jack)
+MachineControl::MachineControl ()
 {
 	build_mmc_cmd_map ();
 
 	_receive_device_id = 0x7f;
 	_send_device_id = 0x7f;
+}
+
+void
+MachineControl::set_ports (MIDI::Port* ip, MIDI::Port* op)
+{
+	port_connections.drop_connections ();
 
-	_input_port = m->add_port (new JackMIDIPort ("MMC in", Port::IsInput, jack));
-	_output_port = m->add_port (new JackMIDIPort ("MMC out", Port::IsOutput, jack));
+	_input_port = ip;
+	_output_port = op;
 
 	_input_port->parser()->mmc.connect_same_thread (port_connections, boost::bind (&MachineControl::process_mmc_message, this, _1, _2, _3));
 	_input_port->parser()->start.connect_same_thread (port_connections, boost::bind (&MachineControl::spp_start, this));
diff --git a/libs/midi++2/mtc.cc b/libs/midi++2/mtc.cc
index affe65ec68..0c2d8a41b3 100644
--- a/libs/midi++2/mtc.cc
+++ b/libs/midi++2/mtc.cc
@@ -240,7 +240,7 @@ Parser::process_mtc_quarter_frame (byte *msg)
 	/* time code is looking good */
 
 #ifdef DEBUG_MTC
-	// cerr << "for quarter frame " << which_quarter_frame << " byte = " << hex << (int) msg[1] << dec << endl;
+	cerr << "for quarter frame " << which_quarter_frame << " byte = " << hex << (int) msg[1] << dec << endl;
 #endif
 
 	switch (which_quarter_frame) {
diff --git a/libs/midi++2/parser.cc b/libs/midi++2/parser.cc
index 8e3af64504..2f6b50899c 100644
--- a/libs/midi++2/parser.cc
+++ b/libs/midi++2/parser.cc
@@ -104,8 +104,7 @@ Parser::midi_event_type_name (eventType t)
 	}
 }
 
-Parser::Parser (Port &p) 
-	: _port(p)
+Parser::Parser () 
 {
 	trace_stream = 0;
 	trace_prefix = "";
diff --git a/libs/midi++2/port.cc b/libs/midi++2/port.cc
index 3e7896631a..1480202867 100644
--- a/libs/midi++2/port.cc
+++ b/libs/midi++2/port.cc
@@ -71,7 +71,7 @@ Port::init (string const & name, Flags flags)
 	_tagname = name;
 	_flags = flags;
 
-	_parser = new Parser (*this);
+	_parser = new Parser ();
 
 	for (int i = 0; i < 16; i++) {
 		_channel[i] = new Channel (i, *this);
diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index ea8988110d..0abbab7d40 100644
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -26,12 +26,11 @@ out = 'build'
 
 path_prefix = 'libs/midi++2/'
 
+
 libmidi_sources = [
         'midi.cc',
         'channel.cc',
         'ipmidi_port.cc',
-        'jack_midi_port.cc',
-        'manager.cc',
         'parser.cc',
         'port.cc',
         'midnam_patch.cc',
@@ -68,7 +67,7 @@ def build(bld):
         obj.cxxflags = [ '-fPIC', '-DWITH_JACK_MIDI' ]
     # everybody loves JACK
     obj.export_includes = ['.']
-    obj.includes     = ['.', '../surfaces/control_protocol']
+    obj.includes     = ['.', '../surfaces/control_protocol', '../ardour' ]
     obj.name         = 'libmidipp'
     obj.target       = 'midipp'
     obj.uselib       = 'GLIBMM SIGCPP XML JACK OSX'
diff --git a/libs/pbd/pbd/pthread_utils.h b/libs/pbd/pbd/pthread_utils.h
index 793c3a1980..0c7b5f3ac1 100644
--- a/libs/pbd/pbd/pthread_utils.h
+++ b/libs/pbd/pbd/pthread_utils.h
@@ -31,7 +31,6 @@ int  pthread_create_and_store (std::string name, pthread_t  *thread, void * (*st
 void pthread_cancel_one (pthread_t thread);
 void pthread_cancel_all ();
 void pthread_kill_all (int signum);
-void pthread_exit_pbd (void* status);
 const char* pthread_name ();
 void pthread_set_name (const char* name);
 
diff --git a/libs/pbd/pthread_utils.cc b/libs/pbd/pthread_utils.cc
index e8b5e2690d..3d3cb96fb5 100644
--- a/libs/pbd/pthread_utils.cc
+++ b/libs/pbd/pthread_utils.cc
@@ -72,12 +72,34 @@ fake_thread_start (void* arg)
 	void* (*thread_work)(void*) = ts->thread_work;
 	void* thread_arg = ts->arg;
 
+	/* name will be deleted by the default handler for GStaticPrivate, when the thread exits */
+
 	pthread_set_name (ts->name.c_str());
 
+	/* we don't need this object anymore */
+
 	delete ts;
-	/* name will be deleted by the default handler for GStaticPrivate, when the thread exits */
 
-	return thread_work (thread_arg);
+	/* actually run the thread's work function */
+
+	void* ret = thread_work (thread_arg);
+
+	/* cleanup */
+
+	pthread_mutex_lock (&thread_map_lock);
+
+	for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
+		if (pthread_equal ((*i), pthread_self())) {
+			all_threads.erase (i);
+			break;
+		}
+	}
+
+	pthread_mutex_unlock (&thread_map_lock);
+
+	/* done */
+
+	return ret;
 }
 
 int  
@@ -139,10 +161,16 @@ void
 pthread_cancel_all () 
 {	
 	pthread_mutex_lock (&thread_map_lock);
-	for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
-		if ((*i) != pthread_self()) {
+	for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ) {
+
+		ThreadMap::iterator nxt = i;
+		++nxt;
+
+		if (!pthread_equal ((*i), pthread_self())) {
 			pthread_cancel ((*i));
 		}
+
+		i = nxt;
 	}
 	all_threads.clear();
 	pthread_mutex_unlock (&thread_map_lock);
@@ -153,7 +181,7 @@ pthread_cancel_one (pthread_t thread)
 {	
 	pthread_mutex_lock (&thread_map_lock);
 	for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
-		if ((*i) == thread) {
+		if (pthread_equal ((*i), thread)) {
 			all_threads.erase (i);
 			break;
 		}
@@ -163,18 +191,3 @@ pthread_cancel_one (pthread_t thread)
 	pthread_mutex_unlock (&thread_map_lock);
 }
 
-void
-pthread_exit_pbd (void* status) 
-{	
-	pthread_t thread = pthread_self();
-
-	pthread_mutex_lock (&thread_map_lock);
-	for (ThreadMap::iterator i = all_threads.begin(); i != all_threads.end(); ++i) {
-		if ((*i) == thread) {
-			all_threads.erase (i);
-			break;
-		}
-	}
-	pthread_mutex_unlock (&thread_map_lock);
-	pthread_exit (status);
-}
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index 6da0192a8f..ba1858a174 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -32,13 +32,14 @@
 #include "pbd/xml++.h"
 
 #include "midi++/port.h"
-#include "midi++/manager.h"
 
+#include "ardour/audioengine.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/session.h"
 #include "ardour/route.h"
 #include "ardour/midi_ui.h"
 #include "ardour/rc_configuration.h"
+#include "ardour/midiport_manager.h"
 
 #include "generic_midi_control_protocol.h"
 #include "midicontrollable.h"
@@ -59,8 +60,8 @@ GenericMidiControlProtocol::GenericMidiControlProtocol (Session& s)
 	, _threshold (10)
 	, gui (0)
 {
-	_input_port = MIDI::Manager::instance()->midi_input_port ();
-	_output_port = MIDI::Manager::instance()->midi_output_port ();
+	_input_port = s.midi_input_port ();
+	_output_port = s.midi_output_port ();
 
 	do_feedback = false;
 	_feedback_interval = 10000; // microseconds
@@ -338,7 +339,7 @@ GenericMidiControlProtocol::start_learning (Controllable* c)
 	}
 
 	if (!mc) {
-		mc = new MIDIControllable (this, *_input_port, *c, false);
+		mc = new MIDIControllable (this, *_input_port->parser(), *c, false);
 	}
 	
 	{
@@ -435,7 +436,7 @@ GenericMidiControlProtocol::create_binding (PBD::Controllable* control, int pos,
 		MIDI::byte value = control_number;
 		
 		// Create a MIDIControllable
-		MIDIControllable* mc = new MIDIControllable (this, *_input_port, *control, false);
+		MIDIControllable* mc = new MIDIControllable (this, *_input_port->parser(), *control, false);
 
 		// Remove any old binding for this midi channel/type/value pair
 		// Note:  can't use delete_binding() here because we don't know the specific controllable we want to remove, only the midi information
@@ -559,7 +560,7 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version)
 						Controllable* c = Controllable::by_id (id);
 						
 						if (c) {
-							MIDIControllable* mc = new MIDIControllable (this, *_input_port, *c, false);
+							MIDIControllable* mc = new MIDIControllable (this, *_input_port->parser(), *c, false);
 							
 							if (mc->set_state (**niter, version) == 0) {
 								controllables.push_back (mc);
@@ -754,7 +755,7 @@ GenericMidiControlProtocol::create_binding (const XMLNode& node)
 	prop = node.property (X_("uri"));
 	uri = prop->value();
 
-	MIDIControllable* mc = new MIDIControllable (this, *_input_port, momentary);
+	MIDIControllable* mc = new MIDIControllable (this, *_input_port->parser(), momentary);
 
 	if (mc->init (uri)) {
 		delete mc;
@@ -892,7 +893,7 @@ GenericMidiControlProtocol::create_function (const XMLNode& node)
 
 	prop = node.property (X_("function"));
 	
-	MIDIFunction* mf = new MIDIFunction (*_input_port);
+	MIDIFunction* mf = new MIDIFunction (*_input_port->parser());
 	
 	if (mf->setup (*this, prop->value(), argument, data, data_size)) {
 		delete mf;
@@ -988,7 +989,7 @@ GenericMidiControlProtocol::create_action (const XMLNode& node)
 
 	prop = node.property (X_("action"));
 	
-	MIDIAction* ma = new MIDIAction (*_input_port);
+	MIDIAction* ma = new MIDIAction (*_input_port->parser());
         
 	if (ma->init (*this, prop->value(), data, data_size)) {
 		delete ma;
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
index a7c420cc41..a4a51b7f99 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
@@ -22,14 +22,11 @@
 
 #include <list>
 #include <glibmm/threads.h>
+
 #include "ardour/types.h"
 
 #include "control_protocol/control_protocol.h"
 
-namespace MIDI {
-	class Port;
-}
-
 namespace PBD {
 	class Controllable;
 	class ControllableDescriptor;
@@ -37,6 +34,11 @@ namespace PBD {
 
 namespace ARDOUR {
 	class Session;
+	class MidiPort;
+}
+
+namespace MIDI {
+    class Port;
 }
 
 class MIDIControllable;
@@ -51,8 +53,8 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol {
 	int set_active (bool yn);
 	static bool probe() { return true; }
 
-	MIDI::Port* input_port () const { return _input_port; }
-	MIDI::Port* output_port () const { return _output_port; }
+        MIDI::Port* input_port () const { return _input_port; }
+        MIDI::Port* output_port () const { return _output_port; }
 	void set_feedback_interval (ARDOUR::microseconds_t);
 
 	int set_feedback (bool yn);
@@ -97,8 +99,8 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol {
 	}
 
   private:
-	MIDI::Port* _input_port;
-	MIDI::Port* _output_port;
+        MIDI::Port* _input_port;
+        MIDI::Port* _output_port;
 	ARDOUR::microseconds_t _feedback_interval;
 	ARDOUR::microseconds_t last_feedback_time;
 
diff --git a/libs/surfaces/generic_midi/midiaction.cc b/libs/surfaces/generic_midi/midiaction.cc
index e1eed1a49e..e537122e9c 100644
--- a/libs/surfaces/generic_midi/midiaction.cc
+++ b/libs/surfaces/generic_midi/midiaction.cc
@@ -25,7 +25,7 @@
 
 using namespace MIDI;
 
-MIDIAction::MIDIAction (MIDI::Port& p)
+MIDIAction::MIDIAction (MIDI::Parser& p)
 	: MIDIInvokable (p)
 {
 }
diff --git a/libs/surfaces/generic_midi/midiaction.h b/libs/surfaces/generic_midi/midiaction.h
index 521f59f26d..e2a29143ad 100644
--- a/libs/surfaces/generic_midi/midiaction.h
+++ b/libs/surfaces/generic_midi/midiaction.h
@@ -36,8 +36,6 @@ namespace Gtk {
 }
 
 namespace MIDI {
-	class Channel;
-	class Port;
 	class Parser;
 }
 
@@ -46,7 +44,7 @@ class GenericMidiControlProtocol;
 class MIDIAction : public MIDIInvokable
 {
   public:
-	MIDIAction (MIDI::Port&);
+	MIDIAction (MIDI::Parser&);
 	virtual ~MIDIAction ();
 
 	int init (GenericMidiControlProtocol&, const std::string& action_name, MIDI::byte* sysex = 0, size_t ssize = 0);
diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc
index d36ccefd44..d78dd5e644 100644
--- a/libs/surfaces/generic_midi/midicontrollable.cc
+++ b/libs/surfaces/generic_midi/midicontrollable.cc
@@ -27,9 +27,9 @@
 #include "pbd/xml++.h"
 #include "pbd/stacktrace.h"
 
-#include "midi++/port.h"
 #include "midi++/channel.h"
 
+#include "ardour/async_midi_port.h"
 #include "ardour/automation_control.h"
 #include "ardour/midi_ui.h"
 #include "ardour/utils.h"
@@ -42,11 +42,11 @@ using namespace MIDI;
 using namespace PBD;
 using namespace ARDOUR;
 
-MIDIControllable::MIDIControllable (GenericMidiControlProtocol* s, Port& p, bool m)
+MIDIControllable::MIDIControllable (GenericMidiControlProtocol* s, MIDI::Parser& p, bool m)
 	: _surface (s)
 	, controllable (0)
 	, _descriptor (0)
-	, _port (p)
+	, _parser (p)
 	, _momentary (m)
 {
 	_learned = false; /* from URI */
@@ -59,10 +59,10 @@ MIDIControllable::MIDIControllable (GenericMidiControlProtocol* s, Port& p, bool
 	feedback = true; // for now
 }
 
-MIDIControllable::MIDIControllable (GenericMidiControlProtocol* s, Port& p, Controllable& c, bool m)
+MIDIControllable::MIDIControllable (GenericMidiControlProtocol* s, MIDI::Parser& p, Controllable& c, bool m)
 	: _surface (s)
 	, _descriptor (0)
-	, _port (p)
+	, _parser (p)
 	, _momentary (m)
 {
 	set_controllable (&c);
@@ -149,7 +149,7 @@ void
 MIDIControllable::learn_about_external_control ()
 {
 	drop_external_control ();
-	_port.parser()->any.connect_same_thread (midi_learn_connection, boost::bind (&MIDIControllable::midi_receiver, this, _1, _2, _3));
+	_parser.any.connect_same_thread (midi_learn_connection, boost::bind (&MIDIControllable::midi_receiver, this, _1, _2, _3));
 }
 
 void
@@ -357,12 +357,6 @@ MIDIControllable::midi_receiver (Parser &, byte *msg, size_t /*len*/)
 		return;
 	}
 
-	/* if the our port doesn't do input anymore, forget it ... */
-
-	if (!_port.parser()) {
-		return;
-	}
-
 	bind_midi ((channel_t) (msg[0] & 0xf), eventType (msg[0] & 0xF0), msg[1]);
 
 	if (controllable) {
@@ -381,49 +375,43 @@ MIDIControllable::bind_midi (channel_t chn, eventType ev, MIDI::byte additional)
 	control_channel = chn;
 	control_additional = additional;
 
-	if (_port.parser() == 0) {
-		return;
-	}
-
-	Parser& p = *_port.parser();
-
 	int chn_i = chn;
 	switch (ev) {
 	case MIDI::off:
-		p.channel_note_off[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIControllable::midi_sense_note_off, this, _1, _2));
+		_parser.channel_note_off[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIControllable::midi_sense_note_off, this, _1, _2));
 
 		/* if this is a togglee, connect to noteOn as well,
 		   and we'll toggle back and forth between the two.
 		*/
 
 		if (_momentary) {
-			p.channel_note_on[chn_i].connect_same_thread (midi_sense_connection[1], boost::bind (&MIDIControllable::midi_sense_note_on, this, _1, _2));
+			_parser.channel_note_on[chn_i].connect_same_thread (midi_sense_connection[1], boost::bind (&MIDIControllable::midi_sense_note_on, this, _1, _2));
 		} 
 
 		_control_description = "MIDI control: NoteOff";
 		break;
 
 	case MIDI::on:
-		p.channel_note_on[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIControllable::midi_sense_note_on, this, _1, _2));
+		_parser.channel_note_on[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIControllable::midi_sense_note_on, this, _1, _2));
 		if (_momentary) {
-			p.channel_note_off[chn_i].connect_same_thread (midi_sense_connection[1], boost::bind (&MIDIControllable::midi_sense_note_off, this, _1, _2));
+			_parser.channel_note_off[chn_i].connect_same_thread (midi_sense_connection[1], boost::bind (&MIDIControllable::midi_sense_note_off, this, _1, _2));
 		}
 		_control_description = "MIDI control: NoteOn";
 		break;
 		
 	case MIDI::controller:
-		p.channel_controller[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIControllable::midi_sense_controller, this, _1, _2));
+		_parser.channel_controller[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIControllable::midi_sense_controller, this, _1, _2));
 		snprintf (buf, sizeof (buf), "MIDI control: Controller %d", control_additional);
 		_control_description = buf;
 		break;
 
 	case MIDI::program:
-		p.channel_program_change[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIControllable::midi_sense_program_change, this, _1, _2));
+		_parser.channel_program_change[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIControllable::midi_sense_program_change, this, _1, _2));
 		_control_description = "MIDI control: ProgramChange";
 		break;
 
 	case MIDI::pitchbend:
-		p.channel_pitchbend[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIControllable::midi_sense_pitchbend, this, _1, _2));
+		_parser.channel_pitchbend[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIControllable::midi_sense_pitchbend, this, _1, _2));
 		_control_description = "MIDI control: Pitchbend";
 		break;
 
diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h
index dd9dc988b4..aeed05db4a 100644
--- a/libs/surfaces/generic_midi/midicontrollable.h
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -36,17 +36,20 @@ namespace PBD {
 
 namespace MIDI {
 	class Channel;
-	class Port;
 	class Parser;
 }
 
 class GenericMidiControlProtocol;
 
+namespace ARDOUR {
+	class AsyncMIDIPort;
+}
+
 class MIDIControllable : public PBD::Stateful
 {
   public:
-	MIDIControllable (GenericMidiControlProtocol *, MIDI::Port&, PBD::Controllable&, bool momentary);
-	MIDIControllable (GenericMidiControlProtocol *, MIDI::Port&, bool momentary = false);
+        MIDIControllable (GenericMidiControlProtocol *, MIDI::Parser&, PBD::Controllable&, bool momentary);
+        MIDIControllable (GenericMidiControlProtocol *, MIDI::Parser&, bool momentary = false);
 	virtual ~MIDIControllable ();
 
 	int init (const std::string&);
@@ -72,7 +75,7 @@ class MIDIControllable : public PBD::Stateful
 
 	bool learned() const { return _learned; }
 
-	MIDI::Port& get_port() const { return _port; }
+        MIDI::Parser& get_parser() { return _parser; }
 	PBD::Controllable* get_controllable() const { return controllable; }
 	void set_controllable (PBD::Controllable*);
 	const std::string& current_uri() const { return _current_uri; }
@@ -98,8 +101,8 @@ class MIDIControllable : public PBD::Stateful
 	GenericMidiControlProtocol* _surface;
 	PBD::Controllable* controllable;
 	PBD::ControllableDescriptor* _descriptor;
-	std::string        _current_uri;
-	MIDI::Port&     _port;
+	std::string     _current_uri;
+        MIDI::Parser&   _parser;
 	bool             setting;
 	int              last_value;
 	float            last_controllable_value;
diff --git a/libs/surfaces/generic_midi/midifunction.cc b/libs/surfaces/generic_midi/midifunction.cc
index 70e9337861..b0dc95e4fc 100644
--- a/libs/surfaces/generic_midi/midifunction.cc
+++ b/libs/surfaces/generic_midi/midifunction.cc
@@ -25,7 +25,7 @@
 
 using namespace MIDI;
 
-MIDIFunction::MIDIFunction (MIDI::Port& p)
+MIDIFunction::MIDIFunction (MIDI::Parser& p)
 	: MIDIInvokable (p)
 {
 }
diff --git a/libs/surfaces/generic_midi/midifunction.h b/libs/surfaces/generic_midi/midifunction.h
index 8f0b0218d0..88aff0ab0a 100644
--- a/libs/surfaces/generic_midi/midifunction.h
+++ b/libs/surfaces/generic_midi/midifunction.h
@@ -33,7 +33,6 @@
 
 namespace MIDI {
 	class Channel;
-	class Port;
 	class Parser;
 }
 
@@ -64,7 +63,7 @@ class MIDIFunction : public MIDIInvokable
 		TrackSetSoloIsolate,
 	};
 
-	MIDIFunction (MIDI::Port&);
+	MIDIFunction (MIDI::Parser&);
 	virtual ~MIDIFunction ();
 
 	int setup (GenericMidiControlProtocol&, const std::string& function_name, const std::string& argument, MIDI::byte* sysex = 0, size_t ssize = 0);
diff --git a/libs/surfaces/generic_midi/midiinvokable.cc b/libs/surfaces/generic_midi/midiinvokable.cc
index 79835835a4..42c74553d8 100644
--- a/libs/surfaces/generic_midi/midiinvokable.cc
+++ b/libs/surfaces/generic_midi/midiinvokable.cc
@@ -25,8 +25,8 @@
 
 using namespace MIDI;
 
-MIDIInvokable::MIDIInvokable (MIDI::Port& p)
-	: _port (p)
+MIDIInvokable::MIDIInvokable (MIDI::Parser& p)
+	: _parser (p)
 {
 	data_size = 0;
 	data = 0;
@@ -127,12 +127,6 @@ MIDIInvokable::bind_midi (channel_t chn, eventType ev, MIDI::byte additional)
 	control_channel = chn;
 	control_additional = additional;
 
-	if (_port.parser() == 0) {
-		return;
-	}
-
-	Parser& p = *_port.parser();
-
 	int chn_i = chn;
 
 	/* incoming MIDI is parsed by Ardour' MidiUI event loop/thread, and we want our handlers to execute in that context, so we use
@@ -141,27 +135,27 @@ MIDIInvokable::bind_midi (channel_t chn, eventType ev, MIDI::byte additional)
 
 	switch (ev) {
 	case MIDI::off:
-		p.channel_note_off[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_note_off, this, _1, _2));
+		_parser.channel_note_off[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_note_off, this, _1, _2));
 		break;
 
 	case MIDI::on:
-		p.channel_note_on[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_note_on, this, _1, _2));
+		_parser.channel_note_on[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_note_on, this, _1, _2));
 		break;
 		
 	case MIDI::controller:
-		p.channel_controller[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_controller, this, _1, _2));
+		_parser.channel_controller[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_controller, this, _1, _2));
 		break;
 
 	case MIDI::program:
-		p.channel_program_change[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_program_change, this, _1, _2));
+		_parser.channel_program_change[chn_i].connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_program_change, this, _1, _2));
 		break;
 
 	case MIDI::sysex:
-		p.sysex.connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_sysex, this, _1, _2, _3));
+		_parser.sysex.connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_sysex, this, _1, _2, _3));
 		break;
 
 	case MIDI::any:
-		p.any.connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_any, this, _1, _2, _3));
+		_parser.any.connect_same_thread (midi_sense_connection[0], boost::bind (&MIDIInvokable::midi_sense_any, this, _1, _2, _3));
 		break;
 
 	default:
diff --git a/libs/surfaces/generic_midi/midiinvokable.h b/libs/surfaces/generic_midi/midiinvokable.h
index 62cbab238c..f374a126a5 100644
--- a/libs/surfaces/generic_midi/midiinvokable.h
+++ b/libs/surfaces/generic_midi/midiinvokable.h
@@ -31,7 +31,6 @@
 
 namespace MIDI {
 	class Channel;
-	class Port;
 	class Parser;
 }
 
@@ -40,12 +39,12 @@ class GenericMidiControlProtocol;
 class MIDIInvokable : public PBD::Stateful
 {
   public:
-	MIDIInvokable (MIDI::Port&);
+	MIDIInvokable (MIDI::Parser&);
 	virtual ~MIDIInvokable ();
 
 	virtual int init (GenericMidiControlProtocol&, const std::string&, MIDI::byte* data = 0, size_t dsize = 0);
 
-	MIDI::Port& get_port() const { return _port; }
+	MIDI::Parser& get_parser() { return _parser; }
 
 	void bind_midi (MIDI::channel_t, MIDI::eventType, MIDI::byte);
 	MIDI::channel_t get_control_channel () { return control_channel; }
@@ -55,7 +54,7 @@ class MIDIInvokable : public PBD::Stateful
   protected:
 	GenericMidiControlProtocol* _ui;
 	std::string     _invokable_name;
-	MIDI::Port&     _port;
+	MIDI::Parser&     _parser;
 	PBD::ScopedConnection midi_sense_connection[2];
 	MIDI::eventType  control_type;
 	MIDI::byte       control_additional;
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index cfa6524f70..32be851247 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -101,7 +101,7 @@ MackieControlProtocol::MackieControlProtocol (Session& session)
 	, _gui (0)
 	, _zoom_mode (false)
 	, _scrub_mode (false)
-	, _flip_mode (false)
+	, _flip_mode (Normal)
 	, _view_mode (Mixer)
 	, _current_selected_track (-1)
 	, _modifier_state (0)
@@ -393,7 +393,9 @@ MackieControlProtocol::set_active (bool yn)
 		
 		BaseUI::run ();
 		
-		create_surfaces ();
+		if (create_surfaces ()) {
+			return -1;
+		}
 		connect_session_signals ();
 		_active = true;
 		update_surfaces ();
@@ -606,7 +608,7 @@ MackieControlProtocol::set_profile (const string& profile_name)
 	_device_profile = d->second;
 }	
 
-void
+int
 MackieControlProtocol::set_device (const string& device_name, bool allow_activation)
 {
 	map<string,DeviceInfo>::iterator d = DeviceInfo::device_info.find (device_name);
@@ -615,7 +617,7 @@ MackieControlProtocol::set_device (const string& device_name, bool allow_activat
 							   device_name, allow_activation));
 
 	if (d == DeviceInfo::device_info.end()) {
-		return;
+		return -1;
 	}
 	
 	if (_active) {
@@ -629,13 +631,16 @@ MackieControlProtocol::set_device (const string& device_name, bool allow_activat
 		set_active (true);
 	} else {
 		if (_active) {
-			create_surfaces ();
+			if (create_surfaces ()) {
+				return -1;
+			}
 			switch_banks (0, true);
 		}
 	}
+	return 0;
 }
 
-void 
+int
 MackieControlProtocol::create_surfaces ()
 {
 	string device_name;
@@ -652,7 +657,13 @@ MackieControlProtocol::create_surfaces ()
 
 	for (uint32_t n = 0; n < 1 + _device_info.extenders(); ++n) {
 
-		boost::shared_ptr<Surface> surface (new Surface (*this, device_name, n, stype));
+		boost::shared_ptr<Surface> surface;
+
+		try {
+			surface.reset (new Surface (*this, device_name, n, stype));
+		} catch (...) {
+			return -1;
+		}
 
 		{
 			Glib::Threads::Mutex::Lock lm (surfaces_lock);
@@ -698,6 +709,8 @@ MackieControlProtocol::create_surfaces ()
 			g_source_ref (psrc->gobj());
 		}
 	}
+
+	return 0;
 }
 
 void 
@@ -1236,7 +1249,7 @@ MackieControlProtocol::midi_input_handler (IOCondition ioc, MIDI::Port* port)
 		}
 
 		DEBUG_TRACE (DEBUG::MackieControl, string_compose ("data available on %1\n", port->name()));
-		framepos_t now = session->engine().frame_time();
+		framepos_t now = session->engine().sample_time();
 		port->parse (now);
 	}
 
@@ -1271,11 +1284,11 @@ MackieControlProtocol::set_view_mode (ViewMode m)
 }
 
 void
-MackieControlProtocol::set_flip_mode (bool yn)
+MackieControlProtocol::set_flip_mode (FlipMode fm)
 {
 	Glib::Threads::Mutex::Lock lm (surfaces_lock);
 
-	_flip_mode = yn;
+	_flip_mode = fm;
 	
 	for (Surfaces::iterator s = surfaces.begin(); s != surfaces.end(); ++s) {
 		(*s)->update_flip_mode_display ();
@@ -1573,14 +1586,17 @@ MackieControlProtocol::set_ipmidi_base (int16_t portnum)
 	}
 }
 
-void
+int
 MackieControlProtocol::ipmidi_restart ()
 {
 	clear_ports ();
 	clear_surfaces ();
-	create_surfaces ();
+	if (create_surfaces ()) {
+		return -1;
+	}
 	switch_banks (_current_initial_bank, true);
 	needs_ipmidi_restart = false;
+	return 0;
 }
 
 void
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 710745f157..4669247726 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -120,16 +120,16 @@ class MackieControlProtocol
 	Mackie::DeviceProfile& device_profile() { return _device_profile; }
 
 	int set_active (bool yn);
-	void set_device (const std::string&, bool allow_activation = true);
-	void set_profile (const std::string&);
+	int  set_device (const std::string&, bool allow_activation = true);
+        void set_profile (const std::string&);
 
-	bool     flip_mode () const { return _flip_mode; }
+	FlipMode flip_mode () const { return _flip_mode; }
 	ViewMode view_mode () const { return _view_mode; }
 	bool zoom_mode () const { return _zoom_mode; }
 	bool     metering_active () const { return _metering_active; }
 
 	void set_view_mode (ViewMode);
-	void set_flip_mode (bool);
+	void set_flip_mode (FlipMode);
 
 	XMLNode& get_state ();
 	int set_state (const XMLNode&, int version);
@@ -278,7 +278,7 @@ class MackieControlProtocol
 	void*                    _gui;
 	bool                     _zoom_mode;
 	bool                     _scrub_mode;
-	bool                     _flip_mode;
+	FlipMode                 _flip_mode;
 	ViewMode                 _view_mode;
 	int                      _current_selected_track;
 	int                      _modifier_state;
@@ -291,7 +291,7 @@ class MackieControlProtocol
 
 	ARDOUR::RouteNotificationList _last_selected_routes;
 
-	void create_surfaces ();
+	int create_surfaces ();
 	bool periodic();
 	void build_gui ();
 	bool midi_input_handler (Glib::IOCondition ioc, MIDI::Port* port);
@@ -301,8 +301,8 @@ class MackieControlProtocol
 	void build_button_map ();
 	void gui_track_selection_changed (ARDOUR::RouteNotificationListPtr, bool save_list);
 	void _gui_track_selection_changed (ARDOUR::RouteNotificationList*, bool save_list);
-	void ipmidi_restart ();
-	void initialize ();
+	int ipmidi_restart ();
+        void initialize ();
 	
 	/* BUTTON HANDLING */
 
diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 286e87a0fb..792813bf33 100644
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -814,8 +814,12 @@ MackieControlProtocol::dyn_release (Button &)
 LedState
 MackieControlProtocol::flip_press (Button &) 
 { 
-	set_flip_mode (!_flip_mode);
-	return (_flip_mode ? on : off);
+	if (_flip_mode != Normal) {
+		set_flip_mode (Normal);
+	} else {
+		set_flip_mode (Mirror);
+	}
+	return ((_flip_mode != Normal) ? on : off);
 }
 LedState
 MackieControlProtocol::flip_release (Button &) 
diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index fd8e956ba1..c736b3f7e6 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -291,7 +291,7 @@ Strip::notify_gain_changed (bool force_update)
 		
 		Control* control;
 
-		if (_surface->mcp().flip_mode()) {
+		if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
 			control = _vpot;
 		} else {
 			control = _fader;
@@ -304,7 +304,7 @@ Strip::notify_gain_changed (bool force_update)
 
 		if (force_update || normalized_position != _last_gain_position_written) {
 			
-			if (_surface->mcp().flip_mode()) {
+			if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
 				if (!control->in_use()) {
 					_surface->write (_vpot->set (normalized_position, true, Pot::wrap));
 				}
@@ -407,7 +407,7 @@ Strip::notify_panner_width_changed (bool force_update)
 		
 		if (force_update || pos != _last_pan_azi_position_written) {
 			
-			if (_surface->mcp().flip_mode()) {
+			if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
 
 				if (control == _fader) {
 					if (!control->in_use()) {
@@ -944,7 +944,7 @@ Strip::next_pot_mode ()
 {
 	vector<Evoral::Parameter>::iterator i;
 
-	if (_surface->mcp().flip_mode()) {
+	if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
 		/* do not change vpot mode while in flipped mode */
 		DEBUG_TRACE (DEBUG::MackieControl, "not stepping pot mode - in flip mode\n");
 		_surface->write (display (1, "Flip"));
@@ -997,7 +997,7 @@ Strip::set_vpot_parameter (Evoral::Parameter p)
 	case PanAzimuthAutomation:
 		pannable = _route->pannable ();
 		if (pannable) {
-			if (_surface->mcp().flip_mode()) {
+			if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
 				/* gain to vpot, pan azi to fader */
 				_vpot->set_control (_route->gain_control());
 				control_by_parameter[GainAutomation] = _vpot;
@@ -1025,7 +1025,7 @@ Strip::set_vpot_parameter (Evoral::Parameter p)
 	case PanWidthAutomation:
 		pannable = _route->pannable ();
 		if (pannable) {
-			if (_surface->mcp().flip_mode()) {
+			if (_surface->mcp().flip_mode() != MackieControlProtocol::Normal) {
 				/* gain to vpot, pan width to fader */
 				_vpot->set_control (_route->gain_control());
 				control_by_parameter[GainAutomation] = _vpot;
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index 0c45a29378..507491d84c 100644
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -24,7 +24,6 @@
 #include <cmath>
 
 #include "midi++/port.h"
-#include "midi++/manager.h"
 
 #include "ardour/automation_control.h"
 #include "ardour/debug.h"
@@ -87,7 +86,11 @@ Surface::Surface (MackieControlProtocol& mcp, const std::string& device_name, ui
 {
 	DEBUG_TRACE (DEBUG::MackieControl, "Surface::Surface init\n");
 	
-	_port = new SurfacePort (*this);
+	try {
+		_port = new SurfacePort (*this);
+	} catch (...) {
+		throw failed_constructor ();
+	}
 
 	/* only the first Surface object has global controls */
 
diff --git a/libs/surfaces/mackie/surface_port.cc b/libs/surfaces/mackie/surface_port.cc
index 9f52f0dccd..508f501f59 100644
--- a/libs/surfaces/mackie/surface_port.cc
+++ b/libs/surfaces/mackie/surface_port.cc
@@ -23,60 +23,48 @@
 #include <sigc++/sigc++.h>
 #include <boost/shared_array.hpp>
 
+#include "pbd/failed_constructor.h"
+
 #include "midi++/types.h"
-#include "midi++/port.h"
-#include "midi++/jack_midi_port.h"
 #include "midi++/ipmidi_port.h"
-#include "midi++/manager.h"
 
+#include "ardour/async_midi_port.h"
 #include "ardour/debug.h"
 #include "ardour/rc_configuration.h"
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
+#include "ardour/async_midi_port.h"
+#include "ardour/midiport_manager.h"
 
 #include "controls.h"
 #include "mackie_control_protocol.h"
 #include "surface.h"
 #include "surface_port.h"
 
-
 #include "i18n.h"
 
 using namespace std;
 using namespace Mackie;
 using namespace PBD;
+using namespace ARDOUR;
 
-/** @param input_port Input MIDI::Port; this object takes responsibility for
- *  adding & removing it from the MIDI::Manager and destroying it.  @param
- *  output_port Output MIDI::Port; responsibility similarly taken.
- */
 SurfacePort::SurfacePort (Surface& s)
 	: _surface (&s)
-	, _input_port (0)
-	, _output_port (0)
 {
+
 	if (_surface->mcp().device_info().uses_ipmidi()) {
 		_input_port = new MIDI::IPMIDIPort (_surface->mcp().ipmidi_base() +_surface->number());
 		_output_port = _input_port;
 	} else {
-		jack_client_t* jack = MackieControlProtocol::instance()->get_session().engine().jack();
-		
-		_input_port = new MIDI::JackMIDIPort (string_compose (_("%1 in"),  _surface->name()), MIDI::Port::IsInput, jack);
-		_output_port =new MIDI::JackMIDIPort (string_compose (_("%1 out"), _surface->name()), MIDI::Port::IsOutput, jack);
-		
-		/* MackieControl has its own thread for handling input from the input
-		 * port, and we don't want anything handling output from the output
-		 * port. This stops the Generic MIDI UI event loop in ardour from
-		 * attempting to handle these ports.
-		 */
-		
-		_input_port->set_centrally_parsed (false);
-		_output_port->set_centrally_parsed (false);
-		
-		MIDI::Manager * mm = MIDI::Manager::instance();
-		
-		mm->add_port (_input_port);
-		mm->add_port (_output_port);
+		_async_in  = AudioEngine::instance()->register_input_port (DataType::MIDI, string_compose (_("%1 in"),  _surface->name()), true);
+		_async_out = AudioEngine::instance()->register_output_port (DataType::MIDI, string_compose (_("%1 out"),  _surface->name()), true);
+
+		if (_async_in == 0 || _async_out == 0) {
+			throw failed_constructor();
+		}
+
+		_input_port = boost::dynamic_pointer_cast<AsyncMIDIPort>(_async_in).get();
+		_output_port = boost::dynamic_pointer_cast<AsyncMIDIPort>(_async_out).get();
 	}
 }
 
@@ -86,17 +74,15 @@ SurfacePort::~SurfacePort()
 		delete _input_port;
 	} else {
 
-		MIDI::Manager* mm = MIDI::Manager::instance ();
-		
-		if (_input_port) {
-			mm->remove_port (_input_port);
-			delete _input_port;
+		if (_async_in) {
+			AudioEngine::instance()->unregister_port (_async_in);
+			_async_in.reset ();
 		}
 		
-		if (_output_port) {
+		if (_async_out) {
 			_output_port->drain (10000);
-			mm->remove_port (_output_port);
-			delete _output_port;
+			AudioEngine::instance()->unregister_port (_async_out);
+			_async_out.reset ();
 		}
 	}
 }
diff --git a/libs/surfaces/mackie/surface_port.h b/libs/surfaces/mackie/surface_port.h
index 7dc20a06f2..751ee848d7 100644
--- a/libs/surfaces/mackie/surface_port.h
+++ b/libs/surfaces/mackie/surface_port.h
@@ -21,16 +21,23 @@
 #include <midi++/types.h>
 
 #include "pbd/signals.h"
+
+
 #include "midi_byte_array.h"
 #include "types.h"
 
 namespace MIDI {
-	class Port;
 	class Parser;
+	class Port;
 }
 
 class MackieControlProtocol;
 
+namespace ARDOUR {
+	class AsyncMIDIPort;
+	class Port;
+}
+
 namespace Mackie
 {
 
@@ -49,17 +56,17 @@ public:
 	/// an easier way to output bytes via midi
 	int write (const MidiByteArray&);
 	
-	MIDI::Port& input_port() { return *_input_port; }
-	const MIDI::Port& input_port() const { return *_input_port; }
-	MIDI::Port& output_port() { return *_output_port; }
-	const MIDI::Port& output_port() const { return *_output_port; }
+    MIDI::Port& input_port() const { return *_input_port; }
+    MIDI::Port& output_port() const { return *_output_port; }
 
 protected:
 
 private:
-	Mackie::Surface* _surface;
-	MIDI::Port*  _input_port;
-	MIDI::Port*  _output_port;
+    Mackie::Surface*   _surface;
+    MIDI::Port* _input_port;
+    MIDI::Port* _output_port;
+    boost::shared_ptr<ARDOUR::Port> _async_in;
+    boost::shared_ptr<ARDOUR::Port> _async_out;
 };	
 
 std::ostream& operator <<  (std::ostream& , const SurfacePort& port);
diff --git a/midi_maps/Novation_Impulse61.map b/midi_maps/Novation_Impulse61.map
new file mode 100644
index 0000000000..516167d071
--- /dev/null
+++ b/midi_maps/Novation_Impulse61.map
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ArdourMIDIBindings version="1.0.0" name="Novation Impulse 61">
+
+<!-- 2013-09-04 Alexandre Prokoudine: Map file creation -->
+<!-- This mapping relies on the Basic MIDI preset in the Impulse 61. -->
+
+<!-- Transport controls -->
+
+  <Binding channel="1" ctl="112" function="transport-start"/>
+  <Binding channel="1" ctl="113" function="transport-end"/>
+  <Binding channel="1" ctl="114" function="transport-stop"/>
+  <Binding channel="1" ctl="115" function="transport-roll"/>
+  <Binding channel="1" ctl="116" function="loop-toggle"/>
+  <Binding channel="1" ctl="117" function="rec-enable"/>
+  <Binding channel="1" ctl="117" function="rec-disable"/>
+
+<!-- Gain controls. Faders are mapped to faders. -->
+
+  <Binding channel="1" ctl="41" uri="/route/gain 1"/>
+  <Binding channel="1" ctl="42" uri="/route/gain 2"/>
+  <Binding channel="1" ctl="43" uri="/route/gain 3"/>
+  <Binding channel="1" ctl="44" uri="/route/gain 4"/>
+  <Binding channel="1" ctl="45" uri="/route/gain 5"/>
+  <Binding channel="1" ctl="46" uri="/route/gain 6"/>
+  <Binding channel="1" ctl="47" uri="/route/gain 7"/>
+  <Binding channel="1" ctl="48" uri="/route/gain 8"/>
+  <Binding channel="1" ctl="49" uri="/bus/gain master"/>
+
+<!-- Pan controls. Encoders are mapped to pan direction. -->
+<!-- There doesn't seem to be a way to map encoders to pan width. -->
+
+  <Binding channel="1" ctl="21" uri="/route/pandirection 1"/>
+  <Binding channel="1" ctl="22" uri="/route/pandirection 2"/>
+  <Binding channel="1" ctl="23" uri="/route/pandirection 3"/>
+  <Binding channel="1" ctl="24" uri="/route/pandirection 4"/>
+  <Binding channel="1" ctl="25" uri="/route/pandirection 5"/>
+  <Binding channel="1" ctl="26" uri="/route/pandirection 6"/>
+  <Binding channel="1" ctl="27" uri="/route/pandirection 7"/>
+  <Binding channel="1" ctl="28" uri="/route/pandirection 8"/>
+
+<!-- Status controls -->
+<!-- Status buttons are mapped to mute toggles. -->
+<!-- Apparently Solo toggle only works when Automap is used. Sad but true. -->
+
+  <Binding channel="1" ctl="51" uri="/route/mute 1"/>
+  <Binding channel="1" ctl="52" uri="/route/mute 2"/>
+  <Binding channel="1" ctl="53" uri="/route/mute 3"/>
+  <Binding channel="1" ctl="54" uri="/route/mute 4"/>
+  <Binding channel="1" ctl="55" uri="/route/mute 5"/>
+  <Binding channel="1" ctl="56" uri="/route/mute 6"/>
+  <Binding channel="1" ctl="57" uri="/route/mute 7"/>
+  <Binding channel="1" ctl="58" uri="/route/mute 8"/>
+  <Binding channel="1" ctl="59" uri="/bus/mute master"/>"
+
+
+</ArdourMIDIBindings>
diff --git a/wscript b/wscript
index 62b47bf739..2c63cab19c 100644
--- a/wscript
+++ b/wscript
@@ -8,7 +8,7 @@ import subprocess
 import sys
 
 MAJOR = '3'
-MINOR = '3'
+MINOR = '4'
 VERSION = MAJOR + '.' + MINOR
 
 APPNAME = 'Ardour' + MAJOR
@@ -29,6 +29,7 @@ children = [
         'libs/rubberband',
         'libs/surfaces',
         'libs/panners',
+        'libs/backends',
         'libs/timecode',
         'libs/ardour',
         'libs/gtkmm2ext',
@@ -157,6 +158,8 @@ def set_compiler_flags (conf,opt):
                 conf.env['build_target'] = 'i386'
             elif re.search("powerpc", cpu) != None:
                 conf.env['build_target'] = 'powerpc'
+            elif re.search("arm", cpu) != None:
+                conf.env['build_target'] = 'arm'
             else:
                 conf.env['build_target'] = 'i686'
     else:
@@ -404,7 +407,7 @@ def options(opt):
                     help='The user-visible name of the program being built')
     opt.add_option('--arch', type='string', action='store', dest='arch',
                     help='Architecture-specific compiler flags')
-    opt.add_option('--backtrace', action='store_true', default=False, dest='backtrace',
+    opt.add_option('--backtrace', action='store_true', default=True, dest='backtrace',
                     help='Compile with -rdynamic -- allow obtaining backtraces from within Ardour')
     opt.add_option('--no-carbon', action='store_true', default=False, dest='nocarbon',
                     help='Compile without support for AU Plugins with only CARBON UI (needed for 64bit)')