From 959a7909c1adca430a63f783fd16687242a7be3d Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 12 Apr 2007 23:20:37 +0000
Subject: [PATCH] Merged with trunk R1705. Synced .po files with trunk. Fixed
 more editor operations to be type agnostic (ie not audio only).

git-svn-id: svn://localhost/ardour2/branches/midi@1709 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 SConstruct                                    |    5 +-
 ardour.rc.in                                  |    1 +
 gtk2_ardour/about.cc                          |    4 +-
 gtk2_ardour/ardour.colors                     |    6 +-
 gtk2_ardour/ardour.menus                      |    1 +
 gtk2_ardour/ardour_ui.cc                      |   33 +-
 gtk2_ardour/ardour_ui.h                       |    5 +-
 gtk2_ardour/ardour_ui2.cc                     |   16 +-
 gtk2_ardour/ardour_ui_dialogs.cc              |    3 +-
 gtk2_ardour/ardour_ui_ed.cc                   |   15 +-
 gtk2_ardour/ardour_ui_options.cc              |    8 -
 gtk2_ardour/audio_clock.cc                    |   33 -
 gtk2_ardour/audio_region_view.cc              |   33 +-
 gtk2_ardour/audio_streamview.cc               |    9 +
 gtk2_ardour/automation_line.cc                |    7 +
 gtk2_ardour/automation_line.h                 |    1 +
 gtk2_ardour/automation_time_axis.cc           |   37 +
 gtk2_ardour/automation_time_axis.h            |    3 +
 gtk2_ardour/canvas-simplerect.c               |    4 +-
 gtk2_ardour/canvas-waveview.c                 |   72 +-
 gtk2_ardour/canvas-waveview.h                 |    3 +
 gtk2_ardour/colors.h                          |    3 +
 gtk2_ardour/editor.cc                         |  190 +-
 gtk2_ardour/editor.h                          |   14 +-
 gtk2_ardour/editor_audio_import.cc            |   24 +-
 gtk2_ardour/editor_canvas.cc                  |   12 +-
 gtk2_ardour/editor_canvas_events.cc           |  100 +-
 gtk2_ardour/editor_mouse.cc                   |  143 +-
 gtk2_ardour/editor_ops.cc                     |  359 +-
 gtk2_ardour/editor_region_list.cc             |   14 +-
 gtk2_ardour/editor_rulers.cc                  |   25 +-
 gtk2_ardour/editor_selection.cc               |   14 +-
 gtk2_ardour/editor_tempodisplay.cc            |   36 +-
 gtk2_ardour/export_dialog.cc                  |    2 +-
 gtk2_ardour/gain_meter.cc                     |    2 +-
 gtk2_ardour/ghostregion.cc                    |   10 +
 gtk2_ardour/ghostregion.h                     |    1 +
 gtk2_ardour/io_selector.cc                    |    5 +-
 gtk2_ardour/io_selector.h                     |    1 +
 gtk2_ardour/main.cc                           |    1 +
 gtk2_ardour/po/de_DE.po                       | 4384 ++++-----
 gtk2_ardour/po/el_GR.po                       | 2912 +++---
 gtk2_ardour/po/fr_FR.po                       | 8399 ++++++++---------
 gtk2_ardour/po/sv_SE.po                       |  236 +-
 gtk2_ardour/redirect_box.cc                   |   88 +-
 gtk2_ardour/redirect_box.h                    |    2 +
 gtk2_ardour/region_selection.cc               |   30 +-
 gtk2_ardour/region_view.cc                    |    1 +
 gtk2_ardour/region_view.h                     |   62 +-
 gtk2_ardour/selection.cc                      |    3 +
 gtk2_ardour/time_axis_view.cc                 |    6 +-
 gtk2_ardour/time_axis_view_item.cc            |  108 +-
 gtk2_ardour/time_axis_view_item.h             |   13 +-
 gtk2_ardour/utils.cc                          |   65 +-
 gtk2_ardour/utils.h                           |    2 +-
 gtk2_ardour/waveview.cc                       |   16 +
 gtk2_ardour/waveview.h                        |    4 +
 libs/ardour/ardour/audiofilesource.h          |    3 +-
 libs/ardour/ardour/audioregion.h              |    2 +
 libs/ardour/ardour/configuration_vars.h       |    1 -
 libs/ardour/ardour/coreaudiosource.h          |    2 +-
 libs/ardour/ardour/diskstream.h               |    1 +
 libs/ardour/ardour/playlist.h                 |    7 +
 libs/ardour/ardour/profile.h                  |   31 +
 libs/ardour/ardour/route.h                    |    4 +-
 libs/ardour/ardour/send.h                     |    2 +-
 libs/ardour/ardour/session.h                  |    4 +
 libs/ardour/ardour/sndfilesource.h            |    2 +
 libs/ardour/ardour/source.h                   |    4 +-
 libs/ardour/audio_diskstream.cc               |   10 +-
 libs/ardour/audiofilesource.cc                |  104 +-
 libs/ardour/audioregion.cc                    |   72 +-
 libs/ardour/coreaudiosource.cc                |   13 +-
 libs/ardour/diskstream.cc                     |    5 +-
 libs/ardour/globals.cc                        |    6 +-
 libs/ardour/insert.cc                         |    4 +-
 libs/ardour/ladspa_plugin.cc                  |   12 +-
 libs/ardour/midi_port.cc                      |    8 +-
 libs/ardour/panner.cc                         |   19 +-
 libs/ardour/playlist.cc                       |   23 +-
 libs/ardour/region.cc                         |    5 +-
 libs/ardour/route.cc                          |   44 +-
 libs/ardour/session.cc                        |    6 +-
 libs/ardour/session_butler.cc                 |    2 +-
 libs/ardour/session_midi.cc                   |   18 -
 libs/ardour/session_process.cc                |    3 +
 libs/ardour/session_state.cc                  |   59 +-
 libs/ardour/session_time.cc                   |    1 +
 libs/ardour/session_transport.cc              |   10 +-
 libs/ardour/sndfilesource.cc                  |    6 +
 libs/ardour/source.cc                         |   21 +-
 libs/ardour/vst_plugin.cc                     |    5 +-
 libs/gtkmm2ext/SConscript                     |    1 +
 libs/gtkmm2ext/fastmeter.cc                   |    4 +-
 libs/gtkmm2ext/gtk_ui.cc                      |   10 +-
 libs/gtkmm2ext/gtkmm2ext/fastmeter.h          |    2 +-
 libs/gtkmm2ext/gtkmm2ext/window_title.h       |   44 +
 libs/gtkmm2ext/window_title.cc                |   26 +
 libs/pbd/SConscript                           |    1 +
 libs/pbd/pbd/shortpath.h                      |    8 +
 libs/pbd/shortpath.cc                         |   56 +
 libs/sigc++2/sigc++/adaptors/bind.h           |    2 +-
 libs/sigc++2/sigc++/adaptors/retype.h         |    2 +-
 libs/sigc++2/sigc++/functors/functor_trait.h  |    6 +-
 libs/sigc++2/sigc++/functors/slot.h           |   72 +-
 libs/sigc++2/sigc++/retype.h                  |    2 +-
 libs/sigc++2/sigc++/signal.h                  |  208 +-
 .../generic_midi_control_protocol.cc          |   66 +-
 .../generic_midi_control_protocol.h           |    4 +-
 .../surfaces/generic_midi/midicontrollable.cc |   14 +-
 libs/surfaces/generic_midi/midicontrollable.h |    2 +-
 libs/surfaces/mackie/bcf_surface.cc           |   78 +-
 .../mackie/mackie_control_protocol.cc         |   65 +-
 .../surfaces/mackie/mackie_control_protocol.h |   22 +-
 libs/surfaces/mackie/scripts/bcf-controls.csv |   24 +-
 manual/xml/adding_tracks.xml                  |   51 +-
 manual/xml/control_surfaces.xml               |    2 +
 manual/xml/mackie.xml                         |  254 +
 manual/xml/sessions.xml                       |    2 -
 manual/xml/tracks_and_busses.xml              |   38 +-
 svn_revision.h                                |    2 +-
 templates/16 Tracks.template.in               |   16 +-
 templates/32 Tracks.template.in               |   24 +-
 templates/4 Tracks.template.in                |    4 +-
 templates/8 Tracks.template.in                |    8 +-
 tools/osx_packaging/ardour2_mac_ui.rc         |  913 +-
 126 files changed, 10459 insertions(+), 9679 deletions(-)
 create mode 100644 libs/ardour/ardour/profile.h
 create mode 100644 libs/gtkmm2ext/gtkmm2ext/window_title.h
 create mode 100644 libs/gtkmm2ext/window_title.cc
 create mode 100644 libs/pbd/pbd/shortpath.h
 create mode 100644 libs/pbd/shortpath.cc
 create mode 100644 manual/xml/mackie.xml

diff --git a/SConstruct b/SConstruct
index 48dd189b93..57d5dc344c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -16,7 +16,7 @@ import SCons.Node.FS
 SConsignFile()
 EnsureSConsVersion(0, 96)
 
-ardour_version = '2.0beta12'
+ardour_version = '2.0rc1'
 
 subst_dict = { }
 
@@ -728,7 +728,8 @@ prep_libcheck(env, libraries['flac'])
 libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib")
 
 conf = Configure (libraries['flac'])
-conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX')
+if conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX'):
+    conf.env.Append(CCFLAGS='-DHAVE_FLAC')
 libraries['flac'] = conf.Finish ()
 
 # or if that fails...
diff --git a/ardour.rc.in b/ardour.rc.in
index ab34ae29d4..44738f8062 100644
--- a/ardour.rc.in
+++ b/ardour.rc.in
@@ -2,6 +2,7 @@
 <Ardour>
   <MIDI-port tag="%MIDITAG%" device="ardour" type="%MIDITYPE%" mode="duplex"/>
   <MIDI-port tag="control" device="ardour" type="%MIDITYPE%" mode="duplex"/>
+  <MIDI-port tag="mcu" device="ardour" type="%MIDITYPE%" mode="duplex"/>
   <Config>
     <Option name="minimum-disk-io-bytes" value="262144"/>
     <Option name="track-buffer-seconds" value="5.000000"/>
diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index df6d0102ed..ccd4de1c0c 100644
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -151,18 +151,20 @@ static const char* authors[] = {
 	N_("Mike Täht"),
 	N_("John Anderson"),
 	N_("Nedko Arnaudov"),
+	N_("Carl Hetherington"),
 	0
 };
 
 static const char* translators[] = {
 	N_("French:\n\tAlain Fréhel <alain.frehel@free.fr>\n\tChristophe Combelles <ccomb@free.fr>\n"),
-	N_("German:\n\tKarsten Petersen <kapet@kapet.de>\n"),
+	N_("German:\n\tKarsten Petersen <kapet@kapet.de>\n\tSebastian Arnold <mail@sebastian-arnold.net>\n"),
 	N_("Italian:\n\tFilippo Pappalardo <filippo@email.it>\n"),
 	N_("Portuguese:\n\tRui Nuno Capela <rncbc@rncbc.org>\n"),
 	N_("Brazilian Portuguese:\n\tAlexander da Franca Fernandes <alexander@nautae.eti.br>\
 \n\tChris Ross <chris@tebibyte.org>\n"),
 	N_("Spanish:\n\t Alex Krohn <alexkrohn@fastmail.fm>\n"),
 	N_("Russian:\n\t Igor Blinov <pitstop@nm.ru>\n"),
+	N_("Greek:\n\t Klearchos Gourgourinis <muadib@in.gr>\n"),
 	0
 };
 
diff --git a/gtk2_ardour/ardour.colors b/gtk2_ardour/ardour.colors
index 9cf1ad359f..d8a1aa9f77 100644
--- a/gtk2_ardour/ardour.colors
+++ b/gtk2_ardour/ardour.colors
@@ -1,4 +1,5 @@
 cWaveForm 0.0 0.0 0.0 0.80
+cWaveFormClip 1.0 0.0 0.0 0.90
 cMutedWaveForm 0.35 0.35 0.35 1.0
 cSelectedFrameBase 0.71 0.57 0.66 1.0
 cFrameBase 0.75 0.75 0.76 1.0
@@ -44,7 +45,7 @@ cLocationRange 0.29 0.48 0.35 1.0
 cLocationCDMarker 0.12 0.91 0.77 1.0
 cLocationLoop 0.21 0.59 0.31 1.0
 cLocationPunch 0.49 0.23 0.23 1.0
-cVerboseCanvasCursor 0 0 0 0.74
+cVerboseCanvasCursor 0.96 0.95 0.08 0.74
 cRangeDragBarRect 0.59 0.59 0.59 0.78
 cRangeDragBarRectFill 0.78 0.82 0.70 0.43
 cRangeDragRect 0.59 0.59 0.59 0.78
@@ -72,6 +73,9 @@ cMeasureLineBeat 0.45 0.45 0.45 0.40
 cMeasureLineBar 0.55 0.55 0.60 0.55
 cGhostTrackBaseOutline 0.00 0.00 0.00 1.00
 cGhostTrackBaseFill 0.27 0.00 0.49 0.50
+cGhostTrackWave 0.0 3.00 0.0 0.30
+cGhostTrackWaveClip 1.0 0.0 0.0 0.0
+cGhostTrackZeroLine 0.9 0.0 0.9 0.40
 cImageTrackBase 0.87 0.87 0.85 1.00
 cImageTrackOutline 0.00 0.00 0.00 1.00
 cMarkerTrackBase 0.87 0.87 0.85 1.00
diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index f24d5280ea..c01195f4f4 100644
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -369,6 +369,7 @@
 	 <menuitem action='cut'/>
 	 <menuitem action='copy'/>
 	 <menuitem action='paste'/>
+	 <menuitem action='delete'/>
 	  <separator/>
 	 <menuitem action='rename'/>
 	  <separator/>
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 826cb88fbc..adea076f7f 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -53,6 +53,8 @@
 #include <midi++/mmc.h>
 
 #include <ardour/ardour.h>
+#include <ardour/profile.h>
+#include <ardour/session_route.h>
 #include <ardour/port.h>
 #include <ardour/audioengine.h>
 #include <ardour/playlist.h>
@@ -60,7 +62,6 @@
 #include <ardour/audio_diskstream.h>
 #include <ardour/audiofilesource.h>
 #include <ardour/recent_sessions.h>
-#include <ardour/session_route.h>
 #include <ardour/port.h>
 #include <ardour/audio_track.h>
 #include <ardour/midi_track.h>
@@ -92,7 +93,6 @@ ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
 
 sigc::signal<void,bool> ARDOUR_UI::Blink;
 sigc::signal<void>      ARDOUR_UI::RapidScreenUpdate;
-sigc::signal<void>      ARDOUR_UI::MidRapidScreenUpdate;
 sigc::signal<void>      ARDOUR_UI::SuperRapidScreenUpdate;
 sigc::signal<void,nframes_t> ARDOUR_UI::Clock;
 
@@ -191,7 +191,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], string rcfile)
 	keybindings_path = ARDOUR::find_config_file ("ardour.bindings");
 
 	can_save_keybindings = false;
-	Glib::signal_idle().connect (mem_fun (*this, &ARDOUR_UI::first_idle));
 
 	last_configure_time.tv_sec = 0;
 	last_configure_time.tv_usec = 0;
@@ -624,13 +623,6 @@ ARDOUR_UI::every_point_one_seconds ()
 	return TRUE;
 }
 
-gint
-ARDOUR_UI::every_point_oh_five_seconds ()
-{
-	MidRapidScreenUpdate(); /* EMIT_SIGNAL */
-	return true;
-}
-
 gint
 ARDOUR_UI::every_point_zero_one_seconds ()
 {
@@ -654,11 +646,11 @@ ARDOUR_UI::update_sample_rate (nframes_t ignored)
 		nframes_t rate = engine->frame_rate();
 		
 		if (fmod (rate, 1000.0) != 0.0) {
-			snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f msecs"), 
+			snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f ms"), 
 				  (float) rate/1000.0f,
 				  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
 		} else {
-			snprintf (buf, sizeof (buf), _("%u kHz / %4.1f msecs"), 
+			snprintf (buf, sizeof (buf), _("%u kHz / %4.1f ms"), 
 				  rate/1000,
 				  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
 		}
@@ -671,7 +663,7 @@ void
 ARDOUR_UI::update_cpu_load ()
 {
 	char buf[32];
-	snprintf (buf, sizeof (buf), _("DSP: %.1f%%"), engine->get_cpu_load());
+	snprintf (buf, sizeof (buf), _("DSP: %5.1f%%"), engine->get_cpu_load());
 	cpu_load_label.set_text (buf);
 }
 
@@ -1583,6 +1575,8 @@ ARDOUR_UI::name_io_setup (AudioEngine& engine,
 	}
 }
 
+/** Ask the user for the name of a new shapshot and then take it.
+ */
 void
 ARDOUR_UI::snapshot_session ()
 {
@@ -2428,7 +2422,7 @@ ARDOUR_UI::disk_overrun_handler ()
 
 	if (!have_disk_speed_dialog_displayed) {
 		have_disk_speed_dialog_displayed = true;
-		MessageDialog* msg = new MessageDialog (*editor, X_("diskrate dialog"), _("\
+		MessageDialog* msg = new MessageDialog (*editor, _("\
 The disk system on your computer\n\
 was not able to keep up with Ardour.\n\
 \n\
@@ -2640,6 +2634,9 @@ ARDOUR_UI::save_keybindings ()
 bool
 ARDOUR_UI::first_idle ()
 {
+	if (session) {
+		session->allow_auto_play (true);
+	}
 	can_save_keybindings = true;
 	return false;
 }
@@ -2763,3 +2760,11 @@ ARDOUR_UI::TransportControllable::set_id (const string& str)
 {
 	_id = str;
 }
+
+void
+ARDOUR_UI::setup_profile ()
+{
+	if (gdk_screen_width() < 1200) {
+		Profile->set_small_screen ();
+	}
+}
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index 171974deaa..8b1304ef2a 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -155,7 +155,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
 	static sigc::signal<void,bool> Blink;
 	static sigc::signal<void>      RapidScreenUpdate;
-	static sigc::signal<void>      MidRapidScreenUpdate;
 	static sigc::signal<void>      SuperRapidScreenUpdate;
 	static sigc::signal<void,nframes_t> Clock;
 
@@ -219,6 +218,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void set_keybindings_path (std::string path);
 	void save_keybindings ();
 
+	void setup_profile ();
+
   protected:
 	friend class PublicEditor;
 
@@ -523,7 +524,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
 	gint every_second ();
 	gint every_point_one_seconds ();
-	gint every_point_oh_five_seconds ();
 	gint every_point_zero_one_seconds ();
 
 	sigc::connection second_connection;
@@ -662,7 +662,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void toggle_send_midi_feedback ();
 	void toggle_use_mmc ();
 	void toggle_send_mmc ();
-	void toggle_use_midi_control();
 	void toggle_send_mtc ();
 
 	void toggle_use_osc ();
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc
index eec94b525f..f3e8b6e344 100644
--- a/gtk2_ardour/ardour_ui2.cc
+++ b/gtk2_ardour/ardour_ui2.cc
@@ -34,6 +34,7 @@
 
 #include <ardour/audioengine.h>
 #include <ardour/ardour.h>
+#include <ardour/profile.h>
 #include <ardour/route.h>
 
 #include "ardour_ui.h"
@@ -364,7 +365,9 @@ ARDOUR_UI::setup_transport ()
 
 	HBox* clock_box = manage (new HBox);
 	clock_box->pack_start (primary_clock, false, false);
-	clock_box->pack_start (secondary_clock, false, false);
+	if (!ARDOUR::Profile->get_small_screen()) {
+		clock_box->pack_start (secondary_clock, false, false);
+	}
 	VBox* time_controls_box = manage (new VBox);
 	time_controls_box->pack_start (sync_option_combo, false, false);
 	time_controls_box->pack_start (time_master_button, false, false);
@@ -603,7 +606,7 @@ ARDOUR_UI::shuttle_box_button_release (GdkEventButton* ev)
 		shuttle_grabbed = false;
 		shuttle_box.remove_modal_grab ();
 		if (Config->get_shuttle_behaviour() == Sprung) {
-			if (Config->get_auto_play() || roll_button.get_state()) {
+			if (Config->get_auto_play() || roll_button.get_visual_state()) {
 				shuttle_fract = SHUTTLE_FRACT_SPEED1;				
 				session->request_transport_speed (1.0);
 				stop_button.set_visual_state (0);
@@ -629,14 +632,9 @@ ARDOUR_UI::shuttle_box_button_release (GdkEventButton* ev)
 		return true;
 
 	case 3:
+	default:
 		return true;
-		
-	case 4:
-		shuttle_fract += 0.005;
-		break;
-	case 5:
-		shuttle_fract -= 0.005;
-		break;
+
 	}
 
 	use_shuttle_fract (true);
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 765eb53282..c3b82c74a8 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -146,6 +146,8 @@ ARDOUR_UI::connect_to_session (Session *s)
 
 	AudioClock::ModeChanged.connect (mem_fun (*this, &ARDOUR_UI::store_clock_modes));
 
+	Glib::signal_idle().connect (mem_fun (*this, &ARDOUR_UI::first_idle));
+
 	start_clocking ();
 	start_blinking ();
 
@@ -153,7 +155,6 @@ ARDOUR_UI::connect_to_session (Session *s)
 
 	second_connection = Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::every_second), 1000);
 	point_one_second_connection = Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::every_point_one_seconds), 100);
-	// point_oh_five_second_connection = Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::every_point_oh_five_seconds), 50);
 	point_zero_one_second_connection = Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::every_point_zero_one_seconds), 40);
 }
 
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index b6222af99c..c889eea0f7 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -37,6 +37,7 @@
 #include "actions.h"
 
 #include <ardour/session.h>
+#include <ardour/profile.h>
 #include <ardour/audioengine.h>
 #include <ardour/control_protocol_manager.h>
 
@@ -397,8 +398,6 @@ ARDOUR_UI::install_actions ()
 	ActionManager::session_sensitive_actions.push_back (act);
 	act = ActionManager::register_toggle_action (option_actions, X_("SendMIDIfeedback"), _("Send MIDI feedback"), mem_fun (*this, &ARDOUR_UI::toggle_send_midi_feedback));
 	ActionManager::session_sensitive_actions.push_back (act);
-	act = ActionManager::register_toggle_action (option_actions, X_("UseMIDIcontrol"), _("Use MIDI control"), mem_fun (*this, &ARDOUR_UI::toggle_use_midi_control));
-	ActionManager::session_sensitive_actions.push_back (act);
 
 	act = ActionManager::register_toggle_action (option_actions, X_("UseOSC"), _("Use OSC"), mem_fun (*this, &ARDOUR_UI::toggle_use_osc));
 #ifndef HAVE_LIBLO
@@ -702,11 +701,13 @@ ARDOUR_UI::build_menu_bar ()
 	sample_rate_label.set_name ("SampleRate");
 
 	menu_hbox.pack_start (*menu_bar, true, true);
-	menu_hbox.pack_end (wall_clock_box, false, false, 10);
-	menu_hbox.pack_end (disk_space_box, false, false, 10);
-	menu_hbox.pack_end (cpu_load_box, false, false, 10);
-	menu_hbox.pack_end (buffer_load_box, false, false, 10);
-	menu_hbox.pack_end (sample_rate_box, false, false, 10);
+	if (!Profile->get_small_screen()) {
+		menu_hbox.pack_end (wall_clock_box, false, false, 2);
+		menu_hbox.pack_end (disk_space_box, false, false, 4);
+	}
+	menu_hbox.pack_end (cpu_load_box, false, false, 4);
+	menu_hbox.pack_end (buffer_load_box, false, false, 4);
+	menu_hbox.pack_end (sample_rate_box, false, false, 4);
 
 	menu_bar_base.set_name ("MainMenuBar");
 	menu_bar_base.add (menu_hbox);
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index c7db8f4ec6..9565c46e40 100644
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -69,12 +69,6 @@ ARDOUR_UI::toggle_use_osc ()
 	ActionManager::toggle_config_state ("options", "UseOSC", &Configuration::set_use_osc, &Configuration::get_use_osc);
 }
 
-void
-ARDOUR_UI::toggle_use_midi_control ()
-{
-	ActionManager::toggle_config_state ("options", "UseMIDIcontrol", &Configuration::set_midi_control, &Configuration::get_midi_control);
-}
-
 void
 ARDOUR_UI::toggle_send_midi_feedback ()
 {
@@ -867,8 +861,6 @@ ARDOUR_UI::parameter_changed (const char* parameter_name)
 		ActionManager::map_some_state ("options", "UseMMC", &Configuration::get_mmc_control);
 	} else if (PARAM_IS ("midi-feedback")) {
 		ActionManager::map_some_state ("options", "SendMIDIfeedback", &Configuration::get_midi_feedback);
-	} else if (PARAM_IS ("midi-control")) {
-		ActionManager::map_some_state ("options", "UseMIDIcontrol", &Configuration::get_midi_control);
 	} else if (PARAM_IS ("do-not-record-plugins")) {
 		ActionManager::map_some_state ("options", "DoNotRunPluginsWhileRecording", &Configuration::get_do_not_record_plugins);
 	} else if (PARAM_IS ("latched-record-enable")) {
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc
index 1334bfdc4b..28505ab46d 100644
--- a/gtk2_ardour/audio_clock.cc
+++ b/gtk2_ardour/audio_clock.cc
@@ -1073,39 +1073,6 @@ AudioClock::field_button_press_event (GdkEventButton *ev, Field field)
 		return FALSE;
 		break;
 
-	case 4:
-		if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
-			frames = get_frames (field);
-			if (frames != 0) {
-				if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
-					frames *= 10;
-				}
-				set (current_time() + frames, true);
-				 ValueChanged (); /* EMIT_SIGNAL */
-			}
-		}
-		break;
-
-	case 5:
-		if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
-			frames = get_frames (field);
-			if (frames != 0) {
-				if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
-					frames *= 10;
-				}
-
-				if ((double)current_time() - (double)frames < 0.0) {
-					set (0, true);
-				}
-				else {
-					set (current_time() - frames, true);
-				}
-				
-				 ValueChanged (); /* EMIT_SIGNAL */
-			}
-		}
-		break;
-
 	default:
 		return FALSE;
 		break;
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index ee2dd63b6c..18e48921c8 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -701,6 +701,9 @@ AudioRegionView::set_colors ()
 		} else {
 			waves[n]->property_wave_color() = color_map[cWaveForm];
 		}
+
+		waves[n]->property_clip_color() = color_map[cWaveFormClip];
+		waves[n]->property_zero_color() = color_map[cZeroLine];
 	}
 }
 
@@ -775,8 +778,6 @@ AudioRegionView::set_envelope_visible (bool yn)
 void
 AudioRegionView::create_waves ()
 {
-	bool create_zero_line = true;
-
 	RouteTimeAxisView& atv (*(dynamic_cast<RouteTimeAxisView*>(&trackview))); // ick
 
 	if (!atv.get_diskstream()) {
@@ -802,23 +803,11 @@ AudioRegionView::create_waves ()
 			if (audio_region()->audio_source(n)->peaks_ready (bind (mem_fun(*this, &AudioRegionView::peaks_ready_handler), n), data_ready_connection)) {
 				create_one_wave (n, true);
 			} else {
-				create_zero_line = false;
 			}
 		} else {
 			create_one_wave (n, true);
 		}
 	}
-
-	if (create_zero_line) {
-		if (zero_line) {
-			delete zero_line;
-		}
-		zero_line = new ArdourCanvas::SimpleLine (*group);
-		zero_line->property_x1() = (gdouble) 1.0;
-		zero_line->property_x2() = (gdouble) (_region->length() / samples_per_unit) - 1.0;
-		zero_line->property_color_rgba() = (guint) color_map[cZeroLine];
-		manage_zero_line ();
-	}
 }
 
 void
@@ -853,6 +842,8 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct)
 	wave->property_samples_per_unit() =  samples_per_unit;
 	wave->property_amplitude_above_axis() =  _amplitude_above_axis;
 	wave->property_wave_color() = _region->muted() ? color_map[cMutedWaveForm] : color_map[cWaveForm];
+	wave->property_clip_color() = color_map[cWaveFormClip];
+	wave->property_zero_color() = color_map[cZeroLine];
 	wave->property_region_start() = _region->start();
 	wave->property_rectified() = (bool) (_flags & WaveformRectified);
 	wave->property_logscaled() = (bool) (_flags & WaveformLogScaled);
@@ -891,6 +882,7 @@ AudioRegionView::create_one_wave (uint32_t which, bool direct)
 		/* all waves created, don't hook into peaks ready anymore */
 		data_ready_connection.disconnect ();		
 
+		if(0)
 		if (!zero_line) {
 			zero_line = new ArdourCanvas::SimpleLine (*group);
 			zero_line->property_x1() = (gdouble) 1.0;
@@ -1098,6 +1090,8 @@ AudioRegionView::add_ghost (AutomationTimeAxisView& atv)
 		wave->property_samples_per_unit() =  samples_per_unit;
 		wave->property_amplitude_above_axis() =  _amplitude_above_axis;
 		wave->property_wave_color() = color_map[cGhostTrackWave];
+		wave->property_clip_color() = color_map[cGhostTrackWaveClip];
+		wave->property_zero_color() = color_map[cGhostTrackZeroLine];
 		wave->property_region_start() = _region->start();
 
 		ghost->waves.push_back(wave);
@@ -1182,6 +1176,8 @@ AudioRegionView::color_handler (ColorID id, uint32_t val)
 	switch (id) {
 	case cMutedWaveForm:
 	case cWaveForm:
+	case cWaveFormClip:
+	case cZeroLine:
 		set_colors ();
 		break;
 
@@ -1189,15 +1185,6 @@ AudioRegionView::color_handler (ColorID id, uint32_t val)
 	case cGainLine:
 		envelope_active_changed();
 		break;
-		
-	case cZeroLine:
-		if (zero_line) {
-			zero_line->property_color_rgba() = (guint) color_map[cZeroLine];
-		}
-		break;
-
-	case cGhostTrackWave:
-		break;
 
 	default:
 		break;
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index d12fa70fed..c2a7165c2e 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -178,6 +178,15 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai
 	region_view->set_amplitude_above_axis(_amplitude_above_axis);
 	region_views.push_front (region_view);
 
+	
+	/* if its the special single-sample length that we use for rec-regions, make it 
+	   insensitive to events 
+	*/
+
+	if (region->length() == 1) {
+		region_view->set_sensitive (false);
+	}
+
 	/* if this was the first one, then lets query the waveform scale and shape.
 	   otherwise, we set it to the current value */
 	   
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 4978a1ef68..67f91e1ed4 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -1136,6 +1136,13 @@ AutomationLine::set_selected_points (PointSelection& points)
 
 }
 
+void AutomationLine::set_colors() {
+	set_line_color( color_map[cAutomationLine] );
+	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
+		(*i)->show_color (false, !points_visible);
+	}
+}
+
 void
 AutomationLine::show_selection ()
 {
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 4942643b65..76afff5097 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -159,6 +159,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
 
 	XMLNode& get_state (void);
 	int set_state (const XMLNode&);
+	void set_colors();
 
   protected:
 
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 69653c9c99..0da3a38fdc 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -163,6 +163,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	/* make sure labels etc. are correct */
 
 	automation_state_changed ();
+	ColorChanged.connect (mem_fun (*this, &AutomationTimeAxisView::color_handler));
 }
 
 AutomationTimeAxisView::~AutomationTimeAxisView ()
@@ -787,6 +788,42 @@ AutomationTimeAxisView::exited ()
 	hide_all_but_selected_control_points ();
 }
 
+void
+AutomationTimeAxisView::set_colors () {
+
+    for( list<GhostRegion *>::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) {
+	(*i)->set_colors();
+    }
+    
+    for( vector<AutomationLine *>::iterator i=lines.begin(); i != lines.end(); i++ ) {
+	(*i)->set_colors();
+    }
+
+}
+
+void
+AutomationTimeAxisView::color_handler (ColorID id, uint32_t val) {
+    
+	switch (id) {
+	case cGhostTrackWave:
+	case cGhostTrackWaveClip:
+	case cGhostTrackZeroLine:
+
+	case cControlPoint:
+	case cControlPointFill:
+	case cControlPointOutline:
+	case cAutomationLine:
+		set_colors ();
+
+		break;
+
+	default: 
+		break;
+	}
+}
+
+
+
 void
 AutomationTimeAxisView::set_state (const XMLNode& node)
 {
diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 0eb525f6c1..f7c61942df 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -122,6 +122,9 @@ class AutomationTimeAxisView : public TimeAxisView {
 	void entered ();
 	void exited ();
 
+	void set_colors ();
+	void color_handler (ColorID, uint32_t);
+
 	static Pango::FontDescription name_font;
 	static bool have_name_font;
 };
diff --git a/gtk2_ardour/canvas-simplerect.c b/gtk2_ardour/canvas-simplerect.c
index e7a7488061..d50943f0c3 100644
--- a/gtk2_ardour/canvas-simplerect.c
+++ b/gtk2_ardour/canvas-simplerect.c
@@ -354,8 +354,8 @@ gnome_canvas_simplerect_reset_bounds (GnomeCanvasItem *item)
 	gnome_canvas_request_redraw (item->canvas, 
 				     unionrect.x0 - 0.5,
 				     unionrect.y0 - 0.5,
-				     unionrect.x1 + 0.5,
-				     unionrect.y1 + 0.5);
+				     unionrect.x1 + 1.5,
+				     unionrect.y1 + 1.5);
 }
 
 /* 
diff --git a/gtk2_ardour/canvas-waveview.c b/gtk2_ardour/canvas-waveview.c
index c8e9f61332..b78bf63ea7 100644
--- a/gtk2_ardour/canvas-waveview.c
+++ b/gtk2_ardour/canvas-waveview.c
@@ -30,6 +30,7 @@
 #include "canvas-waveview.h"
 #include "rgb_macros.h"
 
+
 extern void c_stacktrace();
 
 enum {
@@ -49,6 +50,8 @@ enum {
 	 PROP_Y,
 	 PROP_HEIGHT,
 	 PROP_WAVE_COLOR,
+	 PROP_CLIP_COLOR,
+	 PROP_ZERO_COLOR,
 	 PROP_RECTIFIED,
 	 PROP_REGION_START,
 	 PROP_LOGSCALED,
@@ -249,6 +252,20 @@ gnome_canvas_waveview_class_init (GnomeCanvasWaveViewClass *class)
 				     0, G_MAXUINT, 0,
 				     (G_PARAM_READABLE | G_PARAM_WRITABLE)));
 	 
+	 g_object_class_install_property
+		 (gobject_class,
+		  PROP_CLIP_COLOR,
+		  g_param_spec_uint ("clip_color", NULL, NULL,
+				     0, G_MAXUINT, 0,
+				     (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+	 
+	 g_object_class_install_property
+		 (gobject_class,
+		  PROP_ZERO_COLOR,
+		  g_param_spec_uint ("zero_color", NULL, NULL,
+				     0, G_MAXUINT, 0,
+				     (G_PARAM_READABLE | G_PARAM_WRITABLE)));
+	 
 	 g_object_class_install_property
 		 (gobject_class,
 		  PROP_RECTIFIED,
@@ -326,6 +343,8 @@ gnome_canvas_waveview_init (GnomeCanvasWaveView *waveview)
 	waveview->reload_cache_in_render = FALSE;
 
  	waveview->wave_color = RGBA_TO_UINT(44,35,126,255);
+ 	waveview->clip_color = RGBA_TO_UINT(44,0,0,100);
+ 	waveview->zero_color = RGBA_TO_UINT(44,0,128,100);
 }
 
 static void
@@ -797,6 +816,20 @@ gnome_canvas_waveview_set_property (GObject      *object,
 		}
 		break;
 
+	case PROP_CLIP_COLOR:
+		if (waveview->clip_color != g_value_get_uint(value)) {
+		        waveview->clip_color = g_value_get_uint(value);
+			redraw = TRUE;
+		}
+		break;
+
+	case PROP_ZERO_COLOR:
+		if (waveview->zero_color != g_value_get_uint(value)) {
+		        waveview->zero_color = g_value_get_uint(value);
+			redraw = TRUE;
+		}
+		break;
+
 	case PROP_RECTIFIED:
 		if (waveview->rectified != g_value_get_boolean(value)) {
 			waveview->rectified = g_value_get_boolean(value);
@@ -909,6 +942,14 @@ gnome_canvas_waveview_get_property (GObject      *object,
 		g_value_set_uint (value, waveview->wave_color);
 		break;
 
+	case PROP_CLIP_COLOR:
+		g_value_set_uint (value, waveview->clip_color);
+		break;
+
+	case PROP_ZERO_COLOR:
+		g_value_set_uint (value, waveview->zero_color);
+		break;
+
 	case PROP_RECTIFIED:
 		g_value_set_boolean (value, waveview->rectified);
 		break;
@@ -969,6 +1010,8 @@ gnome_canvas_waveview_update (GnomeCanvasItem *item, double *affine, ArtSVP *cli
 
 	UINT_TO_RGBA (waveview->wave_color, &waveview->wave_r, &waveview->wave_g, &waveview->wave_b,
 		      &waveview->wave_a);
+	UINT_TO_RGBA (waveview->clip_color, &waveview->clip_r, &waveview->clip_g, &waveview->clip_b,
+		      &waveview->clip_a);
 
 //	check_cache (waveview, "end of update");
 }
@@ -984,6 +1027,7 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
 	int cache_index;
 	double half_height;
 	int x, end, begin;
+	int zbegin, zend;
 
 	waveview = GNOME_CANVAS_WAVEVIEW (item);
 
@@ -998,7 +1042,13 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
 		buf->is_bg = FALSE;
 	}
 
-	begin = MAX(waveview->bbox_ulx,buf->rect.x0);
+	begin = MAX(waveview->bbox_ulx, buf->rect.x0);
+
+	if (begin == waveview->bbox_ulx) {
+		zbegin = begin + 1;
+	} else {
+		zbegin = begin;
+	}
 
 	if (waveview->bbox_lrx >= 0) {
 		end = MIN(waveview->bbox_lrx,buf->rect.x1);
@@ -1006,6 +1056,12 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
 		end = buf->rect.x1;
 	}
 
+	if (end == waveview->bbox_lrx) {
+		zend = end - 1;
+	} else {
+		zend = end;
+	}
+
 	if (begin == end) {
 		return;
 	}
@@ -1066,6 +1122,7 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
 
 #define origin half_height
 
+
 	for (x = begin; x < end; x++) {
 
 		double max, min;
@@ -1126,11 +1183,11 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
 		}
 
 		if (clip_max) {
-			PAINT_VERT(buf, 255, 0, 0, x, pymax, pymax+clip_length);
+			PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a, x, pymax, pymax+clip_length);
 		}
 
 		if (clip_min) {
-			PAINT_VERT(buf, 255, 0, 0, x, pymin-clip_length, pymin);
+			PAINT_VERTA(buf, waveview->clip_r, waveview->clip_g, waveview->clip_b, waveview->clip_a, x, pymin-clip_length, pymin);
 		}
 
 		/* presto, we're done */
@@ -1138,6 +1195,15 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
 		cache_index++;
 	}
 
+	if (!waveview->rectified) {
+		// Paint zeroline.
+		//PAINT_HORIZA(buf, waveview->zero_r, waveview->zero_g, waveview->zero_b, waveview->zero_a, begin, endi-1, origin );
+		
+		unsigned char zero_r, zero_g, zero_b, zero_a;
+		UINT_TO_RGBA( waveview->zero_color, &zero_r, &zero_g, &zero_b, &zero_a );
+		int zeroline_y = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
+		PAINT_HORIZA(buf, zero_r, zero_g, zero_b, zero_a, zbegin, end, zeroline_y);
+	}
 #undef origin
 
 }
diff --git a/gtk2_ardour/canvas-waveview.h b/gtk2_ardour/canvas-waveview.h
index 81cf35910e..6a7410546e 100644
--- a/gtk2_ardour/canvas-waveview.h
+++ b/gtk2_ardour/canvas-waveview.h
@@ -99,6 +99,8 @@ struct _GnomeCanvasWaveView
     double height;
     double half_height;
     uint32_t wave_color;
+    uint32_t clip_color;
+    uint32_t zero_color;
 
     char rectified;
     char logscaled; 
@@ -113,6 +115,7 @@ struct _GnomeCanvasWaveView
     int32_t bbox_lrx;
     int32_t bbox_lry;
     unsigned char wave_r, wave_g, wave_b, wave_a;
+    unsigned char clip_r, clip_g, clip_b, clip_a;
     uint32_t samples;
     uint32_t region_start;
     int32_t reload_cache_in_render;
diff --git a/gtk2_ardour/colors.h b/gtk2_ardour/colors.h
index 6997a61c70..6e381a4dfd 100644
--- a/gtk2_ardour/colors.h
+++ b/gtk2_ardour/colors.h
@@ -1,6 +1,7 @@
 /* no guard clauses here */
 
 COLORID(cWaveForm)
+COLORID(cWaveFormClip)
 COLORID(cMutedWaveForm)
 COLORID(cSelectedFrameBase)
 COLORID(cFrameBase)
@@ -75,6 +76,8 @@ COLORID(cMeasureLineBar)
 COLORID(cGhostTrackBaseOutline)
 COLORID(cGhostTrackBaseFill)
 COLORID(cGhostTrackWave)
+COLORID(cGhostTrackWaveClip)
+COLORID(cGhostTrackZeroLine)
 COLORID(cImageTrackBase)
 COLORID(cImageTrackOutline)
 COLORID(cMarkerTrackBase)
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index a56cc5d4e2..01a3deeae1 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -40,6 +40,7 @@
 #include <gtkmm2ext/tearoff.h>
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/window_title.h>
+#include <gtkmm2ext/choice.h>
 
 #include <ardour/audio_track.h>
 #include <ardour/audio_diskstream.h>
@@ -1076,7 +1077,7 @@ Editor::connect_to_session (Session *t)
 
 	session_connections.push_back (session->SMPTEOffsetChanged.connect (mem_fun(*this, &Editor::update_just_smpte)));
 
-	session_connections.push_back (session->tempo_map().StateChanged.connect (bind (mem_fun(*this, &Editor::tempo_map_changed), false)));
+	session_connections.push_back (session->tempo_map().StateChanged.connect (mem_fun(*this, &Editor::tempo_map_changed)));
 
 	edit_groups_changed ();
 
@@ -1631,48 +1632,65 @@ Editor::add_region_context_items (AudioStreamView* sv, boost::shared_ptr<Region>
 
 	items.push_back (SeparatorElem());
 
-	items.push_back (CheckMenuElem (_("Lock"), mem_fun(*this, &Editor::toggle_region_lock)));
+	sigc::connection fooc;
+
+	items.push_back (CheckMenuElem (_("Lock")));
 	region_lock_item = static_cast<CheckMenuItem*>(&items.back());
+	fooc = region_lock_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_lock));
 	if (region->locked()) {
+		fooc.block (true);
 		region_lock_item->set_active();
+		fooc.block (false);
 	}
-	items.push_back (CheckMenuElem (_("Mute"), mem_fun(*this, &Editor::toggle_region_mute)));
+	items.push_back (CheckMenuElem (_("Mute")));
 	region_mute_item = static_cast<CheckMenuItem*>(&items.back());
+	fooc = region_mute_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_mute));
 	if (region->muted()) {
+		fooc.block (true);
 		region_mute_item->set_active();
-	}
-	items.push_back (CheckMenuElem (_("Opaque"), mem_fun(*this, &Editor::toggle_region_opaque)));
-	region_opaque_item = static_cast<CheckMenuItem*>(&items.back());
-	if (region->opaque()) {
-		region_opaque_item->set_active();
+		fooc.block (false);
 	}
 
+	items.push_back (CheckMenuElem (_("Opaque")));
+	region_opaque_item = static_cast<CheckMenuItem*>(&items.back());
+	fooc = region_opaque_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_opaque));
+	if (region->opaque()) {
+		fooc.block (true);
+		region_opaque_item->set_active();
+		fooc.block (false);
+	}
+	
 	items.push_back (CheckMenuElem (_("Original position"), mem_fun(*this, &Editor::naturalize)));
 	if (region->at_natural_position()) {
 		items.back().set_sensitive (false);
 	}
-
+	
 	items.push_back (SeparatorElem());
-
+	
 	if (ar) {
 		
 		RegionView* rv = sv->find_view (ar);
 		AudioRegionView* arv = dynamic_cast<AudioRegionView*>(rv);
-
+		
 		items.push_back (MenuElem (_("Reset Envelope"), mem_fun(*this, &Editor::reset_region_gain_envelopes)));
 		
-		items.push_back (CheckMenuElem (_("Envelope Visible"), mem_fun(*this, &Editor::toggle_gain_envelope_visibility)));
+		items.push_back (CheckMenuElem (_("Envelope Visible")));
 		region_envelope_visible_item = static_cast<CheckMenuItem*> (&items.back());
-
+		fooc = region_envelope_visible_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_gain_envelope_visibility));
 		if (arv->envelope_visible()) {
+			fooc.block (true);
 			region_envelope_visible_item->set_active (true);
+			fooc.block (false);
 		}
-
-		items.push_back (CheckMenuElem (_("Envelope Active"), mem_fun(*this, &Editor::toggle_gain_envelope_active)));
+		
+		items.push_back (CheckMenuElem (_("Envelope Active")));
 		region_envelope_active_item = static_cast<CheckMenuItem*> (&items.back());
-
+		fooc = region_envelope_active_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_gain_envelope_active));
+		
 		if (ar->envelope_active()) {
+			fooc.block (true);
 			region_envelope_active_item->set_active (true);
+			fooc.block (false);
 		}
 
 		items.push_back (SeparatorElem());
@@ -2835,32 +2853,34 @@ Editor::history_changed ()
 void
 Editor::duplicate_dialog (bool dup_region)
 {
-	if (dup_region) {
-		if (clicked_regionview == 0) {
-			return;
-		}
-	} else {
-		if (selection->time.length() == 0) {
-			return;
-		}
+	if (selection->regions.empty() && (selection->time.length() == 0)) {
+		return;
 	}
 
 	ArdourDialog win ("duplicate dialog");
-	Entry  entry;
 	Label  label (_("Duplicate how many times?"));
+	Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0);
+	SpinButton spinner (adjustment);
 
+	win.get_vbox()->set_spacing (12);
 	win.get_vbox()->pack_start (label);
-	win.add_action_widget (entry, RESPONSE_ACCEPT);
+
+	/* dialogs have ::add_action_widget() but that puts the spinner in the wrong
+	   place, visually. so do this by hand.
+	*/
+
+	win.get_vbox()->pack_start (spinner);
+	spinner.signal_activate().connect (sigc::bind (mem_fun (win, &ArdourDialog::response), RESPONSE_ACCEPT));
+
+	label.show ();
+	spinner.show ();
+
 	win.add_button (Stock::OK, RESPONSE_ACCEPT);
 	win.add_button (Stock::CANCEL, RESPONSE_CANCEL);
 
 	win.set_position (WIN_POS_MOUSE);
 
-	entry.set_text ("1");
-	set_size_request_to_display_given_text (entry, X_("12345678"), 20, 15);
-	entry.select_region (0, -1);
-	entry.grab_focus ();
-
+	spinner.grab_focus ();
 
 	switch (win.run ()) {
 	case RESPONSE_ACCEPT:
@@ -2869,17 +2889,12 @@ Editor::duplicate_dialog (bool dup_region)
 		return;
 	}
 
-	string text = entry.get_text();
-	float times;
+	float times = adjustment.get_value();
 
-	if (sscanf (text.c_str(), "%f", &times) == 1) {
-		if (dup_region) {
-			RegionSelection regions;
-			regions.add (clicked_regionview);
-			duplicate_some_regions (regions, times);
-		} else {
-			duplicate_selection (times);
-		}
+	if (!selection->regions.empty()) {
+		duplicate_some_regions (selection->regions, times);
+	} else {
+		duplicate_selection (times);
 	}
 }
 
@@ -3376,6 +3391,9 @@ Editor::control_layout_scroll (GdkEventScroll* ev)
 	return false;
 }
 
+
+/** A new snapshot has been selected.
+ */
 void
 Editor::snapshot_display_selection_changed ()
 {
@@ -3400,7 +3418,93 @@ Editor::snapshot_display_selection_changed ()
 bool
 Editor::snapshot_display_button_press (GdkEventButton* ev)
 {
-	 return false;
+	if (ev->button == 3) {
+		/* Right-click on the snapshot list. Work out which snapshot it
+		   was over. */
+		Gtk::TreeModel::Path path;
+		Gtk::TreeViewColumn* col;
+		int cx;
+		int cy;
+		snapshot_display.get_path_at_pos ((int) ev->x, (int) ev->y, path, col, cx, cy);
+		Gtk::TreeModel::iterator iter = snapshot_display_model->get_iter (path);
+		if (iter) {
+			Gtk::TreeModel::Row row = *iter;
+			popup_snapshot_context_menu (ev->button, ev->time, row[snapshot_display_columns.real_name]);
+		}
+		return true;
+	}
+
+	return false;
+}
+
+
+/** Pop up the snapshot display context menu.
+ * @param button Button used to open the menu.
+ * @param time Menu open time.
+ * @snapshot_name Name of the snapshot that the menu click was over.
+ */
+
+void
+Editor::popup_snapshot_context_menu (int button, int32_t time, Glib::ustring snapshot_name)
+{
+	using namespace Menu_Helpers;
+
+	MenuList& items (snapshot_context_menu.items());
+	items.clear ();
+
+	const bool modification_allowed = (session->snap_name() != snapshot_name && session->name() != snapshot_name);
+
+	items.push_back (MenuElem (_("Remove"), bind (mem_fun (*this, &Editor::remove_snapshot), snapshot_name)));
+	if (!modification_allowed) {
+		items.back().set_sensitive (false);
+	}
+
+	items.push_back (MenuElem (_("Rename"), bind (mem_fun (*this, &Editor::rename_snapshot), snapshot_name)));
+	if (!modification_allowed) {
+		items.back().set_sensitive (false);
+	}
+
+	snapshot_context_menu.popup (button, time);
+}
+
+void
+Editor::rename_snapshot (Glib::ustring old_name)
+{
+	ArdourPrompter prompter(true);
+
+	string new_name;
+
+	prompter.set_name ("Prompter");
+	prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+	prompter.set_prompt (_("New name of snapshot"));
+	prompter.set_initial_text (old_name);
+	
+	if (prompter.run() == RESPONSE_ACCEPT) {
+		prompter.get_result (new_name);
+		if (new_name.length()) {
+			session->rename_state (old_name, new_name);
+		        redisplay_snapshots ();
+		}
+	}
+}
+
+
+void
+Editor::remove_snapshot (Glib::ustring name)
+{
+	vector<string> choices;
+
+	std::string prompt  = string_compose (_("Do you really want to remove snapshot \"%1\" ?\n(cannot be undone)"), name);
+
+	choices.push_back (_("No, do nothing."));
+	choices.push_back (_("Yes, remove it."));
+
+	Gtkmm2ext::Choice prompter (prompt, choices);
+
+	if (prompter.run () == 1) {
+		session->remove_state (name);
+		redisplay_snapshots ();
+	}
 }
 
 void
@@ -3669,7 +3773,7 @@ Editor::idle_visual_changer ()
 			/* the signal handler will do the rest */
 		} else {
 			update_fixed_rulers();
-			tempo_map_changed (Change (0), true);
+			redisplay_tempo (true);
 		}
 	}
 
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 2d43de8a8e..f13ac805d2 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -770,10 +770,12 @@ class Editor : public PublicEditor
 	SnapshotDisplayModelColumns snapshot_display_columns;
 	Glib::RefPtr<Gtk::ListStore> snapshot_display_model;
 	Gtk::TreeView snapshot_display;
+	Gtk::Menu snapshot_context_menu;
 
 	bool snapshot_display_button_press (GdkEventButton*);
 	void snapshot_display_selection_changed ();
 	void redisplay_snapshots();
+	void popup_snapshot_context_menu (int, int32_t, Glib::ustring);
 
 	/* named selections */
 
@@ -795,6 +797,8 @@ class Editor : public PublicEditor
 	void create_named_selection ();
 	void paste_named_selection (float times);
 	void remove_selected_named_selections ();
+	void remove_snapshot (Glib::ustring);
+	void rename_snapshot (Glib::ustring);
 
 	void handle_new_named_selection ();
 	void add_named_selection_to_named_selection_display (ARDOUR::NamedSelection&);
@@ -1167,9 +1171,13 @@ class Editor : public PublicEditor
 
 	bool canvas_playhead_cursor_event (GdkEvent* event, ArdourCanvas::Item*);
 	bool canvas_edit_cursor_event (GdkEvent* event, ArdourCanvas::Item*);
-	bool track_canvas_event (GdkEvent* event, ArdourCanvas::Item*);
 	bool track_canvas_scroll (GdkEventScroll* event);
 
+	bool track_canvas_scroll_event (GdkEventScroll* event);
+	bool track_canvas_button_press_event (GdkEventButton* event);
+	bool track_canvas_button_release_event (GdkEventButton* event);
+	bool track_canvas_motion_notify_event (GdkEventMotion* event);
+
 	Gtk::Allocation canvas_allocation;
 	bool canvas_idle_queued;
 	void track_canvas_allocate (Gtk::Allocation alloc);
@@ -1275,8 +1283,8 @@ class Editor : public PublicEditor
 	void remove_metric_marks ();
 	void draw_metric_marks (const ARDOUR::Metrics& metrics);
 
-	void tempo_map_changed (ARDOUR::Change, bool immediate_redraw);
-	void redisplay_tempo ();
+	void tempo_map_changed (ARDOUR::Change);
+	void redisplay_tempo (bool immediate_redraw);
 	
 	void snap_to (nframes_t& first, int32_t direction = 0, bool for_mark = false);
 	uint32_t bbt_beat_subdivision;
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index abe6534b1b..a933197f7f 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -17,8 +17,14 @@
 
 */
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <unistd.h>
+
 #include <pbd/pthread_utils.h>
 #include <pbd/basename.h>
+#include <pbd/shortpath.h>
 
 #include <gtkmm2ext/choice.h>
 #include <gtkmm2ext/window_title.h>
@@ -293,7 +299,7 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi
 		linked_path += Glib::path_get_basename (path);
 		
 		if (link (path.c_str(), linked_path.c_str()) == 0) {
-			
+
 			/* there are many reasons why link(2) might have failed.
 			   but if it succeeds, we now have a link in the
 			   session sound dir that will protect against
@@ -301,6 +307,21 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi
 			*/
 			
 			path = linked_path;
+
+		} else {
+
+			/* one possible reason is that its already linked */
+
+			if (errno == EEXIST) {
+				struct stat sb;
+
+				if (stat (linked_path.c_str(), &sb) == 0) {
+					if (sb.st_nlink > 1) { // its a hard link, assume its the one we want
+						path = linked_path;
+					}
+				}
+			}
+
 		}
 		
 		/* note that we temporarily truncated _id at the colon */
@@ -380,7 +401,6 @@ Editor::embed_sndfile (vector<Glib::ustring> paths, bool split, bool multiple_fi
 				boost::shared_ptr<Source> s;
 
 				if ((s = session->source_by_path_and_channel (path, n)) == 0) {
-					cerr << "source doesn't exist yet\n";
 					source = boost::dynamic_pointer_cast<AudioFileSource> (SourceFactory::createReadable 
 											       (DataType::AUDIO, *session, path,  n,
 												(mode == ImportAsTapeTrack ? 
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 8324e044b3..6b3b62b06e 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -93,7 +93,13 @@ Editor::initialize_canvas ()
 	track_canvas.set_center_scroll_region (false);
 	track_canvas.set_dither  	(Gdk::RGB_DITHER_NONE);
 
-	track_canvas.signal_event().connect (bind (mem_fun (*this, &Editor::track_canvas_event), (ArdourCanvas::Item*) 0));
+	/* need to handle 4 specific types of events as catch-alls */
+
+	track_canvas.signal_scroll_event().connect (mem_fun (*this, &Editor::track_canvas_scroll_event));
+	track_canvas.signal_motion_notify_event().connect (mem_fun (*this, &Editor::track_canvas_motion_notify_event));
+	track_canvas.signal_button_press_event().connect (mem_fun (*this, &Editor::track_canvas_button_press_event));
+	track_canvas.signal_button_release_event().connect (mem_fun (*this, &Editor::track_canvas_button_release_event));
+
 	track_canvas.set_name ("EditorMainCanvas");
 	track_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK|Gdk::SCROLL_MASK);
 	track_canvas.signal_leave_notify_event().connect (mem_fun(*this, &Editor::left_track_canvas));
@@ -368,7 +374,7 @@ Editor::track_canvas_size_allocated ()
 	}
 		
 	update_fixed_rulers();
-	tempo_map_changed (Change (0), true);
+	redisplay_tempo (true);
 	
 	Resized (); /* EMIT_SIGNAL */
 
@@ -720,6 +726,6 @@ Editor::canvas_horizontally_scrolled ()
 	
 	update_fixed_rulers ();
 
-	tempo_map_changed (Change (0), !_dragging_hscrollbar);
+	redisplay_tempo (!_dragging_hscrollbar);
 }
 
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 4a23e8b316..40bef304c5 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -20,6 +20,8 @@
 #include <cstdlib>
 #include <cmath>
 
+#include <pbd/stacktrace.h>
+
 #include <ardour/audio_diskstream.h>
 #include <ardour/audioplaylist.h>
 
@@ -129,43 +131,36 @@ Editor::track_canvas_scroll (GdkEventScroll* ev)
 }
 
 bool
-Editor::track_canvas_event (GdkEvent *event, ArdourCanvas::Item* item)
+Editor::track_canvas_scroll_event (GdkEventScroll *event)
 {
-	gint x, y;
+	track_canvas.grab_focus();
+	track_canvas_scroll (event);
+	return false;
+}
 
-	/* this is the handler for events that are not handled by
-	   items.
-	*/
+bool
+Editor::track_canvas_button_press_event (GdkEventButton *event)
+{
+	track_canvas.grab_focus();
+	return false;
+}
 
-	switch (event->type) {
-	case GDK_MOTION_NOTIFY:
-		/* keep those motion events coming */
-		track_canvas.get_pointer (x, y);
-		return track_canvas_motion (event);
-
-	case GDK_BUTTON_PRESS:
-		track_canvas.grab_focus();
-		break;
-
-	case GDK_BUTTON_RELEASE:
-		switch (event->button.button) {
-		case 4:
-		case 5:
-			button_release_handler (item, event, NoItem);
-			break;
-		}
-		break;
-
-	case GDK_SCROLL:
-		track_canvas.grab_focus();
-		track_canvas_scroll (&event->scroll);
-		break;
-
-	default:
-		break;
+bool
+Editor::track_canvas_button_release_event (GdkEventButton *event)
+{
+	if (drag_info.item) {
+		end_grab (drag_info.item, (GdkEvent*) event);
 	}
+	return false;
+}
 
-	return FALSE;
+bool
+Editor::track_canvas_motion_notify_event (GdkEventMotion *event)
+{
+	int x, y;
+	/* keep those motion events coming */
+	track_canvas.get_pointer (x, y);
+	return false;
 }
 
 bool
@@ -214,7 +209,12 @@ Editor::typed_event (ArdourCanvas::Item* item, GdkEvent *event, ItemType type)
 bool
 Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, RegionView *rv)
 {
-	gint ret = FALSE;
+	bool ret = false;
+
+	if (!rv->sensitive ()) {
+		return false;
+	}
+
 
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
@@ -290,6 +290,7 @@ bool
 Editor::canvas_automation_track_event (GdkEvent *event, ArdourCanvas::Item* item, AutomationTimeAxisView *atv)
 {
 	bool ret = false;
+
 	
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
@@ -330,6 +331,10 @@ Editor::canvas_fade_in_event (GdkEvent *event, ArdourCanvas::Item* item, AudioRe
 {
 	/* we handle only button 3 press/release events */
 
+	if (!rv->sensitive()) {
+		return false;
+	}
+
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
 		clicked_regionview = rv;
@@ -362,6 +367,10 @@ Editor::canvas_fade_in_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
 {
 	bool ret = false;
 	
+	if (!rv->sensitive()) {
+		return false;
+	}
+
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
 	case GDK_2BUTTON_PRESS:
@@ -401,6 +410,10 @@ Editor::canvas_fade_out_event (GdkEvent *event, ArdourCanvas::Item* item, AudioR
 {
 	/* we handle only button 3 press/release events */
 
+	if (!rv->sensitive()) {
+		return false;
+	}
+
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
 		clicked_regionview = rv;
@@ -433,6 +446,10 @@ Editor::canvas_fade_out_handle_event (GdkEvent *event, ArdourCanvas::Item* item,
 {
 	bool ret = false;
 	
+	if (!rv->sensitive()) {
+		return false;
+	}
+
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
 	case GDK_2BUTTON_PRESS:
@@ -499,6 +516,11 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
 		
 	}
 
+	/* XXX do not forward double clicks */
+
+	if (event->type == GDK_2BUTTON_PRESS) {
+		return false;
+	}
 	
 	/* proxy for the upper most regionview */
 
@@ -524,10 +546,10 @@ Editor::canvas_crossfade_view_event (GdkEvent* event, ArdourCanvas::Item* item,
 
 					RegionView* rv = atv->view()->find_view (rl->front());
 
-					/* proxy */
-
 					delete rl;
 
+					/* proxy */
+					
 					return canvas_region_view_event (event, rv->get_canvas_group(), rv);
 				} 
 			}
@@ -703,6 +725,10 @@ Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::
 {
 	bool ret = false;
 	
+	if (!rv->sensitive()) {
+		return false;
+	}
+
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
 	case GDK_2BUTTON_PRESS:
@@ -739,6 +765,10 @@ Editor::canvas_region_view_name_event (GdkEvent *event, ArdourCanvas::Item* item
 {
 	bool ret = false;
 
+	if (!rv->sensitive()) {
+		return false;
+	}
+
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
 	case GDK_2BUTTON_PRESS:
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index e007a225d8..7290df330a 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -47,6 +47,7 @@
 #include "rgb_macros.h"
 
 #include <ardour/types.h>
+#include <ardour/profile.h>
 #include <ardour/route.h>
 #include <ardour/audio_track.h>
 #include <ardour/audio_diskstream.h>
@@ -325,8 +326,8 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
 	Selection::Operation op = Keyboard::selection_type (event->button.state);
 	bool press = (event->type == GDK_BUTTON_PRESS);
 
-	begin_reversible_command (_("select on click"));
-
+	// begin_reversible_command (_("select on click"));
+	
 	switch (item_type) {
 	case RegionItem:
 		if (mouse_mode != MouseRange) {
@@ -359,8 +360,9 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
 	case GainAutomationControlPointItem:
 	case PanAutomationControlPointItem:
 	case RedirectAutomationControlPointItem:
+		commit = set_selected_track_from_click (press, op, true);
 		if (mouse_mode != MouseRange) {
-			commit = set_selected_control_point_from_click (op, false);
+			commit |= set_selected_control_point_from_click (op, false);
 		}
 		break;
 		
@@ -381,16 +383,14 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
 		break;
 	}
 	
-	if (commit) {
-		commit_reversible_command ();
-	}
+//	if (commit) {
+//		commit_reversible_command ();
+//	}
 }
 
 bool
 Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
 {
-	nframes_t where = event_frame (event, 0, 0);
-
 	track_canvas.grab_focus();
 
 	if (session && session->actively_recording()) {
@@ -748,79 +748,6 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
 	case 3:
 		break;
 
-	case 4:
-		switch (mouse_mode) {
-		case MouseZoom:
-			//temporal_zoom_to_frame (true, where);
-			if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
-				temporal_zoom_to_frame (true, where);
-			}
-			else {
-				temporal_zoom_step (true);
-			}
-			break;
-		default:
-			
-			if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::Alt))) {
-				scroll_backward (0.6f);
-				return true;
-			}
-			else if (Keyboard::no_modifier_keys_pressed (&event->button)) {
-				scroll_tracks_up_line ();
-			} else {
-				if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Shift)) {
-					if (clicked_axisview) {
-						if (!current_stepping_trackview) {
-						  step_timeout = Glib::signal_timeout().connect (mem_fun(*this, &Editor::track_height_step_timeout), 500);
-							current_stepping_trackview = clicked_axisview;
-						}
-						gettimeofday (&last_track_height_step_timestamp, 0);
-						current_stepping_trackview->step_height (true);
-					}
-				}
-				else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
-					temporal_zoom_to_frame (true, where);
-				}
-			}
-		}
-		break;
-
-	case 5:
-		switch (mouse_mode) {
-		case MouseZoom:
-			// temporal_zoom_to_frame (false, where);
-			if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
-				temporal_zoom_to_frame (false, where);
-			}
-			else {
-				temporal_zoom_step (false);
-			}
-			break;
-		default:
-
-			if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::Alt))) {
-				scroll_forward (0.6f);
-				return true;
-			}
-			else if (Keyboard::no_modifier_keys_pressed (&event->button)) {
-				scroll_tracks_down_line ();
-			} else {
-				if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Shift)) {
-					if (clicked_axisview) {
-						if (!current_stepping_trackview) {
-						  step_timeout = Glib::signal_timeout().connect (mem_fun(*this, &Editor::track_height_step_timeout), 500);
-							current_stepping_trackview = clicked_axisview;
-						}
-						gettimeofday (&last_track_height_step_timestamp, 0);
-						current_stepping_trackview->step_height (false);
-					}
-				} else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::Control)) {
-					temporal_zoom_to_frame (false, where);
-				}
-			}
-		}
-		break;
-
 	default:
 		break;
 
@@ -1062,8 +989,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 
 		case MouseGain:
 			// Gain only makes sense for audio regions
-			if ( ! dynamic_cast<AudioRegionView*>(clicked_regionview))
+
+			if (!dynamic_cast<AudioRegionView*>(clicked_regionview)) {
 				break;
+			}
 
 			switch (item_type) {
 			case RegionItem:
@@ -1693,6 +1622,7 @@ Editor::end_grab (ArdourCanvas::Item* item, GdkEvent* event)
 	stop_canvas_autoscroll ();
 
 	if (drag_info.item == 0) {
+		cerr << "end grab with no item\n";
 		return false;
 	}
 	
@@ -1999,7 +1929,11 @@ Editor::start_cursor_grab (ArdourCanvas::Item* item, GdkEvent* event)
 		
 		if (session && drag_info.was_rolling) {
 			session->request_stop ();
-		} 
+		}
+
+		if (session && session->is_auditioning()) {
+			session->cancel_audition ();
+		}
 	}
 
 	drag_info.pointer_frame_offset = drag_info.grab_frame - cursor->current_frame;	
@@ -3361,12 +3295,10 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 	if (regionview_y_movement) {
 
 		/* moved to a different audio track. */
+		
+		vector<RegionView*> new_selection;
 
-		list<RegionView*> new_selection;
-		new_selection = selection->regions.by_layer();
-		selection->clear_regions ();
-
-		for (list<RegionView*>::const_iterator i = new_selection.begin(); i != new_selection.end(); ++i) {
+		for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ) {
 	    
 			RegionView* rv = (*i);	    	    
 
@@ -3383,6 +3315,12 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 			where = (nframes_t) (unit_to_frame (ix1) * speed);
 			boost::shared_ptr<Region> new_region (RegionFactory::create (rv->region()));
 
+			/* undo the previous hide_dependent_views so that xfades don't
+			   disappear on copying regions 
+			*/
+
+			rv->get_time_axis_view().reveal_dependent_views (*rv);
+
 			if (!drag_info.copy) {
 				
 				/* the region that used to be in the old playlist is not
@@ -3408,15 +3346,37 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 			c.disconnect ();
 							      
 			if (latest_regionview) {
-				selection->add (latest_regionview);
+				new_selection.push_back (latest_regionview);
 			}
 
 			if (drag_info.copy) {
 				// get rid of the copy
 				delete rv;
 			} 
+
+			/* OK, this is where it gets tricky. If the playlist was being used by >1 tracks, and the region
+			   was selected in all of them, then removing it from the playlist will have removed all
+			   trace of it from the selection (i.e. there were N regions selected, we removed 1,
+			   but since its the same playlist for N tracks, all N tracks updated themselves, removed the
+			   corresponding regionview, and the selection is now empty).
+
+			   this could have invalidated any and all iterators into the region selection.
+
+			   the heuristic we use here is: if the region selection is empty, break out of the loop
+			   here. if the region selection is not empty, then restart the loop because we know that
+			   we must have removed at least the region(view) we've just been working on as well as any
+			   that we processed on previous iterations.
+			*/
+
+			if (selection->regions.empty()) {
+				break;
+			} else { 
+				i = selection->regions.by_layer().begin();
+			}
 		} 
 
+		selection->set (new_selection);
+
 	} else {
 
 		/* motion within a single track */
@@ -3459,6 +3419,8 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 
 			boost::shared_ptr<Playlist> to_playlist = rv->region()->playlist();
 
+			assert (to_playlist);
+
 			/* add the undo */
 
 			session->add_command (new MementoCommand<Playlist>(*to_playlist, &to_playlist->get_state(), 0));	
@@ -3562,7 +3524,7 @@ Editor::show_verbose_time_cursor (nframes_t frame, double offset, double xpos, d
 		return;
 	}
 
-	switch (ARDOUR_UI::instance()->secondary_clock.mode ()) {
+	switch (Profile->get_small_screen() ? ARDOUR_UI::instance()->primary_clock.mode () : ARDOUR_UI::instance()->secondary_clock.mode ()) {
 	case AudioClock::BBT:
 		session->bbt_time (frame, bbt);
 		snprintf (buf, sizeof (buf), "%02" PRIu32 "|%02" PRIu32 "|%02" PRIu32, bbt.bars, bbt.beats, bbt.ticks);
@@ -4562,7 +4524,6 @@ Editor::end_range_markerbar_op (ArdourCanvas::Item* item, GdkEvent* event)
 			switch (mouse_mode) {
 			case MouseObject:
 				/* find the two markers on either side and then make the selection from it */
-				cerr << "select between " << start << " .. " << end << endl;
 				select_all_within (start, end, 0.0f, FLT_MAX, Selection::Set);
 				break;
 
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 279483243b..b098815208 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -461,9 +461,10 @@ void
 Editor::build_region_boundary_cache ()
 {
 	nframes_t pos = 0;
-	RegionPoint point;
+	vector<RegionPoint> interesting_points;
 	boost::shared_ptr<Region> r;
 	TrackViewList tracks;
+	bool at_end = false;
 
 	region_boundary_cache.clear ();
 
@@ -473,16 +474,17 @@ Editor::build_region_boundary_cache ()
 	
 	switch (snap_type) {
 	case SnapToRegionStart:
-		point = Start;
+		interesting_points.push_back (Start);
 		break;
 	case SnapToRegionEnd:
-		point = End;
+		interesting_points.push_back (End);
 		break;	
 	case SnapToRegionSync:
-		point = SyncPoint;
+		interesting_points.push_back (SyncPoint);
 		break;	
 	case SnapToRegionBoundary:
-		point = Start;
+		interesting_points.push_back (Start);
+		interesting_points.push_back (End);
 		break;	
 	default:
 		fatal << string_compose (_("build_region_boundary_cache called with snap_type = %1"), snap_type) << endmsg;
@@ -491,71 +493,80 @@ Editor::build_region_boundary_cache ()
 	}
 	
 	TimeAxisView *ontrack = 0;
+	TrackViewList tlist;
 
-	while (pos < session->current_end_frame()) {
+	if (!selection->tracks.empty()) {
+		tlist = selection->tracks;
+	} else {
+		tlist = track_views;
+	}
 
-		if (!selection->tracks.empty()) {
-
-			if ((r = find_next_region (pos, point, 1, selection->tracks, &ontrack)) == 0) {
-				break;
-			}
-
-		} else if (clicked_axisview) {
-
-			TrackViewList t;
-			t.push_back (clicked_axisview);
-
-			if ((r = find_next_region (pos, point, 1, t, &ontrack)) == 0) {
-				break;
-			}
-
-		} else {
-
-			if ((r = find_next_region (pos, point, 1, track_views, &ontrack)) == 0) {
-				break;
-			}
-		}
+	while (pos < session->current_end_frame() && !at_end) {
 
 		nframes_t rpos;
-		
-		switch (snap_type) {
-		case SnapToRegionStart:
-			rpos = r->first_frame();
-			break;
-		case SnapToRegionEnd:
-			rpos = r->last_frame();
-			break;	
-		case SnapToRegionSync:
-			rpos = r->adjust_to_sync (r->first_frame());
-			break;
+		nframes_t lpos = max_frames;
 
-		case SnapToRegionBoundary:
-			rpos = r->last_frame();
-			break;	
-		default:
-			break;
-		}
-		
-		float speed = 1.0f;
-		AudioTimeAxisView *atav;
+		for (vector<RegionPoint>::iterator p = interesting_points.begin(); p != interesting_points.end(); ++p) {
 
-		if ( ontrack != 0 && (atav = dynamic_cast<AudioTimeAxisView*>(ontrack)) != 0 ) {
-			if (atav->get_diskstream() != 0) {
-				speed = atav->get_diskstream()->speed();
+			if ((r = find_next_region (pos, *p, 1, tlist, &ontrack)) == 0) {
+				at_end = true;
+				/* move to next point type */
+				continue;
+			}
+
+			
+			switch (*p) {
+			case Start:
+				rpos = r->first_frame();
+				break;
+			case End:
+				rpos = r->last_frame();
+				break;	
+			case SyncPoint:
+				rpos = r->adjust_to_sync (r->first_frame());
+				break;
+			default:
+				break;
+			}
+			
+			float speed = 1.0f;
+			RouteTimeAxisView *rtav;
+			
+			if (ontrack != 0 && (rtav = dynamic_cast<RouteTimeAxisView*>(ontrack)) != 0 ) {
+				if (rtav->get_diskstream() != 0) {
+					speed = rtav->get_diskstream()->speed();
+				}
+			}
+			
+			rpos = track_frame_to_session_frame (rpos, speed);
+
+			if (rpos < lpos) {
+				lpos = rpos;
+			}
+
+			/* prevent duplicates, but we don't use set<> because we want to be able
+			   to sort later.
+			*/
+
+			vector<nframes_t>::iterator ri; 
+			
+			for (ri = region_boundary_cache.begin(); ri != region_boundary_cache.end(); ++ri) {
+				if (*ri == rpos) {
+					break;
+				}
+			}
+
+			if (ri == region_boundary_cache.end()) {
+				region_boundary_cache.push_back (rpos);
 			}
 		}
 
-		rpos = track_frame_to_session_frame(rpos, speed);
-
-		if (region_boundary_cache.empty() || rpos != region_boundary_cache.back()) {
-			if (snap_type == SnapToRegionBoundary) {
-				region_boundary_cache.push_back (r->first_frame());
-			}
-			region_boundary_cache.push_back (rpos);
-		}
-
-		pos = rpos + 1;
+		pos = lpos + 1;
 	}
+
+	/* finally sort to be sure that the order is correct */
+
+	sort (region_boundary_cache.begin(), region_boundary_cache.end());
 }
 
 boost::shared_ptr<Region>
@@ -568,7 +579,7 @@ Editor::find_next_region (nframes_t frame, RegionPoint point, int32_t dir, Track
 
 	float track_speed;
 	nframes_t track_frame;
-	AudioTimeAxisView *atav;
+	RouteTimeAxisView *rtav;
 
 	for (i = tracks.begin(); i != tracks.end(); ++i) {
 
@@ -576,9 +587,9 @@ Editor::find_next_region (nframes_t frame, RegionPoint point, int32_t dir, Track
 		boost::shared_ptr<Region> r;
 		
 		track_speed = 1.0f;
-		if ( (atav = dynamic_cast<AudioTimeAxisView*>(*i)) != 0 ) {
-			if (atav->get_diskstream()!=0)
-				track_speed = atav->get_diskstream()->speed();
+		if ( (rtav = dynamic_cast<RouteTimeAxisView*>(*i)) != 0 ) {
+			if (rtav->get_diskstream()!=0)
+				track_speed = rtav->get_diskstream()->speed();
 		}
 
 		track_frame = session_frame_to_track_frame(frame, track_speed);
@@ -671,11 +682,11 @@ Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir)
 	}
 	
 	float speed = 1.0f;
-	AudioTimeAxisView *atav;
+	RouteTimeAxisView *rtav;
 
-	if ( ontrack != 0 && (atav = dynamic_cast<AudioTimeAxisView*>(ontrack)) != 0 ) {
-		if (atav->get_diskstream() != 0) {
-			speed = atav->get_diskstream()->speed();
+	if ( ontrack != 0 && (rtav = dynamic_cast<RouteTimeAxisView*>(ontrack)) != 0 ) {
+		if (rtav->get_diskstream() != 0) {
+			speed = rtav->get_diskstream()->speed();
 		}
 	}
 
@@ -1477,7 +1488,7 @@ Editor::insert_region_list_drag (boost::shared_ptr<Region> region, int x, int y)
 	double cx, cy;
 	TimeAxisView *tv;
 	nframes_t where;
-	AudioTimeAxisView *atv = 0;
+	RouteTimeAxisView *rtv = 0;
 	boost::shared_ptr<Playlist> playlist;
 	
 	track_canvas.window_to_world (x, y, wx, wy);
@@ -1500,27 +1511,21 @@ Editor::insert_region_list_drag (boost::shared_ptr<Region> region, int x, int y)
 		return;
 	}
 	
-	if ((atv = dynamic_cast<AudioTimeAxisView*>(tv)) == 0) {
+	if ((rtv = dynamic_cast<RouteTimeAxisView*>(tv)) == 0) {
 		return;
 	}
 
-	if ((playlist = atv->playlist()) == 0) {
+	if ((playlist = rtv->playlist()) == 0) {
 		return;
 	}
 	
-	cerr << "drop target playlist, UC  = " << playlist.use_count() << endl;
-
 	snap_to (where);
 	
 	begin_reversible_command (_("insert dragged region"));
         XMLNode &before = playlist->get_state();
-	cerr << "pre add target playlist, UC  = " << playlist.use_count() << endl;
 	playlist->add_region (RegionFactory::create (region), where, 1.0);
-	cerr << "post add target playlist, UC  = " << playlist.use_count() << endl;
 	session->add_command(new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
 	commit_reversible_command ();
-
-	cerr << "post drop target playlist, UC  = " << playlist.use_count() << endl;
 }
 
 void
@@ -1996,31 +2001,34 @@ Editor::separate_region_from_selection ()
 
 	for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
 
-		AudioTimeAxisView* atv;
+		RouteTimeAxisView* rtv;
+		
+		if ((rtv = dynamic_cast<RouteTimeAxisView*> ((*i))) != 0) {
 
-		if ((atv = dynamic_cast<AudioTimeAxisView*> ((*i))) != 0) {
+			Track* t = dynamic_cast<Track*>(rtv->track());
 
-			if (atv->is_audio_track()) {
-					
-				if ((playlist = atv->playlist()) != 0) {
+			if (t != 0 && ! t->diskstream()->destructive()) {
+				
+				if ((playlist = rtv->playlist()) != 0) {
 					if (!doing_undo) {
 						begin_reversible_command (_("separate"));
 						doing_undo = true;
 					}
-                                        XMLNode *before;
-					if (doing_undo) 
-                                            before = &(playlist->get_state());
+					
+					XMLNode *before;
+					if (doing_undo)
+						before = &(playlist->get_state());
 			
 					/* XXX need to consider musical time selections here at some point */
 
-					double speed = atv->get_diskstream()->speed();
+					double speed = t->diskstream()->speed();
 
 					for (list<AudioRange>::iterator t = selection->time.begin(); t != selection->time.end(); ++t) {
 						playlist->partition ((nframes_t)((*t).start * speed), (nframes_t)((*t).end * speed), true);
 					}
 
-					if (doing_undo) 
-                                            session->add_command(new MementoCommand<Playlist>(*playlist, before, &playlist->get_state()));
+					if (doing_undo)
+						session->add_command(new MementoCommand<Playlist>(*playlist, before, &playlist->get_state()));
 				}
 			}
 		}
@@ -2050,25 +2058,28 @@ Editor::separate_regions_using_location (Location& loc)
 	for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {	
 	//for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
 
-		AudioTimeAxisView* atv;
+		RouteTimeAxisView* rtv;
+		
+		if ((rtv = dynamic_cast<RouteTimeAxisView*> ((*i))) != 0) {
 
-		if ((atv = dynamic_cast<AudioTimeAxisView*> ((*i))) != 0) {
+			Track* t = dynamic_cast<Track*>(rtv->track());
 
-			if (atv->is_audio_track()) {
+			if (t != 0 && ! t->diskstream()->destructive()) {
+				
+				if ((playlist = rtv->playlist()) != 0) {
 					
-				if ((playlist = atv->playlist()) != 0) {
-                                        XMLNode *before;
+					XMLNode *before;
 					if (!doing_undo) {
 						begin_reversible_command (_("separate"));
 						doing_undo = true;
 					}
-					if (doing_undo) 
-                                            before = &(playlist->get_state());
+					if (doing_undo)
+						before = &(playlist->get_state());
                                             
 			
 					/* XXX need to consider musical time selections here at some point */
 
-					double speed = atv->get_diskstream()->speed();
+					double speed = rtv->get_diskstream()->speed();
 
 
 					playlist->partition ((nframes_t)(loc.start() * speed), (nframes_t)(loc.end() * speed), true);
@@ -2085,31 +2096,25 @@ Editor::separate_regions_using_location (Location& loc)
 void
 Editor::crop_region_to_selection ()
 {
-	if (selection->time.empty()) {
+	if (selection->time.empty() || selection->tracks.empty()) {
 		return;
 	}
 
 	vector<boost::shared_ptr<Playlist> > playlists;
 	boost::shared_ptr<Playlist> playlist;
 
-	if (clicked_axisview != 0) {
-
-		if ((playlist = clicked_axisview->playlist()) == 0) {
-			return;
-		}
-
-		playlists.push_back (playlist);
-
-	} else {
+	sort_track_selection ();
+	
+	for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
 		
-		sort_track_selection ();
+		RouteTimeAxisView* rtv;
+		
+		if ((rtv = dynamic_cast<RouteTimeAxisView*> ((*i))) != 0) {
 
-		for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
-
-			RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*i);
-
-			if (rtv && rtv->is_track()) {
+			Track* t = dynamic_cast<Track*>(rtv->track());
 
+			if (t != 0 && ! t->diskstream()->destructive()) {
+				
 				if ((playlist = rtv->playlist()) != 0) {
 					playlists.push_back (playlist);
 				}
@@ -2117,40 +2122,46 @@ Editor::crop_region_to_selection ()
 		}
 	}
 
-	if (!playlists.empty()) {
-
-		nframes_t start;
-		nframes_t end;
-		nframes_t cnt;
-
-		begin_reversible_command (_("trim to selection"));
-
-		for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) {
-			
-			boost::shared_ptr<Region> region;
-			
-			start = selection->time.start();
-
-			if ((region = (*i)->top_region_at(start)) == 0) {
-				continue;
-			}
-			
-			/* now adjust lengths to that we do the right thing
-			   if the selection extends beyond the region
-			*/
-			
-			start = max (start, region->position());
-			end = min (selection->time.end_frame(), start + region->length() - 1);
-			cnt = end - start + 1;
-
-                        XMLNode &before = (*i)->get_state();
-			region->trim_to (start, cnt, this);
-                        XMLNode &after = (*i)->get_state();
-			session->add_command (new MementoCommand<Playlist>(*(*i), &before, &after));
-		}
-
-		commit_reversible_command ();
+	if (playlists.empty()) {
+		return;
 	}
+		
+	nframes_t start;
+	nframes_t end;
+	nframes_t cnt;
+	
+	begin_reversible_command (_("trim to selection"));
+	
+	for (vector<boost::shared_ptr<Playlist> >::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+		
+		boost::shared_ptr<Region> region;
+		
+		start = selection->time.start();
+		
+		if ((region = (*i)->top_region_at(start)) == 0) {
+			continue;
+		}
+		
+		/* now adjust lengths to that we do the right thing
+		   if the selection extends beyond the region
+		*/
+		
+		start = max (start, region->position());
+		if (max_frames - start < region->length()) {
+			end = start + region->length() - 1;
+		} else {
+			end = max_frames;
+		}
+		end = min (selection->time.end_frame(), end);
+		cnt = end - start + 1;
+		
+		XMLNode &before = (*i)->get_state();
+		region->trim_to (start, cnt, this);
+		XMLNode &after = (*i)->get_state();
+		session->add_command (new MementoCommand<Playlist>(*(*i), &before, &after));
+	}
+	
+	commit_reversible_command ();
 }		
 
 void
@@ -2446,11 +2457,11 @@ Editor::trim_region_to_edit_cursor ()
 	boost::shared_ptr<Region> region (clicked_regionview->region());
 
 	float speed = 1.0f;
-	AudioTimeAxisView *atav;
+	RouteTimeAxisView *rtav;
 
-	if ( clicked_axisview != 0 && (atav = dynamic_cast<AudioTimeAxisView*>(clicked_axisview)) != 0 ) {
-		if (atav->get_diskstream() != 0) {
-			speed = atav->get_diskstream()->speed();
+	if ( clicked_axisview != 0 && (rtav = dynamic_cast<RouteTimeAxisView*>(clicked_axisview)) != 0 ) {
+		if (rtav->get_diskstream() != 0) {
+			speed = rtav->get_diskstream()->speed();
 		}
 	}
 
@@ -2472,11 +2483,11 @@ Editor::trim_region_from_edit_cursor ()
 	boost::shared_ptr<Region> region (clicked_regionview->region());
 
 	float speed = 1.0f;
-	AudioTimeAxisView *atav;
+	RouteTimeAxisView *rtav;
 
-	if ( clicked_axisview != 0 && (atav = dynamic_cast<AudioTimeAxisView*>(clicked_axisview)) != 0 ) {
-		if (atav->get_diskstream() != 0) {
-			speed = atav->get_diskstream()->speed();
+	if ( clicked_axisview != 0 && (rtav = dynamic_cast<RouteTimeAxisView*>(clicked_axisview)) != 0 ) {
+		if (rtav->get_diskstream() != 0) {
+			speed = rtav->get_diskstream()->speed();
 		}
 	}
 
@@ -2581,20 +2592,20 @@ Editor::bounce_range_selection ()
 	nframes_t start = selection->time[clicked_selection].start;
 	nframes_t end = selection->time[clicked_selection].end;
 	nframes_t cnt = end - start + 1;
-	
+
 	begin_reversible_command (_("bounce range"));
 
 	for (TrackViewList::iterator i = views.begin(); i != views.end(); ++i) {
 
-		AudioTimeAxisView* atv;
+		RouteTimeAxisView* rtv;
 
-		if ((atv = dynamic_cast<AudioTimeAxisView*> (*i)) == 0) {
+		if ((rtv = dynamic_cast<RouteTimeAxisView*> (*i)) == 0) {
 			continue;
 		}
 		
 		boost::shared_ptr<Playlist> playlist;
 		
-		if ((playlist = atv->playlist()) == 0) {
+		if ((playlist = rtv->playlist()) == 0) {
 			return;
 		}
 
@@ -2603,10 +2614,10 @@ Editor::bounce_range_selection ()
 		itt.done = false;
 		itt.cancel = false;
 		itt.progress = false;
-		
-                XMLNode &before = playlist->get_state();
-		atv->audio_track()->bounce_range (start, cnt, itt);
-                XMLNode &after = playlist->get_state();
+
+		XMLNode &before = playlist->get_state();
+		rtv->track()->bounce_range (start, cnt, itt);
+		XMLNode &after = playlist->get_state();
 		session->add_command (new MementoCommand<Playlist> (*playlist, &before, &after));
 	}
 	
@@ -2811,19 +2822,22 @@ Editor::cut_copy_regions (CutCopyOp op)
 		}
 		
 		boost::shared_ptr<Region> r = (*x)->region();
+		boost::shared_ptr<Region> _xx;
 		
 		switch (op) {
 		case Cut:
 			if (!r) break;
 			
-			npl->add_region (RegionFactory::create (r), r->position() - first_position);
-			pl->remove_region (r);
+			_xx = RegionFactory::create ((*x)->region());
+			npl->add_region (_xx, (*x)->region()->position() - first_position);
+			pl->remove_region (((*x)->region()));
 			break;
 			
 		case Copy:
 			if (!r) break;
-			
-			npl->add_region (RegionFactory::create (r), r->position() - first_position);
+
+			/* copy region before adding, so we're not putting same object into two different playlists */
+			npl->add_region (RegionFactory::create ((*x)->region()), (*x)->region()->position() - first_position);
 			break;
 			
 		case Clear:
@@ -2843,10 +2857,11 @@ Editor::cut_copy_regions (CutCopyOp op)
 		foo.push_back ((*i).pl);
 	}
 	
+
 	if (!foo.empty()) {
 		cut_buffer->set (foo);
 	}
-	
+
 	for (set<PlaylistState, lt_playlist>::iterator pl = freezelist.begin(); pl != freezelist.end(); ++pl) {
 		(*pl).playlist->thaw ();
 		session->add_command (new MementoCommand<Playlist>(*(*pl).playlist, (*pl).before, &(*pl).playlist->get_state()));
@@ -2949,15 +2964,15 @@ Editor::paste_named_selection (float times)
 
 	for (t = selection->tracks.begin(); t != selection->tracks.end(); ++t) {
 		
-		AudioTimeAxisView* atv;
+		RouteTimeAxisView* rtv;
 		boost::shared_ptr<Playlist> pl;
 		boost::shared_ptr<AudioPlaylist> apl;
 
-		if ((atv = dynamic_cast<AudioTimeAxisView*> (*t)) == 0) {
+		if ((rtv = dynamic_cast<RouteTimeAxisView*> (*t)) == 0) {
 			continue;
 		}
 
-		if ((pl = atv->playlist()) == 0) {
+		if ((pl = rtv->playlist()) == 0) {
 			continue;
 		}
 		
@@ -2968,7 +2983,7 @@ Editor::paste_named_selection (float times)
 		tmp = chunk;
 		++tmp;
 
-                XMLNode &before = apl->get_state();
+		XMLNode &before = apl->get_state();
 		apl->paste (*chunk, edit_cursor->current_frame, times);
 		session->add_command(new MementoCommand<AudioPlaylist>(*apl, &before, &apl->get_state()));
 
@@ -2995,8 +3010,8 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times)
 		boost::shared_ptr<Region> r ((*i)->region());
 
 		TimeAxisView& tv = (*i)->get_time_axis_view();
-		AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (&tv);
-		sigc::connection c = atv->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
+		RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (&tv);
+		sigc::connection c = rtv->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
 		
  		playlist = (*i)->region()->playlist();
                 XMLNode &before = playlist->get_state();
diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
index 5b1b9c63de..6b6a2981b5 100644
--- a/gtk2_ardour/editor_region_list.cc
+++ b/gtk2_ardour/editor_region_list.cc
@@ -21,6 +21,7 @@
 #include <cmath>
 #include <algorithm>
 #include <string>
+#include <sstream>
 
 #include <pbd/basename.h>
 
@@ -138,12 +139,13 @@ Editor::add_region_to_region_display (boost::shared_ptr<Region> region)
 		if (region->source()->name()[0] == '/') { // external file
 
 			if (region->whole_file()) {
-				str = ".../";
 
 				boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource>(region->source());
 
+				str = ".../";
+
 				if (afs) {
-					str += region_name_from_path (afs->path(), region->n_channels() > 1);
+					str = region_name_from_path (afs->path(), region->n_channels() > 1);
 				} else {
 					str += region->source()->name();
 				}
@@ -158,6 +160,14 @@ Editor::add_region_to_region_display (boost::shared_ptr<Region> region)
 
 		}
 
+		if (region->n_channels() > 1) {
+			std::stringstream foo;
+			foo << region->n_channels ();
+			str += " [";
+			str += foo.str();
+			str += ']';
+		}
+
 		if (missing_source) {
 			str += _(" (MISSING)");
 		}
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 577d62c52a..96d6e635ba 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -151,6 +151,11 @@ Editor::ruler_button_press (GdkEventButton* ev)
 
 	switch (ev->button) {
 	case 1:
+		// Since we are about to move the playhead, cancel any running
+		// auditions.
+		if (session->is_auditioning()) {
+			session->cancel_audition ();
+		}
 		/* transport playhead */
 		snap_to (where);
 		session->request_locate (where);
@@ -255,13 +260,14 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev)
 	/* need to use the correct x,y, the event lies */
 	time_canvas_event_box.get_window()->get_pointer (x, y, state);
 
-	
-	track_canvas.c2w (x, y, wcx, wcy);
-	track_canvas.w2c (wcx, wcy, cx, cy);
-	
-	nframes_t where = leftmost_frame + pixel_to_frame (x);
+	time_canvas.c2w (x, y, wcx, wcy);
+	time_canvas.w2c (wcx, wcy, cx, cy);
 
-	/// ripped from maybe_autoscroll
+	wcx = x;
+	nframes_t where = event_frame ((GdkEvent*) ev, &wcx, (double *) 0);
+	cx = wcx;
+
+	/// ripped from maybe_autoscroll, and adapted to work here
 	nframes_t one_page = (nframes_t) rint (canvas_width * frames_per_unit);
 	nframes_t rightmost_frame = leftmost_frame + one_page;
 
@@ -303,8 +309,7 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev)
 		break;
 	}
 
-	if (cursor)
-	{
+	if (cursor) {
 		cursor->set_position (where);
 		
 		if (cursor == edit_cursor) {
@@ -377,7 +382,7 @@ Editor::popup_ruler_menu (nframes_t where, ItemType t)
 		mitem->set_active(true);
 	}
 
-	ruler_items.push_back (CheckMenuElem (X_("Timecode"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_smpte)));
+	ruler_items.push_back (CheckMenuElem (_("Timecode"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_smpte)));
 	mitem = (CheckMenuItem *) &ruler_items.back(); 
 	if (ruler_shown[ruler_metric_smpte]) {
 		mitem->set_active(true);
@@ -710,7 +715,7 @@ Editor::update_ruler_visibility ()
 	
 	update_fixed_rulers();
 	//update_tempo_based_rulers();
-	tempo_map_changed(Change (0), false);
+	redisplay_tempo (false);
 
 	time_canvas_event_box.show_all();
 	time_button_frame.show_all();
diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc
index 3052fb72fa..417d28f8da 100644
--- a/gtk2_ardour/editor_selection.cc
+++ b/gtk2_ardour/editor_selection.cc
@@ -776,7 +776,7 @@ Editor::select_all_within (nframes_t start, nframes_t end, double top, double bo
 	list<Selectable*>::size_type n = 0;
 	TrackViewList touched_tracks;
 
-	for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) {
+	for (TrackViewList::iterator iter = selection->tracks.begin(); iter != selection->tracks.end(); ++iter) {
 		if ((*iter)->hidden()) {
 			continue;
 		}
@@ -784,13 +784,18 @@ Editor::select_all_within (nframes_t start, nframes_t end, double top, double bo
 		n = touched.size();
 
 		(*iter)->get_selectables (start, end, top, bot, touched);
-
+		
 		if (n != touched.size()) {
 			touched_tracks.push_back (*iter);
 		}
 	}
 
+	if (touched.empty()) {
+		return false;
+	}
+
 	if (!touched_tracks.empty()) {
+
 		switch (op) {
 		case Selection::Add:
 			selection->add (touched_tracks);
@@ -806,7 +811,7 @@ Editor::select_all_within (nframes_t start, nframes_t end, double top, double bo
 			break;
 		}
 	}
-		
+
 	begin_reversible_command (_("select all within"));
 	switch (op) {
 	case Selection::Add:
@@ -822,8 +827,9 @@ Editor::select_all_within (nframes_t start, nframes_t end, double top, double bo
 		/* not defined yet */
 		break;
 	}
-
+	
 	commit_reversible_command ();
+
 	return !touched.empty();
 }
 
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc
index ae2bda903e..7fe8759639 100644
--- a/gtk2_ardour/editor_tempodisplay.cc
+++ b/gtk2_ardour/editor_tempodisplay.cc
@@ -93,13 +93,28 @@ Editor::draw_metric_marks (const Metrics& metrics)
 }
 
 void
-Editor::tempo_map_changed (Change ignored, bool immediate_redraw)
+Editor::tempo_map_changed (Change ignored)
 {
 	if (!session) {
 		return;
 	}
 
-        ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored, immediate_redraw));
+	ENSURE_GUI_THREAD(bind (mem_fun (*this, &Editor::tempo_map_changed), ignored));
+	
+	redisplay_tempo (false); // redraw rulers and measures
+	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
+}
+
+/**
+ * This code was originally in tempo_map_changed, but this is called every time the canvas scrolls horizontally. 
+ * That's why this is moved in here. The new tempo_map_changed is called when the ARDOUR::TempoMap actually changed.
+ */
+void
+Editor::redisplay_tempo (bool immediate_redraw)
+{
+	if (!session) {
+		return;
+	}
 
 	BBT_Time previous_beat, next_beat; // the beats previous to the leftmost frame and after the rightmost frame
 
@@ -152,11 +167,6 @@ Editor::tempo_map_changed (Change ignored, bool immediate_redraw)
 	}
 }
 
-void
-Editor::redisplay_tempo ()
-{	
-}
-
 void
 Editor::hide_measures ()
 {
@@ -307,8 +317,6 @@ Editor::mouse_add_new_tempo_event (nframes_t frame)
 	commit_reversible_command ();
 	
 	map.dump (cerr);
-
-	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 }
 
 void
@@ -349,8 +357,6 @@ Editor::mouse_add_new_meter_event (nframes_t frame)
 	commit_reversible_command ();
 	
 	map.dump (cerr);
-
-	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 }
 
 void
@@ -401,8 +407,6 @@ Editor::edit_meter_section (MeterSection* section)
         XMLNode &after = session->tempo_map().get_state();
 	session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
-
-	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 }
 
 void
@@ -433,8 +437,6 @@ Editor::edit_tempo_section (TempoSection* section)
         XMLNode &after = session->tempo_map().get_state();
 	session->add_command (new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
-
-	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
 }
 
 void
@@ -485,8 +487,6 @@ Editor::real_remove_tempo_marker (TempoSection *section)
 	session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
 
-	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
-
 	return FALSE;
 }
 
@@ -521,7 +521,5 @@ Editor::real_remove_meter_marker (MeterSection *section)
 	session->add_command(new MementoCommand<TempoMap>(session->tempo_map(), &before, &after));
 	commit_reversible_command ();
 
-	session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks);
-
 	return FALSE;
 }
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index c903c1e799..68d5361014 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -876,7 +876,7 @@ ExportDialog::export_cue_file (Locations::LocationList& locations, const string&
 void
 ExportDialog::do_export_cd_markers (const string& path,const string& cuefile_type)
 {
-	if (cuefile_type == "TOC") {
+	if (cuefile_type == _("TOC")) {
 		session->locations()->apply (*this, &ExportDialog::export_toc_file, path);	
 	} else {
 		session->locations()->apply (*this, &ExportDialog::export_cue_file, path);
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index fa719bcca2..74e7c53a95 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -323,7 +323,7 @@ GainMeter::update_meters ()
 		if ((*i).packed) {
 			peak = _io->peak_meter().peak_power (n);
 
-			(*i).meter->set (log_meter (peak), peak);
+			(*i).meter->set (log_meter (peak));
 
 			mpeak = _io->peak_meter().max_peak_power(n);
 			
diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc
index 2cd2601406..7f7d11c0be 100644
--- a/gtk2_ardour/ghostregion.cc
+++ b/gtk2_ardour/ghostregion.cc
@@ -69,3 +69,13 @@ GhostRegion::set_height ()
 	}
 }
 
+void
+GhostRegion::set_colors ()
+{
+    for (uint32_t n=0; n < waves.size(); ++n) {
+	waves[n]->property_wave_color() = color_map[cGhostTrackWave];
+
+	waves[n]->property_clip_color() = color_map[cGhostTrackWaveClip];
+	waves[n]->property_zero_color() = color_map[cGhostTrackZeroLine];
+    }
+}
diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 77b22f942c..1e32add794 100644
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -41,6 +41,7 @@ struct GhostRegion : public sigc::trackable
     void set_samples_per_unit (double spu);
     void set_duration (double units);
     void set_height ();
+    void set_colors ();
 
     sigc::signal<void,GhostRegion*> GoingAway;
 };
diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index 5ad04b929d..aa7d4a58dc 100644
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -828,14 +828,15 @@ PortInsertWindow::PortInsertWindow (Session& sess, boost::shared_ptr<PortInsert>
 	rescan_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::rescan));
 
 	signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));	
-	pi->GoingAway.connect (mem_fun(*this, &PortInsertWindow::plugin_going_away));
+
+	going_away_connection = pi->GoingAway.connect (mem_fun(*this, &PortInsertWindow::plugin_going_away));
 }
 
 void
 PortInsertWindow::plugin_going_away ()
 {
 	ENSURE_GUI_THREAD(mem_fun(*this, &PortInsertWindow::plugin_going_away));
-	
+	going_away_connection.disconnect ();
 	delete_when_idle (this);
 }
 
diff --git a/gtk2_ardour/io_selector.h b/gtk2_ardour/io_selector.h
index 430926f761..957db11a2b 100644
--- a/gtk2_ardour/io_selector.h
+++ b/gtk2_ardour/io_selector.h
@@ -198,6 +198,7 @@ class PortInsertWindow : public ArdourDialog
 	void accept ();
 
 	void plugin_going_away ();
+	sigc::connection going_away_connection;
 };
 
 
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 41a279f604..05203b4133 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -273,6 +273,7 @@ int main (int argc, char *argv[])
 		ARDOUR::init (*engine, use_vst, try_hw_optimization);
 		setup_gtk_ardour_enums ();
 		Config->set_current_owner (ConfigVariableBase::Interface);
+		ui->setup_profile ();
 
 		try { 
 			engine = new ARDOUR::AudioEngine (jack_client_name);
diff --git a/gtk2_ardour/po/de_DE.po b/gtk2_ardour/po/de_DE.po
index 20e3cdc0b7..8af57ef126 100644
--- a/gtk2_ardour/po/de_DE.po
+++ b/gtk2_ardour/po/de_DE.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: gtk-ardour 0.347.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-24 00:48+0100\n"
-"PO-Revision-Date: 2007-01-18 13:04+0100\n"
+"PO-Revision-Date: 2007-03-17 19:33+0100\n"
 "Last-Translator: Sebastian Arnold <mail@sebastian-arnold.net>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,188 +16,224 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 0.9.6\n"
-"X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
 
-#: gtk2_ardour/about.cc:121
+#: gtk2_ardour/about.cc:120
 msgid "Paul Davis"
-msgstr ""
+msgstr "Paul Davis"
+
+#: gtk2_ardour/about.cc:121
+msgid "Jesse Chappell"
+msgstr "Jesse Chappell"
 
 #: gtk2_ardour/about.cc:122
-msgid "Jesse Chappell"
-msgstr ""
+msgid "Taybin Rutkin"
+msgstr "Taybin Rutkin"
 
 #: gtk2_ardour/about.cc:123
-msgid "Taybin Rutkin"
-msgstr ""
+msgid "Marcus Andersson"
+msgstr "Marcus Andersson"
 
 #: gtk2_ardour/about.cc:124
-msgid "Marcus Andersson"
-msgstr ""
+msgid "Jeremy Hall"
+msgstr "Jeremy Hall"
 
 #: gtk2_ardour/about.cc:125
-msgid "Jeremy Hall"
-msgstr ""
+msgid "Steve Harris"
+msgstr "Steve Harris"
 
 #: gtk2_ardour/about.cc:126
-msgid "Steve Harris"
-msgstr ""
+msgid "Tim Mayberry"
+msgstr "Tim Mayberry"
 
 #: gtk2_ardour/about.cc:127
-msgid "Tim Mayberry"
-msgstr ""
+msgid "Mark Stewart"
+msgstr "Mark Stewart"
 
 #: gtk2_ardour/about.cc:128
-msgid "Mark Stewart"
-msgstr ""
+msgid "Sam Chessman"
+msgstr "Sam Chessman"
 
 #: gtk2_ardour/about.cc:129
-msgid "Sam Chessman"
-msgstr ""
+msgid "Jack O'Quin"
+msgstr "Jack O'Quin"
 
 #: gtk2_ardour/about.cc:130
-msgid "Jack O'Quin"
-msgstr ""
+msgid "Matt Krai"
+msgstr "Matt Krai"
 
 #: gtk2_ardour/about.cc:131
-msgid "Matt Krai"
-msgstr ""
+msgid "Ben Bell"
+msgstr "Ben Bell"
 
 #: gtk2_ardour/about.cc:132
-msgid "Ben Bell"
-msgstr ""
+msgid "Gerard van Dongen"
+msgstr "Gerard van Dongen"
 
 #: gtk2_ardour/about.cc:133
-msgid "Gerard van Dongen"
-msgstr ""
+msgid "Thomas Charbonnel"
+msgstr "Thomas Charbonnel"
 
 #: gtk2_ardour/about.cc:134
-msgid "Thomas Charbonnel"
-msgstr ""
+msgid "Nick Mainsbridge"
+msgstr "Nick Mainsbridge"
 
 #: gtk2_ardour/about.cc:135
-msgid "Nick Mainsbridge"
-msgstr ""
+msgid "Colin Law"
+msgstr "Colin Law"
 
 #: gtk2_ardour/about.cc:136
-msgid "Colin Law"
-msgstr ""
+msgid "Sampo Savolainen"
+msgstr "Sampo Savolainen"
 
 #: gtk2_ardour/about.cc:137
-msgid "Sampo Savolainen"
-msgstr ""
+msgid "Joshua Leach"
+msgstr "Joshua Leach"
 
 #: gtk2_ardour/about.cc:138
-msgid "Joshua Leach"
-msgstr ""
+msgid "Rob Holland"
+msgstr "Rob Holland"
 
 #: gtk2_ardour/about.cc:139
-msgid "Rob Holland"
-msgstr ""
+msgid "Per Sigmond"
+msgstr "Per Sigmond"
 
 #: gtk2_ardour/about.cc:140
-msgid "Per Sigmond"
-msgstr ""
+msgid "Doug Mclain"
+msgstr "Doug Mclain"
 
 #: gtk2_ardour/about.cc:141
-msgid "Doug Mclain"
-msgstr ""
+msgid "Petter Sundlöf"
+msgstr "Petter Sundlöf"
 
 #: gtk2_ardour/about.cc:142
-msgid "Petter Sundlöf"
-msgstr ""
+msgid "Thorsten Wilms"
+msgstr "Thorsten Wilms"
 
 #: gtk2_ardour/about.cc:143
-msgid "Thorsten Wilms"
-msgstr ""
+msgid "Ben Loftis"
+msgstr "Ben Loftis"
 
 #: gtk2_ardour/about.cc:144
-msgid "Ben Loftis"
-msgstr ""
+msgid "Stefan Kersten"
+msgstr "Stefan Kersten"
 
 #: gtk2_ardour/about.cc:145
-msgid "Stefan Kersten"
-msgstr ""
+msgid "Christopher George"
+msgstr "Christopher George"
 
 #: gtk2_ardour/about.cc:146
-msgid "Christopher George"
-msgstr ""
+msgid "Robert Jordens"
+msgstr "Robert Jordens"
 
 #: gtk2_ardour/about.cc:147
-msgid "Robert Jordens"
-msgstr ""
+msgid "Dave Robillard"
+msgstr "Dave Robillard"
 
 #: gtk2_ardour/about.cc:148
-msgid "Brian Ahr"
-msgstr ""
+msgid "Hans Fugal"
+msgstr "Hans Fugal"
 
 #: gtk2_ardour/about.cc:149
-msgid "Nimal Ratnayake"
-msgstr ""
+msgid "Brian Ahr"
+msgstr "Brian Ahr"
 
-#: gtk2_ardour/about.cc:154
+#: gtk2_ardour/about.cc:150
+msgid "Nimal Ratnayake"
+msgstr "Nimal Ratnayake"
+
+#: gtk2_ardour/about.cc:151
+msgid "Mike Täht"
+msgstr "Mike Täht"
+
+#: gtk2_ardour/about.cc:152
+msgid "John Anderson"
+msgstr "John Anderson"
+
+#: gtk2_ardour/about.cc:153
+msgid "Nedko Arnaudov"
+msgstr "Nedko Arnaudov"
+
+#: gtk2_ardour/about.cc:158
 msgid ""
 "French:\n"
 "\tAlain Fréhel <alain.frehel@free.fr>\n"
 "\tChristophe Combelles <ccomb@free.fr>\n"
 msgstr ""
+"French:\n"
+"\tAlain Fréhel <alain.frehel@free.fr>\n"
+"\tChristophe Combelles <ccomb@free.fr>\n"
 
-#: gtk2_ardour/about.cc:155
+#: gtk2_ardour/about.cc:159
 msgid ""
 "German:\n"
 "\tKarsten Petersen <kapet@kapet.de>\n"
 msgstr ""
 "German:\n"
-"\tKarsten Petersen <kapet@kapet.de>\n"
 "\tSebastian Arnold <linux@sebastian-arnold.net>\n"
+"\tKarsten Petersen <kapet@kapet.de>\n"
 
-#: gtk2_ardour/about.cc:156
+#: gtk2_ardour/about.cc:160
 msgid ""
 "Italian:\n"
 "\tFilippo Pappalardo <filippo@email.it>\n"
 msgstr ""
+"Italian:\n"
+"\tFilippo Pappalardo <filippo@email.it>\n"
 
-#: gtk2_ardour/about.cc:157
+#: gtk2_ardour/about.cc:161
 msgid ""
 "Portuguese:\n"
 "\tRui Nuno Capela <rncbc@rncbc.org>\n"
 msgstr ""
+"Portuguese:\n"
+"\tRui Nuno Capela <rncbc@rncbc.org>\n"
 
-#: gtk2_ardour/about.cc:158
+#: gtk2_ardour/about.cc:162
 msgid ""
 "Brazilian Portuguese:\n"
 "\tAlexander da Franca Fernandes <alexander@nautae.eti.br>\n"
 "\tChris Ross <chris@tebibyte.org>\n"
 msgstr ""
+"Brazilian Portuguese:\n"
+"\tAlexander da Franca Fernandes <alexander@nautae.eti.br>\n"
+"\tChris Ross <chris@tebibyte.org>\n"
 
-#: gtk2_ardour/about.cc:160
+#: gtk2_ardour/about.cc:164
 msgid ""
 "Spanish:\n"
 "\t Alex Krohn <alexkrohn@fastmail.fm>\n"
 msgstr ""
+"Spanish:\n"
+"\t Alex Krohn <alexkrohn@fastmail.fm>\n"
 
-#: gtk2_ardour/about.cc:161
+#: gtk2_ardour/about.cc:165
 msgid ""
 "Russian:\n"
 "\t Igor Blinov <pitstop@nm.ru>\n"
 msgstr ""
+"Russian:\n"
+"\t Igor Blinov <pitstop@nm.ru>\n"
 
-#: gtk2_ardour/about.cc:189
+#: gtk2_ardour/about.cc:193
 msgid "Copyright (C) 1999-2006 Paul Davis\n"
-msgstr ""
+msgstr "Copyright (C) 1999-2006 Paul Davis\n"
 
-#: gtk2_ardour/about.cc:190
+#: gtk2_ardour/about.cc:194
 msgid ""
 "Ardour comes with ABSOLUTELY NO WARRANTY\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; see the file COPYING for details.\n"
 msgstr ""
+"Ardour wird Ihnen OHNE JEGLICHE GEWÄHRLEISTUNG zur Verfügung gestellt.\n"
+"Dies ist freie Software und Sie dürfen sie gerne weiterverbreiten,\n"
+"solange Sie sich an die Bedingungen, die in der Datei COPYING aufgeführt sind halten.\n"
 
-#: gtk2_ardour/about.cc:195
+#: gtk2_ardour/about.cc:199
 msgid "visit http://www.ardour.org/"
-msgstr ""
+msgstr "besuchen Sie  http://www.ardour.org"
 
-#: gtk2_ardour/about.cc:196
+#: gtk2_ardour/about.cc:200
 msgid ""
 "%1\n"
 "(built from revision %2)"
@@ -205,110 +241,149 @@ msgstr ""
 "%1\n"
 "(built from revision %2)"
 
-#: gtk2_ardour/actions.cc:77
+#: gtk2_ardour/actions.cc:76
 msgid "badly formatted UI definition file"
 msgstr "die UI Definitionsdatei ist falsch formatiert"
 
-#: gtk2_ardour/actions.cc:79
+#: gtk2_ardour/actions.cc:78
 msgid "Ardour menu definition file not found"
 msgstr "Konnte die ardour Menü-Definition nicht finden"
 
-#: gtk2_ardour/actions.cc:83
+#: gtk2_ardour/actions.cc:82
 msgid "ardour will not work without a valid ardour.menus file"
 msgstr "ardour benötigt eine gültige ardour.menus Datei"
 
-#: gtk2_ardour/actions.cc:235
+#: gtk2_ardour/actions.cc:234
 msgid "programmer error: %1 %2"
 msgstr "Programmierfehler: %1 %2"
 
-#: gtk2_ardour/actions.cc:254
+#: gtk2_ardour/actions.cc:253
 msgid "Unknown action name: %1"
 msgstr "Unbekannte Aktionsbezeichnung: %1"
 
-#: gtk2_ardour/add_route_dialog.cc:41
-#: gtk2_ardour/add_route_dialog.cc:196
+#: gtk2_ardour/add_route_dialog.cc:40
+#: gtk2_ardour/add_route_dialog.cc:195
 msgid "Mono"
 msgstr "Mono"
 
-#: gtk2_ardour/add_route_dialog.cc:42
-#: gtk2_ardour/add_route_dialog.cc:198
+#: gtk2_ardour/add_route_dialog.cc:41
+#: gtk2_ardour/add_route_dialog.cc:197
 msgid "Stereo"
 msgstr "Stereo"
 
-#: gtk2_ardour/add_route_dialog.cc:43
+#: gtk2_ardour/add_route_dialog.cc:42
 msgid "3 Channels"
 msgstr "3 Kanäle"
 
-#: gtk2_ardour/add_route_dialog.cc:44
+#: gtk2_ardour/add_route_dialog.cc:43
 msgid "4 Channels"
 msgstr "4 Kanäle"
 
-#: gtk2_ardour/add_route_dialog.cc:45
+#: gtk2_ardour/add_route_dialog.cc:44
 msgid "6 Channels"
 msgstr "6 Kanäle"
 
-#: gtk2_ardour/add_route_dialog.cc:46
+#: gtk2_ardour/add_route_dialog.cc:45
 msgid "8 Channels"
 msgstr "8 Kanäle"
 
-#: gtk2_ardour/add_route_dialog.cc:47
+#: gtk2_ardour/add_route_dialog.cc:46
 msgid "Manual Setup"
 msgstr "Manuell"
 
-#: gtk2_ardour/add_route_dialog.cc:52
-#: gtk2_ardour/add_route_dialog.cc:177
-#: gtk2_ardour/editor.cc:127
-#: gtk2_ardour/editor.cc:3549
+#: gtk2_ardour/add_route_dialog.cc:51
+#: gtk2_ardour/add_route_dialog.cc:176
+#: gtk2_ardour/editor.cc:125
+#: gtk2_ardour/editor.cc:2989
 #: gtk2_ardour/editor_actions.cc:288
-#: gtk2_ardour/time_axis_view.cc:586
+#: gtk2_ardour/time_axis_view.cc:585
 msgid "Normal"
-msgstr "Einrasten"
+msgstr "Normal"
 
-#: gtk2_ardour/add_route_dialog.cc:53
-#: gtk2_ardour/add_route_dialog.cc:179
+#: gtk2_ardour/add_route_dialog.cc:52
+#: gtk2_ardour/add_route_dialog.cc:178
 msgid "Tape"
-msgstr ""
+msgstr "Tape"
 
-#: gtk2_ardour/add_route_dialog.cc:62
+#: gtk2_ardour/add_route_dialog.cc:61
 msgid "ardour: add track/bus"
 msgstr "ardour: Füge Spur/Bus hinzu"
 
-#: gtk2_ardour/add_route_dialog.cc:63
-#: gtk2_ardour/editor_route_list.cc:71
+#: gtk2_ardour/add_route_dialog.cc:62
+#: gtk2_ardour/editor_route_list.cc:72
 msgid "Tracks"
 msgstr "Spuren"
 
-#: gtk2_ardour/add_route_dialog.cc:64
-#: gtk2_ardour/editor_route_list.cc:68
+#: gtk2_ardour/add_route_dialog.cc:63
+#: gtk2_ardour/editor_route_list.cc:69
 msgid "Busses"
 msgstr "Busse"
 
-#: gtk2_ardour/add_route_dialog.cc:96
+#: gtk2_ardour/add_route_dialog.cc:95
 #: gtk2_ardour/plugin_ui.cc:151
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: gtk2_ardour/add_route_dialog.cc:114
+#: gtk2_ardour/add_route_dialog.cc:113
 msgid "Name (template)"
 msgstr "Name für Mixer-Vorlage"
 
-#: gtk2_ardour/add_route_dialog.cc:120
+#: gtk2_ardour/add_route_dialog.cc:119
 msgid "Channel Configuration"
 msgstr "Kanaleinstellungen"
 
-#: gtk2_ardour/ardour_ui.cc:108
+#: gtk2_ardour/ardour_ui.cc:109
 msgid ""
 "pre\n"
 "roll"
 msgstr ""
+"pre\n"
+"roll"
 
-#: gtk2_ardour/ardour_ui.cc:109
+#: gtk2_ardour/ardour_ui.cc:110
 msgid ""
 "post\n"
 "roll"
 msgstr ""
+"post\n"
+"roll"
 
-#: gtk2_ardour/ardour_ui.cc:117
+#: gtk2_ardour/ardour_ui.cc:136
+msgid "% "
+msgstr ""
+
+#: gtk2_ardour/ardour_ui.cc:138
+#: gtk2_ardour/ardour_ui_ed.cc:290
+msgid "Punch In"
+msgstr "Punch In"
+
+#: gtk2_ardour/ardour_ui.cc:139
+#: gtk2_ardour/ardour_ui_ed.cc:293
+msgid "Punch Out"
+msgstr "Punch Out"
+
+#: gtk2_ardour/ardour_ui.cc:140
+#: gtk2_ardour/ardour_ui_ed.cc:305
+msgid "Auto Return"
+msgstr "Auto Return"
+
+#: gtk2_ardour/ardour_ui.cc:141
+#: gtk2_ardour/ardour_ui_ed.cc:302
+msgid "Auto Play"
+msgstr "Auto Play"
+
+#: gtk2_ardour/ardour_ui.cc:142
+#: gtk2_ardour/ardour_ui_ed.cc:299
+msgid "Auto Input"
+msgstr "Auto Input"
+
+#: gtk2_ardour/ardour_ui.cc:143
+#: gtk2_ardour/ardour_ui_ed.cc:296
+#: gtk2_ardour/option_editor.cc:129
+msgid "Click"
+msgstr "Click"
+
+#: gtk2_ardour/ardour_ui.cc:144
 msgid ""
 "time\n"
 "master"
@@ -316,53 +391,31 @@ msgstr ""
 "Time\n"
 "Master"
 
-#: gtk2_ardour/ardour_ui.cc:119
-msgid "% "
-msgstr ""
-
-#: gtk2_ardour/ardour_ui.cc:121
-#: gtk2_ardour/ardour_ui_ed.cc:274
-msgid "Punch In"
-msgstr "Punch In"
-
-#: gtk2_ardour/ardour_ui.cc:122
-#: gtk2_ardour/ardour_ui_ed.cc:277
-msgid "Punch Out"
-msgstr "Punch Out"
-
-#: gtk2_ardour/ardour_ui.cc:123
-#: gtk2_ardour/ardour_ui_ed.cc:289
-msgid "Auto Return"
-msgstr "Auto Return"
-
-#: gtk2_ardour/ardour_ui.cc:124
-msgid "Autuo Play"
-msgstr "Auto Play"
-
-#: gtk2_ardour/ardour_ui.cc:125
-#: gtk2_ardour/ardour_ui_ed.cc:283
-msgid "Auto Input"
-msgstr "Auto Input"
-
-#: gtk2_ardour/ardour_ui.cc:126
-#: gtk2_ardour/ardour_ui_ed.cc:280
-#: gtk2_ardour/option_editor.cc:126
-msgid "Click"
-msgstr "Click"
-
-#: gtk2_ardour/ardour_ui.cc:127
+#: gtk2_ardour/ardour_ui.cc:146
 msgid "AUDITION"
 msgstr "VORHÖREN"
 
-#: gtk2_ardour/ardour_ui.cc:128
+#: gtk2_ardour/ardour_ui.cc:147
 msgid "SOLO"
 msgstr "SOLO"
 
-#: gtk2_ardour/ardour_ui.cc:371
+#: gtk2_ardour/ardour_ui.cc:475
+#, fuzzy
+msgid ""
+"WARNING: Your system has a limit for maximum amount of locked memory. This might cause Ardour to run out of memory before your system runs out of memory. \n"
+"\n"
+"You can view the memory limit with 'ulimit -l', and it is normally controlled by /etc/security/limits.conf"
+msgstr "WARNUNG: Ihr System hat eine Begrenzung für die Reservierung von Arbeitsspeicher eingestellt. Dies könnte dazu führen, dass Ardour zu schnell der Speicher ausgeht."
+
+#: gtk2_ardour/ardour_ui.cc:483
+msgid "Do not show this window again"
+msgstr "Diese Meldung nicht wieder anzeigen"
+
+#: gtk2_ardour/ardour_ui.cc:504
 msgid "quit"
 msgstr "Beenden"
 
-#: gtk2_ardour/ardour_ui.cc:380
+#: gtk2_ardour/ardour_ui.cc:513
 msgid ""
 "Ardour was unable to save your session.\n"
 "\n"
@@ -376,31 +429,31 @@ msgstr ""
 "\n"
 "\"Trotzdem beenden\"."
 
-#: gtk2_ardour/ardour_ui.cc:404
+#: gtk2_ardour/ardour_ui.cc:537
 msgid "ardour: save session?"
 msgstr "ardour: Projekt speichern?"
 
-#: gtk2_ardour/ardour_ui.cc:411
+#: gtk2_ardour/ardour_ui.cc:544
 msgid "Don't %1"
 msgstr "Nicht %1"
 
-#: gtk2_ardour/ardour_ui.cc:413
+#: gtk2_ardour/ardour_ui.cc:546
 msgid "Just %1"
-msgstr "%1 ohne zu Speichern"
+msgstr "Nur %1"
 
-#: gtk2_ardour/ardour_ui.cc:415
+#: gtk2_ardour/ardour_ui.cc:548
 msgid "Save and %1"
 msgstr "Speichern und %1"
 
-#: gtk2_ardour/ardour_ui.cc:427
+#: gtk2_ardour/ardour_ui.cc:560
 msgid "session"
 msgstr "Projekt"
 
-#: gtk2_ardour/ardour_ui.cc:429
+#: gtk2_ardour/ardour_ui.cc:562
 msgid "snapshot"
 msgstr "Schnappschuss..."
 
-#: gtk2_ardour/ardour_ui.cc:431
+#: gtk2_ardour/ardour_ui.cc:564
 msgid ""
 "The %1\"%2\"\n"
 "has not been saved.\n"
@@ -410,88 +463,94 @@ msgid ""
 "\n"
 "What do you want to do?"
 msgstr ""
-"Das Projekt %1\"%2\"\n"
-"wurde nicht gespeichert.\n"
+"Das Projekt %1\"%2\" wurde nicht gespeichert.\n"
 "\n"
-"Alle Änderungen werden verloren\n"
-"gehen wenn Sie nicht speichern.\n"
+"Alle Änderungen werden verloren gehen wenn Sie nicht speichern.\n"
 "\n"
-"Was wollen Sie machen?"
+"Wie wollen Sie vorgehen?"
 
-#: gtk2_ardour/ardour_ui.cc:445
+#: gtk2_ardour/ardour_ui.cc:578
 msgid "Prompter"
-msgstr ""
+msgstr "Frage"
 
-#: gtk2_ardour/ardour_ui.cc:505
+#: gtk2_ardour/ardour_ui.cc:645
 #, c-format
 msgid "disconnected"
 msgstr "getrennt"
 
-#: gtk2_ardour/ardour_ui.cc:512
+#: gtk2_ardour/ardour_ui.cc:652
 #, c-format
 msgid "%.1f kHz / %4.1f msecs"
-msgstr ""
+msgstr "%.1f kHz / %4.1f msecs"
 
-#: gtk2_ardour/ardour_ui.cc:516
+#: gtk2_ardour/ardour_ui.cc:656
 #, c-format
 msgid "%u kHz / %4.1f msecs"
-msgstr ""
+msgstr "%u kHz / %4.1f msecs"
 
-#: gtk2_ardour/ardour_ui.cc:529
+#: gtk2_ardour/ardour_ui.cc:669
 #, c-format
 msgid "DSP: %.1f%%"
 msgstr "CPU: %.1f%%"
 
-#: gtk2_ardour/ardour_ui.cc:539
+#: gtk2_ardour/ardour_ui.cc:679
 #, c-format
 msgid "Buffers p:%<PRIu32>%% c:%<PRIu32>%%"
 msgstr "Buffer p:%<PRIu32>%% c:%<PRIu32>%%"
 
-#: gtk2_ardour/ardour_ui.cc:567
+#: gtk2_ardour/ardour_ui.cc:707
 msgid "Disk: 24hrs+"
-msgstr "Platz: >24 Stunden"
+msgstr "HD: >24 Std."
 
-#: gtk2_ardour/ardour_ui.cc:587
+#: gtk2_ardour/ardour_ui.cc:727
 #, c-format
 msgid "Disk: %02dh:%02dm:%02ds"
 msgstr "HD: %02dh:%02dm:%02ds"
 
-#: gtk2_ardour/ardour_ui.cc:626
-msgid "programming error: impossible control method"
-msgstr "Programmierfehler: ungültige Kontrollmethode"
-
-#: gtk2_ardour/ardour_ui.cc:734
-#: gtk2_ardour/new_session_dialog.cc:355
+#: gtk2_ardour/ardour_ui.cc:840
+#: gtk2_ardour/new_session_dialog.cc:354
 msgid "Recent Sessions"
 msgstr "Zuletzt verwendete Projekte"
 
-#: gtk2_ardour/ardour_ui.cc:827
+#: gtk2_ardour/ardour_ui.cc:933
 msgid "open session"
 msgstr "Projekt öffnen"
 
-#: gtk2_ardour/ardour_ui.cc:833
+#: gtk2_ardour/ardour_ui.cc:939
 msgid "Ardour sessions"
 msgstr "ardour-Projekte"
 
-#: gtk2_ardour/ardour_ui.cc:866
+#: gtk2_ardour/ardour_ui.cc:972
 msgid "Patience is a virtue.\n"
 msgstr "Geduld ist eine Tugend.\n"
 
-#: gtk2_ardour/ardour_ui.cc:876
+#: gtk2_ardour/ardour_ui.cc:982
 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."
 
-#: gtk2_ardour/ardour_ui.cc:886
-#: gtk2_ardour/ardour_ui.cc:898
+#: gtk2_ardour/ardour_ui.cc:992
+#: gtk2_ardour/ardour_ui.cc:1005
 msgid "could not create a new audio track"
 msgstr "Konnte neue Spur nicht erstellen."
 
-#: gtk2_ardour/ardour_ui.cc:888
-#: gtk2_ardour/ardour_ui.cc:900
+#: gtk2_ardour/ardour_ui.cc:994
+#, fuzzy
+msgid "could only create %1 of %2 new audio %3"
+msgstr "nix"
+
+#: gtk2_ardour/ardour_ui.cc:995
+msgid "tracks"
+msgstr "Spuren"
+
+#: gtk2_ardour/ardour_ui.cc:995
+msgid "busses"
+msgstr "Busse"
+
+#: gtk2_ardour/ardour_ui.cc:1007
 msgid "could not create %1 new audio tracks"
 msgstr "Konnte %1 neue Spuren nicht erstellen."
 
-#: gtk2_ardour/ardour_ui.cc:920
+#: gtk2_ardour/ardour_ui.cc:1028
 msgid ""
 "There are insufficient JACK ports available\n"
 "to create a new track or bus.\n"
@@ -504,7 +563,7 @@ msgstr ""
 "ardour sowie JACK mit einer größeren\n"
 "Anzahl Ports erneut."
 
-#: gtk2_ardour/ardour_ui.cc:1040
+#: gtk2_ardour/ardour_ui.cc:1148
 msgid ""
 "Please create 1 or more track\n"
 "before trying to record.\n"
@@ -514,7 +573,7 @@ msgstr ""
 "bevor Sie aufnehmen.\n"
 "Weitere Einstellungen finden Sie im Projektmenü."
 
-#: gtk2_ardour/ardour_ui.cc:1260
+#: gtk2_ardour/ardour_ui.cc:1393
 msgid ""
 "JACK has either been shutdown or it\n"
 "disconnected Ardour because Ardour\n"
@@ -526,35 +585,39 @@ msgstr ""
 "schnell genug war. Sie sollten versuchen,\n"
 "das Projekt zu speichern und erneut mit JACK zu verbinden."
 
-#: gtk2_ardour/ardour_ui.cc:1277
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:1410
 msgid "Unable to start the session running"
 msgstr "Konnte das aktuelle Projekt nicht starten"
 
-#: gtk2_ardour/ardour_ui.cc:1377
-#: gtk2_ardour/ardour_ui.cc:1396
-#: gtk2_ardour/audio_clock.cc:462
+#: gtk2_ardour/ardour_ui.cc:1510
+#: gtk2_ardour/ardour_ui.cc:1529
+#: gtk2_ardour/audio_clock.cc:461
 msgid "none"
 msgstr "keine"
 
-#: gtk2_ardour/ardour_ui.cc:1386
-#: gtk2_ardour/ardour_ui.cc:1405
+#: gtk2_ardour/ardour_ui.cc:1519
+#: gtk2_ardour/ardour_ui.cc:1538
 msgid "off"
 msgstr "aus"
 
-#: gtk2_ardour/ardour_ui.cc:1428
+#: gtk2_ardour/ardour_ui.cc:1562
 msgid "Name of New Snapshot"
 msgstr "Name für neuen Schnappschuss"
 
-#: gtk2_ardour/ardour_ui.cc:1574
+#: gtk2_ardour/ardour_ui.cc:1702
 msgid "Name for mix template:"
 msgstr "Name für Mixer-Vorlage"
 
-#: gtk2_ardour/ardour_ui.cc:1575
+#: gtk2_ardour/ardour_ui.cc:1703
 msgid "-template"
 msgstr "Vorlage"
 
-#: gtk2_ardour/ardour_ui.cc:1696
+#: gtk2_ardour/ardour_ui.cc:1727
+#: gtk2_ardour/ardour_ui.cc:1744
+msgid "Ardour is not connected to JACK at this time. Creating new sessions is not possible."
+msgstr "Ardour ist derzeit nicht mit JACK verbunden. Es ist nicht möglich, neue Projekte zu erstellen."
+
+#: gtk2_ardour/ardour_ui.cc:1837
 msgid ""
 "This session\n"
 "%1\n"
@@ -564,7 +627,7 @@ msgstr ""
 "%1\n"
 "existiert bereits. Wollen Sie sie öffnen?"
 
-#: gtk2_ardour/ardour_ui.cc:1813
+#: gtk2_ardour/ardour_ui.cc:1960
 msgid ""
 "You do not have write access to this session.\n"
 "This prevents the session from being loaded."
@@ -572,42 +635,49 @@ msgstr ""
 "Sie haben keinen Schreibzugriff auf dieses Projekt.\n"
 "Dadurch kann das Projekt nicht geladen werden."
 
-#: gtk2_ardour/ardour_ui.cc:1825
-#: gtk2_ardour/ardour_ui.cc:1874
+#: gtk2_ardour/ardour_ui.cc:1972
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "Projekt  \"%1 (Schnappschuss %2)\" konnte nicht geladen werden."
 
-#: gtk2_ardour/ardour_ui.cc:1933
+#: gtk2_ardour/ardour_ui.cc:2022
+msgid "Could not create session in \"%1\""
+msgstr "Konnte kein Projekt in \"%1\" anlegen"
+
+#: gtk2_ardour/ardour_ui.cc:2082
 msgid "No audio files were ready for cleanup"
 msgstr "Keine Audiodateien zum Aufräumen vorhanden"
 
-#: gtk2_ardour/ardour_ui.cc:1937
+#: gtk2_ardour/ardour_ui.cc:2086
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
 "These may still include regions that\n"
 "require some unused files to continue to exist."
 msgstr ""
+"Falls trotzdem nicht benötigte Dateien\n"
+"existieren, welche hier nicht erkannt werden,\n"
+"sind sie wahrscheinlich noch in einem\n"
+"älteren Schnappschuss als Region eingebunden."
 
-#: gtk2_ardour/ardour_ui.cc:1946
+#: gtk2_ardour/ardour_ui.cc:2095
 msgid "ardour: cleanup"
 msgstr "ardour: Aufräumen"
 
-#: gtk2_ardour/ardour_ui.cc:1982
-#: gtk2_ardour/ardour_ui.cc:1988
+#: gtk2_ardour/ardour_ui.cc:2131
+#: gtk2_ardour/ardour_ui.cc:2137
 msgid "files were"
 msgstr "folgenden Dateien wurden"
 
-#: gtk2_ardour/ardour_ui.cc:1984
-#: gtk2_ardour/ardour_ui.cc:1990
+#: gtk2_ardour/ardour_ui.cc:2133
+#: gtk2_ardour/ardour_ui.cc:2139
 msgid "file was"
 msgstr "folgende Datei wurde"
 
-#: gtk2_ardour/ardour_ui.cc:2031
+#: gtk2_ardour/ardour_ui.cc:2180
 msgid "Are you sure you want to cleanup?"
 msgstr "Sind Sie sicher, dass Sie aufräumen wollen?"
 
-#: gtk2_ardour/ardour_ui.cc:2036
+#: gtk2_ardour/ardour_ui.cc:2185
 msgid ""
 "Cleanup is a destructive operation.\n"
 "ALL undo/redo information will be lost if you cleanup.\n"
@@ -617,20 +687,19 @@ msgstr ""
 "Sämtliche Wiederherstellungsinformationen gehen verloren, wenn Sie aufräumen.\n"
 "Nach dem Aufräumen werden alle nicht benötigten Audiodateien in einen \"dead sounds\" Ordner verschoben."
 
-#: gtk2_ardour/ardour_ui.cc:2042
+#: gtk2_ardour/ardour_ui.cc:2191
 msgid "Clean Up"
 msgstr "Aufräumen"
 
-#: gtk2_ardour/ardour_ui.cc:2045
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:2194
 msgid "CleanupDialog"
-msgstr "leeren"
+msgstr ""
 
-#: gtk2_ardour/ardour_ui.cc:2065
+#: gtk2_ardour/ardour_ui.cc:2222
 msgid "cleaned files"
 msgstr "aufgeräumte Dateien"
 
-#: gtk2_ardour/ardour_ui.cc:2066
+#: gtk2_ardour/ardour_ui.cc:2223
 msgid ""
 "The following %1 %2 not in use and \n"
 "have been moved to:\n"
@@ -647,11 +716,11 @@ msgstr ""
 "Wenn Sie den Müll leeren werden weitere\n"
 "%4 %5byte Speicherplatz frei.\n"
 
-#: gtk2_ardour/ardour_ui.cc:2091
+#: gtk2_ardour/ardour_ui.cc:2251
 msgid "deleted file"
 msgstr "gelöschte Datei"
 
-#: gtk2_ardour/ardour_ui.cc:2092
+#: gtk2_ardour/ardour_ui.cc:2252
 msgid ""
 "The following %1 %2 deleted from\n"
 "%3,\n"
@@ -661,11 +730,11 @@ msgstr ""
 "%3,\n"
 "und machten %4 %5byte Speicherplatz frei"
 
-#: gtk2_ardour/ardour_ui.cc:2208
+#: gtk2_ardour/ardour_ui.cc:2370
 msgid "Recording was stopped because your system could not keep up."
-msgstr ""
+msgstr "Die Aufnahme wurde gestoppt, da Ihr System nicht schnell genug folgen konnte."
 
-#: gtk2_ardour/ardour_ui.cc:2219
+#: gtk2_ardour/ardour_ui.cc:2381
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with Ardour.\n"
@@ -673,8 +742,13 @@ msgid ""
 "Specifically, it failed to write data to disk\n"
 "quickly enough to keep up with recording.\n"
 msgstr ""
+"Ihre Festplatte war nicht schnell genug,\n"
+"um ardour zu folgen.\n"
+"\n"
+"Die Daten konnten nicht schnell genug geschrieben\n"
+"werden, um die Aufnahme fortzuführen.\n"
 
-#: gtk2_ardour/ardour_ui.cc:2238
+#: gtk2_ardour/ardour_ui.cc:2400
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with Ardour.\n"
@@ -682,8 +756,13 @@ msgid ""
 "Specifically, it failed to read data from disk\n"
 "quickly enough to keep up with playback.\n"
 msgstr ""
+"Ihre Festplatte war nicht schnell genug,\n"
+"um ardour zu folgen.\n"
+"\n"
+"Die Daten konnten nicht schnell genug gelesen\n"
+"werden, um die Wiedergabe aufrechtzuerhalten.\n"
 
-#: gtk2_ardour/ardour_ui.cc:2264
+#: gtk2_ardour/ardour_ui.cc:2421
 msgid ""
 "This session appears to have been in\n"
 "middle of recording when ardour or\n"
@@ -693,125 +772,116 @@ msgid ""
 "you, or it can ignore it. Please decide\n"
 "what you would like to do.\n"
 msgstr ""
+"Es scheint, dass dieses Projekt während\n"
+"einer Aufnahme abgebrochen oder\n"
+"geschlossen wurde.\n"
+"\n"
+"Ardour kann die Aufgenommenen Audiodaten\n"
+"für Sie wiederherstellen oder sie verwerfen.\n"
+"Bitte entscheiden Sie, wie Sie vorgehen möchten.\n"
 
-#: gtk2_ardour/ardour_ui.cc:2274
+#: gtk2_ardour/ardour_ui.cc:2431
 msgid "Recover from crash"
-msgstr ""
+msgstr "Daten wiederherstellen"
 
-#: gtk2_ardour/ardour_ui.cc:2275
+#: gtk2_ardour/ardour_ui.cc:2432
 msgid "Ignore crash data"
-msgstr ""
+msgstr "Daten verwerfen"
 
-#: gtk2_ardour/ardour_ui.cc:2293
+#: gtk2_ardour/ardour_ui.cc:2450
 msgid "Could not disconnect from JACK"
-msgstr ""
+msgstr "Konnte Verbindung mit JACK nicht trennen"
 
-#: gtk2_ardour/ardour_ui.cc:2306
+#: gtk2_ardour/ardour_ui.cc:2463
 msgid "Could not reconnect to JACK"
-msgstr ""
+msgstr "Konnte nicht erneut zu JACK verbinden"
 
-#: gtk2_ardour/ardour_ui2.cc:60
+#: gtk2_ardour/ardour_ui2.cc:61
 msgid "UI: cannot setup editor"
 msgstr "Der Editor konnte nicht initialisiert werden."
 
-#: gtk2_ardour/ardour_ui2.cc:65
+#: gtk2_ardour/ardour_ui2.cc:66
 msgid "UI: cannot setup mixer"
 msgstr "Der Mixer konnte nicht initialisiert werden."
 
-#: gtk2_ardour/ardour_ui2.cc:91
-msgid "MMC + Local"
-msgstr ""
-
-#: gtk2_ardour/ardour_ui2.cc:92
-msgid "MMC"
-msgstr ""
-
-#: gtk2_ardour/ardour_ui2.cc:93
-msgid "Local"
-msgstr ""
-
-#: gtk2_ardour/ardour_ui2.cc:110
-msgid "MMC ID"
-msgstr ""
-
-#: gtk2_ardour/ardour_ui2.cc:295
+#: gtk2_ardour/ardour_ui2.cc:242
 msgid "Play from playhead"
 msgstr "Wiedergabe ab Positionszeiger"
 
-#: gtk2_ardour/ardour_ui2.cc:296
+#: gtk2_ardour/ardour_ui2.cc:243
 msgid "Stop playback"
 msgstr "Wiedergabe anhalten"
 
-#: gtk2_ardour/ardour_ui2.cc:297
+#: gtk2_ardour/ardour_ui2.cc:244
 msgid "Play range/selection"
 msgstr "Bereich/Auswahl wiedergeben"
 
-#: gtk2_ardour/ardour_ui2.cc:298
+#: gtk2_ardour/ardour_ui2.cc:245
 msgid "Go to start of session"
 msgstr "Zum Anfang des Projekts springen"
 
-#: gtk2_ardour/ardour_ui2.cc:299
+#: gtk2_ardour/ardour_ui2.cc:246
 msgid "Go to end of session"
 msgstr "Zum Ende des Projekts springen"
 
-#: gtk2_ardour/ardour_ui2.cc:300
+#: gtk2_ardour/ardour_ui2.cc:247
 msgid "Play loop range"
 msgstr "Schleife wiedergeben"
 
-#: gtk2_ardour/ardour_ui2.cc:301
+#: gtk2_ardour/ardour_ui2.cc:249
 msgid "Return to last playback start when stopped"
 msgstr "Bei Stop zum letzten Wiedergabeanfang springen"
 
-#: gtk2_ardour/ardour_ui2.cc:302
+#: gtk2_ardour/ardour_ui2.cc:250
 msgid "Start playback after any locate"
 msgstr "Startet die Wiedergabe nach setzen des Positionszeigers"
 
-#: gtk2_ardour/ardour_ui2.cc:303
+#: gtk2_ardour/ardour_ui2.cc:251
 msgid "Be sensible about input monitoring"
 msgstr "Automatisches Input Monitoring aktivieren"
 
-#: gtk2_ardour/ardour_ui2.cc:304
+#: gtk2_ardour/ardour_ui2.cc:252
 msgid "Start recording at auto-punch start"
 msgstr "Beginnt die Aufnahme bei Auto-Punch Start"
 
-#: gtk2_ardour/ardour_ui2.cc:305
+#: gtk2_ardour/ardour_ui2.cc:253
 msgid "Stop recording at auto-punch end"
 msgstr "Beginnt die Aufnahme bei Auto-Punch Ende"
 
-#: gtk2_ardour/ardour_ui2.cc:306
+#: gtk2_ardour/ardour_ui2.cc:254
 msgid "Enable/Disable audio click"
 msgstr "Aktiviert/Deaktiviert Audio Click"
 
-#: gtk2_ardour/ardour_ui2.cc:307
+#: gtk2_ardour/ardour_ui2.cc:255
 msgid "Positional sync source"
-msgstr ""
+msgstr "Positionsbezogene Sync-quelle"
 
-#: gtk2_ardour/ardour_ui2.cc:308
+#: gtk2_ardour/ardour_ui2.cc:256
 msgid "Does Ardour control the time?"
 msgstr "Bestimmt ardour die Time?"
 
-#: gtk2_ardour/ardour_ui2.cc:309
+#: gtk2_ardour/ardour_ui2.cc:257
 msgid "Shuttle speed control"
 msgstr "Shuttle-Geschwindigkeit"
 
-#: gtk2_ardour/ardour_ui2.cc:310
+#: gtk2_ardour/ardour_ui2.cc:258
 #, c-format
 msgid "Select semitones or %%-age for speed display"
 msgstr "Geschwindigkeitsanzeige als Prozent oder Halbtöne einstellen"
 
-#: gtk2_ardour/ardour_ui2.cc:311
+#: gtk2_ardour/ardour_ui2.cc:259
 msgid "Current transport speed"
 msgstr "Geschwindigkeitsanzeige"
 
-#: gtk2_ardour/ardour_ui2.cc:331
+#: gtk2_ardour/ardour_ui2.cc:279
 msgid "Primary clock"
-msgstr ""
+msgstr "Primärer Zeitgeber"
 
-#: gtk2_ardour/ardour_ui2.cc:332
+#: gtk2_ardour/ardour_ui2.cc:280
 msgid "secondary clock"
-msgstr ""
+msgstr "Sekundärer Zeitgeber"
 
-#: gtk2_ardour/ardour_ui2.cc:363
+#: gtk2_ardour/ardour_ui2.cc:306
 msgid ""
 "When active, something is soloed.\n"
 "Click to de-solo everything"
@@ -819,7 +889,7 @@ msgstr ""
 "Wird aktiv, wenn eine Spur Solo läuft.\n"
 "Schaltet bei Klick Solo aus."
 
-#: gtk2_ardour/ardour_ui2.cc:364
+#: gtk2_ardour/ardour_ui2.cc:307
 msgid ""
 "When active, auditioning is taking place\n"
 "Click to stop the audition"
@@ -827,38 +897,38 @@ msgstr ""
 "Wird beim Vorhören aktiv.\n"
 "Klicken stoppt das Vorhören."
 
-#: gtk2_ardour/ardour_ui2.cc:392
-#: gtk2_ardour/ardour_ui2.cc:823
-#: gtk2_ardour/ardour_ui2.cc:879
-#: gtk2_ardour/ardour_ui_options.cc:811
+#: gtk2_ardour/ardour_ui2.cc:335
+#: gtk2_ardour/ardour_ui2.cc:777
+#: gtk2_ardour/ardour_ui2.cc:833
+#: gtk2_ardour/ardour_ui_options.cc:918
 msgid "sprung"
 msgstr "Feder"
 
-#: gtk2_ardour/ardour_ui2.cc:393
-#: gtk2_ardour/ardour_ui2.cc:825
-#: gtk2_ardour/ardour_ui_options.cc:822
+#: gtk2_ardour/ardour_ui2.cc:336
+#: gtk2_ardour/ardour_ui2.cc:779
+#: gtk2_ardour/ardour_ui_options.cc:929
 msgid "wheel"
 msgstr "Drehrad"
 
-#: gtk2_ardour/ardour_ui2.cc:599
+#: gtk2_ardour/ardour_ui2.cc:542
 msgid "Maximum speed"
-msgstr ""
+msgstr "Max. Geschwindigkeit"
 
-#: gtk2_ardour/ardour_ui2.cc:835
-#: gtk2_ardour/ardour_ui2.cc:858
+#: gtk2_ardour/ardour_ui2.cc:789
+#: gtk2_ardour/ardour_ui2.cc:812
 msgid "stop"
 msgstr "Stop"
 
-#: gtk2_ardour/ardour_ui2.cc:877
+#: gtk2_ardour/ardour_ui2.cc:831
 msgid "-0.55"
-msgstr ""
+msgstr "-0.55"
 
-#: gtk2_ardour/ardour_ui_dependents.cc:85
+#: gtk2_ardour/ardour_ui_dependents.cc:84
 msgid "Ardour key bindings file not found at \"%1\" or contains errors."
-msgstr ""
+msgstr "Konnte die Datei mit den Tastaturzuweisungen nicht an der Stelle \"%1\" finden, oder sie ist fehlerhaft."
 
-#: gtk2_ardour/ardour_ui_dialogs.cc:149
-#: gtk2_ardour/playlist_selector.cc:69
+#: gtk2_ardour/ardour_ui_dialogs.cc:164
+#: gtk2_ardour/playlist_selector.cc:68
 msgid "close"
 msgstr "Schließen"
 
@@ -867,11 +937,11 @@ msgid "Session"
 msgstr "Projekt"
 
 #: gtk2_ardour/ardour_ui_ed.cc:78
-#: gtk2_ardour/ardour_ui_ed.cc:138
-#: gtk2_ardour/editor.cc:1622
-#: gtk2_ardour/export_dialog.cc:348
-#: gtk2_ardour/export_dialog.cc:1057
-#: gtk2_ardour/export_dialog.cc:1061
+#: gtk2_ardour/ardour_ui_ed.cc:139
+#: gtk2_ardour/editor.cc:1619
+#: gtk2_ardour/export_dialog.cc:346
+#: gtk2_ardour/export_dialog.cc:1055
+#: gtk2_ardour/export_dialog.cc:1059
 msgid "Export"
 msgstr "Exportieren"
 
@@ -880,9 +950,9 @@ msgid "Cleanup"
 msgstr "Aufräumen"
 
 #: gtk2_ardour/ardour_ui_ed.cc:80
-#: gtk2_ardour/option_editor.cc:123
+#: gtk2_ardour/option_editor.cc:126
 msgid "Sync"
-msgstr ""
+msgstr "Sync"
 
 #: gtk2_ardour/ardour_ui_ed.cc:81
 #: gtk2_ardour/ardour_ui_ed.cc:82
@@ -927,89 +997,85 @@ msgstr "Pegelanzeige halten"
 
 #: gtk2_ardour/ardour_ui_ed.cc:95
 #: gtk2_ardour/route_time_axis.cc:1308
-#: gtk2_ardour/new_session_dialog.cc:612
+#: gtk2_ardour/new_session_dialog.cc:611
 msgid "New"
-msgstr "Neu..."
+msgstr "Neu"
 
 #: gtk2_ardour/ardour_ui_ed.cc:97
-#: gtk2_ardour/new_session_dialog.cc:599
+#: gtk2_ardour/new_session_dialog.cc:598
 msgid "Open"
-msgstr "Öffnen..."
+msgstr "Öffnen"
 
 #: gtk2_ardour/ardour_ui_ed.cc:98
 msgid "Recent"
 msgstr "Zuletzt verwendet..."
 
 #: gtk2_ardour/ardour_ui_ed.cc:99
-#: gtk2_ardour/io_selector.cc:60
-#: gtk2_ardour/io_selector.cc:748
-#: gtk2_ardour/connection_editor.cc:59
+#: gtk2_ardour/io_selector.cc:59
+#: gtk2_ardour/io_selector.cc:747
+#: gtk2_ardour/connection_editor.cc:58
 msgid "Close"
 msgstr "Schließen"
 
 #: gtk2_ardour/ardour_ui_ed.cc:102
-#: gtk2_ardour/route_params_ui.cc:510
+#: gtk2_ardour/route_params_ui.cc:508
 msgid "Add Track/Bus"
 msgstr "Spur/Bus hinzufügen..."
 
-#: gtk2_ardour/ardour_ui_ed.cc:113
+#: gtk2_ardour/ardour_ui_ed.cc:114
 msgid "Connect"
 msgstr "Verbinden"
 
-#: gtk2_ardour/ardour_ui_ed.cc:121
+#: gtk2_ardour/ardour_ui_ed.cc:122
 msgid "Snapshot"
 msgstr "Schnappschuss"
 
-#: gtk2_ardour/ardour_ui_ed.cc:124
+#: gtk2_ardour/ardour_ui_ed.cc:125
 msgid "Save Template..."
 msgstr "Als Vorlage Speichern..."
 
-#: gtk2_ardour/ardour_ui_ed.cc:127
+#: gtk2_ardour/ardour_ui_ed.cc:128
 msgid "Export session to audiofile..."
 msgstr "Exportiere Projekt als Audio-Datei..."
 
-#: gtk2_ardour/ardour_ui_ed.cc:130
+#: gtk2_ardour/ardour_ui_ed.cc:131
 msgid "Export selection to audiofile..."
 msgstr "Exportiere Auswahl als Audio-Datei..."
 
-#: gtk2_ardour/ardour_ui_ed.cc:134
+#: gtk2_ardour/ardour_ui_ed.cc:135
 msgid "Export range markers to audiofile..."
 msgstr "Exportiere Bereich als Audio-Datei..."
 
-#: gtk2_ardour/ardour_ui_ed.cc:141
+#: gtk2_ardour/ardour_ui_ed.cc:142
 msgid "Cleanup unused sources"
 msgstr "Nicht benutzte Dateien entfernen"
 
-#: gtk2_ardour/ardour_ui_ed.cc:143
+#: gtk2_ardour/ardour_ui_ed.cc:144
 msgid "Flush wastebasket"
 msgstr "Müll leeren"
 
-#: gtk2_ardour/ardour_ui_ed.cc:149
-msgid "JACK"
-msgstr ""
-
 #: gtk2_ardour/ardour_ui_ed.cc:150
+msgid "JACK"
+msgstr "JACK"
+
+#: gtk2_ardour/ardour_ui_ed.cc:151
 msgid "Latency"
 msgstr "Latenz"
 
-#: gtk2_ardour/ardour_ui_ed.cc:152
+#: gtk2_ardour/ardour_ui_ed.cc:153
 msgid "Reconnect"
 msgstr "Neu Verbinden"
 
-#: gtk2_ardour/ardour_ui_ed.cc:155
-#: gtk2_ardour/mixer_strip.cc:517
-#: gtk2_ardour/mixer_strip.cc:579
+#: gtk2_ardour/ardour_ui_ed.cc:156
+#: gtk2_ardour/mixer_strip.cc:510
+#: gtk2_ardour/mixer_strip.cc:572
 msgid "Disconnect"
 msgstr "Trennen"
 
-#: gtk2_ardour/ardour_ui_ed.cc:182
+#: gtk2_ardour/ardour_ui_ed.cc:183
 msgid "Windows"
 msgstr "Fenster"
 
-#: gtk2_ardour/ardour_ui_ed.cc:183
-msgid "start prefix"
-msgstr ""
-
 #: gtk2_ardour/ardour_ui_ed.cc:184
 msgid "Quit"
 msgstr "Beenden"
@@ -1035,8 +1101,8 @@ msgid "Track/Bus Inspector"
 msgstr "Verbindungen"
 
 #: gtk2_ardour/ardour_ui_ed.cc:195
+#: gtk2_ardour/connection_editor.cc:146
 #: gtk2_ardour/connection_editor.cc:147
-#: gtk2_ardour/connection_editor.cc:148
 msgid "Connections"
 msgstr "Verbindungen"
 
@@ -1046,7 +1112,7 @@ msgstr "Positionen"
 
 #: gtk2_ardour/ardour_ui_ed.cc:199
 msgid "Big Clock"
-msgstr "Große Uhr"
+msgstr "Große Zeitanzeige"
 
 #: gtk2_ardour/ardour_ui_ed.cc:201
 msgid "About"
@@ -1062,7 +1128,7 @@ msgstr "Audiospur hinzufügen"
 
 #: gtk2_ardour/ardour_ui_ed.cc:206
 msgid "Add Audio Bus"
-msgstr ""
+msgstr "Audio-Bus hinzufügen"
 
 #: gtk2_ardour/ardour_ui_ed.cc:208
 msgid "Save"
@@ -1078,13 +1144,13 @@ msgid "Transport"
 msgstr "Transport"
 
 #: gtk2_ardour/ardour_ui_ed.cc:223
-#: gtk2_ardour/sfdb_ui.cc:60
+#: gtk2_ardour/sfdb_ui.cc:62
 msgid "Stop"
 msgstr "Stop"
 
 #: gtk2_ardour/ardour_ui_ed.cc:226
 msgid "Roll"
-msgstr ""
+msgstr "Wiedergabe"
 
 #: gtk2_ardour/ardour_ui_ed.cc:230
 msgid "Start/Stop"
@@ -1094,410 +1160,439 @@ msgstr "Start/Stop"
 msgid "Stop + Forget Capture"
 msgstr "Stop + Aufnahme verwerfen"
 
-#: gtk2_ardour/ardour_ui_ed.cc:236
-msgid "Play Loop Range"
-msgstr "Schleife wiedergeben"
-
-#: gtk2_ardour/ardour_ui_ed.cc:239
-msgid "Play Selection"
-msgstr "Auswahl wiedergeben"
-
 #: gtk2_ardour/ardour_ui_ed.cc:243
-msgid "Enable Record"
-msgstr "Aufnahme aktivieren"
+#, fuzzy
+msgid "Transition To Roll"
+msgstr "Traditionell"
 
-#: gtk2_ardour/ardour_ui_ed.cc:246
-msgid "Rewind"
-msgstr "Rückwärts"
-
-#: gtk2_ardour/ardour_ui_ed.cc:249
-msgid "Rewind (Slow)"
+#: gtk2_ardour/ardour_ui_ed.cc:247
+msgid "Transition To Reverse"
 msgstr ""
 
 #: gtk2_ardour/ardour_ui_ed.cc:252
-msgid "Rewind (Fast)"
-msgstr ""
+msgid "Play Loop Range"
+msgstr "Schleife wiedergeben"
 
 #: gtk2_ardour/ardour_ui_ed.cc:255
+msgid "Play Selection"
+msgstr "Auswahl wiedergeben"
+
+#: gtk2_ardour/ardour_ui_ed.cc:259
+msgid "Enable Record"
+msgstr "Aufnahme aktivieren"
+
+#: gtk2_ardour/ardour_ui_ed.cc:262
+msgid "Rewind"
+msgstr "Rückwärts"
+
+#: gtk2_ardour/ardour_ui_ed.cc:265
+msgid "Rewind (Slow)"
+msgstr "Rückwärts (langsam)"
+
+#: gtk2_ardour/ardour_ui_ed.cc:268
+msgid "Rewind (Fast)"
+msgstr "Rückwärts (schnell)"
+
+#: gtk2_ardour/ardour_ui_ed.cc:271
 msgid "Forward"
 msgstr "Vorwärts"
 
-#: gtk2_ardour/ardour_ui_ed.cc:258
+#: gtk2_ardour/ardour_ui_ed.cc:274
 msgid "Forward (Slow)"
-msgstr ""
+msgstr "Vorwärts (langsam)"
 
-#: gtk2_ardour/ardour_ui_ed.cc:261
+#: gtk2_ardour/ardour_ui_ed.cc:277
 msgid "Forward (Fast)"
-msgstr ""
+msgstr "Vorwärts (schnell)"
 
-#: gtk2_ardour/ardour_ui_ed.cc:264
+#: gtk2_ardour/ardour_ui_ed.cc:280
 msgid "Goto Zero"
 msgstr "Zum Nullpunkt springen"
 
-#: gtk2_ardour/ardour_ui_ed.cc:267
+#: gtk2_ardour/ardour_ui_ed.cc:283
 msgid "Goto Start"
 msgstr "Zum Anfang springen"
 
-#: gtk2_ardour/ardour_ui_ed.cc:270
+#: gtk2_ardour/ardour_ui_ed.cc:286
 msgid "Goto End"
 msgstr "Zum Ende Springen"
 
-#: gtk2_ardour/ardour_ui_ed.cc:286
-msgid "Auto Play"
-msgstr "Auto Play"
-
-#: gtk2_ardour/ardour_ui_ed.cc:293
+#: gtk2_ardour/ardour_ui_ed.cc:309
 msgid "Sync startup to video"
 msgstr "Mit Video synchronisieren"
 
-#: gtk2_ardour/ardour_ui_ed.cc:294
+#: gtk2_ardour/ardour_ui_ed.cc:310
 msgid "Time master"
 msgstr "Time Master"
 
-#: gtk2_ardour/ardour_ui_ed.cc:297
-msgid "Toggle Record Enable Track1"
-msgstr ""
-
-#: gtk2_ardour/ardour_ui_ed.cc:299
-msgid "Toggle Record Enable Track2"
-msgstr ""
-
-#: gtk2_ardour/ardour_ui_ed.cc:301
-msgid "Toggle Record Enable Track3"
-msgstr ""
-
-#: gtk2_ardour/ardour_ui_ed.cc:303
-msgid "Toggle Record Enable Track4"
-msgstr ""
-
-#: gtk2_ardour/ardour_ui_ed.cc:305
-msgid "Toggle Record Enable Track5"
-msgstr ""
-
-#: gtk2_ardour/ardour_ui_ed.cc:307
-msgid "Toggle Record Enable Track6"
-msgstr ""
-
-#: gtk2_ardour/ardour_ui_ed.cc:309
-msgid "Toggle Record Enable Track7"
-msgstr ""
-
-#: gtk2_ardour/ardour_ui_ed.cc:311
-msgid "Toggle Record Enable Track8"
-msgstr ""
-
 #: gtk2_ardour/ardour_ui_ed.cc:313
-msgid "Toggle Record Enable Track9"
-msgstr ""
+msgid "Toggle Record Enable Track1"
+msgstr "Aufnahme aktivieren für Spur 1"
 
 #: gtk2_ardour/ardour_ui_ed.cc:315
-msgid "Toggle Record Enable Track10"
-msgstr ""
+msgid "Toggle Record Enable Track2"
+msgstr "Aufnahme aktivieren für Spur 2"
 
 #: gtk2_ardour/ardour_ui_ed.cc:317
-msgid "Toggle Record Enable Track11"
-msgstr ""
+msgid "Toggle Record Enable Track3"
+msgstr "Aufnahme aktivieren für Spur 3"
 
 #: gtk2_ardour/ardour_ui_ed.cc:319
-msgid "Toggle Record Enable Track12"
-msgstr ""
+msgid "Toggle Record Enable Track4"
+msgstr "Aufnahme aktivieren für Spur 4"
 
 #: gtk2_ardour/ardour_ui_ed.cc:321
-msgid "Toggle Record Enable Track13"
-msgstr ""
+msgid "Toggle Record Enable Track5"
+msgstr "Aufnahme aktivieren für Spur 5"
 
 #: gtk2_ardour/ardour_ui_ed.cc:323
-msgid "Toggle Record Enable Track14"
-msgstr ""
+msgid "Toggle Record Enable Track6"
+msgstr "Aufnahme aktivieren für Spur 6"
 
 #: gtk2_ardour/ardour_ui_ed.cc:325
-msgid "Toggle Record Enable Track15"
-msgstr ""
+msgid "Toggle Record Enable Track7"
+msgstr "Aufnahme aktivieren für Spur 7"
 
 #: gtk2_ardour/ardour_ui_ed.cc:327
-msgid "Toggle Record Enable Track16"
-msgstr ""
+msgid "Toggle Record Enable Track8"
+msgstr "Aufnahme aktivieren für Spur 8"
 
 #: gtk2_ardour/ardour_ui_ed.cc:329
-msgid "Toggle Record Enable Track17"
-msgstr ""
+msgid "Toggle Record Enable Track9"
+msgstr "Aufnahme aktivieren für Spur 9"
 
 #: gtk2_ardour/ardour_ui_ed.cc:331
-msgid "Toggle Record Enable Track18"
-msgstr ""
+msgid "Toggle Record Enable Track10"
+msgstr "Aufnahme aktivieren für Spur 10"
 
 #: gtk2_ardour/ardour_ui_ed.cc:333
-msgid "Toggle Record Enable Track19"
-msgstr ""
+msgid "Toggle Record Enable Track11"
+msgstr "Aufnahme aktivieren für Spur 11"
 
 #: gtk2_ardour/ardour_ui_ed.cc:335
-msgid "Toggle Record Enable Track20"
-msgstr ""
+msgid "Toggle Record Enable Track12"
+msgstr "Aufnahme aktivieren für Spur 12"
 
 #: gtk2_ardour/ardour_ui_ed.cc:337
-msgid "Toggle Record Enable Track21"
-msgstr ""
+msgid "Toggle Record Enable Track13"
+msgstr "Aufnahme aktivieren für Spur 13"
 
 #: gtk2_ardour/ardour_ui_ed.cc:339
-msgid "Toggle Record Enable Track22"
-msgstr ""
+msgid "Toggle Record Enable Track14"
+msgstr "Aufnahme aktivieren für Spur 14"
 
 #: gtk2_ardour/ardour_ui_ed.cc:341
-msgid "Toggle Record Enable Track23"
-msgstr ""
+msgid "Toggle Record Enable Track15"
+msgstr "Aufnahme aktivieren für Spur 15"
 
 #: gtk2_ardour/ardour_ui_ed.cc:343
-msgid "Toggle Record Enable Track24"
-msgstr ""
+msgid "Toggle Record Enable Track16"
+msgstr "Aufnahme aktivieren für Spur 16"
 
 #: gtk2_ardour/ardour_ui_ed.cc:345
-msgid "Toggle Record Enable Track25"
-msgstr ""
+msgid "Toggle Record Enable Track17"
+msgstr "Aufnahme aktivieren für Spur 17"
 
 #: gtk2_ardour/ardour_ui_ed.cc:347
-msgid "Toggle Record Enable Track26"
-msgstr ""
+msgid "Toggle Record Enable Track18"
+msgstr "Aufnahme aktivieren für Spur 18"
 
 #: gtk2_ardour/ardour_ui_ed.cc:349
-msgid "Toggle Record Enable Track27"
-msgstr ""
+msgid "Toggle Record Enable Track19"
+msgstr "Aufnahme aktivieren für Spur 19"
 
 #: gtk2_ardour/ardour_ui_ed.cc:351
-msgid "Toggle Record Enable Track28"
-msgstr ""
+msgid "Toggle Record Enable Track20"
+msgstr "Aufnahme aktivieren für Spur 20"
 
 #: gtk2_ardour/ardour_ui_ed.cc:353
-msgid "Toggle Record Enable Track29"
-msgstr ""
+msgid "Toggle Record Enable Track21"
+msgstr "Aufnahme aktivieren für Spur 21"
 
 #: gtk2_ardour/ardour_ui_ed.cc:355
-msgid "Toggle Record Enable Track30"
-msgstr ""
+msgid "Toggle Record Enable Track22"
+msgstr "Aufnahme aktivieren für Spur 22"
 
 #: gtk2_ardour/ardour_ui_ed.cc:357
-msgid "Toggle Record Enable Track31"
-msgstr ""
+msgid "Toggle Record Enable Track23"
+msgstr "Aufnahme aktivieren für Spur 23"
 
 #: gtk2_ardour/ardour_ui_ed.cc:359
-msgid "Toggle Record Enable Track32"
-msgstr ""
+msgid "Toggle Record Enable Track24"
+msgstr "Aufnahme aktivieren für Spur 24"
 
-#: gtk2_ardour/ardour_ui_ed.cc:364
+#: gtk2_ardour/ardour_ui_ed.cc:361
+msgid "Toggle Record Enable Track25"
+msgstr "Aufnahme aktivieren für Spur 25"
+
+#: gtk2_ardour/ardour_ui_ed.cc:363
+msgid "Toggle Record Enable Track26"
+msgstr "Aufnahme aktivieren für Spur 26"
+
+#: gtk2_ardour/ardour_ui_ed.cc:365
+msgid "Toggle Record Enable Track27"
+msgstr "Aufnahme aktivieren für Spur 27"
+
+#: gtk2_ardour/ardour_ui_ed.cc:367
+msgid "Toggle Record Enable Track28"
+msgstr "Aufnahme aktivieren für Spur 28"
+
+#: gtk2_ardour/ardour_ui_ed.cc:369
+msgid "Toggle Record Enable Track29"
+msgstr "Aufnahme aktivieren für Spur 29"
+
+#: gtk2_ardour/ardour_ui_ed.cc:371
+msgid "Toggle Record Enable Track30"
+msgstr "Aufnahme aktivieren für Spur 30"
+
+#: gtk2_ardour/ardour_ui_ed.cc:373
+msgid "Toggle Record Enable Track31"
+msgstr "Aufnahme aktivieren für Spur 31"
+
+#: gtk2_ardour/ardour_ui_ed.cc:375
+msgid "Toggle Record Enable Track32"
+msgstr "Aufnahme aktivieren für Spur 32"
+
+#: gtk2_ardour/ardour_ui_ed.cc:380
 msgid "Percentage"
 msgstr "Prozent"
 
-#: gtk2_ardour/ardour_ui_ed.cc:365
+#: gtk2_ardour/ardour_ui_ed.cc:381
 msgid "Semitones"
 msgstr "Halbtöne"
 
-#: gtk2_ardour/ardour_ui_ed.cc:369
+#: gtk2_ardour/ardour_ui_ed.cc:385
 msgid "Send MTC"
 msgstr "MTC senden"
 
-#: gtk2_ardour/ardour_ui_ed.cc:371
+#: gtk2_ardour/ardour_ui_ed.cc:387
 msgid "Send MMC"
 msgstr "MMC senden"
 
-#: gtk2_ardour/ardour_ui_ed.cc:373
+#: gtk2_ardour/ardour_ui_ed.cc:389
 msgid "Use MMC"
 msgstr "Benutze MMC"
 
-#: gtk2_ardour/ardour_ui_ed.cc:375
+#: gtk2_ardour/ardour_ui_ed.cc:391
 msgid "Send MIDI feedback"
-msgstr ""
+msgstr "MIDI Feedback senden"
 
-#: gtk2_ardour/ardour_ui_ed.cc:377
+#: gtk2_ardour/ardour_ui_ed.cc:393
 msgid "Use MIDI control"
-msgstr ""
+msgstr "Benutze MIDI-Steuerung"
 
-#: gtk2_ardour/ardour_ui_ed.cc:380
+#: gtk2_ardour/ardour_ui_ed.cc:396
+msgid "Use OSC"
+msgstr "Aktiviere OSC"
+
+#: gtk2_ardour/ardour_ui_ed.cc:401
 msgid "Stop plugins with transport"
 msgstr "Plugins mit Transport stoppen"
 
-#: gtk2_ardour/ardour_ui_ed.cc:381
+#: gtk2_ardour/ardour_ui_ed.cc:402
 msgid "Verify remove last capture"
 msgstr "Verwerfen der letzten Aufnahme bestätigen"
 
-#: gtk2_ardour/ardour_ui_ed.cc:382
+#: gtk2_ardour/ardour_ui_ed.cc:403
 msgid "Stop recording on xrun"
 msgstr "Aufnahme bei XRUN stoppen"
 
-#: gtk2_ardour/ardour_ui_ed.cc:383
+#: gtk2_ardour/ardour_ui_ed.cc:404
 msgid "Stop transport at session end"
 msgstr "Transport am Ende des Projekts stoppen"
 
-#: gtk2_ardour/ardour_ui_ed.cc:384
+#: gtk2_ardour/ardour_ui_ed.cc:405
 msgid "-12dB gain reduce ffwd/rewind"
 msgstr "Beim Spulen Pegel um -12dB absenken"
 
-#: gtk2_ardour/ardour_ui_ed.cc:385
+#: gtk2_ardour/ardour_ui_ed.cc:406
 msgid "Rec-enable stays engaged at stop"
 msgstr "Aufnahmestatus bleibt nach Stop erhalten"
 
-#: gtk2_ardour/ardour_ui_ed.cc:387
+#: gtk2_ardour/ardour_ui_ed.cc:407
+msgid "Region equivalents overlap"
+msgstr "Region entspricht Überdeckung"
+
+#: gtk2_ardour/ardour_ui_ed.cc:409
 msgid "Do not run plugins while recording"
 msgstr "Plugins während der Aufnahme daktivieren"
 
-#: gtk2_ardour/ardour_ui_ed.cc:390
+#: gtk2_ardour/ardour_ui_ed.cc:412
 msgid "Latched solo"
 msgstr "Latch Solo"
 
-#: gtk2_ardour/ardour_ui_ed.cc:398
-#: gtk2_ardour/ardour_ui_ed.cc:406
-#: gtk2_ardour/audio_clock.cc:1839
-#: gtk2_ardour/gain_meter.cc:160
-#: gtk2_ardour/ladspa_pluginui.cc:330
-#: gtk2_ardour/ladspa_pluginui.cc:573
-#: gtk2_ardour/panner_ui.cc:89
+#: gtk2_ardour/ardour_ui_ed.cc:414
+msgid "Show solo muting"
+msgstr "Solo als Mute anzeigen"
+
+#: gtk2_ardour/ardour_ui_ed.cc:422
+#: gtk2_ardour/ardour_ui_ed.cc:430
+#: gtk2_ardour/audio_clock.cc:1838
 msgid "Off"
 msgstr "Aus"
 
-#: gtk2_ardour/ardour_ui_ed.cc:399
-#: gtk2_ardour/editor.cc:1243
-#: gtk2_ardour/editor.cc:1260
+#: gtk2_ardour/ardour_ui_ed.cc:423
+#: gtk2_ardour/editor.cc:1240
+#: gtk2_ardour/editor.cc:1257
 msgid "Slowest"
 msgstr "Sehr langsam"
 
-#: gtk2_ardour/ardour_ui_ed.cc:400
-#: gtk2_ardour/editor.cc:1244
-#: gtk2_ardour/editor.cc:1261
+#: gtk2_ardour/ardour_ui_ed.cc:424
+#: gtk2_ardour/editor.cc:1241
+#: gtk2_ardour/editor.cc:1258
 msgid "Slow"
 msgstr "Langsam"
 
-#: gtk2_ardour/ardour_ui_ed.cc:401
-#: gtk2_ardour/ardour_ui_ed.cc:408
+#: gtk2_ardour/ardour_ui_ed.cc:425
+#: gtk2_ardour/ardour_ui_ed.cc:432
 msgid "Medium"
 msgstr "Mittel"
 
-#: gtk2_ardour/ardour_ui_ed.cc:402
-#: gtk2_ardour/editor.cc:1245
-#: gtk2_ardour/editor.cc:1262
+#: gtk2_ardour/ardour_ui_ed.cc:426
+#: gtk2_ardour/editor.cc:1242
+#: gtk2_ardour/editor.cc:1259
 msgid "Fast"
 msgstr "Schnell"
 
-#: gtk2_ardour/ardour_ui_ed.cc:403
+#: gtk2_ardour/ardour_ui_ed.cc:427
 msgid "Faster"
 msgstr "Schneller"
 
-#: gtk2_ardour/ardour_ui_ed.cc:404
-#: gtk2_ardour/editor.cc:1246
-#: gtk2_ardour/editor.cc:1263
+#: gtk2_ardour/ardour_ui_ed.cc:428
+#: gtk2_ardour/editor.cc:1243
+#: gtk2_ardour/editor.cc:1260
 msgid "Fastest"
 msgstr "Schnellstmöglich"
 
-#: gtk2_ardour/ardour_ui_ed.cc:407
+#: gtk2_ardour/ardour_ui_ed.cc:431
 #: gtk2_ardour/editor_actions.cc:58
 msgid "Short"
 msgstr "Kurz"
 
-#: gtk2_ardour/ardour_ui_ed.cc:409
+#: gtk2_ardour/ardour_ui_ed.cc:433
 msgid "Long"
 msgstr "Lange"
 
-#: gtk2_ardour/ardour_ui_ed.cc:427
+#: gtk2_ardour/ardour_ui_ed.cc:451
 msgid "Hardware monitoring"
 msgstr "Hardware Monitoring"
 
-#: gtk2_ardour/ardour_ui_ed.cc:428
+#: gtk2_ardour/ardour_ui_ed.cc:452
 msgid "Software monitoring"
 msgstr "Software Monitoring"
 
-#: gtk2_ardour/ardour_ui_ed.cc:429
+#: gtk2_ardour/ardour_ui_ed.cc:453
 msgid "External monitoring"
 msgstr "Externes Monitoring"
 
-#: gtk2_ardour/ardour_ui_ed.cc:433
+#: gtk2_ardour/ardour_ui_ed.cc:457
 msgid "Solo in-place"
 msgstr "Solo-In-Place"
 
-#: gtk2_ardour/ardour_ui_ed.cc:435
+#: gtk2_ardour/ardour_ui_ed.cc:459
 msgid "Solo via bus"
 msgstr "Solo über Bus"
 
-#: gtk2_ardour/ardour_ui_ed.cc:440
+#: gtk2_ardour/ardour_ui_ed.cc:464
 msgid "Auto-connect inputs to physical inputs"
 msgstr "Eingänge automatisch mit Soundkarteneingängen verbinden"
 
-#: gtk2_ardour/ardour_ui_ed.cc:442
+#: gtk2_ardour/ardour_ui_ed.cc:466
 msgid "Manually connect inputs"
 msgstr "Eingänge manuell verbinden"
 
-#: gtk2_ardour/ardour_ui_ed.cc:447
+#: gtk2_ardour/ardour_ui_ed.cc:471
 msgid "Auto-connect outputs to physical outs"
 msgstr "Ausgänge automatisch mit Soundkartenausgängen verbinden"
 
-#: gtk2_ardour/ardour_ui_ed.cc:449
+#: gtk2_ardour/ardour_ui_ed.cc:473
 msgid "Auto-connect outputs to master bus"
 msgstr "Ausgänge automatisch mit Master-Bus verbinden"
 
-#: gtk2_ardour/ardour_ui_ed.cc:451
+#: gtk2_ardour/ardour_ui_ed.cc:475
 msgid "Manually connect outputs"
 msgstr "Ausgänge manuell verbinden"
 
-#: gtk2_ardour/ardour_ui_ed.cc:549
+#: gtk2_ardour/ardour_ui_ed.cc:480
+msgid "Remote ID assigned by User"
+msgstr "Fernsteuerungs-ID vom Benutzer festgelegt"
+
+#: gtk2_ardour/ardour_ui_ed.cc:482
+msgid "Remote ID follows order of Mixer"
+msgstr "Fernsteuerungs-ID aus Reihenfolge im Mixer"
+
+#: gtk2_ardour/ardour_ui_ed.cc:484
+msgid "Remote ID follows order of Editor"
+msgstr "Fernsteuerungs-ID aus Reihenfolge im Editor"
+
+#: gtk2_ardour/ardour_ui_ed.cc:633
 #: gtk2_ardour/ladspa_pluginui.cc:168
 msgid "Controls"
 msgstr "Steuerelemente"
 
-#: gtk2_ardour/ardour_ui_ed.cc:553
+#: gtk2_ardour/ardour_ui_ed.cc:637
 msgid "Feedback"
-msgstr ""
+msgstr "Feedback"
 
-#: gtk2_ardour/ardour_ui_ed.cc:633
+#: gtk2_ardour/ardour_ui_ed.cc:717
 msgid "ardour: clock"
-msgstr "ardour: Uhr"
+msgstr "ardour: Zeitanzeige"
 
-#: gtk2_ardour/ardour_ui_options.cc:106
-#: gtk2_ardour/ardour_ui_options.cc:133
+#: gtk2_ardour/ardour_ui_options.cc:112
+#: gtk2_ardour/ardour_ui_options.cc:139
 #: gtk2_ardour/editor_actions.cc:725
 #: gtk2_ardour/editor_actions.cc:953
 #: gtk2_ardour/editor_actions.cc:966
 #: gtk2_ardour/editor_actions.cc:1030
-#: gtk2_ardour/sfdb_ui.cc:524
+#: gtk2_ardour/sfdb_ui.cc:536
 #: gtk2_ardour/audio_streamview.cc:173
 msgid "programming error: %1"
-msgstr ""
+msgstr "Programmierfehler: %1"
 
-#: gtk2_ardour/ardour_ui_options.cc:212
+#: gtk2_ardour/ardour_ui_options.cc:218
 msgid "programming error: unknown solo model in ARDOUR_UI::set_solo_model: %1"
-msgstr ""
+msgstr "Programmierfehler: unbekannte Solo-Einstellung in ARDOUR_UI::set_solo_model: %1"
 
-#: gtk2_ardour/ardour_ui_options.cc:246
+#: gtk2_ardour/ardour_ui_options.cc:251
+msgid "programming error: unknown remote model in ARDOUR_UI::set_remote_model: %1"
+msgstr "Programmierfehler: unbekanntes Fernsteuerungsmodell in ARDOUR_UI::set_remote_model: %1"
+
+#: gtk2_ardour/ardour_ui_options.cc:285
 msgid "programming error: unknown monitor model in ARDOUR_UI::set_monitor_model: %1"
-msgstr ""
+msgstr "Programmierfehler: unbekannte Monitoring-Einstellung in ARDOUR_UI::set_monitor_model: %1"
 
-#: gtk2_ardour/ardour_ui_options.cc:499
+#: gtk2_ardour/ardour_ui_options.cc:577
 msgid "programming error: unknown file header format passed to ARDOUR_UI::map_file_data_format: %1"
-msgstr ""
+msgstr "Programmierfehler: unbekanntes Dateiheaderformat übergeben an ARDOUR_UI::map_file_data_format: %1"
 
-#: gtk2_ardour/ardour_ui_options.cc:531
+#: gtk2_ardour/ardour_ui_options.cc:609
 msgid "programming error: unknown file data format passed to ARDOUR_UI::map_file_data_format: %1"
-msgstr ""
+msgstr "Programmierfehler: unbekanntes Dateiformat übergeben an ARDOUR_UI::map_file_data_format: %1"
 
-#: gtk2_ardour/ardour_ui_options.cc:833
+#: gtk2_ardour/ardour_ui_options.cc:940
 msgid "ST"
-msgstr ""
+msgstr "HT"
 
-#: gtk2_ardour/audio_clock.cc:1835
-#: gtk2_ardour/editor.cc:181
+#: gtk2_ardour/audio_clock.cc:1834
+#: gtk2_ardour/editor.cc:178
 msgid "Timecode"
 msgstr "Timecode"
 
-#: gtk2_ardour/audio_clock.cc:1836
-#: gtk2_ardour/editor.cc:180
-#: gtk2_ardour/editor_rulers.cc:388
+#: gtk2_ardour/audio_clock.cc:1835
+#: gtk2_ardour/editor.cc:177
+#: gtk2_ardour/editor_rulers.cc:387
 msgid "Bars:Beats"
 msgstr "Takte:Schläge"
 
-#: gtk2_ardour/audio_clock.cc:1837
+#: gtk2_ardour/audio_clock.cc:1836
 msgid "Minutes:Seconds"
 msgstr "Minuten:Sekunden"
 
-#: gtk2_ardour/audio_clock.cc:1838
+#: gtk2_ardour/audio_clock.cc:1837
 msgid "Audio Frames"
-msgstr ""
+msgstr "Audio Frames"
 
-#: gtk2_ardour/audio_clock.cc:1841
+#: gtk2_ardour/audio_clock.cc:1840
 msgid "Mode"
 msgstr "Modus"
 
@@ -1511,7 +1606,7 @@ msgstr "s"
 
 #: gtk2_ardour/route_time_axis.cc:87
 msgid "r"
-msgstr ""
+msgstr "r"
 
 #: gtk2_ardour/route_time_axis.cc:91
 msgid "g"
@@ -1523,7 +1618,7 @@ msgstr "w"
 
 #: gtk2_ardour/route_time_axis.cc:93
 #: gtk2_ardour/automation_time_axis.cc:36
-#: gtk2_ardour/visual_time_axis.cc:74
+#: gtk2_ardour/visual_time_axis.cc:73
 msgid "h"
 msgstr "h"
 
@@ -1532,173 +1627,173 @@ msgid "a"
 msgstr "a"
 
 #: gtk2_ardour/route_time_axis.cc:95
-#: gtk2_ardour/visual_time_axis.cc:73
+#: gtk2_ardour/visual_time_axis.cc:72
 msgid "v"
 msgstr "v"
 
-#: gtk2_ardour/route_time_axis.cc:150
-#: gtk2_ardour/mixer_strip.cc:85
+#: gtk2_ardour/route_time_axis.cc:148
+#: gtk2_ardour/mixer_strip.cc:86
 msgid "Record"
 msgstr "Aufnahme"
 
-#: gtk2_ardour/route_time_axis.cc:158
+#: gtk2_ardour/route_time_axis.cc:156
 #: gtk2_ardour/editor_actions.cc:38
-#: gtk2_ardour/mixer_strip.cc:85
-#: gtk2_ardour/mixer_strip.cc:433
+#: gtk2_ardour/mixer_strip.cc:86
+#: gtk2_ardour/mixer_strip.cc:426
 msgid "Solo"
 msgstr "Solo"
 
-#: gtk2_ardour/route_time_axis.cc:159
-#: gtk2_ardour/editor.cc:1546
-#: gtk2_ardour/editor.cc:1636
-#: gtk2_ardour/mixer_strip.cc:85
-#: gtk2_ardour/mixer_strip.cc:432
-#: gtk2_ardour/panner_ui.cc:430
+#: gtk2_ardour/route_time_axis.cc:157
+#: gtk2_ardour/editor.cc:1543
+#: gtk2_ardour/editor.cc:1633
+#: gtk2_ardour/mixer_strip.cc:86
+#: gtk2_ardour/mixer_strip.cc:425
+#: gtk2_ardour/panner_ui.cc:404
 msgid "Mute"
 msgstr "Mute"
 
-#: gtk2_ardour/route_time_axis.cc:160
+#: gtk2_ardour/route_time_axis.cc:158
 msgid "Edit Group"
 msgstr "Bearbeitungsgruppe"
 
-#: gtk2_ardour/route_time_axis.cc:161
-#: gtk2_ardour/visual_time_axis.cc:92
+#: gtk2_ardour/route_time_axis.cc:159
+#: gtk2_ardour/visual_time_axis.cc:91
 msgid "Display Height"
 msgstr "Anzeigehöhe"
 
-#: gtk2_ardour/route_time_axis.cc:162
+#: gtk2_ardour/route_time_axis.cc:160
 msgid "Playlist"
 msgstr "Wiedergabeliste"
 
-#: gtk2_ardour/route_time_axis.cc:163
-#: gtk2_ardour/route_time_axis.cc:425
+#: gtk2_ardour/route_time_axis.cc:161
+#: gtk2_ardour/route_time_axis.cc:414
 msgid "Automation"
 msgstr "Automationen"
 
-#: gtk2_ardour/route_time_axis.cc:164
-#: gtk2_ardour/visual_time_axis.cc:93
+#: gtk2_ardour/route_time_axis.cc:162
+#: gtk2_ardour/visual_time_axis.cc:92
 msgid "Visual options"
 msgstr "Visuelle optionen"
 
-#: gtk2_ardour/route_time_axis.cc:165
-#: gtk2_ardour/visual_time_axis.cc:94
+#: gtk2_ardour/route_time_axis.cc:163
+#: gtk2_ardour/visual_time_axis.cc:93
 msgid "Hide this track"
 msgstr "Diese Spur verbergen"
 
-#: gtk2_ardour/route_time_axis.cc:276
-#: gtk2_ardour/mixer_strip.cc:917
+#: gtk2_ardour/route_time_axis.cc:265
+#: gtk2_ardour/mixer_strip.cc:910
 msgid "No group"
 msgstr "keine Gruppe"
 
-#: gtk2_ardour/route_time_axis.cc:386
+#: gtk2_ardour/route_time_axis.cc:375
 msgid "Show all automation"
 msgstr "Alle Automationen zeigen"
 
-#: gtk2_ardour/route_time_axis.cc:389
+#: gtk2_ardour/route_time_axis.cc:378
 msgid "Show existing automation"
 msgstr "Verfügbare Automationen zeigen"
 
-#: gtk2_ardour/route_time_axis.cc:392
+#: gtk2_ardour/route_time_axis.cc:381
 msgid "Hide all automation"
 msgstr "Automationen verbergen"
 
-#: gtk2_ardour/route_time_axis.cc:395
+#: gtk2_ardour/route_time_axis.cc:384
 msgid "Plugins"
 msgstr "Plugins"
 
-#: gtk2_ardour/route_time_axis.cc:416
+#: gtk2_ardour/route_time_axis.cc:405
 #: gtk2_ardour/automation_time_axis.cc:430
-#: gtk2_ardour/imageframe_time_axis.cc:255
-#: gtk2_ardour/marker_time_axis.cc:211
+#: gtk2_ardour/imageframe_time_axis.cc:254
+#: gtk2_ardour/marker_time_axis.cc:210
 msgid "Height"
 msgstr "Höhe"
 
-#: gtk2_ardour/route_time_axis.cc:417
+#: gtk2_ardour/route_time_axis.cc:406
 #: gtk2_ardour/color_manager.cc:41
-#: gtk2_ardour/imageframe_time_axis.cc:256
-#: gtk2_ardour/marker_time_axis.cc:212
+#: gtk2_ardour/imageframe_time_axis.cc:255
+#: gtk2_ardour/marker_time_axis.cc:211
 msgid "Color"
 msgstr "Farbe"
 
-#: gtk2_ardour/route_time_axis.cc:422
-#: gtk2_ardour/mixer_strip.cc:1002
+#: gtk2_ardour/route_time_axis.cc:411
+#: gtk2_ardour/mixer_strip.cc:995
 msgid "Remote Control ID"
 msgstr "ID für Fernsteuerung"
 
-#: gtk2_ardour/route_time_axis.cc:440
+#: gtk2_ardour/route_time_axis.cc:429
 msgid "Align with existing material"
 msgstr "An vorhandenem Material ausrichten"
 
-#: gtk2_ardour/route_time_axis.cc:446
+#: gtk2_ardour/route_time_axis.cc:435
 msgid "Align with capture time"
 msgstr "An Aufnahmezeit ausrichten"
 
-#: gtk2_ardour/route_time_axis.cc:452
+#: gtk2_ardour/route_time_axis.cc:441
 msgid "Alignment"
 msgstr "Ausrichtung"
 
-#: gtk2_ardour/route_time_axis.cc:458
+#: gtk2_ardour/route_time_axis.cc:447
 msgid "Normal mode"
 msgstr "Normaler Modus"
 
-#: gtk2_ardour/route_time_axis.cc:461
+#: gtk2_ardour/route_time_axis.cc:450
 msgid "Tape mode"
 msgstr "Tape-Modus"
 
-#: gtk2_ardour/route_time_axis.cc:477
-#: gtk2_ardour/editor.cc:483
+#: gtk2_ardour/route_time_axis.cc:466
+#: gtk2_ardour/editor.cc:481
 #: gtk2_ardour/editor_actions.cc:61
-#: gtk2_ardour/mixer_strip.cc:991
-#: gtk2_ardour/mixer_ui.cc:109
+#: gtk2_ardour/mixer_strip.cc:984
+#: gtk2_ardour/mixer_ui.cc:107
 msgid "Active"
 msgstr "Aktiv"
 
-#: gtk2_ardour/route_time_axis.cc:482
-#: gtk2_ardour/editor.cc:1726
+#: gtk2_ardour/route_time_axis.cc:471
+#: gtk2_ardour/editor.cc:1723
 #: gtk2_ardour/editor_actions.cc:328
 #: gtk2_ardour/editor_markers.cc:527
-#: gtk2_ardour/imageframe_time_axis.cc:259
-#: gtk2_ardour/location_ui.cc:58
-#: gtk2_ardour/marker_time_axis.cc:215
-#: gtk2_ardour/mixer_strip.cc:1005
+#: gtk2_ardour/imageframe_time_axis.cc:258
+#: gtk2_ardour/location_ui.cc:57
+#: gtk2_ardour/marker_time_axis.cc:214
+#: gtk2_ardour/mixer_strip.cc:998
 msgid "Remove"
 msgstr "Löschen"
 
-#: gtk2_ardour/route_time_axis.cc:508
-#: gtk2_ardour/route_time_axis.cc:563
-#: gtk2_ardour/route_time_axis.cc:828
+#: gtk2_ardour/route_time_axis.cc:496
+#: gtk2_ardour/route_time_axis.cc:551
+#: gtk2_ardour/route_time_axis.cc:816
 #: gtk2_ardour/editor_actions.cc:1017
 msgid "programming error: %1 %2"
-msgstr ""
+msgstr "Programmierfehler: %1 %2"
 
-#: gtk2_ardour/route_time_axis.cc:852
+#: gtk2_ardour/route_time_axis.cc:840
 msgid "Name for playlist"
 msgstr "Name für Wiedergabeliste"
 
-#: gtk2_ardour/route_time_axis.cc:854
+#: gtk2_ardour/route_time_axis.cc:842
 #: gtk2_ardour/route_time_axis.cc:1305
-#: gtk2_ardour/editor_markers.cc:852
-#: gtk2_ardour/editor_mouse.cc:4799
-#: gtk2_ardour/imageframe_time_axis.cc:248
-#: gtk2_ardour/marker_time_axis.cc:208
-#: gtk2_ardour/mixer_strip.cc:989
-#: gtk2_ardour/redirect_box.cc:823
-#: gtk2_ardour/redirect_box.cc:1149
-#: gtk2_ardour/route_ui.cc:760
-#: gtk2_ardour/visual_time_axis.cc:331
+#: gtk2_ardour/editor_markers.cc:870
+#: gtk2_ardour/editor_mouse.cc:4795
+#: gtk2_ardour/imageframe_time_axis.cc:247
+#: gtk2_ardour/marker_time_axis.cc:207
+#: gtk2_ardour/mixer_strip.cc:982
+#: gtk2_ardour/redirect_box.cc:822
+#: gtk2_ardour/redirect_box.cc:1148
+#: gtk2_ardour/route_ui.cc:807
+#: gtk2_ardour/visual_time_axis.cc:330
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: gtk2_ardour/route_time_axis.cc:896
-#: gtk2_ardour/route_time_axis.cc:942
+#: gtk2_ardour/route_time_axis.cc:884
+#: gtk2_ardour/route_time_axis.cc:930
 msgid "Name for Playlist"
-msgstr "Name für Playlist"
+msgstr "Name für Wiedergabeliste"
 
 #: gtk2_ardour/route_time_axis.cc:1133
-#: gtk2_ardour/visual_time_axis.cc:341
-#: gtk2_ardour/visual_time_axis.cc:388
+#: gtk2_ardour/visual_time_axis.cc:340
+#: gtk2_ardour/visual_time_axis.cc:387
 msgid "A track already exists with that name"
-msgstr ""
+msgstr "Es existiert bereits eine Spur mit diesem Namen"
 
 #: gtk2_ardour/route_time_axis.cc:1309
 msgid "New Copy"
@@ -1706,84 +1801,84 @@ msgstr "Neue Kopie"
 
 #: gtk2_ardour/route_time_axis.cc:1311
 msgid "Clear Current"
-msgstr ""
+msgstr "Ausgewählte zurücksetzen"
 
 #: gtk2_ardour/route_time_axis.cc:1314
 msgid "Select from all ..."
-msgstr ""
+msgstr "Aus allen auswählen..."
 
 #: gtk2_ardour/route_time_axis.cc:1520
-#: gtk2_ardour/editor.cc:1268
-#: gtk2_ardour/selection.cc:646
-#: gtk2_ardour/selection.cc:685
+#: gtk2_ardour/editor.cc:1265
+#: gtk2_ardour/selection.cc:658
+#: gtk2_ardour/selection.cc:697
 msgid "programming error: "
-msgstr ""
+msgstr "Programmierfehler:"
 
-#: gtk2_ardour/audio_time_axis.cc:222
+#: gtk2_ardour/audio_time_axis.cc:213
 msgid "Fader"
 msgstr "Fader"
 
-#: gtk2_ardour/audio_time_axis.cc:227
+#: gtk2_ardour/audio_time_axis.cc:218
 msgid "Pan"
-msgstr ""
+msgstr "Pan"
 
-#: gtk2_ardour/audio_time_axis.cc:242
+#: gtk2_ardour/audio_time_axis.cc:233
 msgid "Hide all crossfades"
 msgstr "Alle Crossfades verbergen"
 
-#: gtk2_ardour/audio_time_axis.cc:243
+#: gtk2_ardour/audio_time_axis.cc:234
 msgid "Show all crossfades"
 msgstr "Alle Crossfades zeigen"
 
-#: gtk2_ardour/audio_time_axis.cc:250
+#: gtk2_ardour/audio_time_axis.cc:241
 msgid "Show waveforms"
 msgstr "Wellenformen zeigen"
 
-#: gtk2_ardour/audio_time_axis.cc:260
+#: gtk2_ardour/audio_time_axis.cc:251
 msgid "Traditional"
 msgstr "Traditionell"
 
-#: gtk2_ardour/audio_time_axis.cc:263
+#: gtk2_ardour/audio_time_axis.cc:254
 msgid "Rectified"
 msgstr "Gleichgerichtet"
 
-#: gtk2_ardour/audio_time_axis.cc:270
-#: gtk2_ardour/editor.cc:1242
-#: gtk2_ardour/editor.cc:1259
+#: gtk2_ardour/audio_time_axis.cc:261
+#: gtk2_ardour/editor.cc:1239
+#: gtk2_ardour/editor.cc:1256
 msgid "Linear"
-msgstr ""
+msgstr "Linear"
 
-#: gtk2_ardour/audio_time_axis.cc:273
+#: gtk2_ardour/audio_time_axis.cc:264
 msgid "Logarithmic"
-msgstr ""
+msgstr "Logarithmisch"
 
-#: gtk2_ardour/audio_time_axis.cc:290
+#: gtk2_ardour/audio_time_axis.cc:281
 msgid "Waveform"
 msgstr "Wellenform"
 
-#: gtk2_ardour/audio_time_axis.cc:362
+#: gtk2_ardour/audio_time_axis.cc:353
 msgid "gain"
-msgstr ""
+msgstr "Gain"
 
-#: gtk2_ardour/audio_time_axis.cc:402
+#: gtk2_ardour/audio_time_axis.cc:393
 msgid "pan"
-msgstr ""
+msgstr "Pan"
 
-#: gtk2_ardour/automation_line.cc:795
+#: gtk2_ardour/automation_line.cc:794
 msgid "automation event move"
 msgstr "Automationspunkt bewegen"
 
-#: gtk2_ardour/automation_line.cc:797
+#: gtk2_ardour/automation_line.cc:796
 msgid "automation range drag"
 msgstr "Automationsbereich bewegen"
 
-#: gtk2_ardour/automation_line.cc:1022
+#: gtk2_ardour/automation_line.cc:1021
 #: gtk2_ardour/region_gain_line.cc:64
 msgid "remove control point"
 msgstr "Automationspunkt entfernen"
 
 #: gtk2_ardour/automation_time_axis.cc:37
-#: gtk2_ardour/editor_ops.cc:2936
+#: gtk2_ardour/editor_ops.cc:2636
 msgid "clear"
 msgstr "Leeren"
 
@@ -1797,7 +1892,7 @@ msgstr "Automationsmodus"
 
 #: gtk2_ardour/automation_time_axis.cc:80
 msgid "clear track"
-msgstr "Verbindungen entfernen"
+msgstr "Spur zurücksetzen"
 
 #: gtk2_ardour/automation_time_axis.cc:81
 msgid "hide track"
@@ -1806,50 +1901,54 @@ msgstr "Diese Spur verbergen"
 #: gtk2_ardour/automation_time_axis.cc:187
 #: gtk2_ardour/automation_time_axis.cc:216
 #: gtk2_ardour/automation_time_axis.cc:441
+#: gtk2_ardour/gain_meter.cc:159
+#: gtk2_ardour/ladspa_pluginui.cc:332
+#: gtk2_ardour/ladspa_pluginui.cc:576
+#: gtk2_ardour/panner_ui.cc:88
 msgid "Manual"
 msgstr "Manuell"
 
 #: gtk2_ardour/automation_time_axis.cc:189
 #: gtk2_ardour/automation_time_axis.cc:227
 #: gtk2_ardour/automation_time_axis.cc:445
-#: gtk2_ardour/editor.cc:1804
-#: gtk2_ardour/editor.cc:1885
-#: gtk2_ardour/gain_meter.cc:162
-#: gtk2_ardour/ladspa_pluginui.cc:333
-#: gtk2_ardour/ladspa_pluginui.cc:575
-#: gtk2_ardour/panner_ui.cc:91
-#: gtk2_ardour/sfdb_ui.cc:59
+#: gtk2_ardour/editor.cc:1801
+#: gtk2_ardour/editor.cc:1882
+#: gtk2_ardour/gain_meter.cc:161
+#: gtk2_ardour/ladspa_pluginui.cc:335
+#: gtk2_ardour/ladspa_pluginui.cc:578
+#: gtk2_ardour/panner_ui.cc:90
+#: gtk2_ardour/sfdb_ui.cc:61
 msgid "Play"
-msgstr "Wiedergabe"
+msgstr "Play"
 
 #: gtk2_ardour/automation_time_axis.cc:191
 #: gtk2_ardour/automation_time_axis.cc:238
 #: gtk2_ardour/automation_time_axis.cc:449
-#: gtk2_ardour/gain_meter.cc:164
-#: gtk2_ardour/ladspa_pluginui.cc:336
-#: gtk2_ardour/ladspa_pluginui.cc:577
-#: gtk2_ardour/panner_ui.cc:93
+#: gtk2_ardour/gain_meter.cc:163
+#: gtk2_ardour/ladspa_pluginui.cc:338
+#: gtk2_ardour/ladspa_pluginui.cc:580
+#: gtk2_ardour/panner_ui.cc:92
 msgid "Write"
-msgstr "Schreiben"
+msgstr "Write"
 
 #: gtk2_ardour/automation_time_axis.cc:193
 #: gtk2_ardour/automation_time_axis.cc:249
 #: gtk2_ardour/automation_time_axis.cc:453
-#: gtk2_ardour/gain_meter.cc:166
-#: gtk2_ardour/ladspa_pluginui.cc:339
-#: gtk2_ardour/ladspa_pluginui.cc:579
-#: gtk2_ardour/panner_ui.cc:95
+#: gtk2_ardour/gain_meter.cc:165
+#: gtk2_ardour/ladspa_pluginui.cc:341
+#: gtk2_ardour/ladspa_pluginui.cc:582
+#: gtk2_ardour/panner_ui.cc:94
 msgid "Touch"
-msgstr "Berühren"
+msgstr "Touch"
 
 #: gtk2_ardour/automation_time_axis.cc:260
-#: gtk2_ardour/ladspa_pluginui.cc:342
+#: gtk2_ardour/ladspa_pluginui.cc:344
 msgid "???"
-msgstr ""
+msgstr "???"
 
 #: gtk2_ardour/automation_time_axis.cc:274
 msgid "clear automation"
-msgstr "Verbindungen entfernen"
+msgstr "Automation zurücksetzen"
 
 #: gtk2_ardour/automation_time_axis.cc:432
 #: gtk2_ardour/editor_actions.cc:326
@@ -1857,9 +1956,9 @@ msgid "Hide"
 msgstr "Verbergen"
 
 #: gtk2_ardour/automation_time_axis.cc:434
-#: gtk2_ardour/crossfade_edit.cc:79
-#: gtk2_ardour/redirect_box.cc:1141
-#: gtk2_ardour/connection_editor.cc:57
+#: gtk2_ardour/crossfade_edit.cc:78
+#: gtk2_ardour/redirect_box.cc:1140
+#: gtk2_ardour/connection_editor.cc:56
 msgid "Clear"
 msgstr "Leeren"
 
@@ -1912,14 +2011,12 @@ msgid "drawn width"
 msgstr ""
 
 #: gtk2_ardour/canvas-imageframe.c:148
-#, fuzzy
 msgid "height"
-msgstr "Rechts"
+msgstr ""
 
 #: gtk2_ardour/canvas-imageframe.c:149
-#, fuzzy
 msgid "the height"
-msgstr "Rechts"
+msgstr ""
 
 #: gtk2_ardour/canvas-imageframe.c:157
 msgid "anchor"
@@ -1988,18 +2085,16 @@ msgid "fill"
 msgstr ""
 
 #: gtk2_ardour/canvas-simplerect.c:172
-#, fuzzy
 msgid "fill rectangle"
-msgstr "Auswahl zu Schleife machen"
+msgstr ""
 
 #: gtk2_ardour/canvas-simplerect.c:179
 msgid "draw"
 msgstr ""
 
 #: gtk2_ardour/canvas-simplerect.c:180
-#, fuzzy
 msgid "draw rectangle"
-msgstr "Bereich"
+msgstr ""
 
 #: gtk2_ardour/canvas-simplerect.c:188
 msgid "outline color rgba"
@@ -2018,819 +2113,811 @@ msgid "color of fill"
 msgstr ""
 
 #: gtk2_ardour/color_manager.cc:40
-#, fuzzy
 msgid "Object"
-msgstr "Objekt"
+msgstr ""
 
 #: gtk2_ardour/color_manager.cc:78
 msgid "cannot open color definition file %1: %2"
-msgstr ""
+msgstr "Konnte die Datei mit den Farbdefinitonen %1 nicht laden: %2"
 
-#: gtk2_ardour/crossfade_edit.cc:76
+#: gtk2_ardour/crossfade_edit.cc:75
 msgid "ardour: x-fade edit"
 msgstr "ardour: Crossfade Editor"
 
-#: gtk2_ardour/crossfade_edit.cc:80
-#: gtk2_ardour/panner_ui.cc:446
+#: gtk2_ardour/crossfade_edit.cc:79
+#: gtk2_ardour/panner_ui.cc:420
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: gtk2_ardour/crossfade_edit.cc:81
+#: gtk2_ardour/crossfade_edit.cc:80
 msgid "Fade"
 msgstr "Fade"
 
-#: gtk2_ardour/crossfade_edit.cc:82
+#: gtk2_ardour/crossfade_edit.cc:81
 msgid "Out (dry)"
 msgstr "Out (dry)"
 
-#: gtk2_ardour/crossfade_edit.cc:83
+#: gtk2_ardour/crossfade_edit.cc:82
 msgid "Out"
 msgstr "Out"
 
-#: gtk2_ardour/crossfade_edit.cc:84
+#: gtk2_ardour/crossfade_edit.cc:83
 msgid "In (dry)"
 msgstr "In (dry)"
 
-#: gtk2_ardour/crossfade_edit.cc:85
+#: gtk2_ardour/crossfade_edit.cc:84
 msgid "In"
 msgstr "In"
 
-#: gtk2_ardour/crossfade_edit.cc:87
+#: gtk2_ardour/crossfade_edit.cc:86
 msgid "With Pre-roll"
 msgstr "mit Pre-Roll"
 
-#: gtk2_ardour/crossfade_edit.cc:88
+#: gtk2_ardour/crossfade_edit.cc:87
 msgid "With Post-roll"
 msgstr "mit Post-Roll"
 
-#: gtk2_ardour/crossfade_edit.cc:96
+#: gtk2_ardour/crossfade_edit.cc:95
 msgid "Fade In"
 msgstr "Fade In"
 
-#: gtk2_ardour/crossfade_edit.cc:97
+#: gtk2_ardour/crossfade_edit.cc:96
 msgid "Fade Out"
 msgstr "Fade Out"
 
-#: gtk2_ardour/crossfade_edit.cc:173
-#: gtk2_ardour/editor.cc:1621
+#: gtk2_ardour/crossfade_edit.cc:172
+#: gtk2_ardour/editor.cc:1618
 #: gtk2_ardour/editor_actions.cc:324
-#: gtk2_ardour/option_editor.cc:127
+#: gtk2_ardour/option_editor.cc:130
 msgid "Audition"
 msgstr "Vorhören"
 
-#: gtk2_ardour/editor.cc:103
-#: gtk2_ardour/editor.cc:3533
+#: gtk2_ardour/editor.cc:101
+#: gtk2_ardour/editor.cc:2973
 #: gtk2_ardour/editor_actions.cc:402
-#: gtk2_ardour/export_dialog.cc:76
-#: gtk2_ardour/export_dialog.cc:90
-#: gtk2_ardour/export_dialog.cc:891
-#: gtk2_ardour/export_dialog.cc:1223
-#: gtk2_ardour/route_ui.cc:459
+#: gtk2_ardour/export_dialog.cc:75
+#: gtk2_ardour/export_dialog.cc:89
+#: gtk2_ardour/export_dialog.cc:889
+#: gtk2_ardour/export_dialog.cc:1221
+#: gtk2_ardour/route_ui.cc:506
 msgid "None"
 msgstr "Kein"
 
-#: gtk2_ardour/editor.cc:104
-#: gtk2_ardour/editor.cc:3521
+#: gtk2_ardour/editor.cc:102
+#: gtk2_ardour/editor.cc:2961
 msgid "CD Frames"
 msgstr "CD-Frames"
 
-#: gtk2_ardour/editor.cc:105
-#: gtk2_ardour/editor.cc:3523
+#: gtk2_ardour/editor.cc:103
+#: gtk2_ardour/editor.cc:2963
 msgid "SMPTE Frames"
 msgstr "SMPTE-Frames"
 
-#: gtk2_ardour/editor.cc:106
-#: gtk2_ardour/editor.cc:3525
+#: gtk2_ardour/editor.cc:104
+#: gtk2_ardour/editor.cc:2965
 msgid "SMPTE Seconds"
 msgstr "SMPTE-Sekunden"
 
-#: gtk2_ardour/editor.cc:107
-#: gtk2_ardour/editor.cc:3527
+#: gtk2_ardour/editor.cc:105
+#: gtk2_ardour/editor.cc:2967
 msgid "SMPTE Minutes"
 msgstr "SMPTE-Minuten"
 
-#: gtk2_ardour/editor.cc:108
-#: gtk2_ardour/editor.cc:3529
+#: gtk2_ardour/editor.cc:106
+#: gtk2_ardour/editor.cc:2969
 msgid "Seconds"
 msgstr "Sekunden"
 
-#: gtk2_ardour/editor.cc:109
-#: gtk2_ardour/editor.cc:3531
+#: gtk2_ardour/editor.cc:107
+#: gtk2_ardour/editor.cc:2971
 msgid "Minutes"
 msgstr "Minuten"
 
-#: gtk2_ardour/editor.cc:110
-#: gtk2_ardour/editor.cc:3503
+#: gtk2_ardour/editor.cc:108
+#: gtk2_ardour/editor.cc:2943
 msgid "Beats/32"
 msgstr "Schläge / 32"
 
-#: gtk2_ardour/editor.cc:111
-#: gtk2_ardour/editor.cc:3501
+#: gtk2_ardour/editor.cc:109
+#: gtk2_ardour/editor.cc:2941
 msgid "Beats/16"
 msgstr "Schläge / 16"
 
-#: gtk2_ardour/editor.cc:112
-#: gtk2_ardour/editor.cc:3499
+#: gtk2_ardour/editor.cc:110
+#: gtk2_ardour/editor.cc:2939
 msgid "Beats/8"
 msgstr "Schläge / 8"
 
-#: gtk2_ardour/editor.cc:113
-#: gtk2_ardour/editor.cc:3497
+#: gtk2_ardour/editor.cc:111
+#: gtk2_ardour/editor.cc:2937
 msgid "Beats/4"
 msgstr "Schläge / 4"
 
-#: gtk2_ardour/editor.cc:114
-#: gtk2_ardour/editor.cc:3495
+#: gtk2_ardour/editor.cc:112
+#: gtk2_ardour/editor.cc:2935
 msgid "Beats/3"
 msgstr "Schläge / 3"
 
-#: gtk2_ardour/editor.cc:115
-#: gtk2_ardour/editor.cc:3505
+#: gtk2_ardour/editor.cc:113
+#: gtk2_ardour/editor.cc:2945
 msgid "Beats"
 msgstr "Schläge"
 
-#: gtk2_ardour/editor.cc:116
-#: gtk2_ardour/editor.cc:3507
+#: gtk2_ardour/editor.cc:114
+#: gtk2_ardour/editor.cc:2947
 msgid "Bars"
 msgstr "Takte"
 
-#: gtk2_ardour/editor.cc:117
-#: gtk2_ardour/editor.cc:3509
+#: gtk2_ardour/editor.cc:115
+#: gtk2_ardour/editor.cc:2949
 msgid "Marks"
 msgstr "Marker"
 
-#: gtk2_ardour/editor.cc:118
-#: gtk2_ardour/editor.cc:137
-#: gtk2_ardour/editor.cc:3511
-#: gtk2_ardour/editor.cc:3576
+#: gtk2_ardour/editor.cc:116
+#: gtk2_ardour/editor.cc:135
+#: gtk2_ardour/editor.cc:2951
+#: gtk2_ardour/editor.cc:3016
 msgid "Edit Cursor"
 msgstr "Editierzeiger"
 
-#: gtk2_ardour/editor.cc:119
-#: gtk2_ardour/editor.cc:3513
+#: gtk2_ardour/editor.cc:117
+#: gtk2_ardour/editor.cc:2953
 msgid "Region starts"
 msgstr "Regionen-Anfang"
 
-#: gtk2_ardour/editor.cc:120
-#: gtk2_ardour/editor.cc:3515
+#: gtk2_ardour/editor.cc:118
+#: gtk2_ardour/editor.cc:2955
 msgid "Region ends"
 msgstr "Regionen-Ende"
 
-#: gtk2_ardour/editor.cc:121
-#: gtk2_ardour/editor.cc:3519
+#: gtk2_ardour/editor.cc:119
+#: gtk2_ardour/editor.cc:2959
 msgid "Region syncs"
 msgstr "Regionen-Sync"
 
-#: gtk2_ardour/editor.cc:122
-#: gtk2_ardour/editor.cc:3517
+#: gtk2_ardour/editor.cc:120
+#: gtk2_ardour/editor.cc:2957
 msgid "Region bounds"
 msgstr "Regionen-Grenzen"
 
-#: gtk2_ardour/editor.cc:128
-#: gtk2_ardour/editor.cc:3551
+#: gtk2_ardour/editor.cc:126
+#: gtk2_ardour/editor.cc:2991
 #: gtk2_ardour/editor_actions.cc:289
 msgid "Magnetic"
 msgstr "Magnetisch"
 
-#: gtk2_ardour/editor.cc:133
-#: gtk2_ardour/editor.cc:3568
-#: gtk2_ardour/export_dialog.cc:138
-#: gtk2_ardour/export_dialog.cc:154
-#: gtk2_ardour/export_dialog.cc:1066
-#: gtk2_ardour/export_dialog.cc:1070
+#: gtk2_ardour/editor.cc:131
+#: gtk2_ardour/editor.cc:3008
+#: gtk2_ardour/export_dialog.cc:136
+#: gtk2_ardour/export_dialog.cc:152
+#: gtk2_ardour/export_dialog.cc:1064
+#: gtk2_ardour/export_dialog.cc:1068
 msgid "Left"
 msgstr "Links"
 
-#: gtk2_ardour/editor.cc:134
-#: gtk2_ardour/editor.cc:3570
-#: gtk2_ardour/export_dialog.cc:139
-#: gtk2_ardour/export_dialog.cc:155
+#: gtk2_ardour/editor.cc:132
+#: gtk2_ardour/editor.cc:3010
+#: gtk2_ardour/export_dialog.cc:137
+#: gtk2_ardour/export_dialog.cc:153
 msgid "Right"
 msgstr "Rechts"
 
-#: gtk2_ardour/editor.cc:135
-#: gtk2_ardour/editor.cc:3572
+#: gtk2_ardour/editor.cc:133
+#: gtk2_ardour/editor.cc:3012
 msgid "Center"
 msgstr "Mitte"
 
-#: gtk2_ardour/editor.cc:136
-#: gtk2_ardour/editor.cc:3574
+#: gtk2_ardour/editor.cc:134
+#: gtk2_ardour/editor.cc:3014
 msgid "Playhead"
 msgstr "Positionszeiger"
 
-#: gtk2_ardour/editor.cc:179
+#: gtk2_ardour/editor.cc:176
 msgid "Mins:Secs"
 msgstr "Min:Sek"
 
-#: gtk2_ardour/editor.cc:182
-#: gtk2_ardour/editor_rulers.cc:382
+#: gtk2_ardour/editor.cc:179
+#: gtk2_ardour/editor_rulers.cc:381
 msgid "Frames"
 msgstr "Frames"
 
-#: gtk2_ardour/editor.cc:183
-#: gtk2_ardour/editor_rulers.cc:402
+#: gtk2_ardour/editor.cc:180
+#: gtk2_ardour/editor_rulers.cc:401
 msgid "Tempo"
 msgstr "Tempo"
 
-#: gtk2_ardour/editor.cc:184
-#: gtk2_ardour/editor_rulers.cc:396
+#: gtk2_ardour/editor.cc:181
+#: gtk2_ardour/editor_rulers.cc:395
 msgid "Meter"
 msgstr "Taktart"
 
-#: gtk2_ardour/editor.cc:185
-#: gtk2_ardour/editor_rulers.cc:408
+#: gtk2_ardour/editor.cc:182
+#: gtk2_ardour/editor_rulers.cc:407
 msgid "Location Markers"
 msgstr "Positionsmarker"
 
-#: gtk2_ardour/editor.cc:186
-#: gtk2_ardour/editor_rulers.cc:414
+#: gtk2_ardour/editor.cc:183
+#: gtk2_ardour/editor_rulers.cc:413
 msgid "Range Markers"
 msgstr "Bereiche"
 
-#: gtk2_ardour/editor.cc:187
-#: gtk2_ardour/editor_rulers.cc:420
+#: gtk2_ardour/editor.cc:184
+#: gtk2_ardour/editor_rulers.cc:419
 msgid "Loop/Punch Ranges"
 msgstr "Schleifen/Punch-Bereiche"
 
-#: gtk2_ardour/editor.cc:205
+#: gtk2_ardour/editor.cc:202
 msgid "mode"
 msgstr "Modus"
 
-#: gtk2_ardour/editor.cc:206
+#: gtk2_ardour/editor.cc:203
 msgid "automation"
-msgstr ""
+msgstr "Automation"
 
-#: gtk2_ardour/editor.cc:458
-#: gtk2_ardour/editor.cc:484
+#: gtk2_ardour/editor.cc:456
+#: gtk2_ardour/editor.cc:482
 #: gtk2_ardour/editor_actions.cc:63
-#: gtk2_ardour/mixer_ui.cc:84
-#: gtk2_ardour/mixer_ui.cc:110
-#: gtk2_ardour/analysis_window.cc:64
+#: gtk2_ardour/mixer_ui.cc:82
+#: gtk2_ardour/mixer_ui.cc:108
+#: gtk2_ardour/analysis_window.cc:63
 msgid "Show"
 msgstr "Anzeigen"
 
-#: gtk2_ardour/editor.cc:459
-#: gtk2_ardour/editor.cc:482
-#, fuzzy
+#: gtk2_ardour/editor.cc:457
+#: gtk2_ardour/editor.cc:480
 msgid "Name"
-msgstr "Umbenennen"
+msgstr "Name"
 
-#: gtk2_ardour/editor.cc:557
-#: gtk2_ardour/editor.cc:624
+#: gtk2_ardour/editor.cc:555
+#: gtk2_ardour/editor.cc:622
 msgid "Regions"
 msgstr "Regionen"
 
-#: gtk2_ardour/editor.cc:596
-#: gtk2_ardour/editor.cc:636
+#: gtk2_ardour/editor.cc:594
+#: gtk2_ardour/editor.cc:634
 msgid "Chunks"
 msgstr "Teile"
 
-#: gtk2_ardour/editor.cc:627
+#: gtk2_ardour/editor.cc:625
 msgid "Tracks/Busses"
 msgstr "Spuren/Busse"
 
-#: gtk2_ardour/editor.cc:630
+#: gtk2_ardour/editor.cc:628
 msgid "Snapshots"
 msgstr "Schnapschüsse"
 
-#: gtk2_ardour/editor.cc:633
+#: gtk2_ardour/editor.cc:631
 msgid "Edit Groups"
 msgstr "Bearbeitungsgruppen"
 
-#: gtk2_ardour/editor.cc:684
+#: gtk2_ardour/editor.cc:682
 msgid "Nudge Region/Selection Forwards"
 msgstr "Region/Auswahl schrittweise nach vorne"
 
-#: gtk2_ardour/editor.cc:685
+#: gtk2_ardour/editor.cc:683
 msgid "Nudge Region/Selection Backwards"
 msgstr "Region/Auswahl schrittweise nach hinten"
 
-#: gtk2_ardour/editor.cc:713
-#: gtk2_ardour/editor_mixer.cc:318
+#: gtk2_ardour/editor.cc:711
+#: gtk2_ardour/editor_mixer.cc:347
 msgid "ardour: editor"
 msgstr "ardour: Editor"
 
-#: gtk2_ardour/editor.cc:1010
+#: gtk2_ardour/editor.cc:1009
 msgid "ardour: editor: "
 msgstr "ardour: Editor: "
 
-#: gtk2_ardour/editor.cc:1090
-#: gtk2_ardour/editor.cc:1099
-#: gtk2_ardour/editor_markers.cc:896
+#: gtk2_ardour/editor.cc:1089
+#: gtk2_ardour/editor.cc:1097
+#: gtk2_ardour/editor_markers.cc:914
 msgid "Loop"
 msgstr "Schleife"
 
-#: gtk2_ardour/editor.cc:1104
-#: gtk2_ardour/editor.cc:1113
-#: gtk2_ardour/editor_markers.cc:924
+#: gtk2_ardour/editor.cc:1102
+#: gtk2_ardour/editor.cc:1110
+#: gtk2_ardour/editor_markers.cc:942
 msgid "Punch"
-msgstr ""
+msgstr "Punch"
 
-#: gtk2_ardour/editor.cc:1223
-#: gtk2_ardour/editor_mouse.cc:1760
+#: gtk2_ardour/editor.cc:1220
+#: gtk2_ardour/editor_mouse.cc:1765
 msgid "programming error: fade in canvas item has no regionview data pointer!"
-msgstr ""
+msgstr "Programmierfehler: fade in canvas item has no regionview data pointer!"
 
-#: gtk2_ardour/editor.cc:1235
-#: gtk2_ardour/editor.cc:1252
-#: gtk2_ardour/redirect_box.cc:1157
+#: gtk2_ardour/editor.cc:1232
+#: gtk2_ardour/editor.cc:1249
+#: gtk2_ardour/redirect_box.cc:1156
 msgid "Deactivate"
 msgstr "Deaktivieren"
 
-#: gtk2_ardour/editor.cc:1237
-#: gtk2_ardour/editor.cc:1254
-#: gtk2_ardour/redirect_box.cc:1155
+#: gtk2_ardour/editor.cc:1234
+#: gtk2_ardour/editor.cc:1251
+#: gtk2_ardour/redirect_box.cc:1154
 msgid "Activate"
 msgstr "Aktivieren"
 
-#: gtk2_ardour/editor.cc:1375
-#: gtk2_ardour/editor.cc:1383
+#: gtk2_ardour/editor.cc:1372
+#: gtk2_ardour/editor.cc:1380
 msgid "Freeze"
 msgstr "Einfrieren"
 
-#: gtk2_ardour/editor.cc:1379
+#: gtk2_ardour/editor.cc:1376
 msgid "Unfreeze"
 msgstr "Auftauen"
 
-#: gtk2_ardour/editor.cc:1548
+#: gtk2_ardour/editor.cc:1545
 msgid "Unmute"
 msgstr "Unmute"
 
-#: gtk2_ardour/editor.cc:1552
-#: gtk2_ardour/editor.cc:1849
+#: gtk2_ardour/editor.cc:1549
+#: gtk2_ardour/editor.cc:1846
 #: gtk2_ardour/editor_actions.cc:28
 #: gtk2_ardour/editor_markers.cc:526
-#: gtk2_ardour/mixer_strip.cc:515
-#: gtk2_ardour/mixer_strip.cc:577
-#: gtk2_ardour/redirect_box.cc:1163
+#: gtk2_ardour/mixer_strip.cc:508
+#: gtk2_ardour/mixer_strip.cc:570
+#: gtk2_ardour/redirect_box.cc:1162
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: gtk2_ardour/editor.cc:1557
+#: gtk2_ardour/editor.cc:1554
 msgid "Convert to short"
-msgstr ""
+msgstr "In kurzen Crossfade umwandeln"
 
-#: gtk2_ardour/editor.cc:1559
+#: gtk2_ardour/editor.cc:1556
 msgid "Convert to full"
-msgstr ""
+msgstr "In langen Crossfade umwandeln"
 
-#: gtk2_ardour/editor.cc:1570
+#: gtk2_ardour/editor.cc:1567
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: gtk2_ardour/editor.cc:1613
+#: gtk2_ardour/editor.cc:1610
 msgid "Popup region editor"
 msgstr "Regioneneditor öffnen"
 
-#: gtk2_ardour/editor.cc:1614
+#: gtk2_ardour/editor.cc:1611
 msgid "Raise to top layer"
 msgstr "Region ganz nach oben"
 
-#: gtk2_ardour/editor.cc:1615
+#: gtk2_ardour/editor.cc:1612
 msgid "Lower to bottom layer"
 msgstr "Region ganz nach unten"
 
-#: gtk2_ardour/editor.cc:1617
+#: gtk2_ardour/editor.cc:1614
 msgid "Define sync point"
 msgstr "Synchronisationspunkt definieren"
 
-#: gtk2_ardour/editor.cc:1618
+#: gtk2_ardour/editor.cc:1615
 msgid "Remove sync point"
 msgstr "Synchronisationspunkt entfernen"
 
-#: gtk2_ardour/editor.cc:1623
+#: gtk2_ardour/editor.cc:1620
 msgid "Bounce"
 msgstr "Bounce"
 
-#: gtk2_ardour/editor.cc:1626
+#: gtk2_ardour/editor.cc:1623
 msgid "Analyze region"
 msgstr "Analysiere Region"
 
-#: gtk2_ardour/editor.cc:1631
+#: gtk2_ardour/editor.cc:1628
 msgid "Lock"
 msgstr "Sperren"
 
-#: gtk2_ardour/editor.cc:1641
+#: gtk2_ardour/editor.cc:1638
 msgid "Opaque"
 msgstr "Deckend"
 
-#: gtk2_ardour/editor.cc:1647
+#: gtk2_ardour/editor.cc:1644
 msgid "Original position"
 msgstr "Ursprungsposition"
 
-#: gtk2_ardour/editor.cc:1659
+#: gtk2_ardour/editor.cc:1656
 msgid "Reset Envelope"
 msgstr "Lautstärkekurve zurücksetzen"
 
-#: gtk2_ardour/editor.cc:1661
+#: gtk2_ardour/editor.cc:1658
 msgid "Envelope Visible"
 msgstr "Lautstärkekurve sichtbar"
 
-#: gtk2_ardour/editor.cc:1668
+#: gtk2_ardour/editor.cc:1665
 msgid "Envelope Active"
 msgstr "Lautstärkekurve aktiv"
 
-#: gtk2_ardour/editor.cc:1678
+#: gtk2_ardour/editor.cc:1675
 msgid "DeNormalize"
 msgstr "Ardour: Region "
 
-#: gtk2_ardour/editor.cc:1680
+#: gtk2_ardour/editor.cc:1677
 msgid "Normalize"
 msgstr "Normalisieren"
 
-#: gtk2_ardour/editor.cc:1683
+#: gtk2_ardour/editor.cc:1680
 msgid "Reverse"
 msgstr "Rückwärts"
 
-#: gtk2_ardour/editor.cc:1689
-#: gtk2_ardour/editor.cc:1771
+#: gtk2_ardour/editor.cc:1686
+#: gtk2_ardour/editor.cc:1768
 msgid "Add Range Markers"
 msgstr "Bereichsmarker einfügen"
 
-#: gtk2_ardour/editor.cc:1690
+#: gtk2_ardour/editor.cc:1687
 msgid "Set Range Selection"
 msgstr "Bereich auswählen"
 
-#: gtk2_ardour/editor.cc:1699
+#: gtk2_ardour/editor.cc:1696
 msgid "Nudge fwd"
 msgstr "Schritt nach vorne"
 
-#: gtk2_ardour/editor.cc:1700
+#: gtk2_ardour/editor.cc:1697
 msgid "Nudge bwd"
 msgstr "Schritt nach hinten"
 
-#: gtk2_ardour/editor.cc:1701
+#: gtk2_ardour/editor.cc:1698
 msgid "Nudge fwd by capture offset"
 msgstr "Schritt nach vorne um Aufnahme-Offset"
 
-#: gtk2_ardour/editor.cc:1702
+#: gtk2_ardour/editor.cc:1699
 msgid "Nudge bwd by capture offset"
 msgstr "Schritt nach hinten um Aufnahme-Offset"
 
-#: gtk2_ardour/editor.cc:1704
-#: gtk2_ardour/editor.cc:1869
-#: gtk2_ardour/editor.cc:1925
+#: gtk2_ardour/editor.cc:1701
+#: gtk2_ardour/editor.cc:1866
+#: gtk2_ardour/editor.cc:1922
 msgid "Nudge"
 msgstr "Verschieben"
 
-#: gtk2_ardour/editor.cc:1711
+#: gtk2_ardour/editor.cc:1708
 msgid "Start to edit cursor"
 msgstr "Von Anfang bis Editierzeiger"
 
-#: gtk2_ardour/editor.cc:1712
+#: gtk2_ardour/editor.cc:1709
 msgid "Edit cursor to end"
 msgstr "Von Editierzeiger bis Ende"
 
-#: gtk2_ardour/editor.cc:1714
-#: gtk2_ardour/gain_meter.cc:169
-#: gtk2_ardour/gain_meter.cc:873
-#: gtk2_ardour/panner_ui.cc:98
-#: gtk2_ardour/panner_ui.cc:806
+#: gtk2_ardour/editor.cc:1711
+#: gtk2_ardour/gain_meter.cc:168
+#: gtk2_ardour/gain_meter.cc:880
+#: gtk2_ardour/panner_ui.cc:97
+#: gtk2_ardour/panner_ui.cc:780
 msgid "Trim"
 msgstr "Abschneiden"
 
-#: gtk2_ardour/editor.cc:1717
+#: gtk2_ardour/editor.cc:1714
 msgid "Split"
 msgstr "Teilen"
 
-#: gtk2_ardour/editor.cc:1720
+#: gtk2_ardour/editor.cc:1717
 msgid "Make mono regions"
 msgstr "Zu Mono-Regionen umwandeln"
 
-#: gtk2_ardour/editor.cc:1723
+#: gtk2_ardour/editor.cc:1720
 msgid "Duplicate"
 msgstr "Duplizieren"
 
-#: gtk2_ardour/editor.cc:1724
+#: gtk2_ardour/editor.cc:1721
 msgid "Fill Track"
 msgstr "Spur auffüllen"
 
-#: gtk2_ardour/editor.cc:1756
-#, fuzzy
+#: gtk2_ardour/editor.cc:1753
 msgid "Play range"
-msgstr "Bereich"
+msgstr "Bereich abspielen"
 
-#: gtk2_ardour/editor.cc:1757
-#, fuzzy
+#: gtk2_ardour/editor.cc:1754
 msgid "Loop range"
-msgstr "Bereich"
+msgstr "Bereich in Schleife abspielen"
 
-#: gtk2_ardour/editor.cc:1761
+#: gtk2_ardour/editor.cc:1758
 msgid "Analyze range"
 msgstr "Bereich analysieren"
 
-#: gtk2_ardour/editor.cc:1765
+#: gtk2_ardour/editor.cc:1762
 msgid "Separate range to track"
 msgstr "Bereich als Spur"
 
-#: gtk2_ardour/editor.cc:1766
+#: gtk2_ardour/editor.cc:1763
 msgid "Separate range to region list"
 msgstr "Bereich zur Regionenliste hinzufügen"
 
-#: gtk2_ardour/editor.cc:1769
+#: gtk2_ardour/editor.cc:1766
 msgid "Select all in range"
 msgstr "Alles im Bereich auswählen"
 
-#: gtk2_ardour/editor.cc:1772
-#: gtk2_ardour/editor.cc:1817
+#: gtk2_ardour/editor.cc:1769
+#: gtk2_ardour/editor.cc:1814
 msgid "Set range to loop range"
 msgstr "Ausgewählten Bereich als Schleife"
 
-#: gtk2_ardour/editor.cc:1773
-#: gtk2_ardour/editor.cc:1818
+#: gtk2_ardour/editor.cc:1770
+#: gtk2_ardour/editor.cc:1815
 msgid "Set range to punch range"
 msgstr "Ausgewählten Bereich als Punch-Bereich"
 
-#: gtk2_ardour/editor.cc:1775
+#: gtk2_ardour/editor.cc:1772
 msgid "Crop region to range"
 msgstr "Regionen-Editor öffnen"
 
-#: gtk2_ardour/editor.cc:1776
+#: gtk2_ardour/editor.cc:1773
 msgid "Fill range with region"
 msgstr "Bereich mit Region ausfüllen"
 
-#: gtk2_ardour/editor.cc:1777
+#: gtk2_ardour/editor.cc:1774
 msgid "Duplicate range"
 msgstr "Bereich Duplizieren"
 
-#: gtk2_ardour/editor.cc:1778
+#: gtk2_ardour/editor.cc:1775
 msgid "Create chunk from range"
 msgstr "Abschnitt aus Bereich erstellen..."
 
-#: gtk2_ardour/editor.cc:1780
+#: gtk2_ardour/editor.cc:1777
 msgid "Bounce range"
 msgstr "Bereich Bouncen"
 
-#: gtk2_ardour/editor.cc:1781
+#: gtk2_ardour/editor.cc:1778
 msgid "Export range"
-msgstr "Bereich exportieren..."
+msgstr "Bereiche exportieren..."
 
-#: gtk2_ardour/editor.cc:1783
+#: gtk2_ardour/editor.cc:1780
 msgid "Range"
 msgstr "Bereich"
 
-#: gtk2_ardour/editor.cc:1798
-#: gtk2_ardour/editor.cc:1883
+#: gtk2_ardour/editor.cc:1795
+#: gtk2_ardour/editor.cc:1880
 msgid "Play from edit cursor"
 msgstr "Wiedergabe ab Editierzeiger"
 
-#: gtk2_ardour/editor.cc:1799
-#: gtk2_ardour/editor.cc:1884
+#: gtk2_ardour/editor.cc:1796
+#: gtk2_ardour/editor.cc:1881
 msgid "Play from start"
 msgstr "Wiedergabe ab Anfang"
 
-#: gtk2_ardour/editor.cc:1800
+#: gtk2_ardour/editor.cc:1797
 msgid "Play region"
 msgstr "Region wiedergeben"
 
-#: gtk2_ardour/editor.cc:1802
+#: gtk2_ardour/editor.cc:1799
 msgid "Loop Region"
 msgstr "Region in Schleife wiedergeben"
 
-#: gtk2_ardour/editor.cc:1812
-#: gtk2_ardour/editor.cc:1893
+#: gtk2_ardour/editor.cc:1809
+#: gtk2_ardour/editor.cc:1890
 msgid "Select All in track"
 msgstr "Alles in Spur auswählen"
 
-#: gtk2_ardour/editor.cc:1813
-#: gtk2_ardour/editor.cc:1894
-#: gtk2_ardour/redirect_box.cc:1151
+#: gtk2_ardour/editor.cc:1810
+#: gtk2_ardour/editor.cc:1891
+#: gtk2_ardour/redirect_box.cc:1150
 msgid "Select All"
 msgstr "Alles Auswählen"
 
-#: gtk2_ardour/editor.cc:1814
-#: gtk2_ardour/editor.cc:1895
+#: gtk2_ardour/editor.cc:1811
+#: gtk2_ardour/editor.cc:1892
 msgid "Invert selection in track"
 msgstr "Auswahl in Spur umkehren"
 
-#: gtk2_ardour/editor.cc:1815
-#: gtk2_ardour/editor.cc:1896
+#: gtk2_ardour/editor.cc:1812
+#: gtk2_ardour/editor.cc:1893
 msgid "Invert selection"
 msgstr "Auswahl umkehren"
 
-#: gtk2_ardour/editor.cc:1820
-#: gtk2_ardour/editor.cc:1898
+#: gtk2_ardour/editor.cc:1817
+#: gtk2_ardour/editor.cc:1895
 msgid "Select all after edit cursor"
 msgstr "Alles nach Editierzeiger auswählen"
 
-#: gtk2_ardour/editor.cc:1821
-#: gtk2_ardour/editor.cc:1899
+#: gtk2_ardour/editor.cc:1818
+#: gtk2_ardour/editor.cc:1896
 msgid "Select all before edit cursor"
 msgstr "Alles vor Editierzeiger auswählen"
 
-#: gtk2_ardour/editor.cc:1822
-#: gtk2_ardour/editor.cc:1900
+#: gtk2_ardour/editor.cc:1819
+#: gtk2_ardour/editor.cc:1897
 msgid "Select all after playhead"
 msgstr "Alles nach Positionszeiger auswählen"
 
-#: gtk2_ardour/editor.cc:1823
-#: gtk2_ardour/editor.cc:1901
+#: gtk2_ardour/editor.cc:1820
+#: gtk2_ardour/editor.cc:1898
 msgid "Select all before playhead"
 msgstr "Alles vor Positionszeiger auswählen"
 
-#: gtk2_ardour/editor.cc:1824
+#: gtk2_ardour/editor.cc:1821
 msgid "Select all between cursors"
 msgstr "Alles zwischen Zeigern auswählen"
 
-#: gtk2_ardour/editor.cc:1827
-#: gtk2_ardour/editor.cc:1903
+#: gtk2_ardour/editor.cc:1824
+#: gtk2_ardour/editor.cc:1900
 msgid "Select"
 msgstr "Auswahl"
 
-#: gtk2_ardour/editor.cc:1835
-#: gtk2_ardour/editor.cc:1911
+#: gtk2_ardour/editor.cc:1832
+#: gtk2_ardour/editor.cc:1908
 #: gtk2_ardour/editor_actions.cc:217
-#: gtk2_ardour/redirect_box.cc:1144
+#: gtk2_ardour/redirect_box.cc:1143
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: gtk2_ardour/editor.cc:1836
-#: gtk2_ardour/editor.cc:1912
+#: gtk2_ardour/editor.cc:1833
+#: gtk2_ardour/editor.cc:1909
 #: gtk2_ardour/editor_actions.cc:222
-#: gtk2_ardour/redirect_box.cc:1146
+#: gtk2_ardour/redirect_box.cc:1145
 msgid "Copy"
 msgstr "Kopieren"
 
-#: gtk2_ardour/editor.cc:1837
+#: gtk2_ardour/editor.cc:1834
 msgid "Paste at edit cursor"
 msgstr "Am Editierzeiger einfügen"
 
-#: gtk2_ardour/editor.cc:1838
+#: gtk2_ardour/editor.cc:1835
 msgid "Paste at mouse"
 msgstr "An Mausposition einfügen"
 
-#: gtk2_ardour/editor.cc:1842
+#: gtk2_ardour/editor.cc:1839
 msgid "Align"
 msgstr "Ausrichten"
 
-#: gtk2_ardour/editor.cc:1843
+#: gtk2_ardour/editor.cc:1840
 msgid "Align Relative"
 msgstr "Relativ ausrichten"
 
-#: gtk2_ardour/editor.cc:1847
+#: gtk2_ardour/editor.cc:1844
 msgid "Insert chunk"
 msgstr "Abschnitt einfügen"
 
-#: gtk2_ardour/editor.cc:1854
+#: gtk2_ardour/editor.cc:1851
 msgid "Insert Selected Region"
 msgstr "Ausgewählte Region einfügen"
 
-#: gtk2_ardour/editor.cc:1855
+#: gtk2_ardour/editor.cc:1852
 msgid "Insert Existing Audio"
 msgstr "Audio importieren..."
 
-#: gtk2_ardour/editor.cc:1864
-#: gtk2_ardour/editor.cc:1920
+#: gtk2_ardour/editor.cc:1861
+#: gtk2_ardour/editor.cc:1917
 msgid "Nudge entire track fwd"
 msgstr "Gesamte Spur schrittweise nach vorne"
 
-#: gtk2_ardour/editor.cc:1865
-#: gtk2_ardour/editor.cc:1921
+#: gtk2_ardour/editor.cc:1862
+#: gtk2_ardour/editor.cc:1918
 msgid "Nudge track after edit cursor fwd"
 msgstr "Spur nach Editierzeiger schrittweise nach vorne"
 
-#: gtk2_ardour/editor.cc:1866
-#: gtk2_ardour/editor.cc:1922
+#: gtk2_ardour/editor.cc:1863
+#: gtk2_ardour/editor.cc:1919
 msgid "Nudge entire track bwd"
 msgstr "Gesamte Spur schrittweise nach hinten"
 
-#: gtk2_ardour/editor.cc:1867
-#: gtk2_ardour/editor.cc:1923
+#: gtk2_ardour/editor.cc:1864
+#: gtk2_ardour/editor.cc:1920
 msgid "Nudge track after edit cursor bwd"
 msgstr "Spur nach Editierzeiger schrittweise nach hinten"
 
-#: gtk2_ardour/editor.cc:1913
+#: gtk2_ardour/editor.cc:1910
 #: gtk2_ardour/editor_actions.cc:224
-#: gtk2_ardour/redirect_box.cc:1148
+#: gtk2_ardour/redirect_box.cc:1147
 msgid "Paste"
 msgstr "Einfügen"
 
-#: gtk2_ardour/editor.cc:2498
+#: gtk2_ardour/editor.cc:2495
 msgid "Select/Move Objects"
 msgstr "Objekte auswählen/verschieben"
 
-#: gtk2_ardour/editor.cc:2499
+#: gtk2_ardour/editor.cc:2496
 msgid "Select/Move Ranges"
 msgstr "Bereiche auswählen/verschieben"
 
-#: gtk2_ardour/editor.cc:2500
+#: gtk2_ardour/editor.cc:2497
 msgid "Draw Gain Automation"
 msgstr "Lautstärkekurve zeichnen"
 
-#: gtk2_ardour/editor.cc:2501
+#: gtk2_ardour/editor.cc:2498
 msgid "Select Zoom Range"
 msgstr "Zoombereich auswählen"
 
-#: gtk2_ardour/editor.cc:2502
+#: gtk2_ardour/editor.cc:2499
 msgid "Stretch/Shrink Regions"
 msgstr "Regionen vergrößern/verkleinern (Time-Stretch)"
 
-#: gtk2_ardour/editor.cc:2503
+#: gtk2_ardour/editor.cc:2500
 msgid "Listen to Specific Regions"
 msgstr "Ausgewählte Regionen vorhören"
 
-#: gtk2_ardour/editor.cc:2533
+#: gtk2_ardour/editor.cc:2530
 #: gtk2_ardour/editor_actions.cc:143
 msgid "Zoom In"
 msgstr "Vergrößern"
 
-#: gtk2_ardour/editor.cc:2539
+#: gtk2_ardour/editor.cc:2536
 #: gtk2_ardour/editor_actions.cc:141
 msgid "Zoom Out"
 msgstr "Verkleinern"
 
-#: gtk2_ardour/editor.cc:2545
+#: gtk2_ardour/editor.cc:2542
 #: gtk2_ardour/editor_actions.cc:145
 msgid "Zoom to Session"
 msgstr "Auf ganzes Projekt zoomen"
 
-#: gtk2_ardour/editor.cc:2551
+#: gtk2_ardour/editor.cc:2548
 msgid "Zoom focus"
 msgstr "Zoom-Mittelpunkt"
 
-#: gtk2_ardour/editor.cc:2567
+#: gtk2_ardour/editor.cc:2564
 msgid "Unit to snap cursors and ranges to"
-msgstr ""
+msgstr "Rastereinheit für Zeiger und Bereiche"
 
-#: gtk2_ardour/editor.cc:3281
-#: gtk2_ardour/editor.cc:3330
-#, fuzzy
-msgid "set selected regions"
-msgstr "Auswahl zu Schleife machen"
-
-#: gtk2_ardour/editor.cc:3370
+#: gtk2_ardour/editor.cc:2810
 #: gtk2_ardour/editor_actions.cc:207
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: gtk2_ardour/editor.cc:3372
+#: gtk2_ardour/editor.cc:2812
 msgid "Undo (%1)"
 msgstr "Rückgängig (%1)"
 
-#: gtk2_ardour/editor.cc:3379
+#: gtk2_ardour/editor.cc:2819
 #: gtk2_ardour/editor_actions.cc:209
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: gtk2_ardour/editor.cc:3381
+#: gtk2_ardour/editor.cc:2821
 msgid "Redo (%1)"
 msgstr "Wiederherstellen (%1)"
 
-#: gtk2_ardour/editor.cc:3402
+#: gtk2_ardour/editor.cc:2842
 msgid "Duplicate how many times?"
 msgstr "Wie häufig duplizieren?"
 
-#: gtk2_ardour/editor.cc:3480
-#, fuzzy
+#: gtk2_ardour/editor.cc:2920
 msgid "Splice Edit"
-msgstr "Teilen"
+msgstr "Kleben"
 
-#: gtk2_ardour/editor.cc:3482
+#: gtk2_ardour/editor.cc:2922
 msgid "Slide Edit"
-msgstr ""
+msgstr "Slide Edit"
 
-#: gtk2_ardour/editor.cc:3904
+#: gtk2_ardour/editor.cc:3276
 msgid ""
 "Playlist %1 is currently unused.\n"
 "If left alone, no audio files used by it will be cleaned.\n"
 "If deleted, audio files used by it alone by will cleaned."
 msgstr ""
+"Die Wiedergabeliste %1 wird nicht verwendet.\n"
+"Es können keine Audiodateien aufgeräumt werden, die von ihr verwendet werden.\n"
+"Falls sie gelöscht wird, werden die ausschließlich von ihr verwendeten Audiodateien gelöscht."
 
-#: gtk2_ardour/editor.cc:3914
+#: gtk2_ardour/editor.cc:3286
 msgid "Delete playlist"
 msgstr "Wiedergabeliste löschen"
 
-#: gtk2_ardour/editor.cc:3915
+#: gtk2_ardour/editor.cc:3287
 msgid "Keep playlist"
 msgstr "Wiedergabeliste beibehalten"
 
-#: gtk2_ardour/editor.cc:3916
-#: gtk2_ardour/editor_audio_import.cc:315
-#: gtk2_ardour/editor_ops.cc:2063
-#: gtk2_ardour/editor_timefx.cc:72
-#: gtk2_ardour/export_dialog.cc:969
-#: gtk2_ardour/io_selector.cc:61
-#: gtk2_ardour/io_selector.cc:749
-#: gtk2_ardour/redirect_box.cc:975
-#: gtk2_ardour/tempo_dialog.cc:20
-#: gtk2_ardour/tempo_dialog.cc:37
-#: gtk2_ardour/tempo_dialog.cc:202
-#: gtk2_ardour/tempo_dialog.cc:220
-#: gtk2_ardour/connection_editor.cc:60
+#: gtk2_ardour/editor.cc:3288
+#: gtk2_ardour/editor_audio_import.cc:341
+#: gtk2_ardour/editor_ops.cc:1760
+#: gtk2_ardour/editor_timefx.cc:71
+#: gtk2_ardour/export_dialog.cc:967
+#: gtk2_ardour/io_selector.cc:60
+#: gtk2_ardour/io_selector.cc:748
+#: gtk2_ardour/redirect_box.cc:974
+#: gtk2_ardour/tempo_dialog.cc:22
+#: gtk2_ardour/tempo_dialog.cc:41
+#: gtk2_ardour/tempo_dialog.cc:158
+#: gtk2_ardour/tempo_dialog.cc:176
+#: gtk2_ardour/connection_editor.cc:59
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: gtk2_ardour/editor.cc:4120
+#: gtk2_ardour/editor.cc:3492
 msgid "new playlists"
 msgstr "Neue Wiedergabelisten"
 
-#: gtk2_ardour/editor.cc:4128
+#: gtk2_ardour/editor.cc:3500
 msgid "copy playlists"
 msgstr "Wiedergabelisten kopieren"
 
-#: gtk2_ardour/editor.cc:4136
+#: gtk2_ardour/editor.cc:3508
 msgid "clear playlists"
-msgstr ""
+msgstr "Wiedergabelisten zurücksetzen"
 
 #: gtk2_ardour/editor_actions.cc:29
 msgid "Select regions"
@@ -2850,7 +2937,7 @@ msgstr "Region(en)"
 
 #: gtk2_ardour/editor_actions.cc:33
 msgid "Tools"
-msgstr ""
+msgstr "Werkzeuge"
 
 #: gtk2_ardour/editor_actions.cc:34
 msgid "View"
@@ -2870,7 +2957,7 @@ msgstr "Abfall der Pegelanzeigen"
 
 #: gtk2_ardour/editor_actions.cc:39
 msgid "Crossfades"
-msgstr "ardour: Editor"
+msgstr "Crossfades"
 
 #: gtk2_ardour/editor_actions.cc:40
 msgid "Monitoring"
@@ -2886,7 +2973,7 @@ msgstr "Layering"
 
 #: gtk2_ardour/editor_actions.cc:43
 msgid "Timecode fps"
-msgstr ""
+msgstr "Timecode FPS"
 
 #: gtk2_ardour/editor_actions.cc:44
 msgid "Pullup / Pulldown"
@@ -2977,7 +3064,7 @@ msgid "Edit Cursor to Range End"
 msgstr "Editierzeiger zum Ende der Auswahl"
 
 #: gtk2_ardour/editor_actions.cc:106
-#: gtk2_ardour/editor_ops.cc:1331
+#: gtk2_ardour/editor_selection.cc:726
 msgid "select all"
 msgstr "Alle Regionen auswählen"
 
@@ -3018,7 +3105,7 @@ msgid "Jump Backward to Mark"
 msgstr "Zum vorherigen Marker springen"
 
 #: gtk2_ardour/editor_actions.cc:129
-msgid "Add Location from Playhead"
+msgid "Add Mark from Playhead"
 msgstr "Marker am Positionszeiger setzen"
 
 #: gtk2_ardour/editor_actions.cc:132
@@ -3027,16 +3114,15 @@ msgstr "Schritt nach vorne"
 
 #: gtk2_ardour/editor_actions.cc:134
 msgid "Nudge Next Forward"
-msgstr ""
+msgstr "nächste Region Schritt vorwärts"
 
 #: gtk2_ardour/editor_actions.cc:136
 msgid "Nudge Backward"
 msgstr "Schritt nach Hinten"
 
 #: gtk2_ardour/editor_actions.cc:138
-#, fuzzy
 msgid "Nudge Next Backward"
-msgstr "Stille einfügen"
+msgstr "Nächste Region Schritt nach vorne"
 
 #: gtk2_ardour/editor_actions.cc:148
 msgid "Scroll Tracks Up"
@@ -3064,7 +3150,7 @@ msgstr "Rückwärts scrollen"
 
 #: gtk2_ardour/editor_actions.cc:161
 msgid "goto"
-msgstr ""
+msgstr "Gehe zu"
 
 #: gtk2_ardour/editor_actions.cc:163
 msgid "Center Playhead"
@@ -3091,14 +3177,12 @@ msgid "Edit to Playhead"
 msgstr "Editierzeiger zum Positionszeiger setzen"
 
 #: gtk2_ardour/editor_actions.cc:178
-#, fuzzy
 msgid "Align Regions Start"
-msgstr "Regionen"
+msgstr "Anfang der Regionen ausrichten"
 
 #: gtk2_ardour/editor_actions.cc:180
-#, fuzzy
 msgid "Align Regions Start Relative"
-msgstr "nach Anfang der Region in der Datei"
+msgstr "Anfang der Regionen relativ ausrichten"
 
 #: gtk2_ardour/editor_actions.cc:182
 msgid "Align Regions End"
@@ -3106,7 +3190,7 @@ msgstr "ardour: Region"
 
 #: gtk2_ardour/editor_actions.cc:184
 msgid "Align Regions End Relative"
-msgstr ""
+msgstr "Regionenenden relativ ausrichten"
 
 #: gtk2_ardour/editor_actions.cc:187
 msgid "Align Regions Sync"
@@ -3114,7 +3198,7 @@ msgstr "ardour: Region"
 
 #: gtk2_ardour/editor_actions.cc:189
 msgid "Align Regions Sync Relative"
-msgstr ""
+msgstr "Regionen-Sync relativ ausrichten"
 
 #: gtk2_ardour/editor_actions.cc:192
 msgid "Audition at Mouse"
@@ -3145,17 +3229,15 @@ msgid "Set Region Sync Position"
 msgstr "Sync-Position der Region setzen"
 
 #: gtk2_ardour/editor_actions.cc:212
-#, fuzzy
 msgid "Export Session"
-msgstr "Name für Region:"
+msgstr "Projekt exportieren"
 
 #: gtk2_ardour/editor_actions.cc:214
-#, fuzzy
 msgid "Export Range"
-msgstr "Ausgewählten Bereich wiedergeben"
+msgstr "Bereich exportieren"
 
 #: gtk2_ardour/editor_actions.cc:220
-#: gtk2_ardour/connection_editor.cc:56
+#: gtk2_ardour/connection_editor.cc:55
 msgid "Delete"
 msgstr "Löschen"
 
@@ -3164,9 +3246,8 @@ msgid "Duplicate Region"
 msgstr "Duplizieren"
 
 #: gtk2_ardour/editor_actions.cc:228
-#, fuzzy
 msgid "Duplicate Range"
-msgstr "Duplizieren"
+msgstr "Bereich duplizieren"
 
 #: gtk2_ardour/editor_actions.cc:230
 msgid "Insert Region"
@@ -3189,9 +3270,8 @@ msgid "Insert Chunk"
 msgstr "Abschnitt einfügen"
 
 #: gtk2_ardour/editor_actions.cc:241
-#, fuzzy
 msgid "Split at edit cursor"
-msgstr "Wiedergabe ab Cursor"
+msgstr "Am Editierzeiger trennen"
 
 #: gtk2_ardour/editor_actions.cc:244
 msgid "Start Range"
@@ -3203,7 +3283,7 @@ msgstr "Bereich beenden"
 
 #: gtk2_ardour/editor_actions.cc:248
 msgid "Finish add Range"
-msgstr ""
+msgstr "Bereich hinzufügen beenden"
 
 #: gtk2_ardour/editor_actions.cc:251
 msgid "Extend Range to End of Region"
@@ -3523,11 +3603,11 @@ msgstr ""
 
 #: gtk2_ardour/editor_actions.cc:410
 msgid "80 per frame"
-msgstr ""
+msgstr "80 pro Frame"
 
 #: gtk2_ardour/editor_actions.cc:411
 msgid "100 per frame"
-msgstr ""
+msgstr "100 pro Frame"
 
 #: gtk2_ardour/editor_actions.cc:714
 #: gtk2_ardour/editor_actions.cc:759
@@ -3535,254 +3615,270 @@ msgstr ""
 #: gtk2_ardour/editor_actions.cc:814
 #: gtk2_ardour/editor_actions.cc:824
 msgid "programming error: %1: %2"
-msgstr ""
+msgstr "Programmierfehler: %1: %2"
 
 #: gtk2_ardour/editor_actions.cc:985
 msgid "Configuraton is using unhandled subframes per frame value: %1"
-msgstr ""
+msgstr "Diese Konfiguration benutzt einen unzulässigen Wert für Subframes pro Frame: %1"
 
 #: gtk2_ardour/editor_audio_import.cc:76
-#, fuzzy
 msgid "You can't import or embed an audiofile until you have a session loaded."
-msgstr "Sie können keine Audio-Daten importieren, solange kein Projekt geladen ist."
+msgstr "Sie können keine Audiodatei importieren, solange kein Projekt geladen ist."
 
 #: gtk2_ardour/editor_audio_import.cc:81
 msgid "Add existing audio to session"
 msgstr "Audio importieren"
 
-#: gtk2_ardour/editor_audio_import.cc:166
-msgid "Import as a %1 region"
-msgstr ""
-
-#: gtk2_ardour/editor_audio_import.cc:167
-#, fuzzy
-msgid "multichannel"
-msgstr "Kanäle"
-
-#: gtk2_ardour/editor_audio_import.cc:167
-#: gtk2_ardour/export_dialog.cc:84
-msgid "stereo"
-msgstr ""
-
 #: gtk2_ardour/editor_audio_import.cc:168
-#, fuzzy
-msgid "Import as multiple regions"
-msgstr "Auswahl zu Schleife machen"
+msgid "Import as a %1 region"
+msgstr "Importiere als eine %1 Region"
+
+#: gtk2_ardour/editor_audio_import.cc:169
+msgid "multichannel"
+msgstr "Mehrkanal"
+
+#: gtk2_ardour/editor_audio_import.cc:169
+#: gtk2_ardour/export_dialog.cc:83
+msgid "stereo"
+msgstr "Stereo"
 
 #: gtk2_ardour/editor_audio_import.cc:170
+msgid "Import as multiple regions"
+msgstr "In mehrere Regionen aufteilen"
+
+#: gtk2_ardour/editor_audio_import.cc:172
 msgid ""
 "Paired files detected (%1, %2 ...).\n"
 "Do you want to:"
 msgstr ""
+"Zusammenhängende Dateien gefunden (%1, %2 ...).\n"
+"Wollen Sie:"
 
-#: gtk2_ardour/editor_audio_import.cc:216
+#: gtk2_ardour/editor_audio_import.cc:218
 msgid "ardour: importing %1"
 msgstr "ardour: Importiere %1"
 
-#: gtk2_ardour/editor_audio_import.cc:220
+#: gtk2_ardour/editor_audio_import.cc:222
 msgid "Cancel Import"
 msgstr "Importieren Abbrechen"
 
-#: gtk2_ardour/editor_audio_import.cc:303
+#: gtk2_ardour/editor_audio_import.cc:307
 msgid "Editor: cannot open file \"%1\", (%2)"
-msgstr ""
+msgstr "Editor: kann die Datei \"%1\" nicht öffnen (%2)"
 
-#: gtk2_ardour/editor_audio_import.cc:311
-#, fuzzy
+#: gtk2_ardour/editor_audio_import.cc:315
 msgid "Cancel entire import"
 msgstr "Importieren Abbrechen"
 
-#: gtk2_ardour/editor_audio_import.cc:312
-#, fuzzy
+#: gtk2_ardour/editor_audio_import.cc:316
 msgid "Don't embed it"
-msgstr "Ohne %1"
+msgstr "Nicht einbetten"
 
-#: gtk2_ardour/editor_audio_import.cc:313
+#: gtk2_ardour/editor_audio_import.cc:317
 msgid "Embed all without questions"
-msgstr ""
+msgstr "Alle Importieren ohne nachzufragen"
 
-#: gtk2_ardour/editor_audio_import.cc:318
-msgid "Embed it anyway"
-msgstr ""
-
-#: gtk2_ardour/editor_audio_import.cc:321
+#: gtk2_ardour/editor_audio_import.cc:320
+#: gtk2_ardour/editor_audio_import.cc:345
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
 msgstr ""
+"%1\n"
+"Die Samplerate dieser Audiodatei unterscheidet sich von der Samplerate dieses Projekts."
 
-#: gtk2_ardour/editor_audio_import.cc:360
+#: gtk2_ardour/editor_audio_import.cc:342
+msgid "Embed it anyway"
+msgstr "Trotzdem importieren"
+
+#: gtk2_ardour/editor_audio_import.cc:393
 msgid "could not open %1"
 msgstr "Konnte \"%s\" nicht öffnen."
 
-#: gtk2_ardour/editor_audio_import.cc:407
-#, fuzzy
+#: gtk2_ardour/editor_audio_import.cc:440
 msgid "insert sndfile"
-msgstr "Stille einfügen"
+msgstr "Audiodatei einfügen"
 
-#: gtk2_ardour/editor_canvas.cc:119
+#: gtk2_ardour/editor_canvas.cc:118
 msgid "VerboseCanvasCursor"
 msgstr ""
 
-#: gtk2_ardour/editor_edit_groups.cc:53
-#: gtk2_ardour/mixer_ui.cc:751
+#: gtk2_ardour/editor_canvas.cc:267
+msgid "edit cursor color not defined, check your ardour.colors file!"
+msgstr ""
+
+#: gtk2_ardour/editor_canvas.cc:272
+msgid "playhead color not defined, check your ardour.colors file!"
+msgstr ""
+
+#: gtk2_ardour/editor_edit_groups.cc:52
+#: gtk2_ardour/mixer_ui.cc:754
 msgid "Activate All"
 msgstr "Alle aktivieren"
 
-#: gtk2_ardour/editor_edit_groups.cc:54
-#: gtk2_ardour/mixer_ui.cc:752
+#: gtk2_ardour/editor_edit_groups.cc:53
+#: gtk2_ardour/mixer_ui.cc:755
 msgid "Disable All"
 msgstr "Alle deaktivieren"
 
-#: gtk2_ardour/editor_edit_groups.cc:56
-#: gtk2_ardour/mixer_ui.cc:754
+#: gtk2_ardour/editor_edit_groups.cc:55
+#: gtk2_ardour/mixer_ui.cc:757
 msgid "Add group"
 msgstr "Gruppe hinzufügen"
 
-#: gtk2_ardour/editor_edit_groups.cc:229
-#: gtk2_ardour/mixer_ui.cc:985
+#: gtk2_ardour/editor_edit_groups.cc:228
+#: gtk2_ardour/mixer_ui.cc:998
 msgid "unnamed"
 msgstr "unbenannt"
 
-#: gtk2_ardour/editor_edit_groups.cc:258
-#: gtk2_ardour/mixer_ui.cc:849
+#: gtk2_ardour/editor_edit_groups.cc:257
+#: gtk2_ardour/mixer_ui.cc:852
 msgid "-all-"
 msgstr "-alle-"
 
-#: gtk2_ardour/editor_export_audio.cc:67
+#: gtk2_ardour/editor_export_audio.cc:66
 msgid ""
 "There is no selection to export.\n"
 "\n"
 "Select a selection using the range mouse mode"
 msgstr ""
+"Es wurde keine Auswahl zum Exportieren getroffen.\n"
+"\n"
+"Erstellen Sie eine Auswahl mit dem Bereichswerkzeug"
 
-#: gtk2_ardour/editor_export_audio.cc:112
+#: gtk2_ardour/editor_export_audio.cc:111
 msgid ""
 "There are no ranges to export.\n"
 "\n"
 "Create 1 or more ranges by dragging the mouse in the range bar"
 msgstr ""
+"Es gibt keine Bereiche, die exportiert werden können.\n"
+"\n"
+"Erstellen Sie einen oder mehrere Bereiche, indem Sie den Mauszeiger in der Bereichleiste ziehen"
 
-#: gtk2_ardour/editor_imageframe.cc:623
-#: gtk2_ardour/editor_imageframe.cc:653
+#: gtk2_ardour/editor_imageframe.cc:622
+#: gtk2_ardour/editor_imageframe.cc:652
 msgid "programming error: no ImageFrameView selected"
-msgstr ""
+msgstr "Programmierfehler: kein ImageFrameView ausgewählt"
 
-#: gtk2_ardour/editor_imageframe.cc:846
-#: gtk2_ardour/editor_imageframe.cc:868
+#: gtk2_ardour/editor_imageframe.cc:845
+#: gtk2_ardour/editor_imageframe.cc:867
 msgid "programming error: no MarkerView selected"
-msgstr ""
+msgstr "Programmierfehler: kein MarkerView ausgewählt"
 
-#: gtk2_ardour/editor_keyboard.cc:105
-#, fuzzy
+#: gtk2_ardour/editor_keyboard.cc:104
 msgid "mute region"
-msgstr "Name für Region:"
+msgstr "Region stummschalten"
 
-#: gtk2_ardour/editor_keys.cc:46
-#, fuzzy
+#: gtk2_ardour/editor_keys.cc:45
 msgid "keyboard selection"
-msgstr "Auswahl zu Abschnitt machen"
+msgstr "Tastaturauswahl"
 
-#: gtk2_ardour/editor_markers.cc:295
-#: gtk2_ardour/editor_ops.cc:1249
-#: gtk2_ardour/editor_ops.cc:1266
-#: gtk2_ardour/editor_ops.cc:1285
-#: gtk2_ardour/location_ui.cc:779
+#: gtk2_ardour/editor_markers.cc:294
+#: gtk2_ardour/editor_ops.cc:1248
+#: gtk2_ardour/editor_ops.cc:1265
+#: gtk2_ardour/editor_ops.cc:1284
+#: gtk2_ardour/location_ui.cc:778
 msgid "add marker"
-msgstr ""
+msgstr "Marker hinzufügen"
 
-#: gtk2_ardour/editor_markers.cc:311
-#: gtk2_ardour/editor_markers.cc:375
+#: gtk2_ardour/editor_markers.cc:310
+#: gtk2_ardour/editor_markers.cc:374
 #: gtk2_ardour/editor_markers.cc:551
 #: gtk2_ardour/editor_markers.cc:569
-#: gtk2_ardour/editor_markers.cc:588
-#: gtk2_ardour/editor_markers.cc:607
-#: gtk2_ardour/editor_markers.cc:637
-#: gtk2_ardour/editor_markers.cc:665
-#: gtk2_ardour/editor_markers.cc:693
-#: gtk2_ardour/editor_markers.cc:732
-#: gtk2_ardour/editor_markers.cc:757
-#: gtk2_ardour/editor_markers.cc:784
-#: gtk2_ardour/editor_markers.cc:807
-#: gtk2_ardour/editor_markers.cc:826
-#: gtk2_ardour/editor_mouse.cc:2080
-#: gtk2_ardour/editor_mouse.cc:4395
+#: gtk2_ardour/editor_markers.cc:587
+#: gtk2_ardour/editor_markers.cc:606
+#: gtk2_ardour/editor_markers.cc:625
+#: gtk2_ardour/editor_markers.cc:655
+#: gtk2_ardour/editor_markers.cc:683
+#: gtk2_ardour/editor_markers.cc:711
+#: gtk2_ardour/editor_markers.cc:750
+#: gtk2_ardour/editor_markers.cc:775
+#: gtk2_ardour/editor_markers.cc:802
+#: gtk2_ardour/editor_markers.cc:825
+#: gtk2_ardour/editor_markers.cc:844
+#: gtk2_ardour/editor_mouse.cc:2085
+#: gtk2_ardour/editor_mouse.cc:4393
 msgid "programming error: marker canvas item has no marker object pointer!"
-msgstr ""
+msgstr "Programmierfehler: marker canvas item has no marker object pointer!"
 
-#: gtk2_ardour/editor_markers.cc:325
-#: gtk2_ardour/location_ui.cc:657
+#: gtk2_ardour/editor_markers.cc:324
+#: gtk2_ardour/location_ui.cc:656
 msgid "remove marker"
 msgstr "Marker entfernen"
 
-#: gtk2_ardour/editor_markers.cc:466
+#: gtk2_ardour/editor_markers.cc:465
 msgid "Locate to Mark"
 msgstr "Positionszeiger zu Marker setzen"
 
-#: gtk2_ardour/editor_markers.cc:467
+#: gtk2_ardour/editor_markers.cc:466
 msgid "Play from Mark"
 msgstr "Wiedergabe ab Marker"
 
-#: gtk2_ardour/editor_markers.cc:468
+#: gtk2_ardour/editor_markers.cc:467
 msgid "Set Mark from Playhead"
 msgstr "Marker am Positionszeiger setzen"
 
-#: gtk2_ardour/editor_markers.cc:472
+#: gtk2_ardour/editor_markers.cc:471
 msgid "Hide Mark"
 msgstr "Marker verbergen"
 
-#: gtk2_ardour/editor_markers.cc:474
+#: gtk2_ardour/editor_markers.cc:473
 msgid "Rename Mark"
 msgstr "Marker umbenennen"
 
-#: gtk2_ardour/editor_markers.cc:475
+#: gtk2_ardour/editor_markers.cc:474
 msgid "Remove Mark"
 msgstr "Marker entfernen"
 
-#: gtk2_ardour/editor_markers.cc:493
+#: gtk2_ardour/editor_markers.cc:492
 msgid "Locate to Range Mark"
 msgstr "Positionszeiger zu Bereichsmarker"
 
-#: gtk2_ardour/editor_markers.cc:494
+#: gtk2_ardour/editor_markers.cc:493
 msgid "Play from Range Mark"
 msgstr "Wiedergabe ab Bereichsmarker"
 
-#: gtk2_ardour/editor_markers.cc:496
+#: gtk2_ardour/editor_markers.cc:495
 msgid "Play Range"
 msgstr "Bereich wiedergeben"
 
-#: gtk2_ardour/editor_markers.cc:497
+#: gtk2_ardour/editor_markers.cc:496
 msgid "Loop Range"
 msgstr "Bereich in Schleife wiedergeben"
 
-#: gtk2_ardour/editor_markers.cc:499
+#: gtk2_ardour/editor_markers.cc:498
 msgid "Set Range Mark from Playhead"
 msgstr "Bereichsmarker zum Positionszeiger verschieben"
 
-#: gtk2_ardour/editor_markers.cc:500
+#: gtk2_ardour/editor_markers.cc:499
 msgid "Set Range from Range Selection"
 msgstr "Bereichsmarker zum Auswahlbereich verschieben"
 
-#: gtk2_ardour/editor_markers.cc:504
+#: gtk2_ardour/editor_markers.cc:503
 msgid "Hide Range"
 msgstr "Bereich verbergen"
 
-#: gtk2_ardour/editor_markers.cc:506
+#: gtk2_ardour/editor_markers.cc:505
 msgid "Rename Range"
 msgstr "Bereich umbenennen"
 
-#: gtk2_ardour/editor_markers.cc:507
+#: gtk2_ardour/editor_markers.cc:506
 msgid "Remove Range"
 msgstr "Bereich entfernen"
 
-#: gtk2_ardour/editor_markers.cc:512
+#: gtk2_ardour/editor_markers.cc:511
 msgid "Separate Regions in Range"
 msgstr "Regionen an Bereichsgrenzen teilen"
 
-#: gtk2_ardour/editor_markers.cc:513
+#: gtk2_ardour/editor_markers.cc:512
 msgid "Select All in Range"
 msgstr "Alles im Bereich auswählen"
 
+#: gtk2_ardour/editor_markers.cc:513
+msgid "Select Range"
+msgstr "Bereich auswählen"
+
 #: gtk2_ardour/editor_markers.cc:539
 msgid "Set Loop Range"
 msgstr "Schleife erstellen"
@@ -3791,572 +3887,550 @@ msgstr "Schleife erstellen"
 msgid "Set Punch Range"
 msgstr "Punch-Bereich erstellen"
 
-#: gtk2_ardour/editor_markers.cc:840
+#: gtk2_ardour/editor_markers.cc:858
 msgid "New Name:"
 msgstr "Neuer Name: "
 
-#: gtk2_ardour/editor_markers.cc:843
+#: gtk2_ardour/editor_markers.cc:861
 msgid "ardour: rename mark"
 msgstr "ardour: Marker umbenennen"
 
-#: gtk2_ardour/editor_markers.cc:845
+#: gtk2_ardour/editor_markers.cc:863
 msgid "ardour: rename range"
 msgstr "ardour: Bereich umbenennen"
 
-#: gtk2_ardour/editor_markers.cc:865
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:883
 msgid "rename marker"
-msgstr "Feld entfernen"
+msgstr "Marker umbenennen"
 
-#: gtk2_ardour/editor_markers.cc:891
+#: gtk2_ardour/editor_markers.cc:909
 msgid "set loop range"
-msgstr ""
+msgstr "Loop-Bereich festlegen"
 
-#: gtk2_ardour/editor_markers.cc:919
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:937
 msgid "set punch range"
-msgstr "Ausgewählten Bereich wiedergeben"
+msgstr "Punch-Bereich festlegen"
 
-#: gtk2_ardour/editor_mouse.cc:105
+#: gtk2_ardour/editor_mouse.cc:104
 msgid "Editor::event_frame() used on unhandled event type %1"
 msgstr ""
 
-#: gtk2_ardour/editor_mouse.cc:315
+#: gtk2_ardour/editor_mouse.cc:326
 msgid "select on click"
 msgstr "Auswählen durch Klicken"
 
-#: gtk2_ardour/editor_mouse.cc:1608
+#: gtk2_ardour/editor_mouse.cc:1613
 msgid "programming error: start_grab called without drag item"
-msgstr ""
+msgstr "Programmierfehler: start_grab called without drag item"
 
-#: gtk2_ardour/editor_mouse.cc:1835
+#: gtk2_ardour/editor_mouse.cc:1840
 msgid "change fade in length"
-msgstr ""
+msgstr "Ändere Fade-In Länge"
 
-#: gtk2_ardour/editor_mouse.cc:1867
+#: gtk2_ardour/editor_mouse.cc:1872
 msgid "programming error: fade out canvas item has no regionview data pointer!"
-msgstr ""
+msgstr "Programmierfehler: fade out canvas item has no regionview data pointer!"
 
-#: gtk2_ardour/editor_mouse.cc:1952
+#: gtk2_ardour/editor_mouse.cc:1957
 msgid "change fade out length"
 msgstr "Fade-Out verändern"
 
-#: gtk2_ardour/editor_mouse.cc:1984
+#: gtk2_ardour/editor_mouse.cc:1989
 msgid "programming error: cursor canvas item has no cursor data pointer!"
-msgstr ""
+msgstr "Programmierfehler: cursor canvas item has no cursor data pointer!"
 
-#: gtk2_ardour/editor_mouse.cc:2215
+#: gtk2_ardour/editor_mouse.cc:2220
 msgid "move marker"
 msgstr "Marker bewegen"
 
-#: gtk2_ardour/editor_mouse.cc:2243
-#: gtk2_ardour/editor_mouse.cc:2274
-#: gtk2_ardour/editor_tempodisplay.cc:492
+#: gtk2_ardour/editor_mouse.cc:2248
+#: gtk2_ardour/editor_mouse.cc:2279
+#: gtk2_ardour/editor_tempodisplay.cc:500
 msgid "programming error: meter marker canvas item has no marker object pointer!"
-msgstr ""
+msgstr "pProgrammierfehler: meter marker canvas item has no marker object pointer!"
 
-#: gtk2_ardour/editor_mouse.cc:2342
+#: gtk2_ardour/editor_mouse.cc:2347
 msgid "copy meter mark"
 msgstr "Taktmarker kopieren"
 
-#: gtk2_ardour/editor_mouse.cc:2353
+#: gtk2_ardour/editor_mouse.cc:2358
 msgid "move meter mark"
 msgstr "Taktwechsel bewegen"
 
-#: gtk2_ardour/editor_mouse.cc:2369
-#: gtk2_ardour/editor_mouse.cc:2402
-#: gtk2_ardour/editor_tempodisplay.cc:355
-#: gtk2_ardour/editor_tempodisplay.cc:439
-#: gtk2_ardour/editor_tempodisplay.cc:458
-msgid "programming error: tempo marker canvas item has no marker object pointer!"
-msgstr ""
-
 #: gtk2_ardour/editor_mouse.cc:2374
 #: gtk2_ardour/editor_mouse.cc:2407
-#: gtk2_ardour/editor_tempodisplay.cc:360
-#: gtk2_ardour/editor_tempodisplay.cc:444
-msgid "programming error: marker for tempo is not a tempo marker!"
-msgstr ""
+#: gtk2_ardour/editor_tempodisplay.cc:363
+#: gtk2_ardour/editor_tempodisplay.cc:447
+#: gtk2_ardour/editor_tempodisplay.cc:466
+msgid "programming error: tempo marker canvas item has no marker object pointer!"
+msgstr "Programmierfehler: tempo marker canvas item has no marker object pointer!"
 
-#: gtk2_ardour/editor_mouse.cc:2474
+#: gtk2_ardour/editor_mouse.cc:2379
+#: gtk2_ardour/editor_mouse.cc:2412
+#: gtk2_ardour/editor_tempodisplay.cc:368
+#: gtk2_ardour/editor_tempodisplay.cc:452
+msgid "programming error: marker for tempo is not a tempo marker!"
+msgstr "Programmierfehler: marker for tempo is not a tempo marker!"
+
+#: gtk2_ardour/editor_mouse.cc:2479
 msgid "copy tempo mark"
 msgstr "Tempomarker kopieren"
 
-#: gtk2_ardour/editor_mouse.cc:2485
+#: gtk2_ardour/editor_mouse.cc:2490
 msgid "move tempo mark"
 msgstr "Tempowechsel bewegen"
 
-#: gtk2_ardour/editor_mouse.cc:2500
-#: gtk2_ardour/editor_mouse.cc:2519
-#: gtk2_ardour/editor_mouse.cc:2532
+#: gtk2_ardour/editor_mouse.cc:2505
+#: gtk2_ardour/editor_mouse.cc:2524
+#: gtk2_ardour/editor_mouse.cc:2537
 msgid "programming error: control point canvas item has no control point object pointer!"
-msgstr ""
+msgstr "Programmierfehler: control point canvas item has no control point object pointer!"
 
-#: gtk2_ardour/editor_mouse.cc:2638
+#: gtk2_ardour/editor_mouse.cc:2643
 msgid "programming error: line canvas item has no line pointer!"
-msgstr ""
+msgstr "Programmierfehler:  line canvas item has no line pointer!"
 
-#: gtk2_ardour/editor_mouse.cc:2747
+#: gtk2_ardour/editor_mouse.cc:2752
 msgid "move region(s)"
 msgstr "Region(en) bewegen"
 
-#: gtk2_ardour/editor_mouse.cc:2811
+#: gtk2_ardour/editor_mouse.cc:2816
 #, fuzzy
 msgid "Drag region brush"
 msgstr "Ardour: Region"
 
-#: gtk2_ardour/editor_mouse.cc:2833
-msgid "Drag region copy"
-msgstr ""
+#: gtk2_ardour/editor_mouse.cc:3344
+msgid "fixed time region copy"
+msgstr "Region zeitgleich kopieren"
+
+#: gtk2_ardour/editor_mouse.cc:3346
+msgid "region copy"
+msgstr "Region kopieren"
+
+#: gtk2_ardour/editor_mouse.cc:3350
+msgid "fixed time region drag"
+msgstr "Region zeitgleich verschieben"
+
+#: gtk2_ardour/editor_mouse.cc:3352
+msgid "region drag"
+msgstr "Region verschieben"
 
 #: gtk2_ardour/editor_mouse.cc:3712
-#, fuzzy
 msgid "selection grab"
-msgstr "Auswahl"
+msgstr "Auswählen"
 
 #: gtk2_ardour/editor_mouse.cc:3754
-#, fuzzy
 msgid "cancel selection"
-msgstr "Auswahl wiedergeben"
+msgstr "Auswahl abbrechen"
 
 #: gtk2_ardour/editor_mouse.cc:3864
-#, fuzzy
 msgid "range selection"
-msgstr "Auswahl wiedergeben"
+msgstr "Bereichsauswahl"
 
 #: gtk2_ardour/editor_mouse.cc:3880
-#, fuzzy
 msgid "trim selection start"
-msgstr "Auswahl zu Abschnitt machen"
+msgstr "Anfangspunkt der Auswahl abschneiden"
 
 #: gtk2_ardour/editor_mouse.cc:3896
-#, fuzzy
 msgid "trim selection end"
-msgstr "Auswahl zu Abschnitt machen"
+msgstr "Endpunkt der Auswahl abschneiden"
 
 #: gtk2_ardour/editor_mouse.cc:3913
 msgid "move selection"
 msgstr "Auswahl bewegen"
 
-#: gtk2_ardour/editor_mouse.cc:4304
+#: gtk2_ardour/editor_mouse.cc:4302
 msgid "Start point trim"
-msgstr ""
+msgstr "Anfangspunkt verändern"
 
-#: gtk2_ardour/editor_mouse.cc:4336
+#: gtk2_ardour/editor_mouse.cc:4334
 msgid "End point trim"
-msgstr ""
+msgstr "Endpunkt verändern"
 
-#: gtk2_ardour/editor_mouse.cc:4379
-#, fuzzy
+#: gtk2_ardour/editor_mouse.cc:4377
 msgid "trimmed region"
-msgstr "Ardour: Region"
+msgstr "Abgeschnittene Region"
 
-#: gtk2_ardour/editor_mouse.cc:4522
-#, fuzzy
+#: gtk2_ardour/editor_mouse.cc:4520
 msgid "new range marker"
-msgstr "Ardour: Region umbenennen"
+msgstr "Neuer Bereich"
 
-#: gtk2_ardour/editor_mouse.cc:4767
-#, fuzzy
-msgid "select regions"
-msgstr "Auswahl zu Schleife machen"
+#: gtk2_ardour/editor_mouse.cc:4763
+msgid "rubberband selection"
+msgstr "Bereichsauswahl"
 
-#: gtk2_ardour/editor_mouse.cc:4797
+#: gtk2_ardour/editor_mouse.cc:4793
 msgid "Name for region:"
 msgstr "Name für Region:"
 
-#: gtk2_ardour/editor_mouse.cc:4861
-#, fuzzy
+#: gtk2_ardour/editor_mouse.cc:4857
 msgid "timestretch"
-msgstr "Ardour: Mixer"
+msgstr "Time-Stretch"
 
-#: gtk2_ardour/editor_ops.cc:115
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:114
 msgid "split"
-msgstr "Teilen"
+msgstr "Teile"
 
-#: gtk2_ardour/editor_ops.cc:154
+#: gtk2_ardour/editor_ops.cc:153
 msgid "remove region"
 msgstr "Region(en) löschen"
 
-#: gtk2_ardour/editor_ops.cc:174
+#: gtk2_ardour/editor_ops.cc:173
 msgid ""
 " This is destructive, will possibly delete audio files\n"
 "It cannot be undone\n"
 "Do you really want to destroy %1 ?"
 msgstr ""
+" Diese Aktion ist destruktiv und löscht möglicherweise Audiodateien\n"
+"Dies kann nicht rückgängig gemacht werden\n"
+"Wollen Sie %1 wirklich löschen ?"
 
-#: gtk2_ardour/editor_ops.cc:178
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:177
 msgid "these regions"
-msgstr "Name für Region:"
+msgstr "diese Region"
 
-#: gtk2_ardour/editor_ops.cc:178
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:177
 msgid "this region"
-msgstr "Name für Region:"
+msgstr "diese Region"
 
-#: gtk2_ardour/editor_ops.cc:180
-#: gtk2_ardour/editor_ops.cc:3444
-#: gtk2_ardour/route_ui.cc:736
-#: gtk2_ardour/visual_time_axis.cc:283
+#: gtk2_ardour/editor_ops.cc:179
+#: gtk2_ardour/editor_ops.cc:3144
+#: gtk2_ardour/route_ui.cc:783
+#: gtk2_ardour/visual_time_axis.cc:282
 msgid "No, do nothing."
 msgstr "Nein, nichts machen."
 
-#: gtk2_ardour/editor_ops.cc:183
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:182
 msgid "Yes, destroy them."
 msgstr "Ja, entfernen."
 
-#: gtk2_ardour/editor_ops.cc:185
-#: gtk2_ardour/editor_ops.cc:3445
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:184
+#: gtk2_ardour/editor_ops.cc:3145
 msgid "Yes, destroy it."
 msgstr "Ja, entfernen."
 
-#: gtk2_ardour/editor_ops.cc:271
-#: gtk2_ardour/editor_ops.cc:299
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:270
+#: gtk2_ardour/editor_ops.cc:298
 msgid "extend selection"
-msgstr "Auswahl zu Abschnitt machen"
+msgstr "Auswahl erweitern"
 
-#: gtk2_ardour/editor_ops.cc:315
-#: gtk2_ardour/editor_ops.cc:350
-#: gtk2_ardour/editor_ops.cc:395
-#: gtk2_ardour/editor_ops.cc:422
+#: gtk2_ardour/editor_ops.cc:314
+#: gtk2_ardour/editor_ops.cc:349
+#: gtk2_ardour/editor_ops.cc:394
+#: gtk2_ardour/editor_ops.cc:421
 msgid "nudge forward"
-msgstr ""
+msgstr "Schritt vorwärts"
 
-#: gtk2_ardour/editor_ops.cc:487
+#: gtk2_ardour/editor_ops.cc:486
 msgid "build_region_boundary_cache called with snap_type = %1"
 msgstr ""
 
-#: gtk2_ardour/editor_ops.cc:1413
-msgid "select all within"
-msgstr "Alle im Bereich auswählen"
-
-#: gtk2_ardour/editor_ops.cc:1443
-#, fuzzy
-msgid "set selection from region"
-msgstr "Ausgewählten Bereich wiedergeben"
-
-#: gtk2_ardour/editor_ops.cc:1476
-#, fuzzy
-msgid "set selection from range"
-msgstr "Ausgewählten Bereich wiedergeben"
-
-#: gtk2_ardour/editor_ops.cc:1506
-msgid "select all from range"
-msgstr "Alle im Bereich auswählen"
-
-#: gtk2_ardour/editor_ops.cc:1528
-msgid "select all from punch"
-msgstr "Alle im Punch-Bereich auswählen"
-
-#: gtk2_ardour/editor_ops.cc:1550
-msgid "select all from loop"
-msgstr "Alle im Loop-Bereich auswählen"
-
-#: gtk2_ardour/editor_ops.cc:1564
-msgid "select all after cursor"
-msgstr "Alle nach Positionszeiger auswählen"
-
-#: gtk2_ardour/editor_ops.cc:1569
-msgid "select all before cursor"
-msgstr "Alle vor Positionszeiger auswählen"
-
-#: gtk2_ardour/editor_ops.cc:1599
-msgid "select all between cursors"
-msgstr "Alle zwischen den Zeigern auswählen"
-
-#: gtk2_ardour/editor_ops.cc:1732
+#: gtk2_ardour/editor_ops.cc:1405
 msgid "clear markers"
-msgstr ""
+msgstr "Marker zurücksetzen"
 
-#: gtk2_ardour/editor_ops.cc:1745
+#: gtk2_ardour/editor_ops.cc:1418
 msgid "clear ranges"
-msgstr "Verbindungen entfernen"
+msgstr "Bereiche zurücksetzen"
 
-#: gtk2_ardour/editor_ops.cc:1765
+#: gtk2_ardour/editor_ops.cc:1438
 msgid "clear locations"
-msgstr "Verbindungen entfernen"
+msgstr "Positionen zurücksetzen"
 
-#: gtk2_ardour/editor_ops.cc:1840
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:1513
 msgid "insert dragged region"
-msgstr "Ardour: Region"
+msgstr "Region ziehen"
 
-#: gtk2_ardour/editor_ops.cc:1887
+#: gtk2_ardour/editor_ops.cc:1560
 msgid "insert region"
 msgstr "Region einfügen"
 
-#: gtk2_ardour/editor_ops.cc:2062
-#: gtk2_ardour/io_selector.cc:60
-#: gtk2_ardour/io_selector.cc:748
-#: gtk2_ardour/connection_editor.cc:86
+#: gtk2_ardour/editor_ops.cc:1759
+#: gtk2_ardour/io_selector.cc:59
+#: gtk2_ardour/io_selector.cc:747
+#: gtk2_ardour/connection_editor.cc:85
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
-#: gtk2_ardour/editor_ops.cc:2069
+#: gtk2_ardour/editor_ops.cc:1766
 msgid "ardour: rename region"
 msgstr "ardour: Region umbenennen"
 
-#: gtk2_ardour/editor_ops.cc:2298
-#: gtk2_ardour/editor_ops.cc:2351
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2000
+#: gtk2_ardour/editor_ops.cc:2053
 msgid "separate"
-msgstr "Ausgewählten Bereich wiedergeben"
+msgstr "Teilen"
 
-#: gtk2_ardour/editor_ops.cc:2418
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2120
 msgid "trim to selection"
-msgstr "Auswahl zu Abschnitt machen"
+msgstr "Auf Auswahl kürzen"
 
-#: gtk2_ardour/editor_ops.cc:2459
+#: gtk2_ardour/editor_ops.cc:2161
 msgid "region fill"
-msgstr ""
+msgstr "Region füllen"
 
-#: gtk2_ardour/editor_ops.cc:2523
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2225
 msgid "fill selection"
-msgstr "Auswahl zu Schleife machen"
+msgstr "Auswahl füllen"
 
-#: gtk2_ardour/editor_ops.cc:2544
+#: gtk2_ardour/editor_ops.cc:2246
 msgid "Programming error. that region doesn't cover that position"
-msgstr ""
+msgstr "Programmierfehler: that region doesn't cover that position"
 
-#: gtk2_ardour/editor_ops.cc:2547
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2249
 msgid "set region sync position"
-msgstr "Regionen"
+msgstr "Sync-Position setzen"
 
-#: gtk2_ardour/editor_ops.cc:2563
+#: gtk2_ardour/editor_ops.cc:2265
 msgid "Place the edit cursor at the desired sync point"
 msgstr "Positionieren sie den Arbeits-Cursor am gewünschten Synchronisationspunkt"
 
-#: gtk2_ardour/editor_ops.cc:2568
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2270
 msgid "set sync from edit cursor"
-msgstr "Wiedergabe ab Cursor"
+msgstr "Sync-Position an Editierzeiger setzen"
 
-#: gtk2_ardour/editor_ops.cc:2581
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2283
 msgid "remove sync"
 msgstr "Synchronisationspunkt entfernen"
 
-#: gtk2_ardour/editor_ops.cc:2596
+#: gtk2_ardour/editor_ops.cc:2298
 #, fuzzy
 msgid "naturalize"
 msgstr "Ardour: Region"
 
-#: gtk2_ardour/editor_ops.cc:2661
+#: gtk2_ardour/editor_ops.cc:2363
 msgid "align selection (relative)"
-msgstr ""
+msgstr "Auswahl relativ ausrichten"
 
-#: gtk2_ardour/editor_ops.cc:2690
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2392
 msgid "align selection"
-msgstr "Auswahl zu Schleife machen"
+msgstr "Auswahl ausrichten"
 
-#: gtk2_ardour/editor_ops.cc:2702
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2404
 msgid "align region"
-msgstr "Ardour: Region"
+msgstr "Region ausrichten"
 
-#: gtk2_ardour/editor_ops.cc:2750
-#: gtk2_ardour/editor_ops.cc:2776
+#: gtk2_ardour/editor_ops.cc:2452
+#: gtk2_ardour/editor_ops.cc:2478
 msgid "trim to edit"
-msgstr ""
+msgstr "Am Editierzeiger abschneiden"
 
-#: gtk2_ardour/editor_ops.cc:2828
+#: gtk2_ardour/editor_ops.cc:2530
 msgid "ardour: freeze"
 msgstr "ardour: Einfrieren"
 
-#: gtk2_ardour/editor_ops.cc:2833
+#: gtk2_ardour/editor_ops.cc:2535
 msgid "Cancel Freeze"
 msgstr "Einfrieren abbrechen"
 
-#: gtk2_ardour/editor_ops.cc:2876
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2578
 msgid "bounce range"
-msgstr "Bereich"
+msgstr "Bereich Bouncen"
 
-#: gtk2_ardour/editor_ops.cc:2930
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2630
 msgid "cut"
 msgstr "Ausschneiden"
 
-#: gtk2_ardour/editor_ops.cc:2933
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2633
 msgid "copy"
 msgstr "Kopieren"
 
-#: gtk2_ardour/editor_ops.cc:2946
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2646
 msgid " objects"
-msgstr "Objekt"
+msgstr "Objekte"
 
-#: gtk2_ardour/editor_ops.cc:2972
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2672
 msgid " range"
 msgstr "Bereich"
 
-#: gtk2_ardour/editor_ops.cc:3197
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2897
 msgid "paste"
 msgstr "Einfügen"
 
-#: gtk2_ardour/editor_ops.cc:3239
+#: gtk2_ardour/editor_ops.cc:2939
 msgid "paste chunk"
 msgstr "Abschnitt einfügen"
 
-#: gtk2_ardour/editor_ops.cc:3282
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2982
 msgid "duplicate region"
-msgstr "Auswahl zu Schleife machen"
+msgstr "Region duplizieren"
 
-#: gtk2_ardour/editor_ops.cc:3327
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:3027
 msgid "duplicate selection"
-msgstr "Auswahl zu Schleife machen"
+msgstr "Auswahl duplizieren"
 
-#: gtk2_ardour/editor_ops.cc:3383
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:3083
 msgid "clear playlist"
-msgstr "Name für Schnappschuß"
+msgstr "Wiedergabeliste zurücksetzen"
 
-#: gtk2_ardour/editor_ops.cc:3413
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:3113
 msgid "nudge track"
-msgstr "Stille einfügen"
+msgstr "Spur verschieben"
 
-#: gtk2_ardour/editor_ops.cc:3441
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:3141
 msgid ""
 "Do you really want to destroy the last capture?\n"
 "(This is destructive and cannot be undone)"
 msgstr ""
-"Wollen Sie wirklich die Spur \"%1\" löschen?\n"
-"(Kann nicht rückgängig gemacht werden!)"
+"Wollen Sie wirklich die letzte Aufnahme rückgängig machen?\n"
+"(Dies kann nicht rückgängig gemacht werden!)"
 
-#: gtk2_ardour/editor_ops.cc:3469
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:3169
 msgid "normalize"
-msgstr "Ardour: Region"
+msgstr "Normalisieren"
 
-#: gtk2_ardour/editor_ops.cc:3522
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:3222
 msgid "reverse regions"
-msgstr "Name für Region:"
+msgstr "Regionen umkehren"
 
-#: gtk2_ardour/editor_ops.cc:3635
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:3335
 msgid "reset region gain"
-msgstr "Name für Region:"
+msgstr "Lautstärkekurve zurücksetzen"
 
-#: gtk2_ardour/editor_ops.cc:3724
+#: gtk2_ardour/editor_ops.cc:3424
 msgid "set fade in shape"
-msgstr ""
+msgstr "Fade-In Kurve bearbeiten"
 
-#: gtk2_ardour/editor_ops.cc:3748
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:3448
 msgid "set fade out shape"
-msgstr "Ardour: Editor"
+msgstr "Fade-Out Kurve ändern"
 
-#: gtk2_ardour/editor_ops.cc:3772
+#: gtk2_ardour/editor_ops.cc:3472
 msgid "set fade in active"
-msgstr ""
+msgstr "Fade-In aktivieren"
 
-#: gtk2_ardour/editor_ops.cc:3796
+#: gtk2_ardour/editor_ops.cc:3496
 msgid "set fade out active"
-msgstr ""
+msgstr "Fade-Out aktivieren"
 
-#: gtk2_ardour/editor_region_list.cc:104
-#: gtk2_ardour/editor_region_list.cc:110
+#: gtk2_ardour/editor_region_list.cc:107
 #: gtk2_ardour/editor_region_list.cc:113
-#: gtk2_ardour/location_ui.cc:57
+#: gtk2_ardour/editor_region_list.cc:116
+#: gtk2_ardour/location_ui.cc:56
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: gtk2_ardour/editor_route_list.cc:100
-#: gtk2_ardour/editor_route_list.cc:101
-#: gtk2_ardour/editor_route_list.cc:250
-msgid "editor"
-msgstr ""
+#: gtk2_ardour/editor_region_list.cc:162
+msgid " (MISSING)"
+msgstr "(FEHLT)"
 
-#: gtk2_ardour/editor_route_list.cc:317
-#: gtk2_ardour/mixer_ui.cc:714
+#: gtk2_ardour/editor_route_list.cc:101
+#: gtk2_ardour/editor_route_list.cc:102
+#: gtk2_ardour/editor_route_list.cc:252
+msgid "editor"
+msgstr "Editor"
+
+#: gtk2_ardour/editor_route_list.cc:321
+#: gtk2_ardour/mixer_ui.cc:717
 msgid "Show All"
 msgstr "Alles zeigen"
 
-#: gtk2_ardour/editor_route_list.cc:318
-#: gtk2_ardour/mixer_ui.cc:715
+#: gtk2_ardour/editor_route_list.cc:322
+#: gtk2_ardour/mixer_ui.cc:718
 msgid "Hide All"
 msgstr "Alle verbergen"
 
-#: gtk2_ardour/editor_route_list.cc:319
-#: gtk2_ardour/mixer_ui.cc:716
+#: gtk2_ardour/editor_route_list.cc:323
+#: gtk2_ardour/mixer_ui.cc:719
 msgid "Show All Audio Tracks"
 msgstr "Zeige alle Audio-Spuren"
 
-#: gtk2_ardour/editor_route_list.cc:320
-#: gtk2_ardour/mixer_ui.cc:717
+#: gtk2_ardour/editor_route_list.cc:324
+#: gtk2_ardour/mixer_ui.cc:720
 msgid "Hide All Audio Tracks"
 msgstr "Verberge alle Audio-Spuren"
 
-#: gtk2_ardour/editor_route_list.cc:321
-#: gtk2_ardour/mixer_ui.cc:718
+#: gtk2_ardour/editor_route_list.cc:325
+#: gtk2_ardour/mixer_ui.cc:721
 msgid "Show All Audio Busses"
 msgstr "Zeige alle Audio-Busse"
 
-#: gtk2_ardour/editor_route_list.cc:322
-#: gtk2_ardour/mixer_ui.cc:719
+#: gtk2_ardour/editor_route_list.cc:326
+#: gtk2_ardour/mixer_ui.cc:722
 msgid "Hide All Audio Busses"
 msgstr "Verberge alle Audio-Busse"
 
-#: gtk2_ardour/editor_rulers.cc:338
+#: gtk2_ardour/editor_rulers.cc:337
 msgid "New location marker"
 msgstr "Neuer Positionsmarker"
 
-#: gtk2_ardour/editor_rulers.cc:339
+#: gtk2_ardour/editor_rulers.cc:338
 msgid "Clear all locations"
 msgstr "Alle Positionsmarker entfernen"
 
-#: gtk2_ardour/editor_rulers.cc:340
-#, fuzzy
+#: gtk2_ardour/editor_rulers.cc:339
 msgid "Unhide locations"
-msgstr "Verbindungen entfernen"
+msgstr "Positionen anzeigen"
 
-#: gtk2_ardour/editor_rulers.cc:345
+#: gtk2_ardour/editor_rulers.cc:344
 msgid "Clear all ranges"
 msgstr "Alle Bereiche entfernen"
 
-#: gtk2_ardour/editor_rulers.cc:346
-#, fuzzy
+#: gtk2_ardour/editor_rulers.cc:345
 msgid "Unhide ranges"
-msgstr "Bereich verbergen"
+msgstr "Bereiche anzeigen"
 
-#: gtk2_ardour/editor_rulers.cc:355
+#: gtk2_ardour/editor_rulers.cc:354
 msgid "New Tempo"
 msgstr "Tempowechsel einfügen..."
 
-#: gtk2_ardour/editor_rulers.cc:356
+#: gtk2_ardour/editor_rulers.cc:355
 msgid "Clear tempo"
 msgstr "Tempo zurücksetzen"
 
-#: gtk2_ardour/editor_rulers.cc:361
+#: gtk2_ardour/editor_rulers.cc:360
 msgid "New Meter"
 msgstr "Taktwechsel einfügen..."
 
-#: gtk2_ardour/editor_rulers.cc:362
+#: gtk2_ardour/editor_rulers.cc:361
 msgid "Clear meter"
 msgstr "Taktart zurücksetzen"
 
-#: gtk2_ardour/editor_rulers.cc:370
-#, fuzzy
+#: gtk2_ardour/editor_rulers.cc:369
 msgid "Min:Secs"
 msgstr "Min:Sek"
 
+#: gtk2_ardour/editor_selection.cc:564
+#: gtk2_ardour/editor_selection.cc:613
+msgid "set selected regions"
+msgstr "Regionen auswählen"
+
+#: gtk2_ardour/editor_selection.cc:810
+msgid "select all within"
+msgstr "Alle im Bereich auswählen"
+
+#: gtk2_ardour/editor_selection.cc:840
+msgid "set selection from region"
+msgstr "Auswahl von Region wählen"
+
+#: gtk2_ardour/editor_selection.cc:873
+msgid "set selection from range"
+msgstr "Auswahl von Bereich wählen"
+
+#: gtk2_ardour/editor_selection.cc:903
+msgid "select all from range"
+msgstr "Alle im Bereich auswählen"
+
+#: gtk2_ardour/editor_selection.cc:925
+msgid "select all from punch"
+msgstr "Alle im Punch-Bereich auswählen"
+
+#: gtk2_ardour/editor_selection.cc:947
+msgid "select all from loop"
+msgstr "Alle im Loop-Bereich auswählen"
+
+#: gtk2_ardour/editor_selection.cc:961
+msgid "select all after cursor"
+msgstr "Alle nach Positionszeiger auswählen"
+
+#: gtk2_ardour/editor_selection.cc:966
+msgid "select all before cursor"
+msgstr "Alle vor Positionszeiger auswählen"
+
+#: gtk2_ardour/editor_selection.cc:996
+msgid "select all between cursors"
+msgstr "Alle zwischen den Zeigern auswählen"
+
 #: gtk2_ardour/editor_selection_list.cc:180
 msgid "Name for Chunk:"
 msgstr "Name für Abschnitt:"
@@ -4371,621 +4445,564 @@ msgstr "Abbrechen"
 
 #: gtk2_ardour/editor_selection_list.cc:206
 msgid "No selectable material found in the currently selected time range"
-msgstr ""
+msgstr "Konnte im ausgewählten Bereich kein auswählbares Material finden"
 
-#: gtk2_ardour/editor_tempodisplay.cc:272
-#: gtk2_ardour/editor_tempodisplay.cc:315
-#, fuzzy
+#: gtk2_ardour/editor_tempodisplay.cc:280
+#: gtk2_ardour/editor_tempodisplay.cc:323
 msgid "add"
 msgstr "Hinzufügen"
 
-#: gtk2_ardour/editor_tempodisplay.cc:294
-#, fuzzy
+#: gtk2_ardour/editor_tempodisplay.cc:302
 msgid "add tempo mark"
-msgstr "Ardour: Region umbenennen"
+msgstr "Tempowechsel einfügen"
 
-#: gtk2_ardour/editor_tempodisplay.cc:337
-#, fuzzy
+#: gtk2_ardour/editor_tempodisplay.cc:345
 msgid "add meter mark"
-msgstr "Ardour: Region umbenennen"
+msgstr "Taktwechsel einfügen"
 
-#: gtk2_ardour/editor_tempodisplay.cc:372
-#: gtk2_ardour/editor_tempodisplay.cc:403
-#, fuzzy
+#: gtk2_ardour/editor_tempodisplay.cc:380
+#: gtk2_ardour/editor_tempodisplay.cc:411
 msgid "done"
-msgstr "keine"
+msgstr "Fertig"
 
-#: gtk2_ardour/editor_tempodisplay.cc:390
-#: gtk2_ardour/editor_tempodisplay.cc:421
+#: gtk2_ardour/editor_tempodisplay.cc:398
+#: gtk2_ardour/editor_tempodisplay.cc:429
 msgid "replace tempo mark"
-msgstr ""
+msgstr "Tempowechsel ersetzen"
 
-#: gtk2_ardour/editor_tempodisplay.cc:463
-#: gtk2_ardour/editor_tempodisplay.cc:497
+#: gtk2_ardour/editor_tempodisplay.cc:471
+#: gtk2_ardour/editor_tempodisplay.cc:505
 msgid "programming error: marker for meter is not a meter marker!"
-msgstr ""
+msgstr "Programmierfehler: marker for meter is not a meter marker!"
 
-#: gtk2_ardour/editor_tempodisplay.cc:473
-#: gtk2_ardour/editor_tempodisplay.cc:509
+#: gtk2_ardour/editor_tempodisplay.cc:481
+#: gtk2_ardour/editor_tempodisplay.cc:517
 msgid "remove tempo mark"
 msgstr "Tempowechsel entfernen"
 
-#: gtk2_ardour/editor_timefx.cc:52
+#: gtk2_ardour/editor_timefx.cc:51
 msgid "Quick but Ugly"
-msgstr ""
+msgstr "Quick but Ugly"
 
-#: gtk2_ardour/editor_timefx.cc:53
+#: gtk2_ardour/editor_timefx.cc:52
 msgid "Skip Anti-aliasing"
-msgstr ""
+msgstr "Überspringe Anti-Aliasing"
 
-#: gtk2_ardour/editor_timefx.cc:57
+#: gtk2_ardour/editor_timefx.cc:56
 msgid "ardour: timestretch"
 msgstr "ardour: Time-Stretch"
 
-#: gtk2_ardour/editor_timefx.cc:58
+#: gtk2_ardour/editor_timefx.cc:57
 msgid "TimeStretchDialog"
 msgstr ""
 
-#: gtk2_ardour/editor_timefx.cc:71
+#: gtk2_ardour/editor_timefx.cc:70
 msgid "Stretch/Shrink it"
-msgstr ""
+msgstr "Time-Stretch ausführen"
 
+#: gtk2_ardour/editor_timefx.cc:73
 #: gtk2_ardour/editor_timefx.cc:74
-#: gtk2_ardour/editor_timefx.cc:75
 msgid "TimeStretchButton"
 msgstr ""
 
-#: gtk2_ardour/editor_timefx.cc:76
+#: gtk2_ardour/editor_timefx.cc:75
 msgid "TimeStretchProgress"
 msgstr ""
 
-#: gtk2_ardour/editor_timefx.cc:140
+#: gtk2_ardour/editor_timefx.cc:139
 msgid "timestretch cannot be started - thread creation error"
-msgstr ""
+msgstr "Time-Stretch konnte nicht gestartet werden - Fehler beim erstellen des Threads"
 
-#: gtk2_ardour/export_dialog.cc:57
-#: gtk2_ardour/export_dialog.cc:397
-#: gtk2_ardour/export_dialog.cc:1025
-#: gtk2_ardour/export_dialog.cc:1193
+#: gtk2_ardour/export_dialog.cc:56
+#: gtk2_ardour/export_dialog.cc:395
+#: gtk2_ardour/export_dialog.cc:1023
+#: gtk2_ardour/export_dialog.cc:1191
 msgid "22.05kHz"
 msgstr ""
 
-#: gtk2_ardour/export_dialog.cc:58
-#: gtk2_ardour/export_dialog.cc:400
-#: gtk2_ardour/export_dialog.cc:415
-#: gtk2_ardour/export_dialog.cc:1027
-#: gtk2_ardour/export_dialog.cc:1195
+#: gtk2_ardour/export_dialog.cc:57
+#: gtk2_ardour/export_dialog.cc:398
+#: gtk2_ardour/export_dialog.cc:413
+#: gtk2_ardour/export_dialog.cc:1025
+#: gtk2_ardour/export_dialog.cc:1193
 msgid "44.1kHz"
 msgstr ""
 
+#: gtk2_ardour/export_dialog.cc:58
+#: gtk2_ardour/export_dialog.cc:401
+#: gtk2_ardour/export_dialog.cc:1027
+#: gtk2_ardour/export_dialog.cc:1195
+msgid "48kHz"
+msgstr "4"
+
 #: gtk2_ardour/export_dialog.cc:59
-#: gtk2_ardour/export_dialog.cc:403
+#: gtk2_ardour/export_dialog.cc:404
 #: gtk2_ardour/export_dialog.cc:1029
 #: gtk2_ardour/export_dialog.cc:1197
-msgid "48kHz"
-msgstr ""
-
-#: gtk2_ardour/export_dialog.cc:60
-#: gtk2_ardour/export_dialog.cc:406
-#: gtk2_ardour/export_dialog.cc:1031
-#: gtk2_ardour/export_dialog.cc:1199
 msgid "88.2kHz"
 msgstr ""
 
-#: gtk2_ardour/export_dialog.cc:61
-#: gtk2_ardour/export_dialog.cc:409
-#: gtk2_ardour/export_dialog.cc:1033
-#: gtk2_ardour/export_dialog.cc:1201
+#: gtk2_ardour/export_dialog.cc:60
+#: gtk2_ardour/export_dialog.cc:407
+#: gtk2_ardour/export_dialog.cc:1031
+#: gtk2_ardour/export_dialog.cc:1199
 msgid "96kHz"
 msgstr ""
 
-#: gtk2_ardour/export_dialog.cc:62
-#: gtk2_ardour/export_dialog.cc:412
-#: gtk2_ardour/export_dialog.cc:1035
-#: gtk2_ardour/export_dialog.cc:1203
+#: gtk2_ardour/export_dialog.cc:61
+#: gtk2_ardour/export_dialog.cc:410
+#: gtk2_ardour/export_dialog.cc:1033
+#: gtk2_ardour/export_dialog.cc:1201
 msgid "192kHz"
 msgstr ""
 
-#: gtk2_ardour/export_dialog.cc:67
+#: gtk2_ardour/export_dialog.cc:66
 msgid "best"
 msgstr "bestmöglich"
 
-#: gtk2_ardour/export_dialog.cc:68
-#: gtk2_ardour/export_dialog.cc:1210
+#: gtk2_ardour/export_dialog.cc:67
+#: gtk2_ardour/export_dialog.cc:1208
 msgid "fastest"
 msgstr "schnellstmöglich"
 
+#: gtk2_ardour/export_dialog.cc:68
+#: gtk2_ardour/export_dialog.cc:1210
+msgid "linear"
+msgstr "Linear"
+
 #: gtk2_ardour/export_dialog.cc:69
 #: gtk2_ardour/export_dialog.cc:1212
-msgid "linear"
-msgstr ""
-
-#: gtk2_ardour/export_dialog.cc:70
-#: gtk2_ardour/export_dialog.cc:1214
 msgid "better"
 msgstr "besser"
 
-#: gtk2_ardour/export_dialog.cc:71
-#: gtk2_ardour/export_dialog.cc:1216
+#: gtk2_ardour/export_dialog.cc:70
+#: gtk2_ardour/export_dialog.cc:1214
 msgid "intermediate"
 msgstr "mittelmäßig"
 
-#: gtk2_ardour/export_dialog.cc:77
-#: gtk2_ardour/export_dialog.cc:1225
+#: gtk2_ardour/export_dialog.cc:76
+#: gtk2_ardour/export_dialog.cc:1223
 msgid "Rectangular"
 msgstr "rechteckig"
 
-#: gtk2_ardour/export_dialog.cc:78
+#: gtk2_ardour/export_dialog.cc:77
 msgid "Shaped Noise"
-msgstr ""
+msgstr "Shaped Noise"
 
-#: gtk2_ardour/export_dialog.cc:79
-#: gtk2_ardour/export_dialog.cc:1227
+#: gtk2_ardour/export_dialog.cc:78
+#: gtk2_ardour/export_dialog.cc:1225
 msgid "Triangular"
 msgstr "dreieckig"
 
-#: gtk2_ardour/export_dialog.cc:85
-#: gtk2_ardour/export_dialog.cc:484
-#: gtk2_ardour/export_dialog.cc:1053
-#: gtk2_ardour/export_dialog.cc:1175
+#: gtk2_ardour/export_dialog.cc:84
+#: gtk2_ardour/export_dialog.cc:482
+#: gtk2_ardour/export_dialog.cc:1051
+#: gtk2_ardour/export_dialog.cc:1173
 msgid "mono"
-msgstr ""
+msgstr "Mono"
+
+#: gtk2_ardour/export_dialog.cc:90
+msgid "CUE"
+msgstr "CUE"
 
 #: gtk2_ardour/export_dialog.cc:91
-msgid "CUE"
-msgstr ""
-
-#: gtk2_ardour/export_dialog.cc:92
 msgid "TOC"
-msgstr ""
+msgstr "TOC"
 
-#: gtk2_ardour/export_dialog.cc:100
+#: gtk2_ardour/export_dialog.cc:99
 msgid "Format"
 msgstr "Format"
 
-#: gtk2_ardour/export_dialog.cc:101
+#: gtk2_ardour/export_dialog.cc:100
 msgid "CD Marker File Type"
 msgstr "CD-Marker"
 
-#: gtk2_ardour/export_dialog.cc:102
+#: gtk2_ardour/export_dialog.cc:101
 msgid "Channels"
 msgstr "Kanäle"
 
-#: gtk2_ardour/export_dialog.cc:103
+#: gtk2_ardour/export_dialog.cc:102
 msgid "File Type"
 msgstr "Dateiformat"
 
-#: gtk2_ardour/export_dialog.cc:104
+#: gtk2_ardour/export_dialog.cc:103
 msgid "Sample Format"
 msgstr "Sampleformat"
 
-#: gtk2_ardour/export_dialog.cc:105
+#: gtk2_ardour/export_dialog.cc:104
 msgid "Sample Endianness"
 msgstr "Bytefolge"
 
-#: gtk2_ardour/export_dialog.cc:106
+#: gtk2_ardour/export_dialog.cc:105
 msgid "Sample Rate"
 msgstr "Samplerate"
 
-#: gtk2_ardour/export_dialog.cc:107
+#: gtk2_ardour/export_dialog.cc:106
 msgid "Conversion Quality"
 msgstr "Qualität"
 
-#: gtk2_ardour/export_dialog.cc:108
+#: gtk2_ardour/export_dialog.cc:107
 msgid "Dither Type"
 msgstr "Dithering"
 
-#: gtk2_ardour/export_dialog.cc:109
+#: gtk2_ardour/export_dialog.cc:108
 msgid "Export CD Marker File Only"
 msgstr "Nur CD-Marker exportieren"
 
-#: gtk2_ardour/export_dialog.cc:110
-msgid "Export to File"
-msgstr "Als Audiodatei exportieren"
-
-#: gtk2_ardour/export_dialog.cc:111
-#: gtk2_ardour/option_editor.cc:80
-#: gtk2_ardour/option_editor.cc:81
+#: gtk2_ardour/export_dialog.cc:109
+#: gtk2_ardour/option_editor.cc:83
+#: gtk2_ardour/option_editor.cc:84
 msgid "Browse"
 msgstr "Durchsuchen"
 
-#: gtk2_ardour/export_dialog.cc:112
+#: gtk2_ardour/export_dialog.cc:110
 msgid "Specific tracks ..."
 msgstr "Alle Spuren..."
 
-#: gtk2_ardour/export_dialog.cc:123
+#: gtk2_ardour/export_dialog.cc:121
 msgid "ardour: export"
 msgstr "ardour: Exportieren"
 
-#: gtk2_ardour/export_dialog.cc:137
-#: gtk2_ardour/export_dialog.cc:153
-#: gtk2_ardour/mixer_strip.cc:123
-#: gtk2_ardour/mixer_strip.cc:746
+#: gtk2_ardour/export_dialog.cc:135
+#: gtk2_ardour/export_dialog.cc:151
+#: gtk2_ardour/mixer_strip.cc:124
+#: gtk2_ardour/mixer_strip.cc:739
 msgid "Output"
 msgstr "Ausgang"
 
-#: gtk2_ardour/export_dialog.cc:631
+#: gtk2_ardour/export_dialog.cc:629
 msgid "Editor: cannot open \"%1\" as export file for CD toc file"
 msgstr "Editor: Kann \"%1\" nicht nicht zum Export für CD-Inhaltsverzeichnis (TOC) öffnen."
 
-#: gtk2_ardour/export_dialog.cc:757
+#: gtk2_ardour/export_dialog.cc:755
 msgid "Editor: cannot open \"%1\" as export file for CD cue file"
 msgstr "Editor: Kann \"%1\" nicht zum Export für CD CUE-Datei öffnen."
 
-#: gtk2_ardour/export_dialog.cc:776
+#: gtk2_ardour/export_dialog.cc:774
 msgid "WAV"
-msgstr ""
+msgstr "WAV"
 
-#: gtk2_ardour/export_dialog.cc:910
+#: gtk2_ardour/export_dialog.cc:908
 msgid "Stop Export"
 msgstr "Export Abbrechen"
 
-#: gtk2_ardour/export_dialog.cc:1129
+#: gtk2_ardour/export_dialog.cc:1127
 msgid "Please enter a valid filename."
 msgstr "Bitte geben Sie einen gültigen Dateinamen ein."
 
-#: gtk2_ardour/export_dialog.cc:1139
+#: gtk2_ardour/export_dialog.cc:1137
 msgid "Please specify a complete filename for the audio file."
 msgstr "Bitte geben Sie einen kompletten Dateinamen für die Audiodatei ein."
 
-#: gtk2_ardour/export_dialog.cc:1145
+#: gtk2_ardour/export_dialog.cc:1143
 msgid "File already exists, do you want to overwrite it?"
 msgstr "Datei existiert bereits, wollen Sie sie überschreiben?"
 
-#: gtk2_ardour/export_dialog.cc:1157
-#: gtk2_ardour/export_range_markers_dialog.cc:153
+#: gtk2_ardour/export_dialog.cc:1155
+#: gtk2_ardour/export_range_markers_dialog.cc:160
 msgid "Cannot write file in: "
 msgstr "Konnte Datei nicht in Verzeichnis  schreiben:"
 
-#: gtk2_ardour/export_range_markers_dialog.cc:135
+#: gtk2_ardour/export_session_dialog.cc:29
+#: gtk2_ardour/export_region_dialog.cc:35
+msgid "Export to File"
+msgstr "Als Audiodatei exportieren"
+
+#: gtk2_ardour/export_region_dialog.cc:34
+msgid "ardour: export region"
+msgstr "ardour: Region Exportieren"
+
+#: gtk2_ardour/export_range_markers_dialog.cc:41
+msgid "ardour: export ranges"
+msgstr "ardour: Bereiche Exportieren"
+
+#: gtk2_ardour/export_range_markers_dialog.cc:42
+msgid "Export to Directory"
+msgstr "In Verzeichnis exportieren"
+
+#: gtk2_ardour/export_range_markers_dialog.cc:143
 msgid "Please enter a valid target directory."
 msgstr "Bitte geben Sie ein gültiges Zielverzeichis an."
 
-#: gtk2_ardour/export_range_markers_dialog.cc:143
-msgid ""
-"Please select an existing target directory. Files\n"
-"are not allowed!"
+#: gtk2_ardour/export_range_markers_dialog.cc:151
+msgid "Please select an existing target directory. Files are not allowed!"
 msgstr ""
 "Bitte wählen Sie ein vorhandenes Zielverzeichnis aus.\n"
 "Dateien sind nicht möglich."
 
-#: gtk2_ardour/gain_automation_time_axis.cc:65
-#, fuzzy
+#: gtk2_ardour/gain_automation_time_axis.cc:64
 msgid "add gain automation event"
-msgstr "Stellen"
+msgstr "Punkt in die Lautstärkekurve einfügen"
 
-#: gtk2_ardour/gain_meter.cc:113
-#: gtk2_ardour/gain_meter.cc:331
-#: gtk2_ardour/gain_meter.cc:512
-#: gtk2_ardour/gain_meter.cc:583
+#: gtk2_ardour/gain_meter.cc:112
+#: gtk2_ardour/gain_meter.cc:330
+#: gtk2_ardour/gain_meter.cc:519
+#: gtk2_ardour/gain_meter.cc:590
 msgid "-inf"
-msgstr ""
+msgstr "-inf"
 
-#: gtk2_ardour/gain_meter.cc:124
+#: gtk2_ardour/gain_meter.cc:123
 msgid "Fader automation mode"
 msgstr "Fader Automationsmodus"
 
-#: gtk2_ardour/gain_meter.cc:125
-#, fuzzy
+#: gtk2_ardour/gain_meter.cc:124
 msgid "Fader automation type"
-msgstr "Stellen"
+msgstr "Fader-Automationstyp"
 
-#: gtk2_ardour/gain_meter.cc:170
-#: gtk2_ardour/gain_meter.cc:877
-#: gtk2_ardour/panner_ui.cc:99
-#: gtk2_ardour/panner_ui.cc:810
+#: gtk2_ardour/gain_meter.cc:169
+#: gtk2_ardour/gain_meter.cc:884
+#: gtk2_ardour/panner_ui.cc:98
+#: gtk2_ardour/panner_ui.cc:784
 msgid "Abs"
-msgstr ""
+msgstr "Abs"
 
-#: gtk2_ardour/gain_meter.cc:490
+#: gtk2_ardour/gain_meter.cc:497
 msgid "-Inf"
-msgstr ""
+msgstr "-Inf"
 
-#: gtk2_ardour/gain_meter.cc:693
-#: gtk2_ardour/gain_meter.cc:708
-#, fuzzy
+#: gtk2_ardour/gain_meter.cc:700
+#: gtk2_ardour/gain_meter.cc:715
 msgid "meter point change"
-msgstr "Bereich"
+msgstr "Taktwechsel ändern"
 
-#: gtk2_ardour/gain_meter.cc:841
-#: gtk2_ardour/mixer_strip.cc:749
-#: gtk2_ardour/panner_ui.cc:774
-#, fuzzy
-msgid "O"
-msgstr "ODER"
+#: gtk2_ardour/gain_meter.cc:848
+#: gtk2_ardour/mixer_strip.cc:449
+#: gtk2_ardour/panner_ui.cc:748
+msgid "M"
+msgstr "M"
 
-#: gtk2_ardour/gain_meter.cc:844
-#: gtk2_ardour/panner_ui.cc:777
+#: gtk2_ardour/gain_meter.cc:851
+#: gtk2_ardour/panner_ui.cc:751
 msgid "P"
-msgstr ""
+msgstr "P"
 
-#: gtk2_ardour/gain_meter.cc:847
-#: gtk2_ardour/panner_ui.cc:780
+#: gtk2_ardour/gain_meter.cc:854
+#: gtk2_ardour/panner_ui.cc:754
 msgid "T"
-msgstr ""
+msgstr "T"
 
-#: gtk2_ardour/gain_meter.cc:850
-#: gtk2_ardour/panner_ui.cc:783
+#: gtk2_ardour/gain_meter.cc:857
+#: gtk2_ardour/panner_ui.cc:757
 msgid "W"
-msgstr ""
+msgstr "W"
 
 #: gtk2_ardour/gtk-custom-ruler.c:126
-#, fuzzy
 msgid "Lower"
-msgstr "Schicht"
+msgstr "Untergrenze"
 
 #: gtk2_ardour/gtk-custom-ruler.c:127
-#, fuzzy
 msgid "Lower limit of ruler"
-msgstr "Region ganz nach unten"
+msgstr "Untere Grenze des Lineals"
 
 #: gtk2_ardour/gtk-custom-ruler.c:136
 msgid "Upper"
-msgstr ""
+msgstr "Obergrenze"
 
 #: gtk2_ardour/gtk-custom-ruler.c:137
 msgid "Upper limit of ruler"
-msgstr ""
+msgstr "Obere Grenze für das Lineal"
 
 #: gtk2_ardour/gtk-custom-ruler.c:146
-#, fuzzy
 msgid "Position"
-msgstr "Stellen"
+msgstr "Position"
 
 #: gtk2_ardour/gtk-custom-ruler.c:147
 msgid "Position of mark on the ruler"
-msgstr ""
+msgstr "Position der Markierung auf dem Lineal"
 
 #: gtk2_ardour/gtk-custom-ruler.c:156
 msgid "Max Size"
-msgstr ""
+msgstr "Maximale Größe"
 
 #: gtk2_ardour/gtk-custom-ruler.c:157
 msgid "Maximum size of the ruler"
-msgstr ""
+msgstr "Minimal Größe des Lineals"
 
 #: gtk2_ardour/gtk-custom-ruler.c:166
-#, fuzzy
 msgid "Show Position"
-msgstr "nach Zeitstempel der Region"
+msgstr "Zeige Position"
 
 #: gtk2_ardour/gtk-custom-ruler.c:167
 msgid "Draw current ruler position"
-msgstr ""
+msgstr "Zeige aktuelle Position des Lineals"
 
-#: gtk2_ardour/imageframe_socket_handler.cc:127
+#: gtk2_ardour/imageframe_socket_handler.cc:126
 msgid "Image Compositor Socket has been shutdown/closed"
 msgstr ""
 
-#: gtk2_ardour/imageframe_time_axis.cc:286
-#, fuzzy
+#: gtk2_ardour/imageframe_time_axis.cc:285
 msgid "0.5 seconds"
-msgstr "Minuten:Sekunden"
+msgstr "0,5 Sekunden"
+
+#: gtk2_ardour/imageframe_time_axis.cc:286
+#: gtk2_ardour/marker_time_axis.cc:241
+msgid "1 seconds"
+msgstr "1 Sekunde"
 
 #: gtk2_ardour/imageframe_time_axis.cc:287
 #: gtk2_ardour/marker_time_axis.cc:242
-#, fuzzy
-msgid "1 seconds"
-msgstr "Minuten:Sekunden"
+msgid "1.5 seconds"
+msgstr "1,5 Sekunden"
 
 #: gtk2_ardour/imageframe_time_axis.cc:288
 #: gtk2_ardour/marker_time_axis.cc:243
-#, fuzzy
-msgid "1.5 seconds"
-msgstr "Minuten:Sekunden"
+msgid "2 seconds"
+msgstr "2 Sekunden"
 
 #: gtk2_ardour/imageframe_time_axis.cc:289
 #: gtk2_ardour/marker_time_axis.cc:244
-#, fuzzy
-msgid "2 seconds"
-msgstr "Minuten:Sekunden"
+msgid "2.5 seconds"
+msgstr "2,5 Sekunden"
 
 #: gtk2_ardour/imageframe_time_axis.cc:290
 #: gtk2_ardour/marker_time_axis.cc:245
-#, fuzzy
-msgid "2.5 seconds"
-msgstr "Minuten:Sekunden"
-
-#: gtk2_ardour/imageframe_time_axis.cc:291
-#: gtk2_ardour/marker_time_axis.cc:246
-#, fuzzy
 msgid "3 seconds"
-msgstr "Minuten:Sekunden"
+msgstr "3 Sekunden"
 
-#: gtk2_ardour/imageframe_time_axis.cc:296
-#: gtk2_ardour/marker_time_axis.cc:251
-#, fuzzy
+#: gtk2_ardour/imageframe_time_axis.cc:295
+#: gtk2_ardour/marker_time_axis.cc:250
 msgid "Duration (sec)"
-msgstr "Ardour: Region"
+msgstr "Dauer (Sek)"
 
-#: gtk2_ardour/imageframe_time_axis.cc:301
-#, fuzzy
+#: gtk2_ardour/imageframe_time_axis.cc:300
 msgid "Remove Frame"
-msgstr "Feld entfernen"
+msgstr "Frame löschen"
 
-#: gtk2_ardour/imageframe_time_axis.cc:304
+#: gtk2_ardour/imageframe_time_axis.cc:303
 msgid "Image Frame"
 msgstr ""
 
-#: gtk2_ardour/imageframe_time_axis.cc:305
-#: gtk2_ardour/marker_time_axis.cc:257
-#, fuzzy
+#: gtk2_ardour/imageframe_time_axis.cc:304
+#: gtk2_ardour/marker_time_axis.cc:256
 msgid "Rename Track"
-msgstr "Umbenennen"
+msgstr "Spur umbenennen"
 
-#: gtk2_ardour/io_selector.cc:62
-#: gtk2_ardour/io_selector.cc:750
-#: gtk2_ardour/connection_editor.cc:61
-#: gtk2_ardour/connection_editor.cc:110
+#: gtk2_ardour/io_selector.cc:61
+#: gtk2_ardour/io_selector.cc:749
+#: gtk2_ardour/connection_editor.cc:60
+#: gtk2_ardour/connection_editor.cc:109
 msgid "Rescan"
 msgstr "Auffrischen"
 
-#: gtk2_ardour/io_selector.cc:70
+#: gtk2_ardour/io_selector.cc:69
 msgid "%1 input"
 msgstr "%1 Eingang"
 
-#: gtk2_ardour/io_selector.cc:72
+#: gtk2_ardour/io_selector.cc:71
 msgid "%1 output"
 msgstr "%1 Ausgang"
 
-#: gtk2_ardour/io_selector.cc:144
-#: gtk2_ardour/route_params_ui.cc:103
+#: gtk2_ardour/io_selector.cc:143
+#: gtk2_ardour/route_params_ui.cc:101
 msgid "Inputs"
 msgstr "Eingänge"
 
-#: gtk2_ardour/io_selector.cc:144
-#: gtk2_ardour/route_params_ui.cc:104
+#: gtk2_ardour/io_selector.cc:143
+#: gtk2_ardour/route_params_ui.cc:102
 msgid "Outputs"
 msgstr "Ausgänge"
 
-#: gtk2_ardour/io_selector.cc:145
+#: gtk2_ardour/io_selector.cc:144
 msgid "Add Input"
 msgstr "Hinzufügen"
 
-#: gtk2_ardour/io_selector.cc:145
+#: gtk2_ardour/io_selector.cc:144
 msgid "Add Output"
 msgstr "Hinzufügen"
 
-#: gtk2_ardour/io_selector.cc:146
+#: gtk2_ardour/io_selector.cc:145
 msgid "Remove Input"
 msgstr "Entfernen"
 
-#: gtk2_ardour/io_selector.cc:146
+#: gtk2_ardour/io_selector.cc:145
 msgid "Remove Output"
 msgstr "Entfernen"
 
-#: gtk2_ardour/io_selector.cc:147
+#: gtk2_ardour/io_selector.cc:146
 msgid "Disconnect All"
 msgstr "Alle trennen"
 
-#: gtk2_ardour/io_selector.cc:161
+#: gtk2_ardour/io_selector.cc:160
 msgid "Available connections"
 msgstr "Verfügbare Verbindungen"
 
-#: gtk2_ardour/io_selector.cc:549
-#: gtk2_ardour/io_selector.cc:560
+#: gtk2_ardour/io_selector.cc:548
+#: gtk2_ardour/io_selector.cc:559
 msgid "There are no more JACK ports available."
 msgstr "Es sind keine weiteren JACK Ports verfügbar."
 
-#: gtk2_ardour/io_selector.cc:754
+#: gtk2_ardour/io_selector.cc:753
 msgid "ardour: "
 msgstr "ardour: "
 
-#: gtk2_ardour/keyboard.cc:299
-msgid "KeyboardTarget: keyname \"%1\" is unknown."
-msgstr ""
-
-#: gtk2_ardour/keyboard.cc:525
-msgid "Your system is completely broken - NumLock uses \"%1\"as its modifier. This is madness - see the man page for xmodmap to find out how to fix this."
-msgstr "Ihr System ist falsch konfiguriert. Die NumLock-Taste nutzt \"%1\" als Modifier. Das wird schwere Probleme bereiten. Auf der man page von xmodmap finden sich Infirmationen, wie dieses Problem behoben werden kann."
-
-#: gtk2_ardour/keyboard.cc:533
-msgid "Your system generates \"%1\" when the NumLock key is pressed. This can cause problems when editing so Ardour will use %2 to mean Meta rather than %1"
-msgstr "Ihr System generiert \"%1\" wenn NumLock gedrückt wird. Dies kann zu Problemen führen. ardour wird deshalb als Meta-Taste %2 an Stelle von %1 benutzen."
-
-#: gtk2_ardour/keyboard.cc:594
-msgid "You have %1 keys bound to \"mod1\""
-msgstr ""
-
-#: gtk2_ardour/keyboard.cc:609
-msgid "You have %1 keys bound to \"mod2\""
-msgstr ""
-
-#: gtk2_ardour/keyboard.cc:624
-msgid "You have %1 keys bound to \"mod3\""
-msgstr ""
-
-#: gtk2_ardour/keyboard.cc:639
-msgid "You have %1 keys bound to \"mod4\""
-msgstr ""
-
-#: gtk2_ardour/keyboard.cc:654
-msgid "You have %1 keys bound to \"mod5\""
-msgstr ""
-
 #: gtk2_ardour/ladspa_pluginui.cc:77
 msgid "<span size=\"large\">Presets</span>"
-msgstr ""
+msgstr "<span size=\"large\">Voreinstellungen</span>"
 
 #: gtk2_ardour/ladspa_pluginui.cc:205
 msgid "Plugin Editor: could not build control element for port %1"
-msgstr ""
+msgstr "Plugin Editor: konnte kein Steuerelement für Port %1 erzeugen"
 
-#: gtk2_ardour/ladspa_pluginui.cc:296
-#, fuzzy
+#: gtk2_ardour/ladspa_pluginui.cc:295
 msgid "Automation control"
-msgstr "Stellen"
+msgstr "Automation"
 
-#: gtk2_ardour/location_ui.cc:49
-#: gtk2_ardour/location_ui.cc:52
+#: gtk2_ardour/ladspa_pluginui.cc:302
+#, fuzzy
+msgid "Mgnual"
+msgstr "Manuell"
+
+#: gtk2_ardour/location_ui.cc:48
+#: gtk2_ardour/location_ui.cc:51
 #, fuzzy
 msgid "Set"
 msgstr "Auswahl"
 
-#: gtk2_ardour/location_ui.cc:50
-#: gtk2_ardour/location_ui.cc:53
+#: gtk2_ardour/location_ui.cc:49
+#: gtk2_ardour/location_ui.cc:52
+#, fuzzy
 msgid "Go"
-msgstr ""
+msgstr "Los"
 
-#: gtk2_ardour/location_ui.cc:56
+#: gtk2_ardour/location_ui.cc:55
 msgid "CD"
 msgstr "CD"
 
-#: gtk2_ardour/location_ui.cc:59
+#: gtk2_ardour/location_ui.cc:58
+#, fuzzy
 msgid "SCMS"
-msgstr ""
+msgstr "SCMS"
 
-#: gtk2_ardour/location_ui.cc:60
+#: gtk2_ardour/location_ui.cc:59
+#, fuzzy
 msgid "Pre-Emphasis"
-msgstr ""
+msgstr "Pre-Emphasis"
 
-#: gtk2_ardour/location_ui.cc:571
+#: gtk2_ardour/location_ui.cc:570
 msgid "Add New Location"
 msgstr "Neue Position hinzufügen"
 
-#: gtk2_ardour/location_ui.cc:572
+#: gtk2_ardour/location_ui.cc:571
 msgid "Add New Range"
 msgstr "Neuen Bereich hinzufügen"
 
-#: gtk2_ardour/location_ui.cc:576
+#: gtk2_ardour/location_ui.cc:575
 msgid "ardour: locations"
 msgstr "ardour: Positionen"
 
-#: gtk2_ardour/location_ui.cc:605
+#: gtk2_ardour/location_ui.cc:604
 msgid "Location (CD Index) Markers"
 msgstr "Positionsmarker (CD Index)"
 
-#: gtk2_ardour/location_ui.cc:625
+#: gtk2_ardour/location_ui.cc:624
 msgid "Range (CD Track) Markers"
 msgstr "Bereiche (CD Tracks)"
 
-#: gtk2_ardour/location_ui.cc:798
-#, fuzzy
+#: gtk2_ardour/location_ui.cc:797
 msgid "add range marker"
-msgstr "Ardour: Region umbenennen"
+msgstr "Bereich hinzufügen"
 
-#: gtk2_ardour/main.cc:74
-msgid "ardour is killing itself for a clean exit\n"
-msgstr ""
-
-#: gtk2_ardour/main.cc:100
-#, c-format
-msgid "%d(%d): received signal %d\n"
-msgstr ""
-
-#: gtk2_ardour/main.cc:180
-msgid "cannot become new process group leader (%1)"
-msgstr ""
-
-#: gtk2_ardour/main.cc:207
-msgid "cannot setup signal handling for %1"
-msgstr ""
-
-#: gtk2_ardour/main.cc:218
-msgid "cannot set default signal mask (%1)"
-msgstr ""
-
-#: gtk2_ardour/main.cc:248
+#: gtk2_ardour/main.cc:75
 msgid ""
 "Without a UI style file, ardour will look strange.\n"
 " Please set ARDOUR2_UI_RC to point to a valid UI style file"
@@ -4993,11 +5010,11 @@ msgstr ""
 "Ohne UI-Definitionsdatei wird ardour merkwürdig aussehen.\n"
 " Bitte setzen Sie ARDOUR_UI_RC auf eine gültige UI-Definitionsdatei"
 
-#: gtk2_ardour/main.cc:269
+#: gtk2_ardour/main.cc:96
 msgid "Ardour could not connect to JACK."
 msgstr "ardour konnte nicht zu JACK verbinden."
 
-#: gtk2_ardour/main.cc:273
+#: gtk2_ardour/main.cc:100
 msgid ""
 "There are several possible reasons:\n"
 "\n"
@@ -5015,11 +5032,11 @@ msgstr ""
 "\n"
 "Betrachten Sie bitte diese Möglichkeiten und starten Sie JACK neu, wenn dies notwendig sein sollte."
 
-#: gtk2_ardour/main.cc:315
+#: gtk2_ardour/main.cc:144
 msgid "could not load command line session \"%1\""
 msgstr "Konnte das per Kommandozeile übergebene Projekt nicht laden: \"%1\""
 
-#: gtk2_ardour/main.cc:323
+#: gtk2_ardour/main.cc:152
 msgid ""
 "\n"
 "\n"
@@ -5031,390 +5048,423 @@ msgstr ""
 "Es existiert kein Projekt mit dem Namen \"%1\".\n"
 "Um sie von der Kommandozeile aus zu erstellen, starten Sie ardour mit \"ardour --new %1"
 
-#: gtk2_ardour/main.cc:390
+#: gtk2_ardour/main.cc:225
 msgid "Ardour/GTK "
-msgstr ""
+msgstr "Ardour/GTK "
 
-#: gtk2_ardour/main.cc:392
+#: gtk2_ardour/main.cc:227
 msgid ""
 "\n"
 "   (built using "
 msgstr ""
+"\n"
+"   (kompiliert mit Version "
 
-#: gtk2_ardour/main.cc:395
+#: gtk2_ardour/main.cc:230
 msgid " and GCC version "
-msgstr ""
+msgstr " und GCC Version"
 
-#: gtk2_ardour/main.cc:405
-msgid "Copyright (C) 1999-2006 Paul Davis"
-msgstr ""
+#: gtk2_ardour/main.cc:240
+msgid "Copyright (C) 1999-2007 Paul Davis"
+msgstr "Copyright (C) 1999-2007 Paul Davis"
 
-#: gtk2_ardour/main.cc:406
+#: gtk2_ardour/main.cc:241
 msgid "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker"
-msgstr ""
+msgstr "Einige Teile Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker"
 
-#: gtk2_ardour/main.cc:408
+#: gtk2_ardour/main.cc:243
 msgid "Ardour comes with ABSOLUTELY NO WARRANTY"
-msgstr ""
+msgstr "Ardour wird Ihnen ohne jegliche Gewährleistung und ausdrücklich ohne die Zusicherung"
 
-#: gtk2_ardour/main.cc:409
+#: gtk2_ardour/main.cc:244
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-msgstr ""
+msgstr "für allgemeine oder spezielle Gebrauchstauglichkeit zur Verfügung gestellt."
 
-#: gtk2_ardour/main.cc:410
+#: gtk2_ardour/main.cc:245
 msgid "This is free software, and you are welcome to redistribute it "
 msgstr "Dies ist freie Software und Sie dürfen sie gerne weiterverbreiten,"
 
-#: gtk2_ardour/main.cc:411
+#: gtk2_ardour/main.cc:246
 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."
 
-#: gtk2_ardour/main.cc:418
+#: gtk2_ardour/main.cc:257
 msgid "could not create ARDOUR GUI"
-msgstr ""
+msgstr "konnte das grafische Ardour User Interface nicht erstellen"
 
-#: gtk2_ardour/main.cc:442
+#: gtk2_ardour/main.cc:281
 msgid "Could not connect to JACK server as  \"%1\""
 msgstr "Konnte nicht zu JACK Server als \"%1\" verbinden"
 
-#: gtk2_ardour/main.cc:449
+#: gtk2_ardour/main.cc:288
 msgid "could not initialize Ardour."
 msgstr "Konnte ardour nicht initialisieren."
 
-#: gtk2_ardour/marker.cc:244
-#, fuzzy
+#: gtk2_ardour/marker.cc:243
 msgid "MarkerText"
-msgstr "Schicht"
+msgstr ""
 
-#: gtk2_ardour/marker_time_axis.cc:254
+#: gtk2_ardour/marker_time_axis.cc:253
 msgid "Remove Marker"
 msgstr "Marker entfernen"
 
-#: gtk2_ardour/marker_time_axis.cc:256
-#, fuzzy
+#: gtk2_ardour/marker_time_axis.cc:255
 msgid "Marker"
-msgstr "Schicht"
-
-#: gtk2_ardour/mixer_strip.cc:94
-#: gtk2_ardour/mixer_strip.cc:139
-#: gtk2_ardour/mixer_strip.cc:1218
-msgid "pre"
-msgstr "pre"
+msgstr "Marker"
 
 #: gtk2_ardour/mixer_strip.cc:95
-#: gtk2_ardour/mixer_strip.cc:796
+#: gtk2_ardour/mixer_strip.cc:140
+#: gtk2_ardour/mixer_strip.cc:1211
+msgid "pre"
+msgstr "Pre"
+
+#: gtk2_ardour/mixer_strip.cc:96
+#: gtk2_ardour/mixer_strip.cc:789
 msgid "Comments"
 msgstr "Kommentare"
 
-#: gtk2_ardour/mixer_strip.cc:118
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:119
 msgid "Input"
-msgstr "Eingänge"
+msgstr "Eingang"
 
-#: gtk2_ardour/mixer_strip.cc:135
-#: gtk2_ardour/mixer_strip.cc:1214
+#: gtk2_ardour/mixer_strip.cc:136
+#: gtk2_ardour/mixer_strip.cc:1207
 msgid "input"
-msgstr "input"
+msgstr "Input"
 
-#: gtk2_ardour/mixer_strip.cc:143
-#: gtk2_ardour/mixer_strip.cc:1222
+#: gtk2_ardour/mixer_strip.cc:144
+#: gtk2_ardour/mixer_strip.cc:1215
 msgid "post"
-msgstr "post"
+msgstr "Post"
 
-#: gtk2_ardour/mixer_strip.cc:150
+#: gtk2_ardour/mixer_strip.cc:151
 msgid "tupni"
 msgstr ""
 
-#: gtk2_ardour/mixer_strip.cc:204
+#: gtk2_ardour/mixer_strip.cc:199
 msgid "Varispeed"
-msgstr ""
+msgstr "Varispeed"
 
-#: gtk2_ardour/mixer_strip.cc:230
-#: gtk2_ardour/mixer_strip.cc:812
+#: gtk2_ardour/mixer_strip.cc:225
+#: gtk2_ardour/mixer_strip.cc:805
 msgid "Click to Add/Edit Comments"
 msgstr "Kommentare hinzufügen/ändern"
 
-#: gtk2_ardour/mixer_strip.cc:386
+#: gtk2_ardour/mixer_strip.cc:380
 msgid "unknown strip width \"%1\" in XML GUI information"
-msgstr ""
+msgstr "Unbekannte Mixerkanalbreite \"%1\" in der XML GUI Information"
 
-#: gtk2_ardour/mixer_strip.cc:430
+#: gtk2_ardour/mixer_strip.cc:423
 msgid "record"
 msgstr "Aufnahme"
 
-#: gtk2_ardour/mixer_strip.cc:437
+#: gtk2_ardour/mixer_strip.cc:430
 msgid "comments"
 msgstr "Kommentare"
 
-#: gtk2_ardour/mixer_strip.cc:440
+#: gtk2_ardour/mixer_strip.cc:433
 msgid "*comments*"
-msgstr ""
+msgstr "*Kommentare*"
 
-#: gtk2_ardour/mixer_strip.cc:455
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:447
 msgid "Rec"
-msgstr "Auffrischen"
+msgstr "Rec"
 
-#: gtk2_ardour/mixer_strip.cc:457
-msgid "M"
-msgstr "M"
-
-#: gtk2_ardour/mixer_strip.cc:458
+#: gtk2_ardour/mixer_strip.cc:450
 msgid "S"
 msgstr "S"
 
-#: gtk2_ardour/mixer_strip.cc:462
-#: gtk2_ardour/mixer_strip.cc:806
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:454
+#: gtk2_ardour/mixer_strip.cc:799
 msgid "Cmt"
-msgstr "Ausschneiden"
+msgstr "Kmt"
 
-#: gtk2_ardour/mixer_strip.cc:465
-#: gtk2_ardour/mixer_strip.cc:803
+#: gtk2_ardour/mixer_strip.cc:457
+#: gtk2_ardour/mixer_strip.cc:796
 msgid "*Cmt*"
-msgstr ""
+msgstr "*Kmt*"
 
-#: gtk2_ardour/mixer_strip.cc:503
-#: gtk2_ardour/mixer_strip.cc:569
-#: gtk2_ardour/redirect_box.cc:1086
+#: gtk2_ardour/mixer_strip.cc:496
+#: gtk2_ardour/mixer_strip.cc:562
+#: gtk2_ardour/redirect_box.cc:1085
 msgid "Not connected to JACK - no I/O changes are possible"
 msgstr "Nicht mit Jack verbunden - es sind keine Änderungen an Ein-/Ausgängen möglich"
 
-#: gtk2_ardour/mixer_strip.cc:603
-#: gtk2_ardour/mixer_strip.cc:619
+#: gtk2_ardour/mixer_strip.cc:596
+#: gtk2_ardour/mixer_strip.cc:612
 msgid "could not register new ports required for that connection"
 msgstr "Konnte die Ports, die diese Verbindung benötigt nicht registrieren"
 
-#: gtk2_ardour/mixer_strip.cc:726
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:719
 msgid " Input"
-msgstr "Eingänge"
+msgstr "Eingang"
 
-#: gtk2_ardour/mixer_strip.cc:729
+#: gtk2_ardour/mixer_strip.cc:722
 msgid "I"
-msgstr ""
+msgstr "I"
 
-#: gtk2_ardour/mixer_strip.cc:793
+#: gtk2_ardour/mixer_strip.cc:742
+msgid "O"
+msgstr "O"
+
+#: gtk2_ardour/mixer_strip.cc:786
 msgid "*Comments*"
-msgstr ""
+msgstr "*Kommentare*"
 
-#: gtk2_ardour/mixer_strip.cc:848
+#: gtk2_ardour/mixer_strip.cc:841
 msgid ": comment editor"
 msgstr "Kommentare bearbeiten"
 
-#: gtk2_ardour/mixer_strip.cc:943
+#: gtk2_ardour/mixer_strip.cc:936
 msgid "Grp"
 msgstr "Grp"
 
-#: gtk2_ardour/mixer_strip.cc:946
+#: gtk2_ardour/mixer_strip.cc:939
 msgid "~G"
-msgstr ""
+msgstr "~G"
 
-#: gtk2_ardour/mixer_strip.cc:995
+#: gtk2_ardour/mixer_strip.cc:988
 msgid "Invert Polarity"
 msgstr "Polarität umkehren"
 
-#: gtk2_ardour/mixer_ui.cc:83
+#: gtk2_ardour/mixer_ui.cc:81
 msgid "Strips"
 msgstr "Spur"
 
-#: gtk2_ardour/mixer_ui.cc:108
+#: gtk2_ardour/mixer_ui.cc:106
 msgid "Group"
 msgstr "Gruppe"
 
-#: gtk2_ardour/mixer_ui.cc:206
-#: gtk2_ardour/mixer_ui.cc:386
+#: gtk2_ardour/mixer_ui.cc:204
+#: gtk2_ardour/mixer_ui.cc:385
 msgid "ardour: mixer"
 msgstr "ardour: Mixer"
 
-#: gtk2_ardour/mixer_ui.cc:358
+#: gtk2_ardour/mixer_ui.cc:356
 msgid "ardour: mixer: "
 msgstr "ardour: Mixer: "
 
-#: gtk2_ardour/mixer_ui.cc:589
+#: gtk2_ardour/mixer_ui.cc:590
 msgid "signal"
 msgstr "Signal"
 
-#: gtk2_ardour/mixer_ui.cc:738
+#: gtk2_ardour/mixer_ui.cc:741
 msgid "track display list item for renamed strip not found!"
-msgstr ""
+msgstr "Konnte Bezeichnung für umbenannten Mixerkanal nicht in der Spurliste finden!"
 
-#: gtk2_ardour/new_session_dialog.cc:41
-#, fuzzy
+#: gtk2_ardour/new_session_dialog.cc:40
 msgid "Name :"
-msgstr "Umbenennen"
+msgstr "Name :"
 
+#: gtk2_ardour/new_session_dialog.cc:44
 #: gtk2_ardour/new_session_dialog.cc:45
 #: gtk2_ardour/new_session_dialog.cc:46
 #: gtk2_ardour/new_session_dialog.cc:47
-#: gtk2_ardour/new_session_dialog.cc:48
 msgid "channels"
 msgstr "Kanäle"
 
-#: gtk2_ardour/new_session_dialog.cc:66
+#: gtk2_ardour/new_session_dialog.cc:65
 msgid "<b>Busses</b>"
 msgstr "<b>Busse</b>"
 
-#: gtk2_ardour/new_session_dialog.cc:67
+#: gtk2_ardour/new_session_dialog.cc:66
 msgid "<b>Inputs</b>"
 msgstr "<b>Eingänge</b>"
 
-#: gtk2_ardour/new_session_dialog.cc:68
+#: gtk2_ardour/new_session_dialog.cc:67
 msgid "<b>Outputs</b>"
 msgstr "<b>Ausgänge</b>"
 
-#: gtk2_ardour/new_session_dialog.cc:70
+#: gtk2_ardour/new_session_dialog.cc:69
 msgid "Create Folder In :"
 msgstr "Verzeichnis erstellen in:"
 
-#: gtk2_ardour/new_session_dialog.cc:72
+#: gtk2_ardour/new_session_dialog.cc:71
 msgid "Template :"
 msgstr "Vorlage :"
 
-#: gtk2_ardour/new_session_dialog.cc:74
+#: gtk2_ardour/new_session_dialog.cc:73
 msgid "Create Monitor Bus"
 msgstr "Monitor Bus erstellen"
 
-#: gtk2_ardour/new_session_dialog.cc:81
+#: gtk2_ardour/new_session_dialog.cc:80
 msgid "Create Master Bus"
 msgstr "Master Bus erstellen"
 
-#: gtk2_ardour/new_session_dialog.cc:83
+#: gtk2_ardour/new_session_dialog.cc:82
 msgid "Automatically Connect to Physical Inputs"
 msgstr "Eingänge automatisch mit Soundkarteneingängen verbinden"
 
-#: gtk2_ardour/new_session_dialog.cc:84
-#: gtk2_ardour/new_session_dialog.cc:97
+#: gtk2_ardour/new_session_dialog.cc:83
+#: gtk2_ardour/new_session_dialog.cc:96
 msgid "Use only"
 msgstr "Benutze nur"
 
-#: gtk2_ardour/new_session_dialog.cc:96
+#: gtk2_ardour/new_session_dialog.cc:95
 msgid "Automatically Connect Outputs"
 msgstr "Ausgänge automatisch verbinden"
 
-#: gtk2_ardour/new_session_dialog.cc:105
+#: gtk2_ardour/new_session_dialog.cc:104
 msgid "... to Master Bus"
 msgstr "... mit Master Bus"
 
-#: gtk2_ardour/new_session_dialog.cc:106
+#: gtk2_ardour/new_session_dialog.cc:105
 msgid "... to Physical Outputs"
 msgstr "... mit Soundkartenausgängen"
 
-#: gtk2_ardour/new_session_dialog.cc:112
+#: gtk2_ardour/new_session_dialog.cc:111
 msgid "Advanced Options"
 msgstr "Erweiterte Einstellungen"
 
-#: gtk2_ardour/new_session_dialog.cc:120
+#: gtk2_ardour/new_session_dialog.cc:119
 msgid "Recent:"
 msgstr "Zuletzt verwendet:"
 
-#: gtk2_ardour/new_session_dialog.cc:157
+#: gtk2_ardour/new_session_dialog.cc:156
 msgid "Browse:"
 msgstr "Durchsuchen:"
 
-#: gtk2_ardour/new_session_dialog.cc:335
+#: gtk2_ardour/new_session_dialog.cc:334
 msgid "New Session"
 msgstr "Neues Projekt"
 
-#: gtk2_ardour/new_session_dialog.cc:337
+#: gtk2_ardour/new_session_dialog.cc:336
 msgid "Open Session"
 msgstr "Projekt öffnen"
 
-#: gtk2_ardour/new_session_dialog.cc:342
+#: gtk2_ardour/new_session_dialog.cc:341
 msgid "ardour: session control"
 msgstr "ardour: Neues Projekt"
 
-#: gtk2_ardour/new_session_dialog.cc:383
+#: gtk2_ardour/new_session_dialog.cc:382
 msgid "select template"
 msgstr "Vorlage auswählen"
 
-#: gtk2_ardour/new_session_dialog.cc:389
+#: gtk2_ardour/new_session_dialog.cc:388
 msgid "select session file"
 msgstr "Projektdatei auswählen"
 
-#: gtk2_ardour/new_session_dialog.cc:398
-#, fuzzy
+#: gtk2_ardour/new_session_dialog.cc:397
 msgid "select directory"
-msgstr "Auswahl zu Schleife machen"
+msgstr "Verzeichnis auswählen"
 
 #: gtk2_ardour/option_editor.cc:73
 msgid "SMPTE offset is negative"
 msgstr "Negatives SMPTE-Offset"
 
-#: gtk2_ardour/option_editor.cc:99
+#: gtk2_ardour/option_editor.cc:102
 msgid "ardour: options editor"
 msgstr "ardour: Einstellungen"
 
-#: gtk2_ardour/option_editor.cc:124
+#: gtk2_ardour/option_editor.cc:127
 msgid "Paths/Files"
 msgstr "Pfade"
 
-#: gtk2_ardour/option_editor.cc:125
+#: gtk2_ardour/option_editor.cc:128
 msgid "Kbd/Mouse"
 msgstr "Tastatur/Maus"
 
-#: gtk2_ardour/option_editor.cc:128
+#: gtk2_ardour/option_editor.cc:131
 msgid "Layers & Fades"
 msgstr "Layer & Fades"
 
-#: gtk2_ardour/option_editor.cc:132
+#: gtk2_ardour/option_editor.cc:135
 msgid "MIDI"
 msgstr "MIDI"
 
-#: gtk2_ardour/option_editor.cc:220
+#: gtk2_ardour/option_editor.cc:223
 msgid "session RAID path"
 msgstr "Projektverzeichnis (RAID)"
 
-#: gtk2_ardour/option_editor.cc:236
-#: gtk2_ardour/option_editor.cc:242
-#: gtk2_ardour/option_editor.cc:652
-#: gtk2_ardour/option_editor.cc:672
+#: gtk2_ardour/option_editor.cc:239
+#: gtk2_ardour/option_editor.cc:245
+#: gtk2_ardour/option_editor.cc:667
+#: gtk2_ardour/option_editor.cc:687
 msgid "internal"
 msgstr "intern"
 
-#: gtk2_ardour/option_editor.cc:255
+#: gtk2_ardour/option_editor.cc:258
 msgid "Short crossfade length (msecs)"
 msgstr "Länge für kurze Crossfades (ms)"
 
-#: gtk2_ardour/option_editor.cc:267
+#: gtk2_ardour/option_editor.cc:270
 msgid "Destructive crossfade length (msecs)"
 msgstr "Länge für destruktive Crossfades (ms)"
 
-#: gtk2_ardour/option_editor.cc:327
+#: gtk2_ardour/option_editor.cc:330
 msgid "SMPTE Offset"
 msgstr "SMPTE Offset"
 
-#: gtk2_ardour/option_editor.cc:394
-#: gtk2_ardour/option_editor.cc:401
-#: gtk2_ardour/option_editor.cc:404
-#: gtk2_ardour/option_editor.cc:552
+#: gtk2_ardour/option_editor.cc:378
+msgid "Port"
+msgstr "Port"
+
+#: gtk2_ardour/option_editor.cc:379
+msgid "Offline"
+msgstr "Offline"
+
+#: gtk2_ardour/option_editor.cc:380
 #, fuzzy
-msgid "online"
-msgstr "Verbindungen"
+msgid ""
+"Trace\n"
+"Input"
+msgstr "Eingang"
+
+#: gtk2_ardour/option_editor.cc:381
+#, fuzzy
+msgid ""
+"Trace\n"
+"Output"
+msgstr "Ausgang"
+
+#: gtk2_ardour/option_editor.cc:382
+msgid "MTC"
+msgstr "MTC"
+
+#: gtk2_ardour/option_editor.cc:383
+msgid "MMC"
+msgstr "MMC"
+
+#: gtk2_ardour/option_editor.cc:384
+msgid ""
+"MIDI Parameter\n"
+"Control"
+msgstr ""
+
+#: gtk2_ardour/option_editor.cc:390
+msgid "MMC Device ID"
+msgstr "MMC Gerät ID"
 
-#: gtk2_ardour/option_editor.cc:401
 #: gtk2_ardour/option_editor.cc:402
-#: gtk2_ardour/option_editor.cc:549
+#: gtk2_ardour/option_editor.cc:409
+#: gtk2_ardour/option_editor.cc:412
+#: gtk2_ardour/option_editor.cc:557
+msgid "online"
+msgstr "Online"
+
+#: gtk2_ardour/option_editor.cc:409
+#: gtk2_ardour/option_editor.cc:410
+#: gtk2_ardour/option_editor.cc:554
 msgid "offline"
-msgstr ""
+msgstr "Offline"
 
-#: gtk2_ardour/option_editor.cc:605
+#: gtk2_ardour/option_editor.cc:620
 msgid "Choose Click"
-msgstr ""
+msgstr "Click auswählen"
 
-#: gtk2_ardour/option_editor.cc:624
+#: gtk2_ardour/option_editor.cc:639
 msgid "Choose Click Emphasis"
-msgstr ""
+msgstr "Click-Betonung auswählen"
 
-#: gtk2_ardour/option_editor.cc:724
+#: gtk2_ardour/option_editor.cc:739
 msgid "Click audio file"
 msgstr "Audiodatei für Click"
 
-#: gtk2_ardour/option_editor.cc:730
+#: gtk2_ardour/option_editor.cc:745
 msgid "Click emphasis audiofile"
 msgstr "Audiodatei für betonten Click "
 
-#: gtk2_ardour/option_editor.cc:767
+#: gtk2_ardour/option_editor.cc:782
 msgid ""
 "The auditioner is a dedicated mixer strip used\n"
 "for listening to specific regions outside the context\n"
@@ -5427,62 +5477,63 @@ msgstr ""
 "Dieser Bus lässt sich wie jeder andere Mixer-Kanal\n"
 "verbinden."
 
-#: gtk2_ardour/option_editor.cc:840
+#: gtk2_ardour/option_editor.cc:855
 msgid "Edit using"
 msgstr "Bearbeiten mit"
 
-#: gtk2_ardour/option_editor.cc:847
-#: gtk2_ardour/option_editor.cc:874
+#: gtk2_ardour/option_editor.cc:862
+#: gtk2_ardour/option_editor.cc:889
 msgid "+ button"
 msgstr "und Maustaste"
 
-#: gtk2_ardour/option_editor.cc:867
+#: gtk2_ardour/option_editor.cc:882
 msgid "Delete using"
 msgstr "Entfernen mit"
 
-#: gtk2_ardour/option_editor.cc:894
+#: gtk2_ardour/option_editor.cc:909
 msgid "Ignore snap using"
 msgstr "Einrasten übergehen mit"
 
-#: gtk2_ardour/opts.cc:47
+#: gtk2_ardour/opts.cc:46
 msgid "Usage: "
 msgstr "Aufruf:"
 
-#: gtk2_ardour/opts.cc:48
+#: gtk2_ardour/opts.cc:47
 msgid "  -v, --version                    Show version information\n"
 msgstr "  -v, --version                    Versionsinformation ausgeben\n"
 
-#: gtk2_ardour/opts.cc:49
+#: gtk2_ardour/opts.cc:48
 msgid "  -h, --help                       Print this message\n"
 msgstr "  -h, --help                       Diese Hinweise\n"
 
-#: gtk2_ardour/opts.cc:50
+#: gtk2_ardour/opts.cc:49
 msgid "  -b, --bindings                   Print all possible keyboard binding names\n"
 msgstr "  -b, --bindings                   Alle möglichen Tastenzuweisungsnamen ausgeben\n"
 
-#: gtk2_ardour/opts.cc:51
-#, fuzzy
+#: gtk2_ardour/opts.cc:50
 msgid "  -n, --show-splash                Show splash screen\n"
-msgstr "  -h, --help                       Diese Hinweise\n"
+msgstr "  -n, --show-splash               Zeige Splashscreen\n"
+
+#: gtk2_ardour/opts.cc:51
+msgid "  -c, --name  name                 Use a specific jack client name, default is ardour\n"
+msgstr "  -c, --name  name                 Benutze spezielle JACK-Clientkennung, Standard: ardour\n"
 
 #: gtk2_ardour/opts.cc:52
-#, fuzzy
-msgid "  -c, --name  name                 Use a specific jack client name, default is ardour\n"
-msgstr "  -U, --ui-rcfile=FILENAME         Dateiname für UI Einstellungen\n"
+msgid "  -N, --new session-name           Create a new session from the command line\n"
+msgstr "  -N, --new session-name           Erstelle neues Projekt aus der Kommandozeile\n"
 
 #: gtk2_ardour/opts.cc:53
-#, fuzzy
-msgid "  -N, --new session-name           Create a new session from the command line\n"
-msgstr "  [session-name]                   Name des zu ladenden Projekts\n"
+msgid "  -O, --no-hw-optimizations        Disable h/w specific optimizations\n"
+msgstr "  -O, --no-hw-optimizations        Hardwarespezifische Optimierungen deaktivieren\n"
 
 #: gtk2_ardour/opts.cc:54
-msgid "  -O, --no-hw-optimizations        Disable h/w specific optimizations\n"
-msgstr ""
+#, fuzzy
+msgid "  -S, --sync\t                   Draw the gui synchronously \n"
+msgstr "  -v, --version                    Versionsinformation ausgeben\n"
 
 #: gtk2_ardour/opts.cc:56
-#, fuzzy
 msgid "  -V, --novst                      Do not use VST support\n"
-msgstr "  -h, --help                       Diese Hinweise\n"
+msgstr "  -V, --novst                      VST-Unterstützung ausschalten\n"
 
 #: gtk2_ardour/opts.cc:58
 msgid "  [session-name]                   Name of session to load\n"
@@ -5490,84 +5541,80 @@ msgstr "  [session-name]                   Name des zu ladenden Projekts\n"
 
 #: gtk2_ardour/opts.cc:59
 msgid "  -C, --curvetest filename         Curve algorithm debugger\n"
-msgstr ""
+msgstr "  -C, --curvetest filename         Kurvenalgorithmus debuggen\n"
 
 #: gtk2_ardour/opts.cc:60
 msgid "  -k, --keybindings filename       Name of key bindings to load (default is ~/.ardour2/ardour.bindings)\n"
-msgstr ""
+msgstr "  -k, --keybindings filename       Dateiname für die Tastaturbelegungen (Standard: ~/.ardour2/ardour.bindings)\n"
 
-#: gtk2_ardour/pan_automation_time_axis.cc:70
-msgid "You need to select which line to edit"
-msgstr ""
-
-#: gtk2_ardour/pan_automation_time_axis.cc:91
+#: gtk2_ardour/pan_automation_time_axis.cc:69
 #, fuzzy
-msgid "add pan automation event"
-msgstr "Stellen"
+msgid "You need to select which line to edit"
+msgstr "You need to select which line to edit"
 
-#: gtk2_ardour/panner2d.cc:589
-#: gtk2_ardour/panner_ui.cc:438
+#: gtk2_ardour/pan_automation_time_axis.cc:90
+msgid "add pan automation event"
+msgstr "Pan-Automationspunkt einfügen"
+
+#: gtk2_ardour/panner2d.cc:588
+#: gtk2_ardour/panner_ui.cc:412
 #: gtk2_ardour/plugin_ui.cc:152
 msgid "Bypass"
 msgstr "Bypass"
 
 #: gtk2_ardour/panner_ui.cc:58
-#: gtk2_ardour/panner_ui.cc:225
-#, fuzzy
+#: gtk2_ardour/panner_ui.cc:217
 msgid "link"
-msgstr "leer"
+msgstr "verb"
 
 #: gtk2_ardour/panner_ui.cc:69
 msgid "Pan automation mode"
 msgstr "Pan-Automationsmodus"
 
 #: gtk2_ardour/panner_ui.cc:70
-#, fuzzy
 msgid "Pan automation type"
-msgstr "Stellen"
+msgstr "Pan-Automationstyp"
 
-#: gtk2_ardour/panner_ui.cc:81
+#: gtk2_ardour/panner_ui.cc:80
 msgid "panning link control"
-msgstr "Pan-Regler gruppieren"
+msgstr "Pan-Regler verbinden"
 
-#: gtk2_ardour/panner_ui.cc:83
+#: gtk2_ardour/panner_ui.cc:82
 msgid "panning link direction"
-msgstr "Richtung der Gruppierung"
+msgstr "Richtung der Verbindung"
 
-#: gtk2_ardour/panner_ui.cc:235
+#: gtk2_ardour/panner_ui.cc:220
 msgid "L"
 msgstr "L"
 
-#: gtk2_ardour/panner_ui.cc:341
+#: gtk2_ardour/panner_ui.cc:333
 #, c-format
 msgid "panner for channel %zu"
 msgstr "Pan-Regler für Kanal %zu"
 
-#: gtk2_ardour/panner_ui.cc:448
-#, fuzzy
+#: gtk2_ardour/panner_ui.cc:422
 msgid "Reset all"
-msgstr "bestmöglich"
+msgstr "Alle zurücksetzen"
 
-#: gtk2_ardour/playlist_selector.cc:52
+#: gtk2_ardour/playlist_selector.cc:51
 msgid "ardour: playlists"
 msgstr "ardour: Wiedergabelisten"
 
-#: gtk2_ardour/playlist_selector.cc:59
+#: gtk2_ardour/playlist_selector.cc:58
 msgid "Playlists grouped by track"
-msgstr ""
+msgstr "Wiedergabelisten, nach Spur gruppiert"
 
-#: gtk2_ardour/playlist_selector.cc:107
+#: gtk2_ardour/playlist_selector.cc:106
 msgid "ardour: playlist for "
 msgstr "ardour: Wiedergabeliste für "
 
-#: gtk2_ardour/playlist_selector.cc:123
-#, fuzzy
+#: gtk2_ardour/playlist_selector.cc:122
 msgid "Other tracks"
-msgstr "Stille einfügen"
+msgstr "Andere Spuren"
 
-#: gtk2_ardour/playlist_selector.cc:140
+#: gtk2_ardour/playlist_selector.cc:139
 msgid "unassigned"
-msgstr ""
+msgstr "nicht zugewiesen"
 
 #: gtk2_ardour/plugin_selector.cc:43
 msgid "ardour: plugins"
@@ -5626,37 +5673,41 @@ msgstr "VST"
 msgid "AudioUnit"
 msgstr ""
 
-#: gtk2_ardour/plugin_ui.cc:85
+#: gtk2_ardour/plugin_ui.cc:84
 msgid "unknown type of editor-supplying plugin (note: no VST support in this version of ardour)"
-msgstr ""
+msgstr "Unbekannter Plugintyp (Hinweis: diese ardour-Version unterstützt keine VST-Plugins)"
 
 #: gtk2_ardour/plugin_ui.cc:172
 msgid "Plugin preset %1 not found"
 msgstr "Plugin Preset %1 nicht gefunden"
 
 #: gtk2_ardour/plugin_ui.cc:182
-#, fuzzy
 msgid "Name of New Preset:"
-msgstr "Name für neue Verbindung:"
+msgstr "Name für neue Voreinstellung:"
 
-#: gtk2_ardour/redirect_automation_line.cc:54
+#: gtk2_ardour/redirect_automation_line.cc:53
 msgid "redirect automation created for non-plugin"
-msgstr ""
+msgstr "Redirect-Automation für ein nicht-Plugin erstellt"
 
-#: gtk2_ardour/redirect_automation_time_axis.cc:96
-#, fuzzy
+#: gtk2_ardour/redirect_automation_time_axis.cc:95
 msgid "add automation event to "
-msgstr "Stellen"
+msgstr "Automationspunkt einfügen für"
+
+#: gtk2_ardour/redirect_box.cc:234
+msgid "New send"
+msgstr "Neuer Send"
 
 #: gtk2_ardour/redirect_box.cc:235
-msgid "New send"
-msgstr ""
-
-#: gtk2_ardour/redirect_box.cc:236
 msgid "Show send controls"
-msgstr ""
+msgstr "Zeige Send-Steuerung"
 
-#: gtk2_ardour/redirect_box.cc:417
+#: gtk2_ardour/redirect_box.cc:409
+#: gtk2_ardour/redirect_box.cc:704
+#, fuzzy
+msgid "ardour: weird plugin dialog"
+msgstr "ardour: Plugins"
+
+#: gtk2_ardour/redirect_box.cc:416
 msgid ""
 "You attempted to add a plugin (%1).\n"
 "The plugin has %2 inputs\n"
@@ -5666,8 +5717,15 @@ msgid ""
 "This makes no sense - you are throwing away\n"
 "part of the signal."
 msgstr ""
+"Sie möchten ein Plugin hinzufügen (%1).\n"
+"Dieses Plugin besitzt %2 Eingänge,\n"
+"doch an dieser Position existieren\n"
+"%3 aktive Signale.\n"
+"\n"
+"Das ist nicht möglich - es würden Teile\n"
+"des Signals fehlen."
 
-#: gtk2_ardour/redirect_box.cc:429
+#: gtk2_ardour/redirect_box.cc:428
 msgid ""
 "You attempted to add a plugin (%1).\n"
 "The plugin has %2 inputs\n"
@@ -5678,8 +5736,16 @@ msgid ""
 "side-chain inputs. A future version of Ardour will\n"
 "support this type of configuration."
 msgstr ""
+"Sie möchten ein Plugin hinzufügen (%1).\n"
+"Dieses Plugin besitzt %2 Eingänge,\n"
+"doch an dieser Position existieren\n"
+"nur %3 aktive Signale.\n"
+"\n"
+"Das ist nicht möglich - außer, wenn dieses Plugin\n"
+"Side-Chain-Eingänge unterstützt. Dies wird in einer\n"
+"der nächsten Versionen von ardour möglich sein."
 
-#: gtk2_ardour/redirect_box.cc:442
+#: gtk2_ardour/redirect_box.cc:441
 msgid ""
 "You attempted to add a plugin (%1).\n"
 "\n"
@@ -5691,231 +5757,237 @@ msgid ""
 "\n"
 "Ardour does not understand what to do in such situations.\n"
 msgstr ""
+"Sie möchten ein Plugin hinzufügen (%1).\n"
+"\n"
+"Die Ein-/Ausgangskonfiguration ist aber nicht möglich:\n"
+"\n"
+"Das Plugin besitzt %2 Eingänge und %3 Ausgänge.\n"
+"Diese Spur besitzt %4 Eingänge und %5 Ausgänge.\n"
+"An dieser Position existieren %6 aktive Signale.\n"
+"\n"
+"Ardour kann mit dieser Situation nicht umgehen.\n"
 
-#: gtk2_ardour/redirect_box.cc:539
+#: gtk2_ardour/redirect_box.cc:538
 msgid "Pre-fader inserts, sends & plugins:"
-msgstr ""
+msgstr "Pre-Fader Inserts, Sends & Plugins:"
 
-#: gtk2_ardour/redirect_box.cc:542
+#: gtk2_ardour/redirect_box.cc:541
 msgid "Post-fader inserts, sends & plugins:"
 msgstr "Post-Fader Inserts, Sends & Plugins:"
 
-#: gtk2_ardour/redirect_box.cc:708
+#: gtk2_ardour/redirect_box.cc:707
 msgid ""
 "You cannot reorder this set of redirects\n"
 "in that way because the inputs and\n"
 "outputs do not work correctly."
 msgstr ""
+"Sie können diese Gruppe von Redirects\n"
+"nicht auf diese Weise verändern, denn\n"
+"die Ein-/Ausgänge arbeiten ncht korrekt."
 
-#: gtk2_ardour/redirect_box.cc:821
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:820
 msgid "rename redirect"
-msgstr "Ardour: Region umbenennen"
+msgstr "Redirect umbenennen"
 
-#: gtk2_ardour/redirect_box.cc:897
-#: gtk2_ardour/redirect_box.cc:946
+#: gtk2_ardour/redirect_box.cc:896
+#: gtk2_ardour/redirect_box.cc:945
 msgid ""
 "Copying the set of redirects on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
 "could not match the configuration of this track."
 msgstr ""
+"Konnte diese Gruppe von Redirects nicht in die\n"
+"Zwischenablage kopieren. Wahrscheinlich passt die\n"
+"Ein-/Ausgangskonfiguration des Plugins nicht zu dieser Spur."
 
-#: gtk2_ardour/redirect_box.cc:968
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:967
 msgid ""
 "Do you really want to remove all redirects from this track?\n"
 "(this cannot be undone)"
 msgstr ""
-"Wollen Sie wirklich die Spur \"%1\" löschen?\n"
-"(Kann nicht rückgängig gemacht werden!)"
+"Wollen Sie wirklich alle Redirects von dieser Spur entfernen?\n"
+"(Dies kann nicht rückgängig gemacht werden)"
 
-#: gtk2_ardour/redirect_box.cc:971
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:970
 msgid ""
 "Do you really want to remove all redirects from this bus?\n"
 "(this cannot be undone)"
 msgstr ""
-"Wollen Sie wirklich die Spur \"%1\" löschen?\n"
-"(Kann nicht rückgängig gemacht werden!)"
+"Wollen Sie wirklich alle Redirects von diesem Bus entfernen?\n"
+"(Dies kann nicht rückgängig gemacht werden)"
 
-#: gtk2_ardour/redirect_box.cc:976
+#: gtk2_ardour/redirect_box.cc:975
 msgid "Yes, remove them all"
 msgstr "Ja, alle löschen"
 
-#: gtk2_ardour/redirect_box.cc:1012
+#: gtk2_ardour/redirect_box.cc:1011
 msgid "ardour: %1"
 msgstr "ardour: %1"
 
-#: gtk2_ardour/redirect_box.cc:1134
+#: gtk2_ardour/redirect_box.cc:1133
 msgid "New Plugin ..."
 msgstr "Plugin einfügen..."
 
-#: gtk2_ardour/redirect_box.cc:1136
+#: gtk2_ardour/redirect_box.cc:1135
 msgid "New Insert"
 msgstr "Insert einfügen"
 
-#: gtk2_ardour/redirect_box.cc:1138
+#: gtk2_ardour/redirect_box.cc:1137
 msgid "New Send ..."
 msgstr "Send einfügen..."
 
-#: gtk2_ardour/redirect_box.cc:1152
+#: gtk2_ardour/redirect_box.cc:1151
 msgid "Deselect All"
 msgstr "Nichts auswählen"
 
-#: gtk2_ardour/redirect_box.cc:1159
+#: gtk2_ardour/redirect_box.cc:1158
 msgid "Activate all"
 msgstr "Alle aktivieren"
 
-#: gtk2_ardour/redirect_box.cc:1160
+#: gtk2_ardour/redirect_box.cc:1159
 msgid "Deactivate all"
 msgstr "Alle deaktivieren"
 
-#: gtk2_ardour/redirect_box.cc:1339
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:1338
 msgid "ardour: %1: %2 (by %3)"
-msgstr "Ardour: "
+msgstr "ardour: %1: %2 (by %3)"
 
-#: gtk2_ardour/audio_region_editor.cc:47
+#: gtk2_ardour/audio_region_editor.cc:46
 msgid "NAME:"
 msgstr "Name:"
 
-#: gtk2_ardour/audio_region_editor.cc:48
+#: gtk2_ardour/audio_region_editor.cc:47
 msgid "play"
 msgstr ""
 
-#: gtk2_ardour/audio_region_editor.cc:67
+#: gtk2_ardour/audio_region_editor.cc:66
 msgid "audition this region"
-msgstr ""
+msgstr "Diese Region Vorhören"
 
-#: gtk2_ardour/audio_region_editor.cc:82
+#: gtk2_ardour/audio_region_editor.cc:81
 msgid "START:"
 msgstr "Beginn:"
 
-#: gtk2_ardour/audio_region_editor.cc:84
+#: gtk2_ardour/audio_region_editor.cc:83
 msgid "END:"
 msgstr "Ende:"
 
-#: gtk2_ardour/audio_region_editor.cc:86
+#: gtk2_ardour/audio_region_editor.cc:85
 msgid "LENGTH:"
 msgstr "Längess:"
 
-#: gtk2_ardour/audio_region_editor.cc:122
+#: gtk2_ardour/audio_region_editor.cc:121
 msgid "ardour: region "
 msgstr "ardour: Region"
 
-#: gtk2_ardour/audio_region_editor.cc:202
+#: gtk2_ardour/audio_region_editor.cc:201
 msgid "change region start position"
 msgstr "Startposition der Region ändern"
 
-#: gtk2_ardour/audio_region_editor.cc:219
+#: gtk2_ardour/audio_region_editor.cc:218
 msgid "change region end position"
 msgstr "Endposition der Region ändern"
 
-#: gtk2_ardour/audio_region_editor.cc:240
+#: gtk2_ardour/audio_region_editor.cc:239
 msgid "change region length"
 msgstr "Länge der Region verändern"
 
-#: gtk2_ardour/audio_region_view.cc:890
+#: gtk2_ardour/audio_region_view.cc:919
 msgid "add gain control point"
 msgstr "Lautstärkekurve bearbeiten"
 
-#: gtk2_ardour/route_params_ui.cc:85
+#: gtk2_ardour/route_params_ui.cc:83
 msgid "Tracks/Buses"
-msgstr ""
+msgstr "Spuren/Busse"
 
-#: gtk2_ardour/route_params_ui.cc:105
+#: gtk2_ardour/route_params_ui.cc:103
 msgid "Pre-fader Redirects"
-msgstr ""
+msgstr "Pre-Fader Redirects (Abzweigungen)"
 
-#: gtk2_ardour/route_params_ui.cc:106
+#: gtk2_ardour/route_params_ui.cc:104
 msgid "Post-fader Redirects"
-msgstr ""
+msgstr "Post-Fader Redirects (Abzweigungen)"
 
-#: gtk2_ardour/route_params_ui.cc:140
-#, fuzzy
+#: gtk2_ardour/route_params_ui.cc:138
 msgid "ardour: track/bus inspector"
-msgstr "Ardour: Editor"
+msgstr "ardour: Spur/Bus Einstellungen"
 
-#: gtk2_ardour/route_params_ui.cc:202
+#: gtk2_ardour/route_params_ui.cc:200
 msgid "route display list item for renamed route not found!"
-msgstr ""
+msgstr "Konnte Bezeichnung für umbenannten Verbindung nicht in der Liste der Verbindungen finden!"
 
-#: gtk2_ardour/route_params_ui.cc:449
+#: gtk2_ardour/route_params_ui.cc:447
 msgid "NO TRACK"
-msgstr ""
+msgstr "KEINE SPUR"
 
-#: gtk2_ardour/route_params_ui.cc:672
-#, fuzzy
+#: gtk2_ardour/route_params_ui.cc:670
 msgid "ardour: track/bus inspector: "
-msgstr "Ardour: Editor"
+msgstr "ardour: Spur/Bus Einstellungen:"
 
-#: gtk2_ardour/route_params_ui.cc:676
+#: gtk2_ardour/route_params_ui.cc:674
 msgid "No Route Selected"
 msgstr "Keine Route ausgewählt"
 
-#: gtk2_ardour/route_params_ui.cc:677
-#, fuzzy
+#: gtk2_ardour/route_params_ui.cc:675
 msgid "ardour: track/bus/inspector: no route selected"
-msgstr "Ardour: Route: keine Route ausgewählt"
+msgstr "ardour: Spur/Bus Einstellungen: keine Route ausgewählt"
 
-#: gtk2_ardour/route_ui.cc:144
-#, fuzzy
+#: gtk2_ardour/route_ui.cc:154
 msgid "mute change"
-msgstr "Bereich"
+msgstr "Mute ändern"
 
-#: gtk2_ardour/route_ui.cc:222
-#: gtk2_ardour/route_ui.cc:233
-#, fuzzy
+#: gtk2_ardour/route_ui.cc:232
+#: gtk2_ardour/route_ui.cc:243
 msgid "solo change"
-msgstr "Bereich"
+msgstr "Solo ändern"
 
-#: gtk2_ardour/route_ui.cc:291
+#: gtk2_ardour/route_ui.cc:301
 msgid "Not connected to JACK - cannot engage record"
-msgstr ""
+msgstr "Nicht mit JACK verbunden - konnte die Aufnahme nicht starten"
 
-#: gtk2_ardour/route_ui.cc:303
+#: gtk2_ardour/route_ui.cc:314
 msgid "rec-enable change"
-msgstr ""
+msgstr "Aufnahmestatus ändern"
 
-#: gtk2_ardour/route_ui.cc:501
+#: gtk2_ardour/route_ui.cc:548
 #, fuzzy
 msgid "Solo-safe"
 msgstr "solo"
 
-#: gtk2_ardour/route_ui.cc:523
+#: gtk2_ardour/route_ui.cc:570
 msgid "Pre Fader"
-msgstr ""
+msgstr "Pre Fader"
 
-#: gtk2_ardour/route_ui.cc:530
+#: gtk2_ardour/route_ui.cc:577
 msgid "Post Fader"
-msgstr ""
+msgstr "Post Fader"
 
-#: gtk2_ardour/route_ui.cc:537
+#: gtk2_ardour/route_ui.cc:584
 msgid "Control Outs"
 msgstr ""
 
-#: gtk2_ardour/route_ui.cc:544
+#: gtk2_ardour/route_ui.cc:591
 msgid "Main Outs"
-msgstr ""
+msgstr "Main Ausgänge"
 
-#: gtk2_ardour/route_ui.cc:581
+#: gtk2_ardour/route_ui.cc:628
 msgid "mix group solo  change"
-msgstr ""
+msgstr "Mixergruppe Solo-Status ändern"
 
-#: gtk2_ardour/route_ui.cc:620
+#: gtk2_ardour/route_ui.cc:667
 msgid "mix group mute change"
-msgstr ""
+msgstr "Mixergruppe Mute-Status ändern"
 
-#: gtk2_ardour/route_ui.cc:637
+#: gtk2_ardour/route_ui.cc:684
 msgid "mix group rec-enable change"
-msgstr ""
+msgstr "Mixergruppe Aufnahmestatus ändern"
 
-#: gtk2_ardour/route_ui.cc:655
-#: gtk2_ardour/visual_time_axis.cc:242
+#: gtk2_ardour/route_ui.cc:702
+#: gtk2_ardour/visual_time_axis.cc:241
 msgid "ardour: color selection"
 msgstr "ardour: Farbe auswählen"
 
-#: gtk2_ardour/route_ui.cc:731
+#: gtk2_ardour/route_ui.cc:778
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "\n"
@@ -5924,9 +5996,10 @@ msgid ""
 msgstr ""
 "Wollen Sie wirklich die Spur \"%1\" löschen?\n"
 "\n"
-"Sie werden auch die Wiedergabeliste, die diese Spur benutzt verlieren.(Dies kann nicht rückgängig gemacht werden!)"
+"Sie werden auch die Wiedergabeliste, die diese Spur benutzt verlieren.\n"
+"(Dies kann nicht rückgängig gemacht werden!)"
 
-#: gtk2_ardour/route_ui.cc:733
+#: gtk2_ardour/route_ui.cc:780
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
 "(cannot be undone)"
@@ -5934,270 +6007,273 @@ msgstr ""
 "Wollen Sie den Bus \"%1\" wirklich löschen?\n"
 "(Dies kann nicht rückgängig gemacht werden!)"
 
-#: gtk2_ardour/route_ui.cc:737
-#: gtk2_ardour/visual_time_axis.cc:284
+#: gtk2_ardour/route_ui.cc:784
+#: gtk2_ardour/visual_time_axis.cc:283
 msgid "Yes, remove it."
 msgstr "Ja, entfernen."
 
-#: gtk2_ardour/route_ui.cc:758
+#: gtk2_ardour/route_ui.cc:805
 msgid "New Name: "
 msgstr "Neuer Name: "
 
-#: gtk2_ardour/sfdb_ui.cc:61
+#: gtk2_ardour/sfdb_ui.cc:63
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: gtk2_ardour/sfdb_ui.cc:67
+#: gtk2_ardour/sfdb_ui.cc:69
 msgid "Soundfile Info"
 msgstr "Eigenschaften der Audiodatei"
 
-#: gtk2_ardour/sfdb_ui.cc:70
+#: gtk2_ardour/sfdb_ui.cc:72
 msgid "comma seperated tags"
 msgstr "Stichworte (durch Komma getrennt)"
 
-#: gtk2_ardour/sfdb_ui.cc:128
+#: gtk2_ardour/sfdb_ui.cc:130
 msgid "Length: n/a"
 msgstr "Länge: n/a"
 
-#: gtk2_ardour/sfdb_ui.cc:129
+#: gtk2_ardour/sfdb_ui.cc:131
 msgid "Format: n/a"
 msgstr "Format: n/a"
 
-#: gtk2_ardour/sfdb_ui.cc:130
+#: gtk2_ardour/sfdb_ui.cc:132
 msgid "Channels: n/a"
 msgstr "Channels: n/a"
 
-#: gtk2_ardour/sfdb_ui.cc:131
+#: gtk2_ardour/sfdb_ui.cc:133
 msgid "Samplerate: n/a"
 msgstr "Samplerate: n/a"
 
-#: gtk2_ardour/sfdb_ui.cc:132
+#: gtk2_ardour/sfdb_ui.cc:134
 msgid "Timecode: n/a"
 msgstr "Timecode: n/a"
 
-#: gtk2_ardour/sfdb_ui.cc:142
+#: gtk2_ardour/sfdb_ui.cc:144
 msgid "Length: %1"
 msgstr "Länge: %1"
 
-#: gtk2_ardour/sfdb_ui.cc:144
+#: gtk2_ardour/sfdb_ui.cc:146
 msgid "Channels: %1"
 msgstr "Kanäle: %1"
 
-#: gtk2_ardour/sfdb_ui.cc:145
+#: gtk2_ardour/sfdb_ui.cc:147
 msgid "Samplerate: %1"
 msgstr "Samplerate: %1"
 
-#: gtk2_ardour/sfdb_ui.cc:146
+#: gtk2_ardour/sfdb_ui.cc:148
 msgid "Timecode: %1"
 msgstr "Timecode: %1"
 
-#: gtk2_ardour/sfdb_ui.cc:186
+#: gtk2_ardour/sfdb_ui.cc:188
 msgid "Could not read file: %1 (%2)."
 msgstr "Konnte Datei nicht lesen: %1 (%2)."
 
-#: gtk2_ardour/sfdb_ui.cc:204
+#: gtk2_ardour/sfdb_ui.cc:206
 msgid "Could not access soundfile: "
 msgstr "Konnte auf Audiodatei nicht zugreifen: "
 
-#: gtk2_ardour/sfdb_ui.cc:253
+#: gtk2_ardour/sfdb_ui.cc:255
 msgid "SoundFileBox: Could not tokenize string: "
 msgstr ""
 
-#: gtk2_ardour/sfdb_ui.cc:273
+#: gtk2_ardour/sfdb_ui.cc:275
 msgid "Add to Region list"
 msgstr "Zur Liste der Regionen hinzufügen"
 
-#: gtk2_ardour/sfdb_ui.cc:274
+#: gtk2_ardour/sfdb_ui.cc:276
 msgid "Add to selected Track(s)"
 msgstr "Zu ausgewählten Spuren hinzufügen"
 
-#: gtk2_ardour/sfdb_ui.cc:275
+#: gtk2_ardour/sfdb_ui.cc:277
 msgid "Add as new Track(s)"
 msgstr "Als neue Spur(en) hinzufügen"
 
-#: gtk2_ardour/sfdb_ui.cc:276
+#: gtk2_ardour/sfdb_ui.cc:278
 msgid "Add as new Tape Track(s)"
 msgstr "Als neue Tape-Spuren hinzufügen"
 
-#: gtk2_ardour/sfdb_ui.cc:285
+#: gtk2_ardour/sfdb_ui.cc:287
 msgid "Search"
 msgstr "Suchen"
 
-#: gtk2_ardour/sfdb_ui.cc:300
+#: gtk2_ardour/sfdb_ui.cc:302
 msgid "Paths"
 msgstr "Pfade"
 
-#: gtk2_ardour/sfdb_ui.cc:302
+#: gtk2_ardour/sfdb_ui.cc:304
 msgid "Files"
 msgstr "Dateien"
 
-#: gtk2_ardour/sfdb_ui.cc:303
+#: gtk2_ardour/sfdb_ui.cc:305
 msgid "Tags"
 msgstr "Stichworte"
 
-#: gtk2_ardour/sfdb_ui.cc:362
+#: gtk2_ardour/sfdb_ui.cc:374
 msgid "SoundFileBrowser: Could not tokenize string: "
 msgstr ""
 
-#: gtk2_ardour/sfdb_ui.cc:420
+#: gtk2_ardour/sfdb_ui.cc:432
 msgid "Split Channels"
 msgstr "Kanäle aufteilen"
 
-#: gtk2_ardour/sfdb_ui.cc:423
+#: gtk2_ardour/sfdb_ui.cc:435
 msgid "Create a region for each channel"
 msgstr "Erstellt aus jedem Kanal eine eigene Region"
 
-#: gtk2_ardour/sfdb_ui.cc:425
+#: gtk2_ardour/sfdb_ui.cc:437
 msgid "Embed"
 msgstr "Einbetten"
 
-#: gtk2_ardour/sfdb_ui.cc:427
+#: gtk2_ardour/sfdb_ui.cc:439
 msgid "Link to an external file"
 msgstr "Bettet eine externe Datei ein, ohne sie zu ins Verzeichnis des Projekts zu importieren"
 
-#: gtk2_ardour/sfdb_ui.cc:429
+#: gtk2_ardour/sfdb_ui.cc:441
 msgid "Import"
 msgstr "Importieren"
 
-#: gtk2_ardour/sfdb_ui.cc:431
+#: gtk2_ardour/sfdb_ui.cc:443
 msgid "Copy a file to the session folder"
 msgstr "Kopiert eine Datei in das Verzeichnis des Projekts"
 
-#: gtk2_ardour/tempo_dialog.cc:18
-#: gtk2_ardour/tempo_dialog.cc:35
-msgid "Beats per minute"
-msgstr ""
+#: gtk2_ardour/tempo_dialog.cc:17
+msgid "edit tempo"
+msgstr "Tempo bearbeiten"
 
-#: gtk2_ardour/tempo_dialog.cc:21
-#: gtk2_ardour/tempo_dialog.cc:38
-#: gtk2_ardour/tempo_dialog.cc:203
-#: gtk2_ardour/tempo_dialog.cc:221
-msgid "Bar"
-msgstr ""
-
-#: gtk2_ardour/tempo_dialog.cc:22
+#: gtk2_ardour/tempo_dialog.cc:20
 #: gtk2_ardour/tempo_dialog.cc:39
-#: gtk2_ardour/tempo_dialog.cc:204
-#: gtk2_ardour/tempo_dialog.cc:222
-msgid "Beat"
-msgstr ""
+msgid "Beats per minute"
+msgstr "Schläge pro Minute"
+
+#: gtk2_ardour/tempo_dialog.cc:23
+#: gtk2_ardour/tempo_dialog.cc:42
+#: gtk2_ardour/tempo_dialog.cc:159
+#: gtk2_ardour/tempo_dialog.cc:177
+msgid "Bar"
+msgstr "Takt"
 
 #: gtk2_ardour/tempo_dialog.cc:24
-#: gtk2_ardour/tempo_dialog.cc:41
-#: gtk2_ardour/tempo_dialog.cc:205
-#: gtk2_ardour/tempo_dialog.cc:223
-#, fuzzy
+#: gtk2_ardour/tempo_dialog.cc:43
+#: gtk2_ardour/tempo_dialog.cc:160
+#: gtk2_ardour/tempo_dialog.cc:178
+msgid "Beat"
+msgstr "Schlag"
+
+#: gtk2_ardour/tempo_dialog.cc:26
+#: gtk2_ardour/tempo_dialog.cc:45
+#: gtk2_ardour/tempo_dialog.cc:161
+#: gtk2_ardour/tempo_dialog.cc:179
 msgid "Location"
-msgstr "Stellen"
+msgstr "Position"
 
-#: gtk2_ardour/tempo_dialog.cc:199
-#: gtk2_ardour/tempo_dialog.cc:217
+#: gtk2_ardour/tempo_dialog.cc:155
+#: gtk2_ardour/tempo_dialog.cc:173
 msgid "Meter denominator"
-msgstr ""
+msgstr "Takteinteilung"
 
-#: gtk2_ardour/tempo_dialog.cc:200
-#: gtk2_ardour/tempo_dialog.cc:218
+#: gtk2_ardour/tempo_dialog.cc:156
+#: gtk2_ardour/tempo_dialog.cc:174
 msgid "Beats per bar"
-msgstr ""
+msgstr "Schläge pro Takt"
 
-#: gtk2_ardour/tempo_dialog.cc:236
-#: gtk2_ardour/tempo_dialog.cc:247
+#: gtk2_ardour/tempo_dialog.cc:192
+#: gtk2_ardour/tempo_dialog.cc:203
 msgid "whole (1)"
-msgstr ""
+msgstr "Ganze (1)"
 
-#: gtk2_ardour/tempo_dialog.cc:237
-#: gtk2_ardour/tempo_dialog.cc:249
+#: gtk2_ardour/tempo_dialog.cc:193
+#: gtk2_ardour/tempo_dialog.cc:205
 msgid "second (2)"
-msgstr ""
+msgstr "Halbe (2)"
 
-#: gtk2_ardour/tempo_dialog.cc:238
-#: gtk2_ardour/tempo_dialog.cc:251
+#: gtk2_ardour/tempo_dialog.cc:194
+#: gtk2_ardour/tempo_dialog.cc:207
 msgid "third (3)"
-msgstr ""
+msgstr "Triolen (3)"
 
-#: gtk2_ardour/tempo_dialog.cc:239
-#: gtk2_ardour/tempo_dialog.cc:253
-#: gtk2_ardour/tempo_dialog.cc:261
+#: gtk2_ardour/tempo_dialog.cc:195
+#: gtk2_ardour/tempo_dialog.cc:209
+#: gtk2_ardour/tempo_dialog.cc:217
 msgid "quarter (4)"
-msgstr ""
+msgstr "Viertel (4)"
 
-#: gtk2_ardour/tempo_dialog.cc:240
-#: gtk2_ardour/tempo_dialog.cc:255
+#: gtk2_ardour/tempo_dialog.cc:196
+#: gtk2_ardour/tempo_dialog.cc:211
 msgid "eighth (8)"
-msgstr ""
+msgstr "Achtel (8)"
 
-#: gtk2_ardour/tempo_dialog.cc:241
-#: gtk2_ardour/tempo_dialog.cc:257
+#: gtk2_ardour/tempo_dialog.cc:197
+#: gtk2_ardour/tempo_dialog.cc:213
 msgid "sixteenth (16)"
-msgstr ""
+msgstr "Sechzehntel (16)"
 
-#: gtk2_ardour/tempo_dialog.cc:242
-#: gtk2_ardour/tempo_dialog.cc:259
+#: gtk2_ardour/tempo_dialog.cc:198
+#: gtk2_ardour/tempo_dialog.cc:215
 msgid "thirty-second (32)"
-msgstr ""
+msgstr "Zweiunddreissigstel (32)"
 
-#: gtk2_ardour/tempo_dialog.cc:420
+#: gtk2_ardour/tempo_dialog.cc:376
 msgid "garbaged note type entry (%1)"
-msgstr ""
+msgstr "Fehlerhafter Notentyp (%1)"
 
-#: gtk2_ardour/tempo_dialog.cc:430
+#: gtk2_ardour/tempo_dialog.cc:386
 msgid "incomprehensible note type entry (%1)"
-msgstr ""
+msgstr "Unverständlicher Notentyp (%1)"
 
-#: gtk2_ardour/time_axis_view.cc:112
+#: gtk2_ardour/time_axis_view.cc:111
 msgid "gTortnam"
 msgstr ""
 
-#: gtk2_ardour/time_axis_view.cc:583
+#: gtk2_ardour/time_axis_view.cc:582
 msgid "Largest"
 msgstr "Am größten"
 
-#: gtk2_ardour/time_axis_view.cc:584
+#: gtk2_ardour/time_axis_view.cc:583
 msgid "Large"
 msgstr "Groß"
 
-#: gtk2_ardour/time_axis_view.cc:585
+#: gtk2_ardour/time_axis_view.cc:584
 msgid "Larger"
 msgstr "Größer"
 
-#: gtk2_ardour/time_axis_view.cc:587
+#: gtk2_ardour/time_axis_view.cc:586
 msgid "Smaller"
 msgstr "Kleiner"
 
-#: gtk2_ardour/time_axis_view.cc:588
+#: gtk2_ardour/time_axis_view.cc:587
 msgid "Small"
 msgstr "Klein"
 
-#: gtk2_ardour/time_axis_view.cc:903
+#: gtk2_ardour/time_axis_view.cc:902
 msgid "unknown track height name \"%1\" in XML GUI information"
-msgstr ""
+msgstr "Unbekannte Spurhöhe \"%1\" in der XML GUI Information"
 
-#: gtk2_ardour/time_axis_view_item.cc:79
+#: gtk2_ardour/time_axis_view_item.cc:78
 msgid "TimeAxisViewItemName"
 msgstr ""
 
-#: gtk2_ardour/time_axis_view_item.cc:302
+#: gtk2_ardour/time_axis_view_item.cc:327
 msgid "new duration %1 frames is out of bounds for %2"
-msgstr ""
+msgstr "Neue Dauer %1 Frames ist außerhalb des erlaubten Bereichs %2"
 
-#: gtk2_ardour/time_selection.cc:41
+#: gtk2_ardour/time_selection.cc:40
 msgid "programming error: request for non-existent audio range (%1)!"
-msgstr ""
+msgstr "Programmierfehler: request for non-existent audio range (%1)!"
 
-#: gtk2_ardour/utils.cc:118
-#: gtk2_ardour/utils.cc:161
+#: gtk2_ardour/utils.cc:117
+#: gtk2_ardour/utils.cc:160
 msgid "bad XPM header %1"
-msgstr ""
+msgstr "Fehlerhafter XPM Header %1"
 
-#: gtk2_ardour/utils.cc:285
+#: gtk2_ardour/utils.cc:299
 msgid "missing RGBA style for \"%1\""
-msgstr ""
+msgstr "Fehlender RGBA Style für \"%1\""
 
-#: gtk2_ardour/utils.cc:467
+#: gtk2_ardour/utils.cc:481
 msgid "cannot find icon image for %1"
-msgstr ""
+msgstr "Konnte Icon-Bild für %1 nicht finden"
 
-#: gtk2_ardour/visual_time_axis.cc:281
+#: gtk2_ardour/visual_time_axis.cc:280
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "(cannot be undone)"
@@ -6205,100 +6281,94 @@ msgstr ""
 "Wollen Sie wirklich die Spur \"%1\" löschen?\n"
 "(Kann nicht rückgängig gemacht werden!)"
 
-#: gtk2_ardour/visual_time_axis.cc:330
+#: gtk2_ardour/visual_time_axis.cc:329
 msgid "new name: "
 msgstr "Neuer Name: "
 
-#: gtk2_ardour/connection_editor.cc:51
+#: gtk2_ardour/connection_editor.cc:50
 msgid "ardour: connections"
 msgstr "ardour: Verbindungen"
 
-#: gtk2_ardour/connection_editor.cc:52
+#: gtk2_ardour/connection_editor.cc:51
 msgid "Input Connections"
 msgstr "Verbindungen der Eingänge"
 
-#: gtk2_ardour/connection_editor.cc:53
+#: gtk2_ardour/connection_editor.cc:52
 msgid "Output Connections"
 msgstr "Verbindungen der Ausgänge"
 
-#: gtk2_ardour/connection_editor.cc:54
+#: gtk2_ardour/connection_editor.cc:53
 msgid "New Input"
 msgstr "Neuer Eingang"
 
-#: gtk2_ardour/connection_editor.cc:55
+#: gtk2_ardour/connection_editor.cc:54
 msgid "New Output"
 msgstr "Neuer Ausgang"
 
-#: gtk2_ardour/connection_editor.cc:58
-#: gtk2_ardour/connection_editor.cc:101
+#: gtk2_ardour/connection_editor.cc:57
+#: gtk2_ardour/connection_editor.cc:100
 msgid "Add Port"
 msgstr "Port hinzufügen"
 
-#: gtk2_ardour/connection_editor.cc:106
+#: gtk2_ardour/connection_editor.cc:105
 msgid "Available Ports"
 msgstr "Verfügbare Verbindungen"
 
-#: gtk2_ardour/connection_editor.cc:501
-#, fuzzy
+#: gtk2_ardour/connection_editor.cc:500
 msgid "Connection \""
-msgstr "Verbindungen"
+msgstr "Verbindung \""
 
-#: gtk2_ardour/connection_editor.cc:503
+#: gtk2_ardour/connection_editor.cc:502
 msgid "\""
 msgstr ""
 
-#: gtk2_ardour/connection_editor.cc:532
+#: gtk2_ardour/connection_editor.cc:531
 #, c-format
 msgid "in %d"
 msgstr ""
 
-#: gtk2_ardour/connection_editor.cc:534
-#, fuzzy, c-format
+#: gtk2_ardour/connection_editor.cc:533
+#, c-format
 msgid "out %d"
-msgstr "Nur %1"
-
-#: gtk2_ardour/connection_editor.cc:658
-#, fuzzy
-msgid "Name for new connection:"
-msgstr "Name für Region:"
-
-#: gtk2_ardour/analysis_window.cc:46
-msgid "analysis window"
 msgstr ""
 
+#: gtk2_ardour/connection_editor.cc:657
+msgid "Name for new connection:"
+msgstr "Name für neue Verbindung:"
+
+#: gtk2_ardour/analysis_window.cc:45
+msgid "analysis window"
+msgstr "Analysefenster"
+
+#: gtk2_ardour/analysis_window.cc:47
+msgid "Signal source"
+msgstr "Signalquelle"
+
 #: gtk2_ardour/analysis_window.cc:48
-msgid "Signal source"
-msgstr ""
+msgid "Selected ranges"
+msgstr "Ausgewählte Bereiche"
 
 #: gtk2_ardour/analysis_window.cc:49
-#, fuzzy
-msgid "Selected ranges"
-msgstr "Ausgewählten Bereich wiedergeben"
-
-#: gtk2_ardour/analysis_window.cc:50
-#, fuzzy
 msgid "Selected regions"
-msgstr "Auswahl zu Schleife machen"
+msgstr "Ausgewählte Regionen"
+
+#: gtk2_ardour/analysis_window.cc:51
+msgid "Display model"
+msgstr "Anzeigetyp"
 
 #: gtk2_ardour/analysis_window.cc:52
-#, fuzzy
-msgid "Display model"
-msgstr "Anzeige"
+msgid "Composite graphs for each track"
+msgstr "Graphen für jede Spur einzeln"
 
 #: gtk2_ardour/analysis_window.cc:53
-msgid "Composite graphs for each track"
-msgstr ""
-
-#: gtk2_ardour/analysis_window.cc:54
 msgid "Composite graph of all tracks"
-msgstr ""
+msgstr "Graphen aller Spuren zusammenfassen"
 
-#: gtk2_ardour/analysis_window.cc:63
+#: gtk2_ardour/analysis_window.cc:62
 msgid "Track"
 msgstr "Spur"
 
-#: gtk2_ardour/analysis_window.cc:131
-#, fuzzy
+#: gtk2_ardour/analysis_window.cc:130
 msgid "Analyze data"
-msgstr "Bereich"
+msgstr "Daten analysieren"
 
diff --git a/gtk2_ardour/po/el_GR.po b/gtk2_ardour/po/el_GR.po
index 4a6545d282..14a9fef928 100644
--- a/gtk2_ardour/po/el_GR.po
+++ b/gtk2_ardour/po/el_GR.po
@@ -1,19 +1,19 @@
-# Σχολιαστικός Τίτλος.
-# Πνευματικά Δικαιώματα (C) YEAR Paul Davis
-# Το παρόν αρχείο διανέμεται υπό της ιδίας αδείας με του PACKAGE πακέτου.
-# ΠΡΩΤΟΣ ΔΗΜΙΟΥΡΓΟΣ <muadib@in.gr>, 2004.
+# Hellenic translations for gtk-ardour
+# Copyright (C) 2003 Paul Davis
+# This file is distributed under the same license as the gtk-ardour package.
+# Klearchos Gourgourinis <muadib@in.gr>, 2004.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.99beta23\n"
+"Project-Id-Version: gtk-ardour 0.347.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-27 13:00-0400\n"
-"PO-Revision-Date: 2005-01-11\n"
-"Last-Translator: Muadibas <EMAIL@ADDRESS>\n"
-"Language-Team: Hellenic(Greek) <LL@li.org>\n"
+"POT-Creation-Date: 2005-01-11 13:00+0200\n"
+"PO-Revision-Date: 2007-04-11 02:27+0200\n"
+"Language-Team: Hellenic\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Last-Translator: Klearchos Gourgourinis <muadib@in.gr>\n"
 
 #: about.cc:120
 msgid "Paul Davis"
@@ -22,7 +22,7 @@ msgstr ""
 #: about.cc:121
 #, fuzzy
 msgid "Jesse Chappell"
-msgstr "Επιλογή όλων"
+msgstr ""
 
 #: about.cc:122
 msgid "Taybin Rutkin"
@@ -147,6 +147,12 @@ msgid ""
 "\t Igor Blinov <pitstop@nm.ru>\n"
 msgstr ""
 
+#: about.cc:154
+msgid ""
+"Hellenic:\n"
+"\t Klearchos Gourgourinis <muadib@in.gr>\n"
+msgstr ""
+
 #: about.cc:181
 #, fuzzy
 msgid "Copyright (C) 1999-2005 Paul Davis\n"
@@ -183,16 +189,19 @@ msgid "ardour: add track/bus"
 msgstr "ardour: Εισαγωγή καναλιού/διαύλου"
 
 #. path = "1"
-#: add_route_dialog.cc:63 editor_route_list.cc:73
+#: add_route_dialog.cc:63
+#: editor_route_list.cc:73
 msgid "Tracks"
 msgstr "Κανάλια"
 
 #. path = "0"
-#: add_route_dialog.cc:64 editor_route_list.cc:70
+#: add_route_dialog.cc:64
+#: editor_route_list.cc:70
 msgid "Busses"
 msgstr "Δίαυλοι"
 
-#: add_route_dialog.cc:96 plugin_ui.cc:833
+#: add_route_dialog.cc:96
+#: plugin_ui.cc:833
 msgid "Add"
 msgstr "Πρόσθεση"
 
@@ -205,24 +214,24 @@ msgstr "Όνομα (προσχέδιο)"
 msgid "Channel Configuration"
 msgstr "Διάταξη"
 
-#: add_route_dialog.cc:177 editor.cc:134 editor.cc:3688 time_axis_view.cc:552
+#: add_route_dialog.cc:177
+#: editor.cc:134
+#: editor.cc:3688
+#: time_axis_view.cc:552
 msgid "Normal"
 msgstr "Κανονικό"
 
 #: add_route_dialog.cc:179
-#, fuzzy
 msgid "Tape"
-msgstr "Αρχή:"
+msgstr ""
 
 #: add_route_dialog.cc:196
-#, fuzzy
 msgid "Mono"
-msgstr "mono"
+msgstr ""
 
 #: add_route_dialog.cc:198
-#, fuzzy
 msgid "Stereo"
-msgstr "stereo"
+msgstr ""
 
 #. preroll stuff
 #: ardour_ui.cc:106
@@ -243,11 +252,10 @@ msgstr ""
 
 #. transport
 #: ardour_ui.cc:115
-#, fuzzy
 msgid ""
 "time\n"
 "master"
-msgstr "JACK master χρόνου"
+msgstr ""
 
 #: ardour_ui.cc:117
 msgid "% "
@@ -317,6 +325,11 @@ msgid ""
 "\n"
 "\"Just quit\" option."
 msgstr ""
+"Ο Ardour δεν μπόρεσε να αποθηκεύσει τη συνεδρία.\n"
+"\n"
+"Αν ακόμα επιθυμείτε να βγείτε, πατήστε την\n"
+"\n"
+"επιλογή \"Μόνο Έξοδος\"."
 
 #: ardour_ui.cc:403
 msgid "ardour: save session?"
@@ -324,11 +337,11 @@ msgstr "ardour: αποθήκευση συνεδρίας;"
 
 #: ardour_ui.cc:410
 msgid "Don't %1"
-msgstr "Μη %1"
+msgstr "ΟΧΙ %1"
 
 #: ardour_ui.cc:412
 msgid "Just %1"
-msgstr "Απλά %1"
+msgstr "Μόνο %1"
 
 #: ardour_ui.cc:414
 msgid "Save and %1"
@@ -368,9 +381,9 @@ msgid "Prompter"
 msgstr "Υποβολέας"
 
 #: ardour_ui.cc:503
-#, fuzzy, c-format
+#, c-format
 msgid "disconnected"
-msgstr "Αποσύνδεση"
+msgstr "Αποσυνδέθηκε"
 
 #: ardour_ui.cc:510
 #, fuzzy, c-format
@@ -405,10 +418,10 @@ msgstr "χώρος: %02dh:%02dm:%02ds"
 msgid "programming error: impossible control method"
 msgstr "Σφάλμα προγραμματισμού: Μη-πιθανή μέθοδος ελέγχου"
 
-#: ardour_ui.cc:741 new_session_dialog.cc:294
-#, fuzzy
+#: ardour_ui.cc:741
+#: new_session_dialog.cc:294
 msgid "Recent Sessions"
-msgstr "Άνοιγμα συνεδρίας"
+msgstr "Πρόσφατες συνεδρίες"
 
 #. ardour sessions are folders
 #: ardour_ui.cc:834
@@ -416,9 +429,8 @@ msgid "open session"
 msgstr "Άνοιγμα συνεδρίας"
 
 #: ardour_ui.cc:840
-#, fuzzy
 msgid "Ardour sessions"
-msgstr "ardour_νέα_συνεδρία"
+msgstr "Ardour συνεδρίες"
 
 #: ardour_ui.cc:873
 msgid "Patience is a virtue.\n"
@@ -443,6 +455,10 @@ msgid ""
 "You should save Ardour, exit and\n"
 "restart JACK with more ports."
 msgstr ""
+"Ανεπαρκείς διαθέσιμες θύρες του JACK\n"
+"για δημιουργία νέου καναλιού ή διαύλου.\n"
+"Αποθηκεύστε τη συνεδρία, τερματίστε το Ardour\n"
+"και επανεκκινήστε το JACK με περισσότερες θύρες."
 
 #: ardour_ui.cc:1036
 msgid ""
@@ -450,9 +466,11 @@ msgid ""
 "before trying to record.\n"
 "Check the Session menu."
 msgstr ""
+"Παρακαλώ δημιουργήστε 1 ή περισότερα\n"
+"κανάλια πριν προσπαθήστε να ηχογραφήσετε.\n"
+"Κοιτάξτε στο μενού 'Συνεδρία'."
 
 #: ardour_ui.cc:1265
-#, fuzzy
 msgid ""
 "JACK has either been shutdown or it\n"
 "disconnected Ardour because Ardour\n"
@@ -461,34 +479,34 @@ msgid ""
 msgstr ""
 "Ή ο JACK απενεργοποιήθηκε ή αυτός\n"
 "αποσύνδεσε το Ardour διότι το Ardour\n"
-"δεν ήταν αρκετά γρήγορο. Καλύτερα να αποθηκεύσετε τη\n"
-"συνεδρία και να επανακινήσετε και τον JACK και το Ardour."
+"δεν ήταν αρκετά γρήγορο. Μπορείτε να αποθηκεύσετε\n"
+"τη συνεδρία και/ή να επανακινήσετε το JACK."
 
 #: ardour_ui.cc:1282
 msgid "Unable to create all required ports"
-msgstr ""
+msgstr "Ανικανότητα δημιουργίας των επιθυμητών θυρών"
 
 #: ardour_ui.cc:1290
-#, fuzzy
 msgid "Unable to start the session running"
-msgstr "Αρχή της συνεδρίας"
+msgstr "Σφάλμα στην έναρξη της συνεδρίας"
 
 #: ardour_ui.cc:1426
 msgid "No Stream"
 msgstr "Δεν υπάρχει ροή(No stream)"
 
-#: ardour_ui.cc:1453 ardour_ui.cc:1472
+#: ardour_ui.cc:1453
+#: ardour_ui.cc:1472
 msgid "none"
 msgstr "Κανένα"
 
-#: ardour_ui.cc:1462 ardour_ui.cc:1481
+#: ardour_ui.cc:1462
+#: ardour_ui.cc:1481
 msgid "off"
 msgstr "εκτός"
 
 #: ardour_ui.cc:1505
-#, fuzzy
 msgid "Name of New Snapshot"
-msgstr "Όνομα για στιγμιότυπο"
+msgstr "Όνομα νέου στιγμιοτύπου"
 
 #: ardour_ui.cc:1651
 msgid "Name for mix template:"
@@ -503,14 +521,17 @@ msgid ""
 "You do not have write access to this session.\n"
 "This prevents the session from being loaded."
 msgstr ""
+"Δεν έχετε πρόσβαση εγγραφής σε αυτή τη συνεδρία.\n"
+"Η συνεδρία δεν θα ανοιχτεί."
 
-#: ardour_ui.cc:1822 ardour_ui.cc:1877
+#: ardour_ui.cc:1822
+#: ardour_ui.cc:1877
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
 msgstr "Η Συνεδρία \"%1 (στιγμιότυπο %2)\" δεν φορτώθηκε επιτυχώς"
 
 #: ardour_ui.cc:1933
 msgid "No audio files were ready for cleanup"
-msgstr ""
+msgstr "Δεν υπάρχει αρχείο ήχου για εκκαθάριση"
 
 #: ardour_ui.cc:1937
 msgid ""
@@ -519,32 +540,40 @@ msgid ""
 "These may still include regions that\n"
 "require some unused files to continue to exist."
 msgstr ""
+"Αν σας φαίνεται παράξενο,\n"
+"κοιτάξτε για τυχόν στιγμιότυπα,\n"
+"τα οποία μπορεί να έχουν περιοχές που\n"
+"χρειάζονται κάποια αρχεία που δεν\n"
+"χρησιμοποιούνται αλλού."
 
 #: ardour_ui.cc:1946
 msgid "ardour: cleanup"
 msgstr "ardour: εκκαθάριση"
 
-#: ardour_ui.cc:1982 ardour_ui.cc:1988
-#, fuzzy
+#: ardour_ui.cc:1982
+#: ardour_ui.cc:1988
 msgid "files were"
-msgstr "αρχεία"
+msgstr "αρχεία ήταν"
 
-#: ardour_ui.cc:1984 ardour_ui.cc:1990
-#, fuzzy
+#: ardour_ui.cc:1984
+#: ardour_ui.cc:1990
 msgid "file was"
-msgstr "αρχεία"
+msgstr "αρχείο ήταν"
 
 #: ardour_ui.cc:2031
 msgid "Are you sure you want to cleanup?"
-msgstr ""
+msgstr "Στ'αλήθεια θέλετε να κάνετε εκκαθάριση?"
 
 #: ardour_ui.cc:2036
 msgid ""
 "Cleanup is a destructive operation.\n"
 "ALL undo/redo information will be lost if you cleanup.\n"
-"After cleanup, unused audio files will be moved to a \"dead sounds\" "
-"location."
+"After cleanup, unused audio files will be moved to a \"dead sounds\" location."
 msgstr ""
+"Η εκκαθάριση είναι καταστροφική διαδικασία.\n"
+"ΟΛΕΣ οι undo/redo πληροφορίες θα χαθούν.\n"
+"Μετά την εκκαθάριση, τα άχρηστα αρχεία μεταφέρονται στην\n"
+"\"dead sounds\" τοποθεσία."
 
 #: ardour_ui.cc:2042
 #, fuzzy
@@ -566,7 +595,6 @@ msgid "cleaned files"
 msgstr "καθαρισμένα αρχεία"
 
 #: ardour_ui.cc:2066
-#, fuzzy
 msgid ""
 "The following %1 %2 not in use and \n"
 "have been moved to:\n"
@@ -576,23 +604,25 @@ msgid ""
 "release an additional\n"
 "%4 %5bytes of disk space.\n"
 msgstr ""
-"Τα ακόλουθα %1 %2 δεν χρησιμοποιούνταν.\n"
-"Την επόμενη φορά που θα αδειάσετε τον κάδο\n"
-"θα ελευθερωθούν %3 %4bytes\n"
-"χώρου στο δίσκο"
+"Τα ακόλουθα %1 %2 δεν χρησιμοποιούνταν και\n"
+"εστάλησαν στο:%3\n"
+"Αν αδειάσετε τον κάδο\n"
+"θα ελευθερωθούν %4 %5bytes\n"
+"στο δίσκο.\n"
 
 #: ardour_ui.cc:2091
 msgid "deleted file"
 msgstr "διαγραμμένα αρχεία"
 
 #: ardour_ui.cc:2092
-#, fuzzy
 msgid ""
 "The following %1 %2 deleted from\n"
 "%3,\n"
 "releasing %4 %5bytes of disk space"
 msgstr ""
-"Τα ακόλουθα %1 file%2 διεγράφησαν, ελευθερώνοντας %3 %4bytes χώρου στο δίσκο"
+"Τα ακόλουθα %1 file%2 διεγράφησαν από\n"
+"%3,\n"
+"ελευθερώνοντας %4 %5bytes χώρου στο δίσκο"
 
 #: ardour_ui.cc:2215
 msgid "Recording was stopped because your system could not keep up."
@@ -606,6 +636,11 @@ msgid ""
 "Specifically, it failed to write data to disk\n"
 "quickly enough to keep up with recording.\n"
 msgstr ""
+"Το σύστημα δίσκων στον υπολογιστή σας\n"
+"δεν μπόρεσε να προλάβει το Ardour.\n"
+"\n"
+"Συγκεκριμένα, απέτυχε να γράψει δεδομένα\n"
+"αρκετά γρήγορα για να προλάβει την ηχογράφηση.\n"
 
 #: ardour_ui.cc:2257
 msgid ""
@@ -615,6 +650,11 @@ msgid ""
 "Specifically, it failed to read data from disk\n"
 "quickly enough to keep up with playback.\n"
 msgstr ""
+"Οι δίσκοι στον υπολογιστή σας\n"
+"δεν μπόρεσαν να προλάβουν το Ardour.\n"
+"\n"
+"Συγκεκριμένα, απέτυχε να διαβάσει δεδομένα\n"
+"αρκετά γρήγορα για να προλάβει την αναπαραγωγή.\n"
 
 #: ardour_ui.cc:2283
 msgid ""
@@ -626,24 +666,28 @@ msgid ""
 "you, or it can ignore it. Please decide\n"
 "what you would like to do.\n"
 msgstr ""
+"Η συνεδρία ήταν εν μέσω ηχογραφήσεως\n"
+"όταν ο υπολογιστής έσβησε.\n"
+"\n"
+"Το Ardour μπορεί να ανακαλέσει τυχον\n"
+"ηχογραφημένα αρχεία, ή να τα αγνοήσει.\n"
+"Παρακαλώ αποφασίστε τί θέλετε να κάνετε.\n"
 
 #: ardour_ui.cc:2293
 msgid "Recover from crash"
-msgstr ""
+msgstr "Ανάκληση από 'κρασάρισμα'"
 
 #: ardour_ui.cc:2294
 msgid "Ignore crash data"
-msgstr ""
+msgstr "Διαγραφή τυχόν δεδομένων"
 
 #: ardour_ui.cc:2312
-#, fuzzy
 msgid "Could not disconnect from JACK"
-msgstr "Δεν γινόταν να συνδεθώ στον JACK server σαν  \"%1\""
+msgstr "Αποσύνδεση απ'το JACK είναι αδύνατη"
 
 #: ardour_ui.cc:2325
-#, fuzzy
 msgid "Could not reconnect to JACK"
-msgstr "Δεν γινόταν να συνδεθώ στον JACK server σαν  \"%1\""
+msgstr "Επανασύνδεση στο JACK αδύνατη"
 
 #: ardour_ui2.cc:60
 msgid "UI: cannot setup editor"
@@ -718,22 +762,21 @@ msgid "Enable/Disable audio click"
 msgstr "Άρση/Παύση μετρονόμου"
 
 #: ardour_ui2.cc:303
-#, fuzzy
 msgid "Positional sync source"
-msgstr "Τοποθεσιακό Sync"
+msgstr ""
 
 #: ardour_ui2.cc:304
 msgid "Does Ardour control the time?"
-msgstr ""
+msgstr "Ελέγχει το χρόνο το Ardour?"
 
 #: ardour_ui2.cc:305
 msgid "Shuttle speed control"
 msgstr "Έλεγχος ταχύτητας Shuttle"
 
 #: ardour_ui2.cc:306
-#, fuzzy, c-format
+#, c-format
 msgid "Select semitones or %%-age for speed display"
-msgstr "Επιλογή ημιτονίων ή %- για απεικόνιση ταχύτητος"
+msgstr "Επιλογή ημιτονίων ή %%-age για απεικόνιση ταχύτητος"
 
 #: ardour_ui2.cc:307
 msgid "Current transport speed"
@@ -749,12 +792,17 @@ msgstr "Δευτερέυον ωρολόγιον"
 
 #. XXX: this should really be saved in instant.xml or something similar and restored from there
 #. Combo's are stupid - they steal space from the entry for the button
-#: ardour_ui2.cc:388 ardour_ui2.cc:833 ardour_ui2.cc:846 ardour_ui2.cc:909
+#: ardour_ui2.cc:388
+#: ardour_ui2.cc:833
+#: ardour_ui2.cc:846
+#: ardour_ui2.cc:909
 #: ardour_ui2.cc:911
 msgid "sprung"
 msgstr "έλασμα"
 
-#: ardour_ui2.cc:389 ardour_ui2.cc:835 ardour_ui2.cc:857
+#: ardour_ui2.cc:389
+#: ardour_ui2.cc:835
+#: ardour_ui2.cc:857
 msgid "wheel"
 msgstr "τροχός"
 
@@ -763,35 +811,41 @@ msgid "ardour: clock"
 msgstr "ardour: Ωρολόγιον"
 
 #: ardour_ui2.cc:596
-#, fuzzy
 msgid "Maximum speed"
-msgstr "μεταβλητή ταχύτητα"
+msgstr "μέγιστη ταχύτητα"
 
 #: ardour_ui2.cc:823
 msgid "st"
 msgstr "st"
 
-#: ardour_ui2.cc:867 ardour_ui2.cc:890 ardour_ui2.cc:907
+#: ardour_ui2.cc:867
+#: ardour_ui2.cc:890
+#: ardour_ui2.cc:907
 msgid "stopped"
 msgstr "παύση"
 
-#: ardour_ui_dialogs.cc:153 playlist_selector.cc:70
+#: ardour_ui_dialogs.cc:153
+#: playlist_selector.cc:70
 #, fuzzy
 msgid "close"
 msgstr "Κλείσιμο"
 
-#: ardour_ui_dialogs.cc:360 ardour_ui_ed.cc:184
-#, fuzzy
+#: ardour_ui_dialogs.cc:360
+#: ardour_ui_ed.cc:184
 msgid "Sound File Browser"
-msgstr "Βιβλιοθήκη Soundfiles"
+msgstr "Αναζήτηση Soundfiles"
 
 #. menus + submenus that need action items
 #: ardour_ui_ed.cc:72
 msgid "Session"
 msgstr "Συνεδρία"
 
-#: ardour_ui_ed.cc:73 ardour_ui_ed.cc:130 editor.cc:1836 export_dialog.cc:350
-#: export_dialog.cc:1059 export_dialog.cc:1063
+#: ardour_ui_ed.cc:73
+#: ardour_ui_ed.cc:130
+#: editor.cc:1836
+#: export_dialog.cc:350
+#: export_dialog.cc:1059
+#: export_dialog.cc:1063
 msgid "Export"
 msgstr "Εξαγωγή"
 
@@ -799,48 +853,49 @@ msgstr "Εξαγωγή"
 msgid "Cleanup"
 msgstr "Εκκαθάριση"
 
-#: ardour_ui_ed.cc:75 option_editor.cc:126
+#: ardour_ui_ed.cc:75
+#: option_editor.cc:126
 msgid "Sync"
 msgstr "Sync"
 
-#: ardour_ui_ed.cc:76 ardour_ui_ed.cc:77
-#, fuzzy
+#: ardour_ui_ed.cc:76
+#: ardour_ui_ed.cc:77
 msgid "Options"
-msgstr "Επεξ/στης Ρυθμίσεων"
+msgstr "Επιλογές"
 
 #: ardour_ui_ed.cc:78
 msgid "Help"
-msgstr ""
+msgstr "Βοήθεια!"
 
 #: ardour_ui_ed.cc:79
 msgid "KeyMouse Actions"
-msgstr ""
+msgstr "Ενέργειες ποντικιού"
 
 #: ardour_ui_ed.cc:80
-#, fuzzy
 msgid "Audio File Format"
-msgstr "Ηχητικά frames"
+msgstr ""
 
 #: ardour_ui_ed.cc:81
-#, fuzzy
 msgid "Header"
-msgstr "Προ Fader"
+msgstr ""
 
 #: ardour_ui_ed.cc:82
 msgid "Data"
-msgstr ""
+msgstr "Δεδομένα"
 
 #: ardour_ui_ed.cc:83
-#, fuzzy
 msgid "Control Surfaces"
-msgstr "Control Outs"
+msgstr "Επιφάνειες ελέγχου"
 
 #. the real actions
-#: ardour_ui_ed.cc:87 audio_time_axis.cc:1854 new_session_dialog.cc:529
+#: ardour_ui_ed.cc:87
+#: audio_time_axis.cc:1854
+#: new_session_dialog.cc:529
 msgid "New"
 msgstr "Νέο"
 
-#: ardour_ui_ed.cc:89 new_session_dialog.cc:517
+#: ardour_ui_ed.cc:89
+#: new_session_dialog.cc:517
 msgid "Open"
 msgstr "Άνοιγμα"
 
@@ -848,11 +903,14 @@ msgstr "Άνοιγμα"
 msgid "Recent"
 msgstr "Πρόσφατο"
 
-#: ardour_ui_ed.cc:91 io_selector.cc:58 io_selector.cc:792
+#: ardour_ui_ed.cc:91
+#: io_selector.cc:58
+#: io_selector.cc:792
 msgid "Close"
 msgstr "Κλείσιμο"
 
-#: ardour_ui_ed.cc:94 route_params_ui.cc:514
+#: ardour_ui_ed.cc:94
+#: route_params_ui.cc:514
 msgid "Add Track/Bus"
 msgstr "Πρόσθεση καναλιού/διαύλου"
 
@@ -874,14 +932,12 @@ msgid "Export session to audiofile..."
 msgstr "Εξαγωγή συνεδρίας σε αρχείο..."
 
 #: ardour_ui_ed.cc:122
-#, fuzzy
 msgid "Export selection to audiofile..."
-msgstr "Εξαγωγή συνεδρίας σε αρχείο..."
+msgstr "Εξαγωγή επιλογής σε ηχο-αρχείο..."
 
 #: ardour_ui_ed.cc:126
-#, fuzzy
 msgid "Export range markers to audiofile..."
-msgstr "Εξαγωγή διαστήματος σε αρχείο..."
+msgstr "Εξαγωγή διαστήματος σε audio αρχείο..."
 
 #: ardour_ui_ed.cc:133
 msgid "Cleanup unused sources"
@@ -891,7 +947,9 @@ msgstr "Εκκαθάριση αχρήστων πηγών"
 msgid "Flush wastebasket"
 msgstr "Άδειασμα κάδου"
 
-#: ardour_ui_ed.cc:141 ardour_ui_options.cc:408 ardour_ui_options.cc:417
+#: ardour_ui_ed.cc:141
+#: ardour_ui_options.cc:408
+#: ardour_ui_options.cc:417
 #: ardour_ui_options.cc:489
 msgid "JACK"
 msgstr ""
@@ -901,11 +959,12 @@ msgid "Latency"
 msgstr ""
 
 #: ardour_ui_ed.cc:144
-#, fuzzy
 msgid "Reconnect"
-msgstr "Σύνδεση"
+msgstr "Επανασύνδεση"
 
-#: ardour_ui_ed.cc:147 mixer_strip.cc:497 mixer_strip.cc:565
+#: ardour_ui_ed.cc:147
+#: mixer_strip.cc:497
+#: mixer_strip.cc:565
 msgid "Disconnect"
 msgstr "Αποσύνδεση"
 
@@ -924,26 +983,23 @@ msgstr "Έξοδος"
 #. windows visibility actions
 #: ardour_ui_ed.cc:180
 msgid "Maximise Editor Space"
-msgstr ""
+msgstr "Μεγιστοποίηση χώρου για τον Editor"
 
 #: ardour_ui_ed.cc:182
-#, fuzzy
 msgid "Show Editor"
-msgstr "Επεξεργαστής"
+msgstr "Ανάδειξη Editor"
 
 #: ardour_ui_ed.cc:183
-#, fuzzy
 msgid "Show Mixer"
-msgstr "Μίκτης"
+msgstr "Ανάδειξη Μίκτη"
 
 #: ardour_ui_ed.cc:185
 msgid "Options Editor"
 msgstr "Επεξ/στης Ρυθμίσεων"
 
 #: ardour_ui_ed.cc:186
-#, fuzzy
 msgid "Track/Bus Inspector"
-msgstr "κανάλια/δίαυλοι"
+msgstr "επιθεώρηση καναλιών/διαύλων "
 
 #: ardour_ui_ed.cc:188
 msgid "Connections"
@@ -967,34 +1023,33 @@ msgid "Colors"
 msgstr "Χρώμα"
 
 #: ardour_ui_ed.cc:197
-#, fuzzy
 msgid "Add Audio Track"
-msgstr "Πρόσθεση καναλιού/διαύλου"
+msgstr "Πρόσθεση καναλιού"
 
 #: ardour_ui_ed.cc:199
-#, fuzzy
 msgid "Add Audio Bus"
-msgstr "Απόκρυψη όλων των Ηχοδιαύλων"
+msgstr "Πρόσθεση Audio Διαύλου"
 
 #: ardour_ui_ed.cc:201
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: ardour_ui_ed.cc:203 editor_actions.cc:255
+#: ardour_ui_ed.cc:203
+#: editor_actions.cc:255
 #, fuzzy
 msgid "Remove Last Capture"
 msgstr "Απαλοιφή τελευταίας λήψης"
 
 #. do-nothing action for the "transport" menu bar item
 #: ardour_ui_ed.cc:210
-#, fuzzy
 msgid "Transport"
-msgstr "Μεταφραστές"
+msgstr ""
 
 #. these two are not used by key bindings, instead use ToggleRoll for that. these two do show up in
 #. menus and via button proxies.
 #.
-#: ardour_ui_ed.cc:216 sfdb_ui.cc:57
+#: ardour_ui_ed.cc:216
+#: sfdb_ui.cc:57
 msgid "Stop"
 msgstr "Παύση"
 
@@ -1003,13 +1058,12 @@ msgid "Roll"
 msgstr ""
 
 #: ardour_ui_ed.cc:223
-#, fuzzy
 msgid "Start/Stop"
-msgstr "Αρχή:"
+msgstr ""
 
 #: ardour_ui_ed.cc:226
 msgid "Stop + Forget Capture"
-msgstr ""
+msgstr "Stop + ξέχασε τη λήψη"
 
 #: ardour_ui_ed.cc:229
 #, fuzzy
@@ -1017,19 +1071,16 @@ msgid "Play Loop Range"
 msgstr "Επαναληπτική αναπαρ/γή διαστήματος"
 
 #: ardour_ui_ed.cc:232
-#, fuzzy
 msgid "Play Selection"
-msgstr "Αναπαρ/γή επιλεγμένης Περιοχής"
+msgstr "Αναπαρ/γή επιλογής"
 
 #: ardour_ui_ed.cc:236
-#, fuzzy
 msgid "Enable Record"
-msgstr "Εγγραφή"
+msgstr "Ενεργοποίηση Εγγραφής"
 
 #: ardour_ui_ed.cc:239
-#, fuzzy
 msgid "Rewind"
-msgstr "Περιοχή"
+msgstr ""
 
 #: ardour_ui_ed.cc:242
 msgid "Rewind (Slow)"
@@ -1040,9 +1091,8 @@ msgid "Rewind (Fast)"
 msgstr ""
 
 #: ardour_ui_ed.cc:248
-#, fuzzy
 msgid "Forward"
-msgstr "νύξη εμπρός"
+msgstr ""
 
 #: ardour_ui_ed.cc:251
 msgid "Forward (Slow)"
@@ -1057,9 +1107,8 @@ msgid "Goto Zero"
 msgstr ""
 
 #: ardour_ui_ed.cc:260
-#, fuzzy
 msgid "Goto Start"
-msgstr "Αρχή:"
+msgstr "Πήγαινε στην Αρχή"
 
 #: ardour_ui_ed.cc:263
 msgid "Goto End"
@@ -1070,35 +1119,27 @@ msgstr ""
 #. name appearance on the buttons.
 #.
 #: ardour_ui_ed.cc:272
-#, fuzzy
 msgid ""
 "Punch\n"
 "in"
 msgstr ""
-"punch\n"
-"in"
 
 #: ardour_ui_ed.cc:275
-#, fuzzy
 msgid ""
 "Punch\n"
 "out"
 msgstr ""
-"punch\n"
-"out"
 
-#: ardour_ui_ed.cc:278 option_editor.cc:129
+#: ardour_ui_ed.cc:278
+#: option_editor.cc:129
 msgid "Click"
 msgstr "Μετρονόμος"
 
 #: ardour_ui_ed.cc:281
-#, fuzzy
 msgid ""
 "Auto\n"
 "input"
 msgstr ""
-"αυτόματο\n"
-"input"
 
 #: ardour_ui_ed.cc:284
 #, fuzzy
@@ -1110,148 +1151,144 @@ msgstr ""
 "αναπαρ/γή"
 
 #: ardour_ui_ed.cc:287
-#, fuzzy
 msgid ""
 "Auto\n"
 "return"
 msgstr ""
-"αυτόματη\n"
-"επιστροφή"
 
 #: ardour_ui_ed.cc:291
-#, fuzzy
 msgid ""
 "Time\n"
 "master"
-msgstr "JACK master χρόνου"
+msgstr ""
 
 #: ardour_ui_ed.cc:294
 msgid "Toggle Record Enable Track1"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 1"
 
 #: ardour_ui_ed.cc:296
 msgid "Toggle Record Enable Track2"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 2"
 
 #: ardour_ui_ed.cc:298
 msgid "Toggle Record Enable Track3"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 3"
 
 #: ardour_ui_ed.cc:300
 msgid "Toggle Record Enable Track4"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 4"
 
 #: ardour_ui_ed.cc:302
 msgid "Toggle Record Enable Track5"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 5"
 
 #: ardour_ui_ed.cc:304
 msgid "Toggle Record Enable Track6"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 6"
 
 #: ardour_ui_ed.cc:306
 msgid "Toggle Record Enable Track7"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 7"
 
 #: ardour_ui_ed.cc:308
 msgid "Toggle Record Enable Track8"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 8"
 
 #: ardour_ui_ed.cc:310
 msgid "Toggle Record Enable Track9"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 9"
 
 #: ardour_ui_ed.cc:312
 msgid "Toggle Record Enable Track10"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 10"
 
 #: ardour_ui_ed.cc:314
 msgid "Toggle Record Enable Track11"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 11"
 
 #: ardour_ui_ed.cc:316
 msgid "Toggle Record Enable Track12"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 12"
 
 #: ardour_ui_ed.cc:318
 msgid "Toggle Record Enable Track13"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 13"
 
 #: ardour_ui_ed.cc:320
 msgid "Toggle Record Enable Track14"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 14"
 
 #: ardour_ui_ed.cc:322
 msgid "Toggle Record Enable Track15"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 15"
 
 #: ardour_ui_ed.cc:324
 msgid "Toggle Record Enable Track16"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 16"
 
 #: ardour_ui_ed.cc:326
 msgid "Toggle Record Enable Track17"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 17"
 
 #: ardour_ui_ed.cc:328
 msgid "Toggle Record Enable Track18"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 18"
 
 #: ardour_ui_ed.cc:330
 msgid "Toggle Record Enable Track19"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 19"
 
 #: ardour_ui_ed.cc:332
 msgid "Toggle Record Enable Track20"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 20"
 
 #: ardour_ui_ed.cc:334
 msgid "Toggle Record Enable Track21"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 21"
 
 #: ardour_ui_ed.cc:336
 msgid "Toggle Record Enable Track22"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 22"
 
 #: ardour_ui_ed.cc:338
 msgid "Toggle Record Enable Track23"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 23"
 
 #: ardour_ui_ed.cc:340
 msgid "Toggle Record Enable Track24"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 24"
 
 #: ardour_ui_ed.cc:342
 msgid "Toggle Record Enable Track25"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 25"
 
 #: ardour_ui_ed.cc:344
 msgid "Toggle Record Enable Track26"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 26"
 
 #: ardour_ui_ed.cc:346
 msgid "Toggle Record Enable Track27"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 27"
 
 #: ardour_ui_ed.cc:348
 msgid "Toggle Record Enable Track28"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 28"
 
 #: ardour_ui_ed.cc:350
 msgid "Toggle Record Enable Track29"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 29"
 
 #: ardour_ui_ed.cc:352
 msgid "Toggle Record Enable Track30"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 30"
 
 #: ardour_ui_ed.cc:354
 msgid "Toggle Record Enable Track31"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 31"
 
 #: ardour_ui_ed.cc:356
 msgid "Toggle Record Enable Track32"
-msgstr ""
+msgstr "Απ/Ενεργοποίηση Καναλιού 32"
 
 #: ardour_ui_ed.cc:361
 msgid "Percentage"
@@ -1270,53 +1307,44 @@ msgid "Send MMC"
 msgstr "Αποστολή MMC"
 
 #: ardour_ui_ed.cc:370
-#, fuzzy
 msgid "Use MMC"
-msgstr "Αποστολή MMC"
+msgstr ""
 
 #: ardour_ui_ed.cc:372
 msgid "Send MIDI feedback"
-msgstr ""
+msgstr "Αποστολή MIDI feedback"
 
 #: ardour_ui_ed.cc:374
-#, fuzzy
 msgid "Use MIDI control"
-msgstr "Εξωτερικός Έλεγχος MIDI"
+msgstr ""
 
 #: ardour_ui_ed.cc:377
-#, fuzzy
 msgid "Connect new track inputs to hardware"
-msgstr "Αυτο-σύνδεση νέων καναλιών"
+msgstr "Σύνδεση νέων inputs καναλιού στο hardware"
 
 #: ardour_ui_ed.cc:396
-#, fuzzy
 msgid "Connect new track outputs to hardware"
-msgstr "Αυτο-σύνδεση νέων καναλιών"
+msgstr "Σύνδεση νέων output καναλιού στο hardware"
 
 #: ardour_ui_ed.cc:398
-#, fuzzy
 msgid "Connect new track outputs to master"
-msgstr "αυτόματη σύνδεση outputs καναλιών σε master outs"
+msgstr "Σύνδεση νέων outputs καναλιου στο master"
 
 #: ardour_ui_ed.cc:400
-#, fuzzy
 msgid "Manually connect new track outputs"
-msgstr "χειροκίνητη σύνδεση των outputs των καναλιών"
+msgstr "χειροκίνητη σύνδεση νέων outputs καναλιού"
 
 #: ardour_ui_ed.cc:405
-#, fuzzy
 msgid "Hardware monitoring"
-msgstr "Χρήση Hardware Monitoring"
+msgstr ""
 
 #: ardour_ui_ed.cc:406
-#, fuzzy
 msgid "Software monitoring"
-msgstr "Χρήση Software Monitoring"
+msgstr "Software Monitoring"
 
 #: ardour_ui_ed.cc:407
-#, fuzzy
 msgid "External monitoring"
-msgstr "Εξωτερικός Έλεγχος MIDI"
+msgstr ""
 
 #. Configuration object options (i.e. not session specific)
 #: ardour_ui_ed.cc:411
@@ -1324,18 +1352,16 @@ msgid "Stop plugins with transport"
 msgstr "Λήξη των plugins με την παύση"
 
 #: ardour_ui_ed.cc:412
-#, fuzzy
 msgid "Verify remove last capture"
-msgstr "Απαλοιφή τελευταίας λήψης"
+msgstr "Επιβεβαιώστε διαγραφή τελευταίας λήψης"
 
 #: ardour_ui_ed.cc:413
 msgid "Stop recording on xrun"
 msgstr "Παύση εγγραφής στα xrun"
 
 #: ardour_ui_ed.cc:414
-#, fuzzy
 msgid "Stop transport at session end"
-msgstr "Στάση αναπαραγωγέα στο τέλος της συνεδρίας"
+msgstr "Παύση αναπαραγωγέα στο τέλος της συνεδρίας"
 
 #: ardour_ui_ed.cc:415
 msgid "-12dB gain reduce ffwd/rewind"
@@ -1343,50 +1369,52 @@ msgstr ""
 
 #: ardour_ui_ed.cc:416
 msgid "Rec-enable stays engaged at stop"
-msgstr ""
+msgstr "Το Rec-enable παραμένει ενεργό στο stop"
 
 #. session options
 #: ardour_ui_ed.cc:420
-#, fuzzy
 msgid "Do not run plugins while recording"
-msgstr "Λειτουργία plugins κατα την εγγραφή"
+msgstr "Απενεργοποίηση plugins κατα την εγγραφή"
 
 #: ardour_ui_ed.cc:423
 msgid "Latched solo"
 msgstr "Προσκολλημένο σόλο"
 
 #: ardour_ui_ed.cc:428
-#, fuzzy
 msgid "Solo in-place"
-msgstr "Σόλο"
+msgstr ""
 
 #: ardour_ui_ed.cc:430
 msgid "Solo via bus"
 msgstr "Solo μέσω διαύλου"
 
 #: ardour_ui_ed.cc:433
-#, fuzzy
 msgid "Automatically create crossfades"
-msgstr "Αυτόματο crossfade στα overlap"
+msgstr "Αυτόματη δημιουργία crossfades"
 
 #: ardour_ui_ed.cc:435
 msgid "Unmute new full crossfades"
-msgstr ""
+msgstr "Unmute νέων full crossfades"
 
-#: ardour_ui_options.cc:406 ardour_ui_options.cc:416 ardour_ui_options.cc:483
+#: ardour_ui_options.cc:406
+#: ardour_ui_options.cc:416
+#: ardour_ui_options.cc:483
 msgid "Internal"
 msgstr "Εσωτερικό"
 
-#: ardour_ui_options.cc:407 ardour_ui_options.cc:486
-#, fuzzy
+#: ardour_ui_options.cc:407
+#: ardour_ui_options.cc:486
 msgid "MTC"
-msgstr "MMC"
+msgstr ""
 
-#: audio_clock.cc:1742 editor.cc:188
+#: audio_clock.cc:1742
+#: editor.cc:188
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: audio_clock.cc:1743 editor.cc:187 editor_rulers.cc:360
+#: audio_clock.cc:1743
+#: editor.cc:187
+#: editor_rulers.cc:360
 msgid "Bars:Beats"
 msgstr "Μπάρες:Κτύποι"
 
@@ -1402,8 +1430,13 @@ msgstr "Ηχητικά frames"
 #. Slowest = 6.6dB/sec falloff at update rate of 40ms
 #. Slow    = 6.8dB/sec falloff at update rate of 40ms
 #.
-#: audio_clock.cc:1746 editor_actions.cc:375 editor_actions.cc:383
-#: gain_meter.cc:172 panner_ui.cc:89 plugin_ui.cc:392 plugin_ui.cc:635
+#: audio_clock.cc:1746
+#: editor_actions.cc:375
+#: editor_actions.cc:383
+#: gain_meter.cc:172
+#: panner_ui.cc:89
+#: plugin_ui.cc:392
+#: plugin_ui.cc:635
 msgid "Off"
 msgstr "Εκτός"
 
@@ -1432,7 +1465,9 @@ msgstr "g"
 msgid "p"
 msgstr "p"
 
-#: audio_time_axis.cc:97 automation_time_axis.cc:32 visual_time_axis.cc:74
+#: audio_time_axis.cc:97
+#: automation_time_axis.cc:32
+#: visual_time_axis.cc:74
 msgid "h"
 msgstr "h"
 
@@ -1441,28 +1476,36 @@ msgstr "h"
 msgid "a"
 msgstr "a"
 
-#: audio_time_axis.cc:99 visual_time_axis.cc:73
+#: audio_time_axis.cc:99
+#: visual_time_axis.cc:73
 msgid "v"
 msgstr "v"
 
-#: audio_time_axis.cc:168 mixer_strip.cc:86
+#: audio_time_axis.cc:168
+#: mixer_strip.cc:86
 msgid "Record"
 msgstr "Εγγραφή"
 
-#: audio_time_axis.cc:169 editor_actions.cc:37 mixer_strip.cc:86
+#: audio_time_axis.cc:169
+#: editor_actions.cc:37
+#: mixer_strip.cc:86
 msgid "Solo"
 msgstr "Σόλο"
 
-#: audio_time_axis.cc:170 editor.cc:1760 editor.cc:1859 mixer_strip.cc:86
+#: audio_time_axis.cc:170
+#: editor.cc:1760
+#: editor.cc:1859
+#: mixer_strip.cc:86
 #: panner_ui.cc:427
 msgid "Mute"
 msgstr "Σιγή"
 
 #: audio_time_axis.cc:171
 msgid "Edit Group"
-msgstr "Διαμόρφωση Ομάδας"
+msgstr "Διαμόρφωση Group"
 
-#: audio_time_axis.cc:172 visual_time_axis.cc:92
+#: audio_time_axis.cc:172
+#: visual_time_axis.cc:92
 msgid "Display Height"
 msgstr "Απεικόνιση ύψους"
 
@@ -1470,44 +1513,52 @@ msgstr "Απεικόνιση ύψους"
 msgid "Playlist"
 msgstr "Playlist"
 
-#: audio_time_axis.cc:174 audio_time_axis.cc:741
+#: audio_time_axis.cc:174
+#: audio_time_axis.cc:741
 msgid "Automation"
 msgstr "Αυτοματισμός"
 
-#: audio_time_axis.cc:175 visual_time_axis.cc:93
+#: audio_time_axis.cc:175
+#: visual_time_axis.cc:93
 msgid "Visual options"
 msgstr "Επιλογές Εμφανίσεως"
 
-#: audio_time_axis.cc:176 visual_time_axis.cc:94
+#: audio_time_axis.cc:176
+#: visual_time_axis.cc:94
 msgid "Hide this track"
 msgstr "Απόκρυψη παρόντος καναλιού"
 
-#: audio_time_axis.cc:333 mixer_strip.cc:927
+#: audio_time_axis.cc:333
+#: mixer_strip.cc:927
 msgid "No group"
-msgstr "Χωρίς ομάδα"
+msgstr "Χωρίς group"
 
-#: audio_time_axis.cc:702 automation_time_axis.cc:450
-#: imageframe_time_axis.cc:255 marker_time_axis.cc:211
+#: audio_time_axis.cc:702
+#: automation_time_axis.cc:450
+#: imageframe_time_axis.cc:255
+#: marker_time_axis.cc:211
 msgid "Height"
 msgstr "Ύψος"
 
-#: audio_time_axis.cc:703 color_manager.cc:41 imageframe_time_axis.cc:256
+#: audio_time_axis.cc:703
+#: color_manager.cc:41
+#: imageframe_time_axis.cc:256
 #: marker_time_axis.cc:212
 msgid "Color"
 msgstr "Χρώμα"
 
 #: audio_time_axis.cc:707
 msgid "Hide all crossfades"
-msgstr ""
+msgstr "Απόκρυψη όλων των crossfades"
 
 #: audio_time_axis.cc:708
 msgid "Show all crossfades"
-msgstr ""
+msgstr "Επαναφορά όλων των crossfades"
 
-#: audio_time_axis.cc:712 mixer_strip.cc:1011
-#, fuzzy
+#: audio_time_axis.cc:712
+#: mixer_strip.cc:1011
 msgid "Remote Control ID"
-msgstr "απαλοιφή σημείου ελέγχου"
+msgstr ""
 
 #: audio_time_axis.cc:718
 #, fuzzy
@@ -1525,14 +1576,12 @@ msgid "Hide all automation"
 msgstr "Κρύψιμο όλων των αυτοματισμών"
 
 #: audio_time_axis.cc:729
-#, fuzzy
 msgid "Fader"
-msgstr "Fades"
+msgstr ""
 
 #: audio_time_axis.cc:734
-#, fuzzy
 msgid "Pan"
-msgstr "pan"
+msgstr ""
 
 #: audio_time_axis.cc:739
 msgid "Plugins"
@@ -1555,28 +1604,34 @@ msgid "Waveform"
 msgstr "Κυματομορφή"
 
 #: audio_time_axis.cc:771
-#, fuzzy
 msgid "Align with existing material"
-msgstr "Υπάρχον υλικό"
+msgstr "Ευθυγράμμιση με το υπάρχον υλικό"
 
 #: audio_time_axis.cc:776
-#, fuzzy
 msgid "Align with capture time"
-msgstr "Χρόνος Λήψεως"
+msgstr "Ευθυγράμμιση με το χρόνο λήψεως"
 
 #: audio_time_axis.cc:782
 #, fuzzy
 msgid "Alignment"
 msgstr "Ευθυγράμμιση"
 
-#: audio_time_axis.cc:788 editor.cc:527 editor_actions.cc:60
-#: mixer_strip.cc:1000 mixer_ui.cc:111
+#: audio_time_axis.cc:788
+#: editor.cc:527
+#: editor_actions.cc:60
+#: mixer_strip.cc:1000
+#: mixer_ui.cc:111
 msgid "Active"
 msgstr "Ενεργό"
 
-#: audio_time_axis.cc:793 editor.cc:1922 editor_actions.cc:320
-#: editor_markers.cc:508 imageframe_time_axis.cc:259 location_ui.cc:57
-#: marker_time_axis.cc:215 mixer_strip.cc:1014
+#: audio_time_axis.cc:793
+#: editor.cc:1922
+#: editor_actions.cc:320
+#: editor_markers.cc:508
+#: imageframe_time_axis.cc:259
+#: location_ui.cc:57
+#: marker_time_axis.cc:215
+#: mixer_strip.cc:1014
 msgid "Remove"
 msgstr "Απαλοιφή"
 
@@ -1584,23 +1639,34 @@ msgstr "Απαλοιφή"
 msgid "Name for playlist"
 msgstr "Όνομα για playlist"
 
-#: audio_time_axis.cc:835 audio_time_axis.cc:1851 editor_markers.cc:827
-#: editor_mouse.cc:4673 imageframe_time_axis.cc:248 marker_time_axis.cc:208
-#: meter_bridge_strip.cc:224 mixer_strip.cc:998 redirect_box.cc:751
-#: redirect_box.cc:1065 route_ui.cc:739 visual_time_axis.cc:326
+#: audio_time_axis.cc:835
+#: audio_time_axis.cc:1851
+#: editor_markers.cc:827
+#: editor_mouse.cc:4673
+#: imageframe_time_axis.cc:248
+#: marker_time_axis.cc:208
+#: meter_bridge_strip.cc:224
+#: mixer_strip.cc:998
+#: redirect_box.cc:751
+#: redirect_box.cc:1065
+#: route_ui.cc:739
+#: visual_time_axis.cc:326
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: audio_time_axis.cc:868 audio_time_axis.cc:908
+#: audio_time_axis.cc:868
+#: audio_time_axis.cc:908
 #, fuzzy
 msgid "Name for Playlist"
 msgstr "Όνομα για playlist"
 
-#: audio_time_axis.cc:1126 visual_time_axis.cc:383
+#: audio_time_axis.cc:1126
+#: visual_time_axis.cc:383
 msgid "a track already exists with that name"
 msgstr "Κανάλι με αυτό το όνομα ήδη υπάρχει"
 
-#: audio_time_axis.cc:1167 editor.cc:218
+#: audio_time_axis.cc:1167
+#: editor.cc:218
 msgid "gain"
 msgstr "gain"
 
@@ -1608,7 +1674,9 @@ msgstr "gain"
 msgid "pan"
 msgstr "pan"
 
-#: audio_time_axis.cc:1410 editor.cc:1483 selection.cc:634
+#: audio_time_axis.cc:1410
+#: editor.cc:1483
+#: selection.cc:634
 msgid "programming error: "
 msgstr "σφάλμα προγραμματισμού: "
 
@@ -1624,7 +1692,9 @@ msgstr "Νέο αντίγραφο"
 msgid "Clear Current"
 msgstr "Εκκαθάριση τρέχοντος"
 
-#: audio_time_axis.cc:1859 editor.cc:2024 editor.cc:2100
+#: audio_time_axis.cc:1859
+#: editor.cc:2024
+#: editor.cc:2100
 msgid "Select"
 msgstr "Επιλογή"
 
@@ -1636,59 +1706,74 @@ msgstr "μετακίνηση συμβάντος αυτοματισμού"
 msgid "automation range drag"
 msgstr "έλξη διαστήματος αυτοματισμού"
 
-#: automation_line.cc:1015 region_gain_line.cc:62
+#: automation_line.cc:1015
+#: region_gain_line.cc:62
 msgid "remove control point"
 msgstr "απαλοιφή σημείου ελέγχου"
 
-#: automation_time_axis.cc:33 editor_ops.cc:2885
+#: automation_time_axis.cc:33
+#: editor_ops.cc:2885
 msgid "clear"
 msgstr "εκκαθάριση"
 
 #: automation_time_axis.cc:75
 msgid "track height"
-msgstr ""
+msgstr "Υψος track"
 
 #: automation_time_axis.cc:76
-#, fuzzy
 msgid "automation state"
-msgstr "Κατάσταση αυτοματισμού pan"
+msgstr "Κατάσταση αυτοματισμού"
 
 #: automation_time_axis.cc:77
-#, fuzzy
 msgid "clear track"
-msgstr "διαγραφή διαστημάτων"
+msgstr "Εκκαθάριση καναλιού"
 
 #: automation_time_axis.cc:78
-#, fuzzy
 msgid "hide track"
-msgstr "νύξη καναλιού"
+msgstr "απόκρυψη καναλιού"
 
-#: automation_time_axis.cc:184 automation_time_axis.cc:213
+#: automation_time_axis.cc:184
+#: automation_time_axis.cc:213
 #: automation_time_axis.cc:461
 msgid "Manual"
 msgstr ""
 
-#: automation_time_axis.cc:186 automation_time_axis.cc:224
-#: automation_time_axis.cc:465 editor.cc:2001 editor.cc:2082 gain_meter.cc:174
-#: panner_ui.cc:91 plugin_ui.cc:395 plugin_ui.cc:637 sfdb_ui.cc:56
+#: automation_time_axis.cc:186
+#: automation_time_axis.cc:224
+#: automation_time_axis.cc:465
+#: editor.cc:2001
+#: editor.cc:2082
+#: gain_meter.cc:174
+#: panner_ui.cc:91
+#: plugin_ui.cc:395
+#: plugin_ui.cc:637
+#: sfdb_ui.cc:56
 msgid "Play"
 msgstr "Αναπαρ/γή"
 
-#: automation_time_axis.cc:188 automation_time_axis.cc:235
-#: automation_time_axis.cc:469 gain_meter.cc:176 panner_ui.cc:93
-#: plugin_ui.cc:398 plugin_ui.cc:639
-#, fuzzy
+#: automation_time_axis.cc:188
+#: automation_time_axis.cc:235
+#: automation_time_axis.cc:469
+#: gain_meter.cc:176
+#: panner_ui.cc:93
+#: plugin_ui.cc:398
+#: plugin_ui.cc:639
 msgid "Write"
-msgstr "εγγραφή"
+msgstr "Γράψε"
 
-#: automation_time_axis.cc:190 automation_time_axis.cc:246
-#: automation_time_axis.cc:473 gain_meter.cc:178 panner_ui.cc:95
-#: plugin_ui.cc:401 plugin_ui.cc:641
-#, fuzzy
+#: automation_time_axis.cc:190
+#: automation_time_axis.cc:246
+#: automation_time_axis.cc:473
+#: gain_meter.cc:178
+#: panner_ui.cc:95
+#: plugin_ui.cc:401
+#: plugin_ui.cc:641
 msgid "Touch"
-msgstr "άγγιγμα"
+msgstr "Αγγιγμα"
 
-#: automation_time_axis.cc:257 option_editor.cc:183 option_editor.cc:189
+#: automation_time_axis.cc:257
+#: option_editor.cc:183
+#: option_editor.cc:189
 #: plugin_ui.cc:404
 msgid "???"
 msgstr "???"
@@ -1697,18 +1782,20 @@ msgstr "???"
 msgid "clear automation"
 msgstr "εκκαθάριση αυτοματισμού"
 
-#: automation_time_axis.cc:452 editor_actions.cc:318
+#: automation_time_axis.cc:452
+#: editor_actions.cc:318
 msgid "Hide"
 msgstr "Κρύψιμο"
 
-#: automation_time_axis.cc:454 crossfade_edit.cc:78 redirect_box.cc:1057
+#: automation_time_axis.cc:454
+#: crossfade_edit.cc:78
+#: redirect_box.cc:1057
 msgid "Clear"
 msgstr "Εκκαθάριση"
 
 #: automation_time_axis.cc:477
-#, fuzzy
 msgid "State"
-msgstr "Αρχή:"
+msgstr "Κατάσταση"
 
 #: canvas-imageframe.c:104
 msgid "pixbuf"
@@ -1722,34 +1809,37 @@ msgstr ""
 msgid "x"
 msgstr ""
 
-#: canvas-imageframe.c:111 canvas-simpleline.c:111 canvas-simplerect.c:107
+#: canvas-imageframe.c:111
+#: canvas-simpleline.c:111
+#: canvas-simplerect.c:107
 msgid "x coordinate of upper left corner of rect"
-msgstr ""
+msgstr "x συντεταγμένη άνω αριστερής γωνίας του τετ"
 
 #: canvas-imageframe.c:120
 msgid "y"
 msgstr ""
 
-#: canvas-imageframe.c:121 canvas-simpleline.c:121 canvas-simplerect.c:117
+#: canvas-imageframe.c:121
+#: canvas-simpleline.c:121
+#: canvas-simplerect.c:117
 msgid "y coordinate of upper left corner of rect "
-msgstr ""
+msgstr "y συντεταγμένη άνω αριστερής γωνίας του τετ"
 
 #: canvas-imageframe.c:129
-#, fuzzy
 msgid "width"
-msgstr "εγγραφή"
+msgstr "πλάτος"
 
 #: canvas-imageframe.c:130
 msgid "the width"
-msgstr ""
+msgstr "πλάτος"
 
 #: canvas-imageframe.c:139
 msgid "drawwidth"
-msgstr ""
+msgstr "σχημάτ.πλάτος"
 
 #: canvas-imageframe.c:140
 msgid "drawn width"
-msgstr ""
+msgstr "νέο πλάτος"
 
 #: canvas-imageframe.c:148
 #, fuzzy
@@ -1757,50 +1847,54 @@ msgid "height"
 msgstr "Ύψος"
 
 #: canvas-imageframe.c:149
-#, fuzzy
 msgid "the height"
-msgstr "Ύψος"
+msgstr "Το ύψος"
 
 #: canvas-imageframe.c:157
 msgid "anchor"
-msgstr ""
+msgstr "άγκυρα"
 
 #: canvas-imageframe.c:158
 msgid "the anchor"
-msgstr ""
+msgstr "η άγκυρα"
 
-#: canvas-simpleline.c:110 canvas-simplerect.c:106
+#: canvas-simpleline.c:110
+#: canvas-simplerect.c:106
 msgid "x1"
 msgstr ""
 
-#: canvas-simpleline.c:120 canvas-simplerect.c:116
+#: canvas-simpleline.c:120
+#: canvas-simplerect.c:116
 msgid "y1"
 msgstr ""
 
-#: canvas-simpleline.c:131 canvas-simplerect.c:127
+#: canvas-simpleline.c:131
+#: canvas-simplerect.c:127
 msgid "x2"
 msgstr ""
 
-#: canvas-simpleline.c:132 canvas-simplerect.c:128
+#: canvas-simpleline.c:132
+#: canvas-simplerect.c:128
 msgid "x coordinate of lower right corner of rect"
-msgstr ""
+msgstr "x συντεταγμένη κάτω δεξιάς γωνίας του τετ"
 
-#: canvas-simpleline.c:141 canvas-simplerect.c:137
+#: canvas-simpleline.c:141
+#: canvas-simplerect.c:137
 msgid "y2"
 msgstr ""
 
-#: canvas-simpleline.c:142 canvas-simplerect.c:138
+#: canvas-simpleline.c:142
+#: canvas-simplerect.c:138
 msgid "y coordinate of lower right corner of rect "
-msgstr ""
+msgstr "y συντεταγμένη κάτω δεξιάς γωνίας του τετ"
 
 #: canvas-simpleline.c:150
 msgid "color rgba"
 msgstr ""
 
 #: canvas-simpleline.c:151
-#, fuzzy
 msgid "color of line"
-msgstr "γραμμική"
+msgstr "χρώμα της γραμμής"
 
 #: canvas-simplerect.c:148
 msgid "outline pixels"
@@ -1808,34 +1902,31 @@ msgstr ""
 
 #: canvas-simplerect.c:149
 msgid "width in pixels of outline"
-msgstr ""
+msgstr "πλάτος σε pixels περιμέτρου"
 
 #: canvas-simplerect.c:159
 msgid "outline what"
-msgstr ""
+msgstr "κύκλωσε τι"
 
 #: canvas-simplerect.c:160
 msgid "which boundaries to outline (mask)"
-msgstr ""
+msgstr "ποιά όρια να κυκλώσω (mask)"
 
 #: canvas-simplerect.c:171
-#, fuzzy
 msgid "fill"
-msgstr "αρχείο"
+msgstr "γέμισμα"
 
 #: canvas-simplerect.c:172
-#, fuzzy
 msgid "fill rectangle"
-msgstr "γόμωση επιλογής"
+msgstr "γέμιση τετραγώνου"
 
 #: canvas-simplerect.c:179
 msgid "draw"
-msgstr ""
+msgstr "σχημάτισε"
 
 #: canvas-simplerect.c:180
-#, fuzzy
 msgid "draw rectangle"
-msgstr " διαστήματος"
+msgstr "σχηματισμός τετραγώνου"
 
 #: canvas-simplerect.c:188
 msgid "outline color rgba"
@@ -1859,38 +1950,33 @@ msgid "Object"
 msgstr "αντικείμενο"
 
 #: color_manager.cc:78
-#, fuzzy
 msgid "cannot open color definition file %1: %2"
-msgstr "Η εισαγωγική εικόνα δεν ανοίγει\"%1\""
+msgstr "το αρχείο καθορισμού χρωμάτων %1: %2 δεν ανοίγει"
 
 #: crossfade_edit.cc:75
 msgid "ardour: x-fade edit"
 msgstr "ardour: επεξεργασία x-fade"
 
-#: crossfade_edit.cc:79 panner_ui.cc:443
-#, fuzzy
+#: crossfade_edit.cc:79
+#: panner_ui.cc:443
 msgid "Reset"
-msgstr "reset"
+msgstr ""
 
 #: crossfade_edit.cc:80
-#, fuzzy
 msgid "Fade"
-msgstr "Fades"
+msgstr ""
 
 #: crossfade_edit.cc:81
-#, fuzzy
 msgid "Out (dry)"
-msgstr "out (dry)"
+msgstr ""
 
 #: crossfade_edit.cc:82
-#, fuzzy
 msgid "Out"
-msgstr "Έξοδοι"
+msgstr ""
 
 #: crossfade_edit.cc:83
-#, fuzzy
 msgid "In (dry)"
-msgstr "in (dry)"
+msgstr ""
 
 #: crossfade_edit.cc:84
 msgid "In"
@@ -1914,16 +2000,20 @@ msgstr "Fade In"
 msgid "Fade Out"
 msgstr "Fade Out"
 
-#: crossfade_edit.cc:172 editor.cc:1835 editor_actions.cc:316
+#: crossfade_edit.cc:172
+#: editor.cc:1835
+#: editor_actions.cc:316
 #: option_editor.cc:130
 msgid "Audition"
 msgstr "Ακρόαση"
 
-#: editor.cc:104 editor.cc:3616
+#: editor.cc:104
+#: editor.cc:3616
 msgid "Slide"
 msgstr "Ολίσθηση"
 
-#: editor.cc:105 editor.cc:3614
+#: editor.cc:105
+#: editor.cc:3614
 msgid "Splice"
 msgstr "Splice"
 
@@ -1931,135 +2021,176 @@ msgstr "Splice"
 #. is a valid, if useless, ID.
 #.
 #. leave some breathing room
-#: editor.cc:110 editor.cc:3671 export_dialog.cc:78 export_dialog.cc:92
-#: export_dialog.cc:893 export_dialog.cc:1225 route_ui.cc:437
+#: editor.cc:110
+#: editor.cc:3671
+#: export_dialog.cc:78
+#: export_dialog.cc:92
+#: export_dialog.cc:893
+#: export_dialog.cc:1225
+#: route_ui.cc:437
 msgid "None"
 msgstr "Ουδέν"
 
-#: editor.cc:111 editor.cc:3659
-#, fuzzy
+#: editor.cc:111
+#: editor.cc:3659
 msgid "CD Frames"
-msgstr "Frames"
+msgstr ""
 
-#: editor.cc:112 editor.cc:3661
+#: editor.cc:112
+#: editor.cc:3661
 msgid "SMPTE Frames"
 msgstr "SMPTE Frames"
 
-#: editor.cc:113 editor.cc:3663
+#: editor.cc:113
+#: editor.cc:3663
 msgid "SMPTE Seconds"
 msgstr "SMPTE Δευτερόλεπτα"
 
-#: editor.cc:114 editor.cc:3665
+#: editor.cc:114
+#: editor.cc:3665
 msgid "SMPTE Minutes"
 msgstr "SMPTE Λεπτά"
 
-#: editor.cc:115 editor.cc:3667
+#: editor.cc:115
+#: editor.cc:3667
 msgid "Seconds"
 msgstr "Δευτερόλεπτα"
 
-#: editor.cc:116 editor.cc:3669
+#: editor.cc:116
+#: editor.cc:3669
 msgid "Minutes"
 msgstr "Λεπτά"
 
-#: editor.cc:117 editor.cc:3641
+#: editor.cc:117
+#: editor.cc:3641
 msgid "Beats/32"
 msgstr "Κτύποι/32"
 
-#: editor.cc:118 editor.cc:3639
+#: editor.cc:118
+#: editor.cc:3639
 msgid "Beats/16"
 msgstr "Κτύποι/16"
 
-#: editor.cc:119 editor.cc:3637
+#: editor.cc:119
+#: editor.cc:3637
 msgid "Beats/8"
 msgstr "Κτύποι/8"
 
-#: editor.cc:120 editor.cc:3635
+#: editor.cc:120
+#: editor.cc:3635
 msgid "Beats/4"
 msgstr "Κτύποι/4"
 
-#: editor.cc:121 editor.cc:3633
+#: editor.cc:121
+#: editor.cc:3633
 msgid "Beats/3"
 msgstr "Κτύποι/3"
 
-#: editor.cc:122 editor.cc:3643
+#: editor.cc:122
+#: editor.cc:3643
 msgid "Beats"
 msgstr "Κτύποι"
 
-#: editor.cc:123 editor.cc:3645
+#: editor.cc:123
+#: editor.cc:3645
 msgid "Bars"
 msgstr "Μπάρες"
 
-#: editor.cc:124 editor.cc:3647
+#: editor.cc:124
+#: editor.cc:3647
 msgid "Marks"
 msgstr "Στίγματα"
 
-#: editor.cc:125 editor.cc:144 editor.cc:3649 editor.cc:3715
+#: editor.cc:125
+#: editor.cc:144
+#: editor.cc:3649
+#: editor.cc:3715
 msgid "Edit Cursor"
 msgstr "Κέρσορας επεξεργασίας"
 
-#: editor.cc:126 editor.cc:3651
+#: editor.cc:126
+#: editor.cc:3651
 msgid "Region starts"
 msgstr "Αρχές Περιοχών"
 
-#: editor.cc:127 editor.cc:3653
+#: editor.cc:127
+#: editor.cc:3653
 msgid "Region ends"
 msgstr "Τέλη Περιοχών"
 
-#: editor.cc:128 editor.cc:3657
+#: editor.cc:128
+#: editor.cc:3657
 msgid "Region syncs"
 msgstr "Συγχρονισμός Περιοχών"
 
-#: editor.cc:129 editor.cc:3655
+#: editor.cc:129
+#: editor.cc:3655
 msgid "Region bounds"
 msgstr "Όρια περιοχών"
 
-#: editor.cc:135 editor.cc:3690
+#: editor.cc:135
+#: editor.cc:3690
 msgid "Magnetic"
 msgstr "Μαγνητικό"
 
-#: editor.cc:140 editor.cc:3707 export_dialog.cc:140 export_dialog.cc:156
-#: export_dialog.cc:1068 export_dialog.cc:1072
+#: editor.cc:140
+#: editor.cc:3707
+#: export_dialog.cc:140
+#: export_dialog.cc:156
+#: export_dialog.cc:1068
+#: export_dialog.cc:1072
 msgid "Left"
 msgstr "Αριστερό"
 
-#: editor.cc:141 editor.cc:3709 export_dialog.cc:141 export_dialog.cc:157
+#: editor.cc:141
+#: editor.cc:3709
+#: export_dialog.cc:141
+#: export_dialog.cc:157
 msgid "Right"
 msgstr "Δεξιό"
 
-#: editor.cc:142 editor.cc:3711
+#: editor.cc:142
+#: editor.cc:3711
 msgid "Center"
 msgstr "Κέντρο"
 
-#: editor.cc:143 editor.cc:3713
+#: editor.cc:143
+#: editor.cc:3713
 msgid "Playhead"
-msgstr "Αναπαραγωγέας"
+msgstr ""
 
 #. time display buttons
 #: editor.cc:186
 msgid "Mins:Secs"
 msgstr "Λεπτά:Δέυτερα"
 
-#: editor.cc:189 editor_rulers.cc:354
+#: editor.cc:189
+#: editor_rulers.cc:354
 msgid "Frames"
 msgstr "Frames"
 
-#: editor.cc:190 editor_rulers.cc:374
+#: editor.cc:190
+#: editor_rulers.cc:374
 msgid "Tempo"
 msgstr "Χρόνος"
 
-#: editor.cc:191 editor_rulers.cc:368
+#: editor.cc:191
+#: editor_rulers.cc:368
 msgid "Meter"
 msgstr "Μετρητής"
 
-#: editor.cc:192 editor_rulers.cc:380
+#: editor.cc:192
+#: editor_rulers.cc:380
 msgid "Location Markers"
 msgstr "Στίγματα Τοποθεσίας"
 
-#: editor.cc:193 editor_rulers.cc:386
+#: editor.cc:193
+#: editor_rulers.cc:386
 msgid "Range Markers"
 msgstr "Στίγματα διαστημάτων"
 
-#: editor.cc:194 editor_rulers.cc:392
+#: editor.cc:194
+#: editor_rulers.cc:392
 msgid "Loop/Punch Ranges"
 msgstr "Διαστήματα Loop/Punch"
 
@@ -2080,9 +2211,8 @@ msgid "timefx"
 msgstr "timefx"
 
 #: editor.cc:221
-#, fuzzy
 msgid "listen"
-msgstr "link"
+msgstr "άκου"
 
 #: editor.cc:223
 msgid "mode"
@@ -2096,7 +2226,8 @@ msgstr "αυτοματισμός"
 msgid "Edit Mode"
 msgstr "Λειτουργία Επεξ/σίας"
 
-#: editor.cc:227 editor_actions.cc:284
+#: editor.cc:227
+#: editor_actions.cc:284
 msgid "Snap To"
 msgstr "Έλξη σε"
 
@@ -2110,7 +2241,10 @@ msgstr "Εστίαση Zoom"
 
 #. </CMT Additions>
 #. nudge
-#: editor.cc:237 editor.cc:1900 editor.cc:2066 editor.cc:2122
+#: editor.cc:237
+#: editor.cc:1900
+#: editor.cc:2066
+#: editor.cc:2122
 msgid "Nudge"
 msgstr "Νύξη"
 
@@ -2130,38 +2264,41 @@ msgstr "Zoom στη συνεδρία"
 msgid "Zoom Span"
 msgstr "Εύρος Zoom"
 
-#: editor.cc:502 editor.cc:528 editor_actions.cc:62 mixer_ui.cc:86
+#: editor.cc:502
+#: editor.cc:528
+#: editor_actions.cc:62
+#: mixer_ui.cc:86
 #: mixer_ui.cc:112
 #, fuzzy
 msgid "Visible"
 msgstr "ορατό"
 
-#: editor.cc:503 editor.cc:526
-#, fuzzy
+#: editor.cc:503
+#: editor.cc:526
 msgid "Name"
-msgstr "Frames"
+msgstr ""
 
-#: editor.cc:602 editor.cc:669
-#, fuzzy
+#: editor.cc:602
+#: editor.cc:669
 msgid "Regions"
-msgstr "Περιοχή"
+msgstr "Περιοχές"
 
-#: editor.cc:642 editor.cc:681
+#: editor.cc:642
+#: editor.cc:681
 msgid "Chunks"
-msgstr "Κομμάτια"
+msgstr ""
 
 #: editor.cc:672
-#, fuzzy
 msgid "Tracks/Busses"
-msgstr "κανάλια/δίαυλοι"
+msgstr "Κανάλια/Δίαυλοι"
 
 #: editor.cc:675
 msgid "Snapshots"
-msgstr ""
+msgstr "Στιγμιότυπα"
 
 #: editor.cc:678
 msgid "Edit Groups"
-msgstr "Πρόσθεση Ομάδων"
+msgstr "επεξερ/σία Groups"
 
 #: editor.cc:727
 msgid "Nudge region/selection forwards"
@@ -2171,7 +2308,8 @@ msgstr "Νύξη περιοχής/επιλογής εμπρός"
 msgid "Nudge region/selection backwards"
 msgstr "Νύξη περιοχής/επιλογής πίσω"
 
-#: editor.cc:735 editor_mixer.cc:299
+#: editor.cc:735
+#: editor_mixer.cc:299
 msgid "ardour: editor"
 msgstr "ardour: επεξεργαστής"
 
@@ -2184,51 +2322,68 @@ msgid "ardour: editor: "
 msgstr "ardour: επεξεργαστής: "
 
 #. force name
-#: editor.cc:1268 editor.cc:1277 editor_markers.cc:870
+#: editor.cc:1268
+#: editor.cc:1277
+#: editor_markers.cc:870
 msgid "Loop"
 msgstr "Loop"
 
 #. force name
-#: editor.cc:1282 editor.cc:1291 editor_markers.cc:896
+#: editor.cc:1282
+#: editor.cc:1291
+#: editor_markers.cc:896
 msgid "Punch"
 msgstr "Punch"
 
-#: editor.cc:1439 editor_mouse.cc:1742
+#: editor.cc:1439
+#: editor_mouse.cc:1742
 msgid "programming error: fade in canvas item has no regionview data pointer!"
-msgstr ""
-"Σφάλμα προγραμματισμού: το αντικείμενο 'fade in canvas' δεν διαθέτει δείκτη "
-"δεδομένων οπτικής περιοχών!"
+msgstr "Σφάλμα προγραμματισμού: το αντικείμενο 'fade in canvas' δεν διαθέτει δείκτη δεδομένων οπτικής περιοχών!"
 
-#: editor.cc:1451 editor.cc:1468 redirect_box.cc:1073
+#: editor.cc:1451
+#: editor.cc:1468
+#: redirect_box.cc:1073
 msgid "Deactivate"
 msgstr "Απενεργοποίηση"
 
 #. activation
-#: editor.cc:1453 editor.cc:1470 redirect_box.cc:1071
+#: editor.cc:1453
+#: editor.cc:1470
+#: redirect_box.cc:1071
 msgid "Activate"
 msgstr "Ενεργοποίηση"
 
-#: editor.cc:1458 editor.cc:1475
+#: editor.cc:1458
+#: editor.cc:1475
 msgid "Linear"
 msgstr "Γραμμικό"
 
-#: editor.cc:1459 editor.cc:1476 editor_actions.cc:376
+#: editor.cc:1459
+#: editor.cc:1476
+#: editor_actions.cc:376
 msgid "Slowest"
 msgstr "Αργότατο"
 
-#: editor.cc:1460 editor.cc:1477 editor_actions.cc:377
+#: editor.cc:1460
+#: editor.cc:1477
+#: editor_actions.cc:377
 msgid "Slow"
 msgstr "Αργό"
 
-#: editor.cc:1461 editor.cc:1478 editor_actions.cc:379
+#: editor.cc:1461
+#: editor.cc:1478
+#: editor_actions.cc:379
 msgid "Fast"
 msgstr "Ταχύ"
 
-#: editor.cc:1462 editor.cc:1479 editor_actions.cc:381
+#: editor.cc:1462
+#: editor.cc:1479
+#: editor_actions.cc:381
 msgid "Fastest"
 msgstr "Ταχύτατο"
 
-#: editor.cc:1589 editor.cc:1597
+#: editor.cc:1589
+#: editor.cc:1597
 msgid "Freeze"
 msgstr "Πάγωμα"
 
@@ -2236,15 +2391,20 @@ msgstr "Πάγωμα"
 msgid "Unfreeze"
 msgstr "Ξεπάγωμα"
 
-#: editor.cc:1762 editor.cc:1857
-#, fuzzy
+#: editor.cc:1762
+#: editor.cc:1857
 msgid "Unmute"
-msgstr "σιγή"
+msgstr ""
 
 #. non-operative menu items for menu bar
 #. show editors
-#: editor.cc:1766 editor.cc:2046 editor.cc:2748 editor_actions.cc:27
-#: editor_markers.cc:507 mixer_strip.cc:495 mixer_strip.cc:563
+#: editor.cc:1766
+#: editor.cc:2046
+#: editor.cc:2748
+#: editor_actions.cc:27
+#: editor_markers.cc:507
+#: mixer_strip.cc:495
+#: mixer_strip.cc:563
 #: redirect_box.cc:1079
 msgid "Edit"
 msgstr "Επεξεργασία"
@@ -2258,23 +2418,20 @@ msgid "Convert to full"
 msgstr ""
 
 #: editor.cc:1784
-#, fuzzy
 msgid "Crossfade"
-msgstr "Crossfade"
+msgstr ""
 
 #: editor.cc:1827
 msgid "Popup region editor"
 msgstr "Εμφάνιση του ρυθμιστή περιοχής"
 
 #: editor.cc:1828
-#, fuzzy
 msgid "Raise to top layer"
-msgstr "Ανόρθωση περιοχής στο ανώτατο στρώμα"
+msgstr "Ανόρθωση στο ανώτατο στρώμα"
 
 #: editor.cc:1829
-#, fuzzy
 msgid "Lower to bottom layer"
-msgstr "Υποβίβαση περιοχής στο κατώτατο στρώμα"
+msgstr "Υποβίβαση στο κατώτατο στρώμα"
 
 #: editor.cc:1831
 msgid "Define sync point"
@@ -2285,14 +2442,12 @@ msgid "Remove sync point"
 msgstr "Απαλοιφή σημείου συγχρονισμού"
 
 #: editor.cc:1837
-#, fuzzy
 msgid "Bounce"
-msgstr "Αναπήδηση διαστήματος"
+msgstr "Αναπήδηση"
 
 #: editor.cc:1840
-#, fuzzy
 msgid "Analyze region"
-msgstr "Αναπαρ/γή Περιοχής"
+msgstr "Ανάλυση περιοχής"
 
 #: editor.cc:1852
 msgid "Lock"
@@ -2311,14 +2466,12 @@ msgid "Toggle envelope visibility"
 msgstr ""
 
 #: editor.cc:1870
-#, fuzzy
 msgid "Toggle envelope active"
-msgstr "Διακόπτης Ενεργού"
+msgstr "Επανενεργοποίηση γραφήματος"
 
 #: editor.cc:1874
-#, fuzzy
 msgid "DeNormalize"
-msgstr "Εξομάλυνση"
+msgstr ""
 
 #: editor.cc:1876
 msgid "Normalize"
@@ -2330,14 +2483,12 @@ msgstr "Αντιστροφή"
 
 #. range related stuff
 #: editor.cc:1885
-#, fuzzy
 msgid "Add Range Markers"
-msgstr "Στίγματα διαστημάτων"
+msgstr "Πρόσθεση Στιγμάτων Διαστήματος"
 
 #: editor.cc:1886
-#, fuzzy
 msgid "Set Range"
-msgstr "Ξεχωριστό διάστημα"
+msgstr "Καθορισμός Διαστήματος"
 
 #: editor.cc:1895
 #, fuzzy
@@ -2345,9 +2496,8 @@ msgid "Nudge fwd"
 msgstr "νύξη εμπρός"
 
 #: editor.cc:1896
-#, fuzzy
 msgid "Nudge bwd"
-msgstr "Νύξη"
+msgstr "Νύξη πίσω"
 
 #: editor.cc:1897
 msgid "Nudge fwd by capture offset"
@@ -2365,7 +2515,10 @@ msgstr "Από αρχή μέχρι  κέρσορα επεξεργασίας"
 msgid "Edit cursor to end"
 msgstr "Από κέρσορα επεξεργασίας μέχρι τέλους"
 
-#: editor.cc:1910 gain_meter.cc:181 gain_meter.cc:813 panner_ui.cc:98
+#: editor.cc:1910
+#: gain_meter.cc:181
+#: gain_meter.cc:813
+#: panner_ui.cc:98
 #: panner_ui.cc:803
 msgid "Trim"
 msgstr "Ισοστάθμιση"
@@ -2399,72 +2552,66 @@ msgid "Loop range"
 msgstr "Loop διαστήματος"
 
 #: editor.cc:1959
-#, fuzzy
 msgid "Analyze range"
-msgstr "Αναπαρ/γή διαστήματος"
+msgstr "Ανάλυση διαστήματος"
 
 #: editor.cc:1963
-#, fuzzy
 msgid "Separate range to track"
-msgstr "Ξεχωριστό διάστημα"
+msgstr "Χωρισμός διαστήματος στο κανάλι"
 
 #: editor.cc:1964
-#, fuzzy
 msgid "Separate range to region list"
-msgstr "θέση επιλεγμένης οπτικής περιοχής"
+msgstr "Διαχωρισμός διαστήματος στη λίστα περιοχής"
 
 #: editor.cc:1967
-#, fuzzy
 msgid "Select all in range"
-msgstr "Επιλογή όλων στο  κανάλι"
+msgstr "Επιλογή όλων στο διάστημα"
 
-#: editor.cc:1969 editor.cc:2014
-#, fuzzy
+#: editor.cc:1969
+#: editor.cc:2014
 msgid "Set range to loop range"
-msgstr "Επιλογή διαστήματος loop"
+msgstr "Επιλογή διαστήματος κατά το loop"
 
-#: editor.cc:1970 editor.cc:2015
-#, fuzzy
+#: editor.cc:1970
+#: editor.cc:2015
 msgid "Set range to punch range"
-msgstr "Επιλογή διαστήματος punch"
+msgstr "Επιλογή διαστήματος κατά το punch"
 
 #: editor.cc:1972
-#, fuzzy
 msgid "Crop region to range"
-msgstr "Κοπή Περιοχής στο διάστημα"
+msgstr "Κοπή Περιοχής κατά το διάστημα"
 
 #: editor.cc:1973
-#, fuzzy
 msgid "Fill range with region"
-msgstr "Γέμισμα διαστήματος  μ/Περιοχή"
+msgstr "Γέμισμα περιοχής με το διάστημα"
 
 #: editor.cc:1974
-#, fuzzy
 msgid "Duplicate range"
-msgstr "Αντιγραφή"
+msgstr "Αντιγραφή διαστήματος"
 
 #: editor.cc:1975
 msgid "Create chunk from range"
-msgstr "Δημιουργία κομματιού από διάστημα"
+msgstr "Δημιουργία chunk από διάστημα"
 
 #: editor.cc:1977
 msgid "Bounce range"
 msgstr "Αναπήδηση διαστήματος"
 
 #: editor.cc:1978
-#, fuzzy
 msgid "Export range"
-msgstr "Εξαγωγή περιοχής"
+msgstr "Εξαγωγή διαστήματος"
 
 #: editor.cc:1980
 msgid "Range"
 msgstr "Διάστημα"
 
-#: editor.cc:1995 editor.cc:2080
+#: editor.cc:1995
+#: editor.cc:2080
 msgid "Play from edit cursor"
 msgstr "Αναπαρ/γή από Κέρσορα Επεξεργασίας"
 
-#: editor.cc:1996 editor.cc:2081
+#: editor.cc:1996
+#: editor.cc:2081
 msgid "Play from start"
 msgstr "Αναπαρ/γή από αρχή"
 
@@ -2477,108 +2624,122 @@ msgstr "Αναπαρ/γή Περιοχής"
 msgid "Loop Region"
 msgstr "Loop Περιοχής"
 
-#: editor.cc:2009 editor.cc:2090
+#: editor.cc:2009
+#: editor.cc:2090
 msgid "Select All in track"
 msgstr "Επιλογή όλων στο  κανάλι"
 
-#: editor.cc:2010 editor.cc:2091 redirect_box.cc:1067
+#: editor.cc:2010
+#: editor.cc:2091
+#: redirect_box.cc:1067
 msgid "Select All"
 msgstr "Επιλογή όλων"
 
-#: editor.cc:2011 editor.cc:2092
-#, fuzzy
+#: editor.cc:2011
+#: editor.cc:2092
 msgid "Invert selection in track"
-msgstr "Αντιστροφή στο κανάλι"
+msgstr "Αντιστροφή επιλογής στο κανάλι"
 
-#: editor.cc:2012 editor.cc:2093
-#, fuzzy
+#: editor.cc:2012
+#: editor.cc:2093
 msgid "Invert selection"
-msgstr "μετακίνηση επιλογής"
+msgstr "Αντιστροφή επιλογής"
 
-#: editor.cc:2017 editor.cc:2095
-#, fuzzy
+#: editor.cc:2017
+#: editor.cc:2095
 msgid "Select all after edit cursor"
-msgstr "Από αρχή μέχρι  κέρσορα επεξεργασίας"
+msgstr "Επιλογή όλων μετά τον κέρσορα επεξεργασίας"
 
-#: editor.cc:2018 editor.cc:2096
-#, fuzzy
+#: editor.cc:2018
+#: editor.cc:2096
 msgid "Select all before edit cursor"
-msgstr "Από αρχή μέχρι  κέρσορα επεξεργασίας"
+msgstr "Επιλογή όλων πρίν τον κέρσορα επεξεργασίας"
 
-#: editor.cc:2019 editor.cc:2097
-#, fuzzy
+#: editor.cc:2019
+#: editor.cc:2097
 msgid "Select all after playhead"
-msgstr "Θέση από αναπαραγωγέα"
+msgstr "Επιλογή όλων μετά την playhead"
 
-#: editor.cc:2020 editor.cc:2098
-#, fuzzy
+#: editor.cc:2020
+#: editor.cc:2098
 msgid "Select all before playhead"
-msgstr "Θέση από αναπαραγωγέα"
+msgstr "Επιλογή όλων πριν την playhead"
 
 #: editor.cc:2021
-#, fuzzy
 msgid "Select all between cursors"
-msgstr "Από αρχή μέχρι  κέρσορα επεξεργασίας"
+msgstr "Επιλογή Ολων μεταξύ κερσόρων"
 
 #. standard editing stuff
-#: editor.cc:2032 editor.cc:2108 editor.cc:3483 editor_actions.cc:214
+#: editor.cc:2032
+#: editor.cc:2108
+#: editor.cc:3483
+#: editor_actions.cc:214
 #: redirect_box.cc:1060
 msgid "Cut"
 msgstr "Κοπή"
 
-#: editor.cc:2033 editor.cc:2109 editor.cc:3485 editor_actions.cc:219
+#: editor.cc:2033
+#: editor.cc:2109
+#: editor.cc:3485
+#: editor_actions.cc:219
 #: redirect_box.cc:1062
 msgid "Copy"
 msgstr "Αντιγραφή"
 
 #: editor.cc:2034
-#, fuzzy
 msgid "Paste at edit cursor"
-msgstr "Από αρχή μέχρι  κέρσορα επεξεργασίας"
+msgstr "Επικόλληση στον κέρσορα επεξεργασίας"
 
 #: editor.cc:2035
-#, fuzzy
 msgid "Paste at mouse"
-msgstr "χρήση των master outs"
+msgstr "Επικόλληση στο ποντίκι"
 
-#: editor.cc:2039 editor.cc:3490
+#: editor.cc:2039
+#: editor.cc:3490
 msgid "Align"
 msgstr "Ευθυγράμμιση"
 
-#: editor.cc:2040 editor.cc:3492
+#: editor.cc:2040
+#: editor.cc:3492
 msgid "Align Relative"
 msgstr "Ευθυγράμμιση σχετικών"
 
 #: editor.cc:2044
 msgid "Insert chunk"
-msgstr "Προσθήκη κομματιού"
+msgstr "Προσθήκη chunk"
 
 #: editor.cc:2051
-#, fuzzy
 msgid "Insert Selected Region"
-msgstr "θέση επιλεγμένης οπτικής περιοχής"
+msgstr "Εισαγωγή επιλεγμένης περιοχής"
 
 #: editor.cc:2052
 msgid "Insert Existing Audio"
-msgstr ""
+msgstr "Εισαγωγή Υπάρχοντος Audio"
 
-#: editor.cc:2061 editor.cc:2117
+#: editor.cc:2061
+#: editor.cc:2117
 msgid "Nudge entire track fwd"
 msgstr "Νύξη ολόκληρου καναλιού εμπρός"
 
-#: editor.cc:2062 editor.cc:2118
+#: editor.cc:2062
+#: editor.cc:2118
 msgid "Nudge track after edit cursor fwd"
 msgstr "Νύξη καναλιού μετά του κέρσορα επεξεργασίας εμπρός"
 
-#: editor.cc:2063 editor.cc:2119
+#: editor.cc:2063
+#: editor.cc:2119
 msgid "Nudge entire track bwd"
 msgstr "Νύξη ολοκλήρου καναλιού πίσω"
 
-#: editor.cc:2064 editor.cc:2120
+#: editor.cc:2064
+#: editor.cc:2120
 msgid "Nudge track after edit cursor bwd"
 msgstr "Νύξη κανάλι μετά του κέρσορα επεξεργασίας  πίσω"
 
-#: editor.cc:2110 editor.cc:3487 editor_actions.cc:221 redirect_box.cc:1064
+#: editor.cc:2110
+#: editor.cc:3487
+#: editor_actions.cc:221
+#: redirect_box.cc:1064
 msgid "Paste"
 msgstr "Επικόλληση"
 
@@ -2603,9 +2764,8 @@ msgid "stretch/shrink regions"
 msgstr "μεγέθυνση/σμίκρυνση περιοχών"
 
 #: editor.cc:2635
-#, fuzzy
 msgid "listen to specific regions"
-msgstr "θέση επιλεγμένης οπτικής περιοχής"
+msgstr "ακρόαση συγκεκριμένων περιοχών"
 
 #: editor.cc:2746
 msgid "Start:"
@@ -2615,12 +2775,13 @@ msgstr "Αρχή:"
 msgid "End:"
 msgstr "Τέλος:"
 
-#: editor.cc:3362 editor.cc:3402
-#, fuzzy
+#: editor.cc:3362
+#: editor.cc:3402
 msgid "set selected regions"
-msgstr "θέση επιλεγμένης οπτικής περιοχής"
+msgstr "καθορισμός επιλεγμένων περιοχών"
 
-#: editor.cc:3458 editor_actions.cc:204
+#: editor.cc:3458
+#: editor_actions.cc:204
 msgid "Undo"
 msgstr "Undo"
 
@@ -2628,7 +2789,8 @@ msgstr "Undo"
 msgid "Undo (%1)"
 msgstr "Undo (%1)"
 
-#: editor.cc:3470 editor_actions.cc:206
+#: editor.cc:3470
+#: editor_actions.cc:206
 msgid "Redo"
 msgstr "Redo"
 
@@ -2638,12 +2800,11 @@ msgstr "Redo (%1)"
 
 #: editor.cc:3506
 msgid "... as new track"
-msgstr ""
+msgstr "...ώς νέο κανάλι"
 
 #: editor.cc:3507
-#, fuzzy
 msgid "... as new region"
-msgstr "ευθυγράμμιση περιοχής"
+msgstr "... ως νέα περιοχή"
 
 #: editor.cc:3509
 msgid "Import audio (copy)"
@@ -2664,10 +2825,8 @@ msgid ""
 "If deleted, audio files used by it alone by will cleaned."
 msgstr ""
 "Η Λίστα Αναπαρ/γής %1 προς το παρόν δε χρησιμοποιείται.\n"
-"Εάν μείνει έτσι, κανένα ηχητικό αρχείο που χρησιμοποιείται απο αυτήν δεν θα "
-"διαγραφεί.\n"
-"Εάν διαγραφεί, τα ηχητικά αρχεία που χρησιμοποιούνται μόνο απ'αυτήν θα "
-"διαγραφούν."
+"Εάν μείνει έτσι, κανένα ηχητικό αρχείο που χρησιμοποιείται απο αυτήν δεν θα διαγραφεί.\n"
+"Εάν διαγραφεί, τα ηχητικά αρχεία που χρησιμοποιούνται μόνο απ'αυτήν θα διαγραφούν."
 
 #: editor.cc:4030
 msgid "Delete playlist"
@@ -2677,27 +2836,32 @@ msgstr "Διαγραφή λίστας αναπαρ/γής"
 msgid "Keep playlist"
 msgstr "Διατήρηση λίστας αναπαρ/γής"
 
-#: editor.cc:4032 editor_audio_import.cc:236 editor_ops.cc:2048
-#: editor_timefx.cc:71 export_dialog.cc:971 io_selector.cc:59
-#: io_selector.cc:793 redirect_box.cc:903 tempo_dialog.cc:20
-#: tempo_dialog.cc:37 tempo_dialog.cc:202 tempo_dialog.cc:220
+#: editor.cc:4032
+#: editor_audio_import.cc:236
+#: editor_ops.cc:2048
+#: editor_timefx.cc:71
+#: export_dialog.cc:971
+#: io_selector.cc:59
+#: io_selector.cc:793
+#: redirect_box.cc:903
+#: tempo_dialog.cc:20
+#: tempo_dialog.cc:37
+#: tempo_dialog.cc:202
+#: tempo_dialog.cc:220
 msgid "Cancel"
 msgstr "Ακύρωση"
 
 #: editor.cc:4199
-#, fuzzy
 msgid "new playlists"
-msgstr "Διατήρηση λίστας αναπαρ/γής"
+msgstr "νέες playlists"
 
 #: editor.cc:4207
-#, fuzzy
 msgid "copy playlists"
-msgstr "Διατήρηση λίστας αναπαρ/γής"
+msgstr "Αντιγραφή playlists"
 
 #: editor.cc:4215
-#, fuzzy
 msgid "clear playlists"
-msgstr "εκκαθάριση playlist"
+msgstr "εκκαθάριση playlists"
 
 #: editor_actions.cc:28
 #, fuzzy
@@ -2705,27 +2869,24 @@ msgid "Select regions"
 msgstr "επιλογή περιοχών"
 
 #: editor_actions.cc:29
-#, fuzzy
 msgid "Select range operations"
-msgstr "επιλογή περιοχών"
+msgstr "επιλογή ενεργειών διαστήματος"
 
 #: editor_actions.cc:30
-#, fuzzy
 msgid "Move edit cursor"
-msgstr "Από αρχή μέχρι  κέρσορα επεξεργασίας"
+msgstr "Μετακίνηση κέρσορα επεξεργασίας"
 
 #: editor_actions.cc:31
-#, fuzzy
 msgid "Region operations"
-msgstr "Περιοχές/δημιουργία"
+msgstr "Ενέργειες Περιοχών"
 
 #: editor_actions.cc:32
 msgid "Tools"
-msgstr ""
+msgstr "Εργαλεία"
 
 #: editor_actions.cc:33
 msgid "View"
-msgstr ""
+msgstr "Οψη"
 
 #: editor_actions.cc:34
 #, fuzzy
@@ -2733,42 +2894,36 @@ msgid "ZoomFocus"
 msgstr "Εστίαση Zoom"
 
 #: editor_actions.cc:35
-#, fuzzy
 msgid "Meter hold"
-msgstr "Μετρητής"
+msgstr "Παύση Μετρητή"
 
 #: editor_actions.cc:36
 msgid "Meter falloff"
 msgstr ""
 
 #: editor_actions.cc:38
-#, fuzzy
 msgid "Crossfades"
-msgstr "Crossfade"
+msgstr ""
 
 #: editor_actions.cc:39
-#, fuzzy
 msgid "Monitoring"
-msgstr "Χρήση Hardware Monitoring"
+msgstr ""
 
 #: editor_actions.cc:40
-#, fuzzy
 msgid "Autoconnect"
-msgstr "Σύνδεση"
+msgstr "ΑυτόματηΣύνδεση"
 
 #: editor_actions.cc:41
-#, fuzzy
 msgid "Layering"
-msgstr "Στρώμα"
+msgstr "Στρωματοποίηση"
 
 #: editor_actions.cc:42
-#, fuzzy
 msgid "Metering"
-msgstr "Μετρητής"
+msgstr "Μέτρηση"
 
 #: editor_actions.cc:43
 msgid "Fall off rate"
-msgstr ""
+msgstr "Fall off χρόνος"
 
 #: editor_actions.cc:44
 msgid "Hold Time"
@@ -2776,133 +2931,119 @@ msgstr ""
 
 #: editor_actions.cc:45
 msgid "Add Existing Audio"
-msgstr ""
+msgstr "Πρόσθεση Υπάρχοντος Audio"
 
 #. add named actions for the editor
 #: editor_actions.cc:50
-#, fuzzy
 msgid "Show Editor Mixer"
-msgstr "Ανάδειξη όλων των ΔιαδρόμωνΜίξεως των καναλιών"
+msgstr "Ανάδειξη Μίκτη του Editor"
 
 #: editor_actions.cc:55
-#, fuzzy
 msgid "Span Entire Overlap"
-msgstr "Ανόρθωση περιοχής κατά ένα στρώμα"
+msgstr "Διασκορπισμός όλου του Overlap"
 
-#: editor_actions.cc:57 editor_actions.cc:384
-#, fuzzy
+#: editor_actions.cc:57
+#: editor_actions.cc:384
 msgid "Short"
-msgstr "θύρα"
+msgstr ""
 
 #: editor_actions.cc:64
 msgid "Created Automatically"
-msgstr ""
+msgstr "Δημιουργήθηκε αυτόματα"
 
 #: editor_actions.cc:67
 msgid "Playhead to Next Region Start"
-msgstr ""
+msgstr "Playhead στην επόμενη Region Start"
 
 #: editor_actions.cc:69
 msgid "Playhead to Next Region End"
-msgstr ""
+msgstr "Playhead στην επόμενη Region End"
 
 #: editor_actions.cc:71
 msgid "Playhead to Next Region Sync"
-msgstr ""
+msgstr "Playhead στην επόμενη Region Sync"
 
 #: editor_actions.cc:74
 msgid "Playhead to Previous Region Start"
-msgstr ""
+msgstr "Playhead στην προηγούμενη Region Start"
 
 #: editor_actions.cc:76
 msgid "Playhead to Previous Region End"
-msgstr ""
+msgstr "Playhead στην προηγούμενη Region End"
 
 #: editor_actions.cc:78
 msgid "Playhead to Previous Region Sync"
-msgstr ""
+msgstr "Playhead στην προηγούμενη Region Sync"
 
 #: editor_actions.cc:81
-#, fuzzy
 msgid "Edit Cursor to Next Region Start"
-msgstr "Από κέρσορα επεξεργασίας μέχρι τέλους"
+msgstr "Ο Κέρσορας επεξεργασίας στην αρχή της επόμενης Περιοχής"
 
 #: editor_actions.cc:83
-#, fuzzy
 msgid "Edit Cursor to Next Region End"
-msgstr "Από κέρσορα επεξεργασίας μέχρι τέλους"
+msgstr "Ο Κέρσορας επεξεργασίας στο τέλος της επόμενης Περιοχής"
 
 #: editor_actions.cc:85
-#, fuzzy
 msgid "Edit Cursor to Next Region Sync"
-msgstr "Από κέρσορα επεξεργασίας μέχρι τέλους"
+msgstr "Ο Κέρσορας επεξεργασίας στο sync της επόμενης Περιοχής"
 
 #: editor_actions.cc:88
 msgid "Edit Cursor to Previous Region Start"
-msgstr ""
+msgstr "Edit Cursor στην προηγούμενη Region Start"
 
 #: editor_actions.cc:90
-#, fuzzy
 msgid "Edit Cursor to Previous Region End"
-msgstr "Από κέρσορα επεξεργασίας μέχρι τέλους"
+msgstr "Ο Κέρσορας επεξεργασίας στο τέλος της προηγούμενης Περιοχής"
 
 #: editor_actions.cc:92
-#, fuzzy
 msgid "Edit Cursor to Previous Region Sync"
-msgstr "Από κέρσορα επεξεργασίας μέχρι τέλους"
+msgstr "Ο Κέρσορας επεξεργασίας στο sync της προηγούμενης Περιοχής"
 
 #: editor_actions.cc:95
 msgid "Playhead to Range Start"
-msgstr ""
+msgstr "Playhead στην Αρχή Διαστήματος"
 
 #: editor_actions.cc:97
-#, fuzzy
 msgid "Playhead to Range End"
-msgstr "Επαναληπτική αναπαρ/γή διαστήματος"
+msgstr "Η playhead στο τέλος του διαστήματος"
 
 #: editor_actions.cc:100
-#, fuzzy
 msgid "Edit Cursor to Range Start"
-msgstr "Από κέρσορα επεξεργασίας μέχρι τέλους"
+msgstr "Ο Κέρσορας επεξεργασίας στην αρχή του διαστήματος"
 
 #: editor_actions.cc:102
-#, fuzzy
 msgid "Edit Cursor to Range End"
-msgstr "Από κέρσορα επεξεργασίας μέχρι τέλους"
+msgstr "Ο Κέρσορας επεξεργασίας στο τέλος του διαστήματος"
 
-#: editor_actions.cc:105 editor_ops.cc:1363
+#: editor_actions.cc:105
+#: editor_ops.cc:1363
 #, fuzzy
 msgid "select all"
 msgstr "Επιλογή όλων"
 
 #: editor_actions.cc:107
-#, fuzzy
 msgid "Select All After Edit Cursor"
-msgstr "Θέση συγχρονισμού(sync) απο κέρσορα επεξερ/σίας"
+msgstr "Επιλογή όλων μετά το Κερσ.Επεξεργασίας"
 
 #: editor_actions.cc:109
 msgid "Select All Before Edit Cursor"
-msgstr ""
+msgstr "Επιλογή όλων πρίν τον Edit Cursor"
 
 #: editor_actions.cc:112
-#, fuzzy
 msgid "Select All After Playhead"
-msgstr "Θέση από αναπαραγωγέα"
+msgstr "Επιλογή όλων μετά την playhead"
 
 #: editor_actions.cc:114
-#, fuzzy
 msgid "Select All Before Playhead"
-msgstr "Θέση από αναπαραγωγέα"
+msgstr "Επιλογή όλων πριν την playhead"
 
 #: editor_actions.cc:116
-#, fuzzy
 msgid "Select All Between Cursors"
-msgstr "Θέση συγχρονισμού(sync) απο κέρσορα επεξερ/σίας"
+msgstr "Επιλογή όλων μεταξύ κερσόρων"
 
 #: editor_actions.cc:119
-#, fuzzy
 msgid "Select All in Punch Range"
-msgstr "Θέση Punch Διαστήματος"
+msgstr "Επιλογή όλων μέσα στο punch όριο"
 
 #: editor_actions.cc:121
 #, fuzzy
@@ -2911,16 +3052,15 @@ msgstr "Επιλογή διαστήματος loop"
 
 #: editor_actions.cc:124
 msgid "Jump Forward to Mark"
-msgstr ""
+msgstr "Μετάθεση εμπρός στο Σημάδι"
 
 #: editor_actions.cc:126
 msgid "Jump Backward to Mark"
-msgstr ""
+msgstr "Μετάθεση πίσω στο Σημάδι"
 
 #: editor_actions.cc:128
-#, fuzzy
 msgid "Add Location from Playhead"
-msgstr "Θέση από αναπαραγωγέα"
+msgstr "Πρόσθεση Θέσεως από την playhead"
 
 #: editor_actions.cc:131
 #, fuzzy
@@ -2928,29 +3068,24 @@ msgid "Nudge Forward"
 msgstr "νύξη εμπρός"
 
 #: editor_actions.cc:133
-#, fuzzy
 msgid "Nudge Next Forward"
-msgstr "νύξη εμπρός"
+msgstr "νύξη επόμενη εμπρός"
 
 #: editor_actions.cc:135
-#, fuzzy
 msgid "Nudge Backward"
-msgstr "Νύξη"
+msgstr "Νύξη πίσω"
 
 #: editor_actions.cc:137
-#, fuzzy
 msgid "Nudge Next Backward"
-msgstr "Νύξη ολόκληρου καναλιού εμπρός"
+msgstr "Νύξη επόμενη πίσω"
 
 #: editor_actions.cc:140
-#, fuzzy
 msgid "Zoom Out"
-msgstr "Zoom out"
+msgstr ""
 
 #: editor_actions.cc:142
-#, fuzzy
 msgid "Zoom In"
-msgstr "Zoom in"
+msgstr ""
 
 #: editor_actions.cc:144
 #, fuzzy
@@ -2958,119 +3093,100 @@ msgid "Zoom to Session"
 msgstr "Zoom στη συνεδρία"
 
 #: editor_actions.cc:147
-#, fuzzy
 msgid "Scroll Tracks Up"
-msgstr "Γόμωση καναλιού"
+msgstr "Κύλιση Καναλιών επάνω"
 
 #: editor_actions.cc:149
 msgid "Scroll Tracks Down"
-msgstr ""
+msgstr "Κύλιση Καναλιών Κάτω"
 
 #: editor_actions.cc:151
-#, fuzzy
 msgid "Step Tracks Up"
-msgstr "νύξη καναλιού"
+msgstr "Μετακίνηση Καναλιών επάνω"
 
 #: editor_actions.cc:153
 msgid "Step Tracks Down"
-msgstr ""
+msgstr "Μετάθεση Καναλιών κάτω"
 
 #: editor_actions.cc:156
 msgid "Scroll Backward"
-msgstr ""
+msgstr "Κύλιση πίσω"
 
 #: editor_actions.cc:158
 msgid "Scroll Forward"
-msgstr ""
+msgstr "Κύλιση εμπρός"
 
 #: editor_actions.cc:160
 msgid "goto"
-msgstr ""
+msgstr "πήγαινε στο"
 
 #: editor_actions.cc:162
-#, fuzzy
 msgid "Center Playhead"
-msgstr "Αναπαραγωγέας"
+msgstr "Playhead στο κέντρο"
 
 #: editor_actions.cc:164
-#, fuzzy
 msgid "Center Edit Cursor"
-msgstr "Κέρσορας επεξεργασίας"
+msgstr "Κέρσορας επεξεργασίας στο κέντρο"
 
 #: editor_actions.cc:166
-#, fuzzy
 msgid "Playhead Forward"
-msgstr "Αναπαραγωγέας"
+msgstr "Playhead εμπρός"
 
 #: editor_actions.cc:168
-#, fuzzy
 msgid "Playhead Backward"
-msgstr "Αναπαραγωγέας"
+msgstr "Playhead πίσω"
 
 #: editor_actions.cc:170
-#, fuzzy
 msgid "Playhead to Edit"
-msgstr "Αναπαραγωγέας"
+msgstr "Playhead στο Κέρσ.Επεξ."
 
 #: editor_actions.cc:172
-#, fuzzy
 msgid "Edit to Playhead"
-msgstr "Θέση από αναπαραγωγέα"
+msgstr "Κέρσ.Επεξ. στην Playhead"
 
 #: editor_actions.cc:175
-#, fuzzy
 msgid "Align Regions Start"
-msgstr "Αρχές Περιοχών"
+msgstr "Ευθυγράμμιση αρχής Περιοχών"
 
 #: editor_actions.cc:177
-#, fuzzy
 msgid "Align Regions Start Relative"
-msgstr "ευθυγράμμιση επιλογής (σχετική)"
+msgstr "ευθυγράμμιση αρχής περιοχών(σχετική)"
 
 #: editor_actions.cc:179
-#, fuzzy
 msgid "Align Regions End"
-msgstr "ευθυγράμμιση περιοχής"
+msgstr "ευθυγράμμιση τέλους περιοχών"
 
 #: editor_actions.cc:181
-#, fuzzy
 msgid "Align Regions End Relative"
-msgstr "Ευθυγράμμιση σχετικών"
+msgstr "Ευθυγράμμιση τέλους περιοχών(σχετική)"
 
 #: editor_actions.cc:184
-#, fuzzy
 msgid "Align Regions Sync"
-msgstr "ευθυγράμμιση περιοχής"
+msgstr "ευθυγράμμιση του sync των περιοχών"
 
 #: editor_actions.cc:186
-#, fuzzy
 msgid "Align Regions Sync Relative"
-msgstr "Ευθυγράμμιση σχετικών"
+msgstr "Ευθυγράμμιση του sync των περιοχών(σχετική)"
 
 #: editor_actions.cc:189
-#, fuzzy
 msgid "Audition at Mouse"
-msgstr "Ακρόαση"
+msgstr "Ακρόαση στο ποντίκι"
 
 #: editor_actions.cc:191
-#, fuzzy
 msgid "Brush at Mouse"
-msgstr "χρήση των master outs"
+msgstr "Brush στο ποντίκι"
 
 #: editor_actions.cc:193
-#, fuzzy
 msgid "Set Edit Cursor"
-msgstr "Κέρσορας επεξεργασίας"
+msgstr "Θέση Κέρσορα επεξεργασίας"
 
 #: editor_actions.cc:195
-#, fuzzy
 msgid "Mute/Unmute Region"
-msgstr "Δημιουργία περιοχής"
+msgstr "Σιγή/Ενεργοποίηση Περιοχής"
 
 #: editor_actions.cc:197
-#, fuzzy
 msgid "Set Playhead"
-msgstr "Αναπαραγωγέας"
+msgstr "Θέση playhead"
 
 #: editor_actions.cc:199
 #, fuzzy
@@ -3078,19 +3194,16 @@ msgid "Split Region"
 msgstr "Διαχωρισμός περιοχής"
 
 #: editor_actions.cc:201
-#, fuzzy
 msgid "Set Region Sync Position"
-msgstr "Με Θέση Περιοχής"
+msgstr "Θέση sync της Περιοχής"
 
 #: editor_actions.cc:209
-#, fuzzy
 msgid "Export Session"
-msgstr "Εξαγωγή περιοχής"
+msgstr "Εξαγωγή Συνεδρίας"
 
 #: editor_actions.cc:211
-#, fuzzy
 msgid "Export Range"
-msgstr "Ξεχωριστό διάστημα"
+msgstr "Εξαγωγή διαστήματος"
 
 #. Note: for now, editor-delete does the exact same thing as editor-cut
 #: editor_actions.cc:217
@@ -3104,223 +3217,189 @@ msgid "Duplicate Region"
 msgstr "αντιγραφή περιοχής"
 
 #: editor_actions.cc:225
-#, fuzzy
 msgid "Duplicate Range"
-msgstr "Αντιγραφή"
+msgstr "Αντιγραφή διαστήματος"
 
 #: editor_actions.cc:227
 msgid "Insert Region"
 msgstr "Προσθήκη περιοχής"
 
 #: editor_actions.cc:229
-#, fuzzy
 msgid "Reverse Region"
-msgstr "αντιστροφή περιοχών"
+msgstr "αντιστροφή περιοχής"
 
 #: editor_actions.cc:231
-#, fuzzy
 msgid "Normalize Region"
-msgstr "Εξομάλυνση"
+msgstr "Κανονικοποίηση περιοχής"
 
 #: editor_actions.cc:233
-#, fuzzy
 msgid "crop"
-msgstr "αντιγραφή"
+msgstr "κοψιμο"
 
 #: editor_actions.cc:235
-#, fuzzy
 msgid "Insert Chunk"
-msgstr "Προσθήκη κομματιού"
+msgstr "Προσθήκη Chunk"
 
 #: editor_actions.cc:238
-#, fuzzy
 msgid "Split at edit cursor"
-msgstr "Από αρχή μέχρι  κέρσορα επεξεργασίας"
+msgstr "Κόψιμο στον κέρσορα επεξεργασίας"
 
 #: editor_actions.cc:241
-#, fuzzy
 msgid "Start Range"
-msgstr "Ξεχωριστό διάστημα"
+msgstr "Εναρκτήριο διάστημα"
 
 #: editor_actions.cc:243
 msgid "Finish Range"
-msgstr ""
+msgstr "Ολοκλήρωση Διαστήματος"
 
 #: editor_actions.cc:245
 msgid "Finish add Range"
-msgstr ""
+msgstr "Ολοκλήρωση πρόσθεσης Διαστήματος"
 
 #: editor_actions.cc:248
 msgid "Extend Range to End of Region"
-msgstr ""
+msgstr "Επέκταση Διαστήματος στο τέλος της Περιοχής"
 
 #: editor_actions.cc:250
-#, fuzzy
 msgid "Extend Range to Start of Region"
-msgstr "Αρχή της συνεδρίας"
+msgstr "Επέκταση Διαστήματος στην Αρχή της Περιοχής"
 
 #: editor_actions.cc:253
-#, fuzzy
 msgid "Follow Playhead"
-msgstr "Ακολουθία Αναπαραγωγέα"
+msgstr "Ακολουθώντας την playhead"
 
 #: editor_actions.cc:261
-#, fuzzy
 msgid "Zoom Focus Left"
-msgstr "Εστίαση Zoom"
+msgstr "Εστίαση Zoom αριστερά"
 
 #: editor_actions.cc:263
-#, fuzzy
 msgid "Zoom Focus Right"
-msgstr "Εστίαση Zoom"
+msgstr "Εστίαση Zoom δεξιά"
 
 #: editor_actions.cc:265
-#, fuzzy
 msgid "Zoom Focus Center"
-msgstr "Εστίαση Zoom"
+msgstr "Εστίαση Zoom κέντρο"
 
 #: editor_actions.cc:267
-#, fuzzy
 msgid "Zoom Focus Playhead"
-msgstr "Εστίαση Zoom"
+msgstr "Εστίαση Zoom στην playhead"
 
 #: editor_actions.cc:269
-#, fuzzy
 msgid "Zoom Focus Edit"
-msgstr "Εστίαση Zoom"
+msgstr "Εστίαση Zoom Κερσ.Επεξ."
 
 #: editor_actions.cc:275
 msgid "Object Tool"
-msgstr ""
+msgstr "Εργαλείο Object"
 
 #: editor_actions.cc:276
-#, fuzzy
 msgid "Range Tool"
-msgstr "Διάστημα"
+msgstr "Εργαλείο Διαστήματος"
 
 #: editor_actions.cc:277
 msgid "Gain Tool"
-msgstr ""
+msgstr "Εργαλείο Gain"
 
 #: editor_actions.cc:278
-#, fuzzy
 msgid "Zoom Tool"
-msgstr "Zoom out"
+msgstr "Εργαλείο Zoom"
 
 #: editor_actions.cc:279
 msgid "Timefx Tool"
-msgstr ""
+msgstr "Εργαλείο Timefx"
 
 #: editor_actions.cc:286
-#, fuzzy
 msgid "Snap to frame"
-msgstr "zoom σε καρέ"
+msgstr "Snap σε frame"
 
 #: editor_actions.cc:287
-#, fuzzy
 msgid "Snap to cd frame"
-msgstr "Λειτουργία Έλξεως"
+msgstr "Snap σε cd frame"
 
 #: editor_actions.cc:288
-#, fuzzy
 msgid "Snap to SMPTE frame"
-msgstr "SMPTE Frames"
+msgstr "Snap σε SMPTE Frame"
 
 #: editor_actions.cc:289
-#, fuzzy
 msgid "Snap to SMPTE seconds"
-msgstr "SMPTE Δευτερόλεπτα"
+msgstr "Snap σε SMPTE Δευτερόλεπτα"
 
 #: editor_actions.cc:290
-#, fuzzy
 msgid "Snap to SMPTE minutes"
-msgstr "SMPTE Λεπτά"
+msgstr "Snap σε SMPTE Λεπτά"
 
 #: editor_actions.cc:291
-#, fuzzy
 msgid "Snap to seconds"
-msgstr "Δευτερόλεπτα"
+msgstr "Snap σε Δευτερόλεπτα"
 
 #: editor_actions.cc:292
 msgid "Snap to minutes"
-msgstr ""
+msgstr "Snap σε λεπτά"
 
 #: editor_actions.cc:293
-#, fuzzy
 msgid "Snap to thirtyseconds"
-msgstr "τριακοστό-όγδοο (32)"
+msgstr "Snap σε τριακοστα-δεύτερα (32)"
 
 #: editor_actions.cc:294
 msgid "Snap to asixteenthbeat"
-msgstr ""
+msgstr "Snap σε δέκατο-έκτο"
 
 #: editor_actions.cc:295
 msgid "Snap to eighths"
-msgstr ""
+msgstr "Snap σε όγδοα"
 
 #: editor_actions.cc:296
 msgid "Snap to quarters"
-msgstr ""
+msgstr "Snap σε τέταρτα"
 
 #: editor_actions.cc:297
-#, fuzzy
 msgid "Snap to thirds"
-msgstr "Λειτουργία Έλξεως"
+msgstr "Snap σε τρίτα"
 
 #: editor_actions.cc:298
-#, fuzzy
 msgid "Snap to beat"
-msgstr "Λειτουργία Έλξεως"
+msgstr "Snap σε beat"
 
 #: editor_actions.cc:299
-#, fuzzy
 msgid "Snap to bar"
-msgstr "Έλξη σε"
+msgstr "Snap σε μπάρες"
 
 #: editor_actions.cc:300
-#, fuzzy
 msgid "Snap to mark"
-msgstr "πρόσθεση στίγματος χρόνου"
+msgstr "Snap σε στίγματα"
 
 #: editor_actions.cc:301
-#, fuzzy
 msgid "Snap to edit cursor"
-msgstr "Από αρχή μέχρι  κέρσορα επεξεργασίας"
+msgstr "Snap στο κέρσορα επεξεργασίας"
 
 #: editor_actions.cc:302
-#, fuzzy
 msgid "Snap to region start"
-msgstr "Αρχές Περιοχών"
+msgstr "Snap στην αρχή περιοχής"
 
 #: editor_actions.cc:303
-#, fuzzy
 msgid "Snap to region end"
-msgstr "Τέλη Περιοχών"
+msgstr "Snap στο Τέλος Περιοχης"
 
 #: editor_actions.cc:304
-#, fuzzy
 msgid "Snap to region sync"
-msgstr "Συγχρονισμός Περιοχών"
+msgstr "Snap στο συγχρονισμό περιοχής"
 
 #: editor_actions.cc:305
-#, fuzzy
 msgid "Snap to region boundary"
-msgstr "Όρια περιοχών"
+msgstr "Snap στο Όριο περιοχης"
 
 #. the region list popup menu
 #: editor_actions.cc:314
-#, fuzzy
 msgid "Sort"
-msgstr "θύρα"
+msgstr "Ταξινόμηση"
 
 #: editor_actions.cc:322
 msgid "Show all"
 msgstr "Ανάδειξη όλων"
 
 #: editor_actions.cc:323
-#, fuzzy
 msgid "Show automatic regions"
-msgstr "Ανάδειξη όλων των αυτοματισμών"
+msgstr "Ανάδειξη αυτομάτων περιοχών"
 
 #: editor_actions.cc:325
 msgid "Ascending"
@@ -3372,24 +3451,20 @@ msgstr "Με Filesystem Πηγής"
 
 #. the next two are duplicate items with different names for use in two different contexts
 #: editor_actions.cc:354
-#, fuzzy
 msgid "Add External Audio"
-msgstr "Πρόσθεση σε Λίστα Εξωτερικής Περιοχής"
+msgstr "Πρόσθεση Εξωγενούς Audio"
 
 #: editor_actions.cc:356
-#, fuzzy
 msgid "as Region(s)"
-msgstr "Έλξη περιοχής(ων)"
+msgstr "ως περιοχή(ές)"
 
 #: editor_actions.cc:358
-#, fuzzy
 msgid "as Tracks"
-msgstr "Κανάλια"
+msgstr "ως Κανάλια"
 
 #: editor_actions.cc:360
-#, fuzzy
 msgid "to Tracks"
-msgstr "Κανάλια"
+msgstr "σε Κανάλια"
 
 #: editor_actions.cc:363
 #, fuzzy
@@ -3406,33 +3481,30 @@ msgstr "Ανάδειξη κυματομορφών κατά την εγγραφή
 msgid "Show Measures"
 msgstr "Ανάδειξη γραμμών μετρήσεων"
 
-#: editor_actions.cc:378 editor_actions.cc:385
+#: editor_actions.cc:378
+#: editor_actions.cc:385
 msgid "Medium"
 msgstr ""
 
 #: editor_actions.cc:380
-#, fuzzy
 msgid "Faster"
-msgstr "Ταχύ"
+msgstr "Ταχύτερα"
 
 #: editor_actions.cc:386
 msgid "Long"
 msgstr ""
 
 #: editor_actions.cc:390
-#, fuzzy
 msgid "Later is Higher"
-msgstr "Υποβίβαση περιοχής κατά ένα στρώμα"
+msgstr "το τελευταίο ψηλότερα"
 
 #: editor_actions.cc:391
-#, fuzzy
 msgid "Most Recently Moved/Added is Higher"
-msgstr "Υποβίβαση περιοχής κατά ένα στρώμα"
+msgstr "Το μετακινημένο/προσθεμένο πιό πρόσφατα ψηλοτερα"
 
 #: editor_actions.cc:392
-#, fuzzy
 msgid "Most Recently Added is Higher"
-msgstr "Υποβίβαση περιοχής κατά ένα στρώμα"
+msgstr "Το προσθεμένο πιό πρόσφατα ψηλοτερα"
 
 #: editor_audio_import.cc:72
 #, fuzzy
@@ -3440,9 +3512,8 @@ msgid "You can't import or embed an audiofile until you have a session loaded."
 msgstr "Δεν γίνεται να εισαχθεί ήχος χωρίς να έχει φορτωθεί πρώτα Συνεδρία."
 
 #: editor_audio_import.cc:77
-#, fuzzy
 msgid "Add existing audio to session"
-msgstr "Ανάδειξη υπαρχόντων αυτοματισμών"
+msgstr "Εισαγωγή υπάρχοντος audio στη συνεδρία"
 
 #: editor_audio_import.cc:142
 msgid "ardour: importing %1"
@@ -3453,28 +3524,24 @@ msgid "Cancel Import"
 msgstr "Ακύρωση Εισαγωγής"
 
 #: editor_audio_import.cc:224
-#, fuzzy
 msgid "Editor: cannot open file \"%1\", (%2)"
-msgstr "Editor: δεν γίνεται να ανοίξει το αρχείο \"%1\" (%2)"
+msgstr "Editor: δεν γίνεται να ανοίξει το αρχείο \"%1\",(%2)"
 
 #: editor_audio_import.cc:232
-#, fuzzy
 msgid "Cancel entire import"
-msgstr "Ακύρωση Εισαγωγής"
+msgstr "Ακύρωση όλης της Εισαγωγής"
 
 #: editor_audio_import.cc:233
-#, fuzzy
 msgid "Don't embed it"
-msgstr "Μη %1"
+msgstr "Μη το εμφυτεύσεις"
 
 #: editor_audio_import.cc:234
 msgid "Embed all without questions"
 msgstr ""
 
 #: editor_audio_import.cc:239
-#, fuzzy
 msgid "Embed it anyway"
-msgstr "%1 το ούτως ή άλλως"
+msgstr "Εμφύτευσέ το ούτως ή άλλως"
 
 #: editor_audio_import.cc:242
 msgid ""
@@ -3482,8 +3549,7 @@ msgid ""
 "This audiofile's sample rate doesn't match the session sample rate!"
 msgstr ""
 "%1\n"
-"Ο ρυθμός δειγματοληψίας αυτού του αρχείου δεν ταιριάζει με αυτόν της "
-"συνεδρίας!"
+"Ο ρυθμός δειγματοληψίας αυτού του αρχείου δεν ταιριάζει με αυτόν της συνεδρίας!"
 
 #: editor_audio_import.cc:275
 msgid "could not open %1"
@@ -3498,26 +3564,28 @@ msgstr "προσθήκη ηχο-αρχείου"
 msgid "VerboseCanvasCursor"
 msgstr ""
 
-#: editor_edit_groups.cc:53 mixer_ui.cc:736
+#: editor_edit_groups.cc:53
+#: mixer_ui.cc:736
 msgid "Activate All"
 msgstr "Ενεργοποίηση όλων"
 
-#: editor_edit_groups.cc:54 mixer_ui.cc:737
-#, fuzzy
+#: editor_edit_groups.cc:54
+#: mixer_ui.cc:737
 msgid "Disable All"
-msgstr "Αποσύνδεση"
+msgstr "Απενεργοποίηση Όλων"
 
-#: editor_edit_groups.cc:56 mixer_ui.cc:739
-#, fuzzy
+#: editor_edit_groups.cc:56
+#: mixer_ui.cc:739
 msgid "Add group"
-msgstr "Χωρίς ομάδα"
+msgstr "Πρόσθεση group"
 
-#: editor_edit_groups.cc:229 mixer_ui.cc:970
-#, fuzzy
+#: editor_edit_groups.cc:229
+#: mixer_ui.cc:970
 msgid "unnamed"
-msgstr "Μετονομασία"
+msgstr "Χωρίς όνομα"
 
-#: editor_edit_groups.cc:258 mixer_ui.cc:834
+#: editor_edit_groups.cc:258
+#: mixer_ui.cc:834
 msgid "-all-"
 msgstr "-όλα-"
 
@@ -3527,6 +3595,9 @@ msgid ""
 "\n"
 "Select a selection using the range mouse mode"
 msgstr ""
+"Δεν υπάρχει επιλογή προς εξαγωγή.\n"
+"\n"
+"Επιλέξτε ένα κομμάτι με το ποντίκι σε λειτουργία 'διαστήματος'"
 
 #: editor_export_audio.cc:110
 msgid ""
@@ -3534,123 +3605,131 @@ msgid ""
 "\n"
 "Create 1 or more ranges by dragging the mouse in the range bar"
 msgstr ""
+"Δεν υπάρχουν διαστήματα προς εξαγωγή.\n"
+"\n"
+"Δημιουργήστε 1 ή περισσότερα διαστήματα τραβώντας το ποντίκι\n"
+"πάνω στη μπάρα Διαστημάτων"
 
-#: editor_imageframe.cc:625 editor_imageframe.cc:655
+#: editor_imageframe.cc:625
+#: editor_imageframe.cc:655
 msgid "programming error: no ImageFrameView selected"
 msgstr "Σφάλμα προγραμματισμού: δεν επιλέχθηκε οπτική καρέ εικόνας"
 
-#: editor_imageframe.cc:848 editor_imageframe.cc:870
+#: editor_imageframe.cc:848
+#: editor_imageframe.cc:870
 msgid "programming error: no MarkerView selected"
 msgstr "Σφάλμα προγραμματισμού: δεν επιλέχθηκε οπτική στίγματος"
 
 #: editor_keyboard.cc:104
-#, fuzzy
 msgid "mute region"
-msgstr "σιγή παρούσας περιοχής"
+msgstr "σιγή περιοχής"
 
 #: editor_keys.cc:46
-#, fuzzy
 msgid "keyboard selection"
-msgstr "επέκταση επιλογής"
+msgstr "επιλογή πληκτρολογίου"
 
-#: editor_markers.cc:292 editor_ops.cc:1290 editor_ops.cc:1303
-#: editor_ops.cc:1321 location_ui.cc:774
+#: editor_markers.cc:292
+#: editor_ops.cc:1290
+#: editor_ops.cc:1303
+#: editor_ops.cc:1321
+#: location_ui.cc:774
 msgid "add marker"
 msgstr "πρόσθεση στίγματος"
 
-#: editor_markers.cc:307 editor_markers.cc:380 editor_markers.cc:552
-#: editor_markers.cc:570 editor_markers.cc:589 editor_markers.cc:608
-#: editor_markers.cc:638 editor_markers.cc:666 editor_markers.cc:694
-#: editor_markers.cc:732 editor_markers.cc:759 editor_markers.cc:782
-#: editor_markers.cc:801 editor_mouse.cc:2015 editor_mouse.cc:4275
+#: editor_markers.cc:307
+#: editor_markers.cc:380
+#: editor_markers.cc:552
+#: editor_markers.cc:570
+#: editor_markers.cc:589
+#: editor_markers.cc:608
+#: editor_markers.cc:638
+#: editor_markers.cc:666
+#: editor_markers.cc:694
+#: editor_markers.cc:732
+#: editor_markers.cc:759
+#: editor_markers.cc:782
+#: editor_markers.cc:801
+#: editor_mouse.cc:2015
+#: editor_mouse.cc:4275
 msgid "programming error: marker canvas item has no marker object pointer!"
-msgstr ""
-"Σφάλμα προγραμματισμού: ο καμβάς στιγμάτων δεν έχει δείκτη αντικειμένου "
-"στιγμάτων!"
+msgstr "Σφάλμα προγραμματισμού: ο καμβάς στιγμάτων δεν έχει δείκτη αντικειμένου στιγμάτων!"
 
-#: editor_markers.cc:331 location_ui.cc:656
+#: editor_markers.cc:331
+#: location_ui.cc:656
 msgid "remove marker"
 msgstr "απαλοιφή στίγματος"
 
 #: editor_markers.cc:458
-#, fuzzy
 msgid "Locate to Mark"
-msgstr "Τοποθέτηση στο"
+msgstr "Τοποθέτηση στο Στίγμα"
 
 #: editor_markers.cc:459
-#, fuzzy
 msgid "Play from Mark"
-msgstr "Αναπαρ/γή από αρχή"
+msgstr "Αναπαρ/γή από Στίγμα"
 
 #: editor_markers.cc:460
-#, fuzzy
 msgid "Set Mark from Playhead"
-msgstr "Θέση από αναπαραγωγέα"
+msgstr "Θέση Στίγματος από playhead"
 
 #: editor_markers.cc:464
-#, fuzzy
 msgid "Rename Mark"
-msgstr "Μετονομασία"
+msgstr "Μετονομασία Στίγματος"
 
 #: editor_markers.cc:465
-#, fuzzy
 msgid "Hide Mark"
-msgstr "νύξη καναλιού"
+msgstr "Απόκρυψη Στίγματος"
 
 #: editor_markers.cc:466
-#, fuzzy
 msgid "Remove Mark"
-msgstr "απαλοιφή στίγματος"
+msgstr "Απαλοιφή Στίγματος"
 
-#: editor_markers.cc:479 editor_markers.cc:535
-#, fuzzy
+#: editor_markers.cc:479
+#: editor_markers.cc:535
 msgid "Locate to Range Mark"
-msgstr "Στίγματα Τοποθεσίας"
+msgstr "Εύρεση σε Στίγματα Διαστημάτων"
 
-#: editor_markers.cc:480 editor_markers.cc:536
-#, fuzzy
+#: editor_markers.cc:480
+#: editor_markers.cc:536
 msgid "Play from Range Mark"
-msgstr "Επαναληπτική αναπαρ/γή διαστήματος"
+msgstr "Αναπαρ/γή από Στίγματα Διαστημάτων"
 
 #: editor_markers.cc:481
 #, fuzzy
 msgid "Loop Range"
 msgstr "Loop διαστήματος"
 
-#: editor_markers.cc:482 editor_markers.cc:537
-#, fuzzy
+#: editor_markers.cc:482
+#: editor_markers.cc:537
 msgid "Set Range Mark from Playhead"
-msgstr "Θέση από αναπαραγωγέα"
+msgstr "Ορισμός Στίγματος Διαστήματος από playhead"
 
-#: editor_markers.cc:483 editor_markers.cc:538
-#, fuzzy
+#: editor_markers.cc:483
+#: editor_markers.cc:538
 msgid "Set Range from Range Selection"
-msgstr "επιλογή διαστήματος"
+msgstr "Ορισμός διαστήματος από επιλογή"
 
 #: editor_markers.cc:487
-#, fuzzy
 msgid "Rename Range"
-msgstr "Μετονομασία"
+msgstr "Μετονομασία Διαστήματος"
 
-#: editor_markers.cc:488 editor_markers.cc:540
-#, fuzzy
+#: editor_markers.cc:488
+#: editor_markers.cc:540
 msgid "Hide Range"
-msgstr "Πρόσθεση νέου διαστήματος"
+msgstr "Απόκρυψη Διαστήματος"
 
 #: editor_markers.cc:489
-#, fuzzy
 msgid "Remove Range"
-msgstr "Απαλοιφή Πεδίου"
+msgstr "Απαλοιφή Διαστήματος"
 
-#: editor_markers.cc:493 editor_markers.cc:542
-#, fuzzy
+#: editor_markers.cc:493
+#: editor_markers.cc:542
 msgid "Separate Regions in Range"
-msgstr "Νέα περιοχή από διάστημα"
+msgstr "Διαχωρισμός περιοχών στο διάστημα"
 
-#: editor_markers.cc:494 editor_markers.cc:543
-#, fuzzy
+#: editor_markers.cc:494
+#: editor_markers.cc:543
 msgid "Select All in Range"
-msgstr "Επιλογή όλων στο  κανάλι"
+msgstr "Επιλογή όλων στο διάστημα"
 
 #: editor_markers.cc:520
 msgid "Set Loop Range"
@@ -3670,14 +3749,12 @@ msgid "ardour: rename mark"
 msgstr "ardour: μετονομασία στίγματος"
 
 #: editor_markers.cc:820
-#, fuzzy
 msgid "ardour: rename range"
-msgstr "ardour: μετονομασία περιοχής"
+msgstr "ardour: μετονομασία διαστήματος"
 
 #: editor_markers.cc:840
-#, fuzzy
 msgid "rename marker"
-msgstr "απαλοιφή στίγματος"
+msgstr "μετονομασία στίγματος"
 
 #: editor_markers.cc:865
 msgid "set loop range"
@@ -3689,18 +3766,15 @@ msgstr "θέση punch διαστήματος"
 
 #: editor_mouse.cc:103
 msgid "Editor::event_frame() used on unhandled event type %1"
-msgstr ""
-"Επαξεργαστής::event_frame() χρησιμοποιήθηκε στο αδιαχείριστο συμβάν τύπου %1"
+msgstr "Επαξεργαστής::event_frame() χρησιμοποιήθηκε στο αδιαχείριστο συμβάν τύπου %1"
 
 #: editor_mouse.cc:313
-#, fuzzy
 msgid "select on click"
-msgstr "Χρήση όπως στο μετρονόμο"
+msgstr "επιλογή στο μετρονόμο"
 
 #: editor_mouse.cc:1590
 msgid "programming error: start_grab called without drag item"
-msgstr ""
-"σφάλμα προγραμματισμού: η ρουτίνα start_grab εκλήθη δίχως 'drag' αντικείμενο"
+msgstr "σφάλμα προγραμματισμού: η ρουτίνα start_grab εκλήθη δίχως 'drag' αντικείμενο"
 
 #: editor_mouse.cc:1814
 msgid "change fade in length"
@@ -3708,9 +3782,7 @@ msgstr "αλλαγή μήκους fade in"
 
 #: editor_mouse.cc:1832
 msgid "programming error: fade out canvas item has no regionview data pointer!"
-msgstr ""
-"σφάλμα προγραμματισμού: ο καμβάς fade out δεν έχει δείκτη δεδομένων της "
-"οπτικής περιοχών!"
+msgstr "σφάλμα προγραμματισμού: ο καμβάς fade out δεν έχει δείκτη δεδομένων της οπτικής περιοχών!"
 
 #: editor_mouse.cc:1906
 msgid "change fade out length"
@@ -3718,75 +3790,66 @@ msgstr "αλλαγή μήκους fade out"
 
 #: editor_mouse.cc:1925
 msgid "programming error: cursor canvas item has no cursor data pointer!"
-msgstr ""
-"σφάλμα προγραμματισμού: ο καμβάς του κέρσορα δεν έχει δείκτη δεδομένων του "
-"κέρσορα!"
+msgstr "σφάλμα προγραμματισμού: ο καμβάς του κέρσορα δεν έχει δείκτη δεδομένων του κέρσορα!"
 
 #: editor_mouse.cc:2142
-#, fuzzy
 msgid "move marker"
-msgstr "απαλοιφή στίγματος"
+msgstr "μετακίνηση στίγματος"
 
-#: editor_mouse.cc:2165 editor_mouse.cc:2196 editor_tempodisplay.cc:459
-msgid ""
-"programming error: meter marker canvas item has no marker object pointer!"
-msgstr ""
-"σφάλμα προγραμματισμού: ο καμβάς του μετρητή στιγμάτων δεν έχει δείκτη "
-"αντικειμένου στιγμάτων!"
+#: editor_mouse.cc:2165
+#: editor_mouse.cc:2196
+#: editor_tempodisplay.cc:459
+msgid "programming error: meter marker canvas item has no marker object pointer!"
+msgstr "σφάλμα προγραμματισμού: ο καμβάς του μετρητή στιγμάτων δεν έχει δείκτη αντικειμένου στιγμάτων!"
 
 #: editor_mouse.cc:2264
-#, fuzzy
 msgid "copy meter mark"
-msgstr "μετακίνηση στίγματος μετρητή"
+msgstr "αντιγραφή στίγματος μετρητή"
 
 #: editor_mouse.cc:2274
 msgid "move meter mark"
 msgstr "μετακίνηση στίγματος μετρητή"
 
-#: editor_mouse.cc:2289 editor_mouse.cc:2322 editor_tempodisplay.cc:331
-#: editor_tempodisplay.cc:409 editor_tempodisplay.cc:428
-msgid ""
-"programming error: tempo marker canvas item has no marker object pointer!"
-msgstr ""
-"σφάλμα προγραμματισμού: ο καμβάς στίξης του tempo δεν έχει δείκτη "
-"αντικειμένου στιγμάτων!"
+#: editor_mouse.cc:2289
+#: editor_mouse.cc:2322
+#: editor_tempodisplay.cc:331
+#: editor_tempodisplay.cc:409
+#: editor_tempodisplay.cc:428
+msgid "programming error: tempo marker canvas item has no marker object pointer!"
+msgstr "σφάλμα προγραμματισμού: ο καμβάς στίξης του tempo δεν έχει δείκτη αντικειμένου στιγμάτων!"
 
-#: editor_mouse.cc:2294 editor_mouse.cc:2327 editor_tempodisplay.cc:336
+#: editor_mouse.cc:2294
+#: editor_mouse.cc:2327
+#: editor_tempodisplay.cc:336
 #: editor_tempodisplay.cc:414
 msgid "programming error: marker for tempo is not a tempo marker!"
-msgstr ""
-"σφάλμα προγραμματισμού: το στίγμα για το  tempo δεν είναι στιγμα για tempo!"
+msgstr "σφάλμα προγραμματισμού: το στίγμα για το  tempo δεν είναι στιγμα για tempo!"
 
 #: editor_mouse.cc:2394
-#, fuzzy
 msgid "copy tempo mark"
-msgstr "μετακίνηση στίγματος tempo"
+msgstr "αντιγραφή στίγματος tempo"
 
 #: editor_mouse.cc:2404
 msgid "move tempo mark"
 msgstr "μετακίνηση στίγματος tempo"
 
-#: editor_mouse.cc:2418 editor_mouse.cc:2437 editor_mouse.cc:2450
-msgid ""
-"programming error: control point canvas item has no control point object "
-"pointer!"
-msgstr ""
-"Σφάλμα Προγραμματισμού: ο καμβάς του σημείου ελέγχου δεν έχει  δείκτη "
-"αναφοράς!"
+#: editor_mouse.cc:2418
+#: editor_mouse.cc:2437
+#: editor_mouse.cc:2450
+msgid "programming error: control point canvas item has no control point object pointer!"
+msgstr "Σφάλμα Προγραμματισμού: ο καμβάς του σημείου ελέγχου δεν έχει  δείκτη αναφοράς!"
 
 #: editor_mouse.cc:2555
 msgid "programming error: line canvas item has no line pointer!"
 msgstr "σφάλμα προγραμματισμού: ο καμβάς γραμμών δεν έχει δείκτη γραμμών!"
 
 #: editor_mouse.cc:2664
-#, fuzzy
 msgid "move region(s)"
-msgstr "απαλοιφή περιοχής"
+msgstr "μετακίνηση περιοχής(ών)"
 
 #: editor_mouse.cc:2727
-#, fuzzy
 msgid "Drag region brush"
-msgstr "Έλξη περιοχής(ων)"
+msgstr "Έλξη βούρτσας περιοχής(ων)"
 
 #. don't copy again
 #. this is committed in the grab finished callback.
@@ -3802,9 +3865,8 @@ msgid "selection grab"
 msgstr "αρπαγή επιλεγμένων"
 
 #: editor_mouse.cc:3650
-#, fuzzy
 msgid "cancel selection"
-msgstr "επιλογή διαστήματος"
+msgstr "ακύρωση επιλογής"
 
 #: editor_mouse.cc:3760
 msgid "range selection"
@@ -3864,36 +3926,44 @@ msgid ""
 "It cannot be undone\n"
 "Do you really want to destroy %1 ?"
 msgstr ""
+"Αυτό είναι καταστροφικό, πιθανότατα να διαγραφούν audio\n"
+"αρχεία.\n"
+"Δεν μπορεί να ανακληθεί\n"
+"Πραγματικά θέλετε να καταστρέψετε το %1 ?"
 
 #: editor_ops.cc:254
-#, fuzzy
 msgid "these regions"
-msgstr "αντιστροφή περιοχών"
+msgstr "αυτές τις περιοχές"
 
 #: editor_ops.cc:254
-#, fuzzy
 msgid "this region"
-msgstr "σιγή παρούσας περιοχής"
+msgstr "αυτή την περιοχή"
 
-#: editor_ops.cc:256 editor_ops.cc:3318 route_ui.cc:707
+#: editor_ops.cc:256
+#: editor_ops.cc:3318
+#: route_ui.cc:707
 #: visual_time_axis.cc:278
 msgid "No, do nothing."
 msgstr "Όχι, να μην γίνει τίποτα."
 
 #: editor_ops.cc:259
-#, fuzzy
 msgid "Yes, destroy them."
-msgstr "Ναι, να καταστραφεί."
+msgstr "Ναι,κατάστρεψέ τις."
 
-#: editor_ops.cc:261 editor_ops.cc:3319
+#: editor_ops.cc:261
+#: editor_ops.cc:3319
 msgid "Yes, destroy it."
 msgstr "Ναι, να καταστραφεί."
 
-#: editor_ops.cc:352 editor_ops.cc:380
+#: editor_ops.cc:352
+#: editor_ops.cc:380
 msgid "extend selection"
 msgstr "επέκταση επιλογής"
 
-#: editor_ops.cc:396 editor_ops.cc:430 editor_ops.cc:474 editor_ops.cc:500
+#: editor_ops.cc:396
+#: editor_ops.cc:430
+#: editor_ops.cc:474
+#: editor_ops.cc:500
 msgid "nudge forward"
 msgstr "νύξη εμπρός"
 
@@ -3902,48 +3972,40 @@ msgid "build_region_boundary_cache called with snap_type = %1"
 msgstr "build_region_boundary_cache εκλήθη με snap_type = %1"
 
 #: editor_ops.cc:1420
-#, fuzzy
 msgid "select all within"
-msgstr "Επιλογή όλων"
+msgstr "Επιλογή όλων εν μέσω"
 
 #: editor_ops.cc:1452
-#, fuzzy
 msgid "set selection from region"
-msgstr "θέση επιλογής από διάστημα"
+msgstr "θέση επιλογής από περιοχή"
 
 #: editor_ops.cc:1485
 msgid "set selection from range"
 msgstr "θέση επιλογής από διάστημα"
 
 #: editor_ops.cc:1515
-#, fuzzy
 msgid "select all from range"
-msgstr "επιλογή διαστήματος zoom"
+msgstr "επιλογή όλων από διάστημα"
 
 #: editor_ops.cc:1537
-#, fuzzy
 msgid "select all from punch"
-msgstr "Επιλογή όλων"
+msgstr "Επιλογή όλων από punch"
 
 #: editor_ops.cc:1559
-#, fuzzy
 msgid "select all from loop"
-msgstr "Επιλογή όλων"
+msgstr "Επιλογή όλων από loop"
 
 #: editor_ops.cc:1573
-#, fuzzy
 msgid "select all after cursor"
-msgstr "Από αρχή μέχρι  κέρσορα επεξεργασίας"
+msgstr "επιλογή όλων μετά κέρσ.επεξ."
 
 #: editor_ops.cc:1578
-#, fuzzy
 msgid "select all before cursor"
-msgstr "Θέση συγχρονισμού(sync) απο κέρσορα επεξερ/σίας"
+msgstr "επιλογή όλων πριν κέρσ.επεξ."
 
 #: editor_ops.cc:1608
-#, fuzzy
 msgid "select all between cursors"
-msgstr "Θέση συγχρονισμού(sync) απο κέρσορα επεξερ/σίας"
+msgstr "επιλογή όλων μετάξυ κερσόρων"
 
 #: editor_ops.cc:1739
 msgid "clear markers"
@@ -3965,7 +4027,9 @@ msgstr "προσθήκη ελκομένης περιοχής"
 msgid "insert region"
 msgstr "προσθήκη περιοχής"
 
-#: editor_ops.cc:2047 io_selector.cc:58 io_selector.cc:792
+#: editor_ops.cc:2047
+#: io_selector.cc:58
+#: io_selector.cc:792
 msgid "OK"
 msgstr "OK"
 
@@ -3973,7 +4037,8 @@ msgstr "OK"
 msgid "ardour: rename region"
 msgstr "ardour: μετονομασία περιοχής"
 
-#: editor_ops.cc:2277 editor_ops.cc:2326
+#: editor_ops.cc:2277
+#: editor_ops.cc:2326
 msgid "separate"
 msgstr "διαχωρισμός"
 
@@ -3990,16 +4055,14 @@ msgid "fill selection"
 msgstr "γόμωση επιλογής"
 
 #: editor_ops.cc:2508
-#, fuzzy
 msgid "Programming error. that region doesn't cover that position"
 msgstr ""
-"Σφάλμα προγραμματισμού: ο χάρτης τοποθεσίας/στίγματος δεν περιέχει "
-"τοποθεσίες!"
+"Σφάλμα προγραμματισμού. αυτή η περιοχή δεν καλύπτει\n"
+"αυτή τη θέση"
 
 #: editor_ops.cc:2511
-#, fuzzy
 msgid "set region sync position"
-msgstr "Περιοχές/θέση"
+msgstr "ορισμός θέσης sync περιοχής"
 
 #: editor_ops.cc:2526
 msgid "Place the edit cursor at the desired sync point"
@@ -4029,19 +4092,18 @@ msgstr "ευθυγράμμιση επιλογής"
 msgid "align region"
 msgstr "ευθυγράμμιση περιοχής"
 
-#: editor_ops.cc:2708 editor_ops.cc:2733
+#: editor_ops.cc:2708
+#: editor_ops.cc:2733
 msgid "trim to edit"
 msgstr "ισοστάθμιση προς σύνταξη"
 
 #: editor_ops.cc:2784
-#, fuzzy
 msgid "ardour: freeze"
-msgstr "ardour: "
+msgstr "ardour: πάγωμα"
 
 #: editor_ops.cc:2789
-#, fuzzy
 msgid "Cancel Freeze"
-msgstr "Ακύρωση"
+msgstr "Ακύρωση παγώματος"
 
 #: editor_ops.cc:2826
 msgid "bounce range"
@@ -4069,7 +4131,7 @@ msgstr "επικόλληση"
 
 #: editor_ops.cc:3116
 msgid "paste chunk"
-msgstr "επικόλληση κομματιού"
+msgstr "επικόλληση chunk"
 
 #. clear (below) will clear the argument list
 #: editor_ops.cc:3157
@@ -4104,43 +4166,49 @@ msgstr "εξομάλυνση"
 msgid "reverse regions"
 msgstr "αντιστροφή περιοχών"
 
-#: editor_region_list.cc:98 editor_region_list.cc:103
-#: editor_region_list.cc:106 location_ui.cc:56
+#: editor_region_list.cc:98
+#: editor_region_list.cc:103
+#: editor_region_list.cc:106
+#: location_ui.cc:56
 msgid "Hidden"
 msgstr "Κρυμμένο"
 
 #. added a new fresh one at the end
-#: editor_route_list.cc:102 editor_route_list.cc:103 editor_route_list.cc:247
+#: editor_route_list.cc:102
+#: editor_route_list.cc:103
+#: editor_route_list.cc:247
 msgid "editor"
 msgstr "επεξεργαστής"
 
-#: editor_route_list.cc:310 mixer_ui.cc:699
+#: editor_route_list.cc:310
+#: mixer_ui.cc:699
 msgid "Show All"
 msgstr "Εμφάνιση Όλων"
 
-#: editor_route_list.cc:311 mixer_ui.cc:700
+#: editor_route_list.cc:311
+#: mixer_ui.cc:700
 msgid "Hide All"
 msgstr "Απόκρυψη όλων"
 
-#: editor_route_list.cc:312 mixer_ui.cc:701
-#, fuzzy
+#: editor_route_list.cc:312
+#: mixer_ui.cc:701
 msgid "Show All Audio Tracks"
-msgstr "Ανάδειξη όλων των Ηχοδιαύλων"
+msgstr "Ανάδειξη όλων των Audio Καναλιών"
 
-#: editor_route_list.cc:313 mixer_ui.cc:702
-#, fuzzy
+#: editor_route_list.cc:313
+#: mixer_ui.cc:702
 msgid "Hide All Audio Tracks"
-msgstr "Απόκρυψη όλων των Ηχοδιαύλων"
+msgstr "Απόκρυψη όλων των Audio Καναλιών"
 
-#: editor_route_list.cc:314 mixer_ui.cc:703
-#, fuzzy
+#: editor_route_list.cc:314
+#: mixer_ui.cc:703
 msgid "Show All Audio Busses"
-msgstr "Ανάδειξη όλων των Ηχοδιαύλων"
+msgstr "Ανάδειξη όλων των Audio διαύλων"
 
-#: editor_route_list.cc:315 mixer_ui.cc:704
-#, fuzzy
+#: editor_route_list.cc:315
+#: mixer_ui.cc:704
 msgid "Hide All Audio Busses"
-msgstr "Απόκρυψη όλων των Ηχοδιαύλων"
+msgstr "Απόκρυψη όλων των Audio διαύλων"
 
 #: editor_rulers.cc:312
 msgid "New location marker"
@@ -4176,20 +4244,19 @@ msgid "Min:Secs"
 msgstr "Λεπ:Δεύτ"
 
 #: editor_selection_list.cc:108
-#, fuzzy
 msgid "Name for Chunk:"
-msgstr "όνομα για κομμάτι:"
+msgstr "όνομα για Chunk:"
 
 #: editor_selection_list.cc:111
-#, fuzzy
 msgid "Create Chunk"
-msgstr "Δημιουργία κομματιού"
+msgstr "Δημιουργία Chunk"
 
 #: editor_selection_list.cc:111
 msgid "Forget it"
 msgstr "Ξέχασέ το"
 
-#: editor_tempodisplay.cc:253 editor_tempodisplay.cc:293
+#: editor_tempodisplay.cc:253
+#: editor_tempodisplay.cc:293
 msgid "add"
 msgstr "πρόσθεση"
 
@@ -4201,20 +4268,23 @@ msgstr "πρόσθεση στίγματος χρόνου"
 msgid "add meter mark"
 msgstr "πρόσθεση στίγματος μέτρου"
 
-#: editor_tempodisplay.cc:348 editor_tempodisplay.cc:376
+#: editor_tempodisplay.cc:348
+#: editor_tempodisplay.cc:376
 msgid "done"
 msgstr "έγινε"
 
-#: editor_tempodisplay.cc:366 editor_tempodisplay.cc:394
+#: editor_tempodisplay.cc:366
+#: editor_tempodisplay.cc:394
 msgid "replace tempo mark"
 msgstr "αντικατάσταση στίγματος χρόνου"
 
-#: editor_tempodisplay.cc:433 editor_tempodisplay.cc:464
+#: editor_tempodisplay.cc:433
+#: editor_tempodisplay.cc:464
 msgid "programming error: marker for meter is not a meter marker!"
-msgstr ""
-"Σφάλμα προγραμματισμού: το στίγμα για το μέτρο δεν είναι στίγμα μέτρου!"
+msgstr "Σφάλμα προγραμματισμού: το στίγμα για το μέτρο δεν είναι στίγμα μέτρου!"
 
-#: editor_tempodisplay.cc:443 editor_tempodisplay.cc:476
+#: editor_tempodisplay.cc:443
+#: editor_tempodisplay.cc:476
 msgid "remove tempo mark"
 msgstr "απαλοιφή στίγματος χρόνου"
 
@@ -4238,7 +4308,8 @@ msgstr "ΔιάλογοςΧρονοκάμψης"
 msgid "Stretch/Shrink it"
 msgstr "Μεγέθυνέ/Σμίκρυνέ το"
 
-#: editor_timefx.cc:73 editor_timefx.cc:74
+#: editor_timefx.cc:73
+#: editor_timefx.cc:74
 msgid "TimeStretchButton"
 msgstr "ΚουμπίΧρονοκάμψης"
 
@@ -4248,34 +4319,47 @@ msgstr "ΠρόοδοςΧρονοκάμψης"
 
 #: editor_timefx.cc:139
 msgid "timestretch cannot be started - thread creation error"
-msgstr ""
+msgstr "timestretch δεν μπορεί να αρχίσει - σφάλμα δημιουργίας thread"
 
-#: export_dialog.cc:59 export_dialog.cc:399 export_dialog.cc:1027
+#: export_dialog.cc:59
+#: export_dialog.cc:399
+#: export_dialog.cc:1027
 #: export_dialog.cc:1195
 msgid "22.05kHz"
 msgstr "22.05kHz"
 
-#: export_dialog.cc:60 export_dialog.cc:402 export_dialog.cc:417
-#: export_dialog.cc:1029 export_dialog.cc:1197
+#: export_dialog.cc:60
+#: export_dialog.cc:402
+#: export_dialog.cc:417
+#: export_dialog.cc:1029
+#: export_dialog.cc:1197
 msgid "44.1kHz"
 msgstr "44.1kHz"
 
-#: export_dialog.cc:61 export_dialog.cc:405 export_dialog.cc:1031
+#: export_dialog.cc:61
+#: export_dialog.cc:405
+#: export_dialog.cc:1031
 #: export_dialog.cc:1199
 msgid "48kHz"
 msgstr "48kHz"
 
-#: export_dialog.cc:62 export_dialog.cc:408 export_dialog.cc:1033
+#: export_dialog.cc:62
+#: export_dialog.cc:408
+#: export_dialog.cc:1033
 #: export_dialog.cc:1201
 msgid "88.2kHz"
 msgstr "88.2kHz"
 
-#: export_dialog.cc:63 export_dialog.cc:411 export_dialog.cc:1035
+#: export_dialog.cc:63
+#: export_dialog.cc:411
+#: export_dialog.cc:1035
 #: export_dialog.cc:1203
 msgid "96kHz"
 msgstr "96kHz"
 
-#: export_dialog.cc:64 export_dialog.cc:414 export_dialog.cc:1037
+#: export_dialog.cc:64
+#: export_dialog.cc:414
+#: export_dialog.cc:1037
 #: export_dialog.cc:1205
 msgid "192kHz"
 msgstr "192kHz"
@@ -4284,23 +4368,28 @@ msgstr "192kHz"
 msgid "best"
 msgstr "βέλτιστη"
 
-#: export_dialog.cc:70 export_dialog.cc:1212
+#: export_dialog.cc:70
+#: export_dialog.cc:1212
 msgid "fastest"
 msgstr "ταχύτατη"
 
-#: export_dialog.cc:71 export_dialog.cc:1214
+#: export_dialog.cc:71
+#: export_dialog.cc:1214
 msgid "linear"
 msgstr "γραμμική"
 
-#: export_dialog.cc:72 export_dialog.cc:1216
+#: export_dialog.cc:72
+#: export_dialog.cc:1216
 msgid "better"
 msgstr "καλύτερη"
 
-#: export_dialog.cc:73 export_dialog.cc:1218
+#: export_dialog.cc:73
+#: export_dialog.cc:1218
 msgid "intermediate"
 msgstr "ενδιάμεση"
 
-#: export_dialog.cc:79 export_dialog.cc:1227
+#: export_dialog.cc:79
+#: export_dialog.cc:1227
 msgid "Rectangular"
 msgstr "Τετράγωνη"
 
@@ -4308,7 +4397,8 @@ msgstr "Τετράγωνη"
 msgid "Shaped Noise"
 msgstr "Μορφοποιημένος Θόρυβος"
 
-#: export_dialog.cc:81 export_dialog.cc:1229
+#: export_dialog.cc:81
+#: export_dialog.cc:1229
 msgid "Triangular"
 msgstr "Τρίγωνη"
 
@@ -4317,7 +4407,9 @@ msgid "stereo"
 msgstr "stereo"
 
 #. default is to use all
-#: export_dialog.cc:87 export_dialog.cc:486 export_dialog.cc:1055
+#: export_dialog.cc:87
+#: export_dialog.cc:486
+#: export_dialog.cc:1055
 #: export_dialog.cc:1177
 msgid "mono"
 msgstr "mono"
@@ -4331,63 +4423,58 @@ msgid "TOC"
 msgstr ""
 
 #: export_dialog.cc:102
-#, fuzzy
 msgid "Format"
-msgstr "Κανονικό"
+msgstr ""
 
 #: export_dialog.cc:103
 msgid "CD Marker File Type"
 msgstr ""
 
 #: export_dialog.cc:104
-#, fuzzy
 msgid "Channels"
-msgstr "Ακύρωση"
+msgstr "Κανάλια"
 
 #: export_dialog.cc:105
-#, fuzzy
 msgid "File Type"
-msgstr "Filesystem"
+msgstr ""
 
 #: export_dialog.cc:106
-#, fuzzy
 msgid "Sample Format"
-msgstr "διαχωρισμός"
+msgstr ""
 
 #: export_dialog.cc:107
 msgid "Sample Endianness"
 msgstr ""
 
 #: export_dialog.cc:108
-#, fuzzy
 msgid "Sample Rate"
-msgstr "διαχωρισμός"
+msgstr ""
 
 #: export_dialog.cc:109
 msgid "Conversion Quality"
-msgstr ""
+msgstr "Ποιότητα Μετατροπής"
 
 #: export_dialog.cc:110
 msgid "Dither Type"
 msgstr ""
 
 #: export_dialog.cc:111
-#, fuzzy
 msgid "Export CD Marker File Only"
-msgstr "Εξαγωγή σε CD από μαρκάρισμα καναλιού"
+msgstr "Εξαγωγή αρχείου CD Marker μόνο"
 
 #: export_dialog.cc:112
-#, fuzzy
 msgid "Export to File"
-msgstr "Εξαγωγή σε CD"
+msgstr "Εξαγωγή σε αρχείο"
 
-#: export_dialog.cc:113 option_editor.cc:83 option_editor.cc:84
+#: export_dialog.cc:113
+#: option_editor.cc:83
+#: option_editor.cc:84
 msgid "Browse"
 msgstr "Αναζήτηση"
 
 #: export_dialog.cc:114
 msgid "Specific tracks ..."
-msgstr ""
+msgstr "Συγκεκριμένα κανάλια"
 
 #: export_dialog.cc:125
 msgid "ardour: export"
@@ -4397,25 +4484,20 @@ msgstr "ardour: εξαγωγή"
 msgid "ardour_export"
 msgstr "ardour_εξαγωγή"
 
-#: export_dialog.cc:139 export_dialog.cc:155 mixer_strip.cc:124
+#: export_dialog.cc:139
+#: export_dialog.cc:155
+#: mixer_strip.cc:124
 #: mixer_strip.cc:767
-#, fuzzy
 msgid "Output"
-msgstr "Έξοδοι"
+msgstr ""
 
 #: export_dialog.cc:633
-#, fuzzy
 msgid "Editor: cannot open \"%1\" as export file for CD toc file"
-msgstr ""
-"Επεξεργαστής: δεν γίνεται να ανοιχτεί το \"%1\" ως αρχείο εξαγωγής για "
-"στίγματα καναλιού CD"
+msgstr "Επεξεργαστής: δεν γίνεται να ανοιχτεί το \"%1\" ως αρχείο εξαγωγής για CD toc αρχείο"
 
 #: export_dialog.cc:759
-#, fuzzy
 msgid "Editor: cannot open \"%1\" as export file for CD cue file"
-msgstr ""
-"Επεξεργαστής: δεν γίνεται να ανοιχτεί το \"%1\" ως αρχείο εξαγωγής για "
-"στίγματα καναλιού CD"
+msgstr "Επεξεργαστής: δεν γίνεται να ανοιχτεί το \"%1\" ως αρχείο εξαγωγής για CD cue αρχείο"
 
 #: export_dialog.cc:778
 msgid "WAV"
@@ -4427,60 +4509,66 @@ msgstr "Παύση Εξαγωγής"
 
 #: export_dialog.cc:1131
 msgid "Please enter a valid filename."
-msgstr ""
+msgstr "Παρακαλώ δώστε ένα ισχύον όνομα."
 
 #: export_dialog.cc:1141
 msgid "Please specify a complete filename for the audio file."
-msgstr ""
+msgstr "Παρακαλώ δώστε ολόκληρο το όνομα του audio αρχείου."
 
 #: export_dialog.cc:1147
 msgid "File already exists, do you want to overwrite it?"
-msgstr ""
+msgstr "Το αρχείο ήδη υπάρχει, θέλετε να σώστε από πάνω?"
 
-#: export_dialog.cc:1159 export_range_markers_dialog.cc:153
+#: export_dialog.cc:1159
+#: export_range_markers_dialog.cc:153
 msgid "Cannot write file in: "
-msgstr ""
+msgstr "Αδύνατη η εγγραφή αρχείου σε:"
 
 #. warning dialog
 #: export_range_markers_dialog.cc:135
 msgid "Please enter a valid target directory."
-msgstr ""
+msgstr "Παρακαλώ δώστε ένα υπάρχον directory. "
 
 #: export_range_markers_dialog.cc:143
 msgid ""
 "Please select an existing target directory. Files\n"
 "are not allowed!"
 msgstr ""
+"ΠΑρακαλώ επιλέξτε ένα υπάρχον directory.Αρχεία\n"
+"δεν επιτρέπονται!"
 
 #: gain_automation_time_axis.cc:62
-#, fuzzy
 msgid "add gain automation event"
-msgstr "πρόσθεση συμβάντος αυτοματισμού σε "
+msgstr "πρόσθεση συμβάντος αυτοματισμού gain"
 
 #: gain_meter.cc:67
 msgid "cannot find images for fader slider"
-msgstr ""
+msgstr "δεν ευρέθησαν εικόνες για το fader slider"
 
 #: gain_meter.cc:74
 msgid "cannot find images for fader rail"
-msgstr ""
+msgstr "δεν ευρέθησαν εικόνες για το fader rail"
 
-#: gain_meter.cc:130 gain_meter.cc:339 gain_meter.cc:494 gain_meter.cc:539
+#: gain_meter.cc:130
+#: gain_meter.cc:339
+#: gain_meter.cc:494
+#: gain_meter.cc:539
 msgid "-inf"
 msgstr "-inf"
 
 #: gain_meter.cc:140
-#, fuzzy
 msgid "Fader automation mode"
-msgstr "Λειτουργία αυτοματισμού pan"
+msgstr "Λειτουργία αυτοματισμού Fader"
 
 #: gain_meter.cc:141
-#, fuzzy
 msgid "Fader automation type"
-msgstr "Τύπος αυτοματισμού Pan"
+msgstr "Τύπος αυτοματισμού Fader"
 
 #. XXX it might different in different languages
-#: gain_meter.cc:182 gain_meter.cc:817 panner_ui.cc:99 panner_ui.cc:807
+#: gain_meter.cc:182
+#: gain_meter.cc:817
+#: panner_ui.cc:99
+#: panner_ui.cc:807
 #, fuzzy
 msgid "Abs"
 msgstr "abs"
@@ -4490,66 +4578,66 @@ msgstr "abs"
 msgid "-Inf"
 msgstr "-inf"
 
-#: gain_meter.cc:781 mixer_strip.cc:770 panner_ui.cc:771
-#, fuzzy
+#: gain_meter.cc:781
+#: mixer_strip.cc:770
+#: panner_ui.cc:771
 msgid "O"
-msgstr "OR"
+msgstr ""
 
-#: gain_meter.cc:784 panner_ui.cc:774
+#: gain_meter.cc:784
+#: panner_ui.cc:774
 msgid "P"
 msgstr ""
 
-#: gain_meter.cc:787 panner_ui.cc:777
+#: gain_meter.cc:787
+#: panner_ui.cc:777
 msgid "T"
 msgstr ""
 
-#: gain_meter.cc:790 panner_ui.cc:780
+#: gain_meter.cc:790
+#: panner_ui.cc:780
 msgid "W"
 msgstr ""
 
 #: gtk-custom-ruler.c:126
-#, fuzzy
 msgid "Lower"
-msgstr "Στρώμα"
+msgstr "Κατώτερο"
 
 #: gtk-custom-ruler.c:127
-#, fuzzy
 msgid "Lower limit of ruler"
-msgstr "Υποβίβαση περιοχής στο κατώτατο στρώμα"
+msgstr "Κατώτερο όριο κλίμακας"
 
 #: gtk-custom-ruler.c:136
 msgid "Upper"
-msgstr ""
+msgstr "Ανώτατο"
 
 #: gtk-custom-ruler.c:137
 msgid "Upper limit of ruler"
-msgstr ""
+msgstr "Ανώτατο όριο κλίμακας"
 
 #: gtk-custom-ruler.c:146
-#, fuzzy
 msgid "Position"
-msgstr "Τοποθεσιακό Sync"
+msgstr "Θέση"
 
 #: gtk-custom-ruler.c:147
 msgid "Position of mark on the ruler"
-msgstr ""
+msgstr "Θέση στίγματος στην κλίμακα"
 
 #: gtk-custom-ruler.c:156
 msgid "Max Size"
-msgstr ""
+msgstr "Μέγ.μέγεθος"
 
 #: gtk-custom-ruler.c:157
 msgid "Maximum size of the ruler"
-msgstr ""
+msgstr "Μέγιστο μέγεθος κίμακας"
 
 #: gtk-custom-ruler.c:166
-#, fuzzy
 msgid "Show Position"
-msgstr "Με Θέση Περιοχής"
+msgstr "Ανάδειξη Θέσεως"
 
 #: gtk-custom-ruler.c:167
 msgid "Draw current ruler position"
-msgstr ""
+msgstr "Σχηματισμός τρέχουσας θέσης κλίμακας"
 
 #. end-of-file, other end closed or shutdown?
 #: imageframe_socket_handler.cc:127
@@ -4557,58 +4645,56 @@ msgid "Image Compositor Socket has been shutdown/closed"
 msgstr "Η  Socket για τον Image Compositor έχει τερματιστεί/κλείσει"
 
 #: imageframe_time_axis.cc:286
-#, fuzzy
 msgid "0.5 seconds"
-msgstr "Δευτερόλεπτα"
+msgstr "0.5 Δευτερόλεπτα"
 
-#: imageframe_time_axis.cc:287 marker_time_axis.cc:242
-#, fuzzy
+#: imageframe_time_axis.cc:287
+#: marker_time_axis.cc:242
 msgid "1 seconds"
-msgstr "Δευτερόλεπτα"
+msgstr "1 Δευτερόλεπτα"
 
-#: imageframe_time_axis.cc:288 marker_time_axis.cc:243
-#, fuzzy
+#: imageframe_time_axis.cc:288
+#: marker_time_axis.cc:243
 msgid "1.5 seconds"
-msgstr "Δευτερόλεπτα"
+msgstr "1.5 Δευτερόλεπτα"
 
-#: imageframe_time_axis.cc:289 marker_time_axis.cc:244
-#, fuzzy
+#: imageframe_time_axis.cc:289
+#: marker_time_axis.cc:244
 msgid "2 seconds"
-msgstr "Δευτερόλεπτα"
+msgstr "2 Δευτερόλεπτα"
 
-#: imageframe_time_axis.cc:290 marker_time_axis.cc:245
-#, fuzzy
+#: imageframe_time_axis.cc:290
+#: marker_time_axis.cc:245
 msgid "2.5 seconds"
-msgstr "Δευτερόλεπτα"
+msgstr "2.5 Δευτερόλεπτα"
 
-#: imageframe_time_axis.cc:291 marker_time_axis.cc:246
-#, fuzzy
+#: imageframe_time_axis.cc:291
+#: marker_time_axis.cc:246
 msgid "3 seconds"
-msgstr "Δευτερόλεπτα"
+msgstr "3 Δευτερόλεπτα"
 
 #. duration_items.push_back(SeparatorElem()) ;
 #. duration_items.push_back(MenuElem (_("custom"), mem_fun(*this, &ImageFrameTimeAxis::set_marker_duration_custom))) ;
-#: imageframe_time_axis.cc:296 marker_time_axis.cc:251
-#, fuzzy
+#: imageframe_time_axis.cc:296
+#: marker_time_axis.cc:251
 msgid "Duration (sec)"
-msgstr "Έλξη περιοχής(ων)"
+msgstr "Διάρκεια (δευτ)"
 
 #: imageframe_time_axis.cc:301
-#, fuzzy
 msgid "Remove Frame"
-msgstr "Απαλοιφή Πεδίου"
+msgstr "Απαλοιφή Frame"
 
 #: imageframe_time_axis.cc:304
-#, fuzzy
 msgid "Image Frame"
-msgstr "Frames"
+msgstr ""
 
-#: imageframe_time_axis.cc:305 marker_time_axis.cc:257
-#, fuzzy
+#: imageframe_time_axis.cc:305
+#: marker_time_axis.cc:257
 msgid "Rename Track"
-msgstr "Μετονομασία"
+msgstr "Μετονομασία Καναλιού"
 
-#: io_selector.cc:60 io_selector.cc:794
+#: io_selector.cc:60
+#: io_selector.cc:794
 #, fuzzy
 msgid "Rescan"
 msgstr "Επανα-ανίχνευση"
@@ -4621,48 +4707,48 @@ msgstr "%1 είσοδος"
 msgid "%1 output"
 msgstr "%1 έξοδος"
 
-#: io_selector.cc:142 route_params_ui.cc:107
+#: io_selector.cc:142
+#: route_params_ui.cc:107
 msgid "Inputs"
 msgstr "Είσοδοι"
 
-#: io_selector.cc:142 route_params_ui.cc:108
+#: io_selector.cc:142
+#: route_params_ui.cc:108
 msgid "Outputs"
 msgstr "Έξοδοι"
 
 #: io_selector.cc:143
-#, fuzzy
 msgid "Add Input"
-msgstr "πρόσθεση εισόδου"
+msgstr "πρόσθεση Input"
 
 #: io_selector.cc:143
-#, fuzzy
 msgid "Add Output"
-msgstr "πρόσθεση εξόδου"
+msgstr "πρόσθεση Output"
 
 #: io_selector.cc:144
-#, fuzzy
 msgid "Remove Input"
-msgstr "Απαλοιφή σημείου συγχρονισμού"
+msgstr "Απαλοιφή Input"
 
 #: io_selector.cc:144
-#, fuzzy
 msgid "Remove Output"
-msgstr "# Έξοδοι"
+msgstr "Απαλοιφή Output"
 
 #: io_selector.cc:145
-#, fuzzy
 msgid "Disconnect All"
-msgstr "Αποσύνδεση"
+msgstr "Αποσύνδεση Όλων"
 
 #: io_selector.cc:159
 msgid "Available connections"
 msgstr "Διαθέσιμες Συνδέσεις"
 
-#: io_selector.cc:555 io_selector.cc:574
+#: io_selector.cc:555
+#: io_selector.cc:574
 msgid "There are no more JACK ports available."
-msgstr ""
+msgstr "Δεν υπάρχουν άλλες διαθέσιμες θύρες του JACK."
 
-#: io_selector.cc:649 io_selector.cc:676 io_selector.cc:729
+#: io_selector.cc:649
+#: io_selector.cc:676
+#: io_selector.cc:729
 msgid "port"
 msgstr "θύρα"
 
@@ -4675,22 +4761,12 @@ msgid "KeyboardTarget: keyname \"%1\" is unknown."
 msgstr "KeyboardTarget: το Όνομα Πλήκτρου \"%1\" είναι άγνωστο."
 
 #: keyboard.cc:525
-msgid ""
-"Your system is completely broken - NumLock uses \"%1\"as its modifier. This "
-"is madness - see the man page for xmodmap to find out how to fix this."
-msgstr ""
-"Το Σύστημά σας έχει χαλάσει τελείως - Το NumLock χρησιμοποιεί το \"%1\"σαν "
-"μεταβλητή του. Αυτό είναι τρέλα - ανατρέξτε στην man page του xmodmap για να "
-"βρείτε πώς θα το φτιάξετε."
+msgid "Your system is completely broken - NumLock uses \"%1\"as its modifier. This is madness - see the man page for xmodmap to find out how to fix this."
+msgstr "Το Σύστημά σας έχει χαλάσει τελείως - Το NumLock χρησιμοποιεί το \"%1\"σαν μεταβλητή του. Αυτό είναι τρέλα - ανατρέξτε στην man page του xmodmap για να βρείτε πώς θα το φτιάξετε."
 
 #: keyboard.cc:533
-msgid ""
-"Your system generates \"%1\" when the NumLock key is pressed. This can cause "
-"problems when editing so Ardour will use %2 to mean Meta rather than %1"
-msgstr ""
-"Το Σύστημά σας δημιουργεί \"%1\" όταν το  NumLock είναι εν ενεργεία. Αυτό "
-"μπορεί να δημιουργήσει προβλήματα στην επεξεργασία οπότε ο Ardour θα "
-"χρησιμοποιήσει %2 για Meta αντί του %1"
+msgid "Your system generates \"%1\" when the NumLock key is pressed. This can cause problems when editing so Ardour will use %2 to mean Meta rather than %1"
+msgstr "Το Σύστημά σας δημιουργεί \"%1\" όταν το  NumLock είναι εν ενεργεία. Αυτό μπορεί να δημιουργήσει προβλήματα στην επεξεργασία οπότε ο Ardour θα χρησιμοποιήσει %2 για Meta αντί του %1"
 
 #: keyboard.cc:594
 msgid "You have %1 keys bound to \"mod1\""
@@ -4712,11 +4788,13 @@ msgstr "Υπάρχουν %1 πλήκτρα αναθεμένα στο \"mod4\""
 msgid "You have %1 keys bound to \"mod5\""
 msgstr "Υπάρχουν %1 πλήκτρα αναθεμένα στο \"mod5\""
 
-#: location_ui.cc:48 location_ui.cc:51
+#: location_ui.cc:48
+#: location_ui.cc:51
 msgid "Set"
 msgstr "Θέση"
 
-#: location_ui.cc:49 location_ui.cc:52
+#: location_ui.cc:49
+#: location_ui.cc:52
 msgid "Go"
 msgstr "Πήγαινε"
 
@@ -4749,14 +4827,12 @@ msgid "ardour_locations"
 msgstr "ardour_τοποθεσίες"
 
 #: location_ui.cc:604
-#, fuzzy
 msgid "Location (CD Index) Markers"
-msgstr "Στίγματα Τοποθεσίας"
+msgstr "Στίγματα Τοποθεσίας (CD Index)"
 
 #: location_ui.cc:624
-#, fuzzy
 msgid "Range (CD Track) Markers"
-msgstr "Στίγματα διαστημάτων"
+msgstr "Στίγματα διαστημάτων (CD Track)"
 
 #: location_ui.cc:790
 msgid "add range marker"
@@ -4772,13 +4848,13 @@ msgstr "παύση του user interface\n"
 
 #. XXX its doubtful that snprintf() is async-safe
 #: main.cc:100
-#, fuzzy, c-format
+#, c-format
 msgid "%d(%d): received signal %d\n"
-msgstr "%d: εδέχθη σήμα %d\n"
+msgstr "%d(%d): εδέχθη σήμα %d\n"
 
 #: main.cc:180
 msgid "cannot become new process group leader (%1)"
-msgstr ""
+msgstr "δεν γίνεται νέος αρχηγός process group (%1)"
 
 #: main.cc:207
 msgid "cannot setup signal handling for %1"
@@ -4789,21 +4865,18 @@ msgid "cannot set default signal mask (%1)"
 msgstr "δεν γίνεται να διαμορφώθεί η προκαθορισμένη μάσκα σημάτων (%1)"
 
 #: main.cc:248
-#, fuzzy
 msgid ""
 "Without a UI style file, ardour will look strange.\n"
 " Please set ARDOUR2_UI_RC to point to a valid UI style file"
 msgstr ""
 "Δίχως αρχείο εμφάνισεως UI, ο ardour θα φαίνεται παράξενα.\n"
-"Παρακαλώ θέστε το ARDOUR_UI_RC να δείχνει σε ενεργό αρχείο εμφανίσεως UI"
+"Παρακαλώ θέστε το ARDOUR_UI_RC να δείχνει σε ενεργό αρχείο εμφανίσεως UI."
 
 #: main.cc:270
-#, fuzzy
 msgid "Ardour could not connect to JACK."
-msgstr "Δεν γινόταν να συνδεθώ στον JACK server σαν  \"%1\""
+msgstr "Το Ardour δεν μπόρεσε να συνδεθεί στον JACK."
 
 #: main.cc:274
-#, fuzzy
 msgid ""
 "There are several possible reasons:\n"
 "\n"
@@ -4813,14 +4886,13 @@ msgid ""
 "\n"
 "Please consider the possibilities, and perhaps (re)start JACK."
 msgstr ""
-"Ο Ardour δεν μπόρεσε να συνδεθεί στον  JACK.\n"
 "Υπάρχουν διάφοροι πιθανοί λόγοι:\n"
 "\n"
 "1) Ο JACK δεν τρέχει.\n"
 "2) JACK τρέχει σαν άλλος Χρήστης, ίσως σαν root.\n"
 "3) Υπάρχει ήδη άλλο πρόγραμμα με το όνομα \"ardour\".\n"
 "\n"
-"Παρακαλώ αναλογιστείτε τις πιθανότητες, και ίσως (ξανα)ξεκινήστε τον JACK."
+"Παρακαλώ αναλογιστείτε τις πιθανότητες, ίσως (ξανα)ξεκινήστε τον JACK."
 
 #: main.cc:304
 msgid "could not load command line session \"%1\""
@@ -4834,6 +4906,11 @@ msgid ""
 "A session named \"%1\" already exists.\n"
 "To avoid this message, start ardour as \"ardour %1"
 msgstr ""
+"\n"
+"\n"
+"Συνεδρία με όνομα \"%1\" ήδη υπάρχει.\n"
+"Προς αποφυγήν αυτού το μηνύματος, αρχίστε\n"
+"το ardour σαν \"ardour %1"
 
 #: main.cc:335
 msgid ""
@@ -4842,6 +4919,11 @@ msgid ""
 "No session named \"%1\" exists.\n"
 "To create it from the command line, start ardour as \"ardour --new %1"
 msgstr ""
+"\n"
+"\n"
+"Συνεδρία με όνομα \"%1\" δεν υπάρχει.\n"
+"Δημιουργήστε τη από command line αρχίζοντας το\n"
+"ardour σαν \"ardour --new %1"
 
 #: main.cc:399
 msgid "Ardour/GTK "
@@ -4854,9 +4936,8 @@ msgid ""
 msgstr ""
 
 #: main.cc:405
-#, fuzzy
 msgid " with libardour "
-msgstr " τρέχοντας με libardour "
+msgstr "με libardour "
 
 #: main.cc:410
 msgid " and GCC version "
@@ -4868,10 +4949,8 @@ msgid "Copyright (C) 1999-2006 Paul Davis"
 msgstr "Πνευματικα Δικαιώματα 1999-2004 Paul Davis"
 
 #: main.cc:421
-msgid ""
-"Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
-"Baker"
-msgstr ""
+msgid "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker"
+msgstr "Μερικά μέρη Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel Baker"
 
 #: main.cc:423
 msgid "Ardour comes with ABSOLUTELY NO WARRANTY"
@@ -4883,13 +4962,13 @@ msgstr ""
 
 #: main.cc:425
 msgid "This is free software, and you are welcome to redistribute it "
-msgstr ""
-"Το παρόν είναι ελεύθερο λογισμικό, είστε ελεύθεροι να το επαναδιανείμετε "
+msgstr "Το παρόν είναι ελεύθερο λογισμικό, είστε ελεύθεροι να το επαναδιανείμετε "
 
 #: main.cc:426
-#, fuzzy
 msgid "under certain conditions; see the source for copying conditions."
-msgstr "υπό ορισμένους όρους, ανατρέξτε στο αρχείο COPYING για λεπτομέρειες"
+msgstr ""
+"υπό ορισμένους όρους, ανατρέξτε στον κώδικα για τους όρους\n"
+" αντιγραφής."
 
 #: main.cc:435
 msgid "could not create ARDOUR GUI"
@@ -4904,19 +4983,16 @@ msgid "could not initialize Ardour."
 msgstr "δεν γινόταν να εκκινηθεί ο  Ardour."
 
 #: marker.cc:244
-#, fuzzy
 msgid "MarkerText"
-msgstr "Στίγματα"
+msgstr "ΚείμενοΣτίγματος"
 
 #: marker_time_axis.cc:254
-#, fuzzy
 msgid "Remove Marker"
-msgstr "απαλοιφή στίγματος"
+msgstr "Απαλοιφή Στίγματος"
 
 #: marker_time_axis.cc:256
-#, fuzzy
 msgid "Marker"
-msgstr "Στίγματα"
+msgstr "Στίγμα"
 
 #: meter_bridge.cc:78
 msgid "ardour: meter bridge"
@@ -4926,7 +5002,8 @@ msgstr "ardour: γέφυρα μετρήσεων"
 msgid "ardour_meter_bridge"
 msgstr "ardour_γέφυρα_μετρήσεων"
 
-#: meter_bridge_strip.cc:80 meter_bridge_strip.cc:94
+#: meter_bridge_strip.cc:80
+#: meter_bridge_strip.cc:94
 #, c-format
 msgid "# of %u-sample overs"
 msgstr "# από %u-sample overs"
@@ -4936,28 +5013,30 @@ msgstr "# από %u-sample overs"
 msgid "New Name for Meter:"
 msgstr "Νέο όνομα για μετρητή:"
 
-#: mixer_strip.cc:95 mixer_strip.cc:140 mixer_strip.cc:1227
+#: mixer_strip.cc:95
+#: mixer_strip.cc:140
+#: mixer_strip.cc:1227
 msgid "pre"
 msgstr "προ"
 
-#: mixer_strip.cc:96 mixer_strip.cc:822
+#: mixer_strip.cc:96
+#: mixer_strip.cc:822
 msgid "Comments"
-msgstr ""
+msgstr "Σχόλια"
 
 #: mixer_strip.cc:119
-#, fuzzy
 msgid "Input"
-msgstr "Είσοδοι"
+msgstr ""
 
-#: mixer_strip.cc:136 mixer_strip.cc:1223
-#, fuzzy
+#: mixer_strip.cc:136
+#: mixer_strip.cc:1223
 msgid "input"
-msgstr "%1 είσοδος"
+msgstr ""
 
-#: mixer_strip.cc:144 mixer_strip.cc:1231
-#, fuzzy
+#: mixer_strip.cc:144
+#: mixer_strip.cc:1231
 msgid "post"
-msgstr "θύρα"
+msgstr ""
 
 #. TRANSLATORS: this string should be longest of the strings
 #. used to describe meter points. In english, its "input".
@@ -4971,9 +5050,10 @@ msgstr ""
 msgid "Varispeed"
 msgstr "μεταβλητή ταχύτητα"
 
-#: mixer_strip.cc:233 mixer_strip.cc:836
+#: mixer_strip.cc:233
+#: mixer_strip.cc:836
 msgid "Click to Add/Edit Comments"
-msgstr ""
+msgstr "Κλίκ για Πρόσθεση/Επεξεργασία Σχολίων"
 
 #: mixer_strip.cc:374
 msgid "unknown strip width \"%1\" in XML GUI information"
@@ -4984,7 +5064,8 @@ msgstr "άγνωστο εύρος διαδρόμου \"%1\" στις πληρο
 msgid "record"
 msgstr "Εγγραφή"
 
-#: mixer_strip.cc:418 region_editor.cc:47
+#: mixer_strip.cc:418
+#: region_editor.cc:47
 msgid "mute"
 msgstr "σιγή"
 
@@ -4994,16 +5075,15 @@ msgstr "σόλο"
 
 #: mixer_strip.cc:422
 msgid "comments"
-msgstr ""
+msgstr "σχόλια"
 
 #: mixer_strip.cc:424
 msgid "*comments*"
-msgstr ""
+msgstr "*σχόλια*"
 
 #: mixer_strip.cc:438
-#, fuzzy
 msgid "Rec"
-msgstr "Επανα-ανίχνευση"
+msgstr ""
 
 #: mixer_strip.cc:439
 msgid "M"
@@ -5013,45 +5093,48 @@ msgstr ""
 msgid "S"
 msgstr ""
 
-#: mixer_strip.cc:443 mixer_strip.cc:830
-#, fuzzy
+#: mixer_strip.cc:443
+#: mixer_strip.cc:830
 msgid "Cmt"
-msgstr "κοπή"
+msgstr ""
 
-#: mixer_strip.cc:445 mixer_strip.cc:828
+#: mixer_strip.cc:445
+#: mixer_strip.cc:828
 msgid "*Cmt*"
 msgstr ""
 
-#: mixer_strip.cc:483 mixer_strip.cc:549 redirect_box.cc:1006
+#: mixer_strip.cc:483
+#: mixer_strip.cc:549
+#: redirect_box.cc:1006
 msgid "Not connected to JACK - no I/O changes are possible"
-msgstr ""
+msgstr "Μη συνδεδεμένο με τον JACK - I/O αλλαγές αδύνατες"
 
 #: mixer_strip.cc:560
 msgid "Track"
 msgstr "Κανάλι"
 
-#: mixer_strip.cc:588 mixer_strip.cc:604
+#: mixer_strip.cc:588
+#: mixer_strip.cc:604
 msgid "could not register new ports required for that connection"
 msgstr ""
+"Αδύνατη η καταγραφή νέων θυρών που απαιτούνται\n"
+"για αυτή τη σύνδεση."
 
 #: mixer_strip.cc:747
-#, fuzzy
 msgid " Input"
-msgstr "# Είσοδοι"
+msgstr ""
 
 #: mixer_strip.cc:750
-#, fuzzy
 msgid "I"
-msgstr "IN"
+msgstr ""
 
 #: mixer_strip.cc:820
 msgid "*Comments*"
-msgstr ""
+msgstr "*Σχόλια*"
 
 #: mixer_strip.cc:859
-#, fuzzy
 msgid ": comment editor"
-msgstr "UI: Ο 'editor' δεν μπορεί να εγερθεί"
+msgstr ": επεξεργαστής σχολίων"
 
 #: mixer_strip.cc:953
 msgid "Grp"
@@ -5062,20 +5145,19 @@ msgid "~G"
 msgstr "~G"
 
 #: mixer_strip.cc:1004
-#, fuzzy
 msgid "Invert Polarity"
-msgstr "πολικότητα"
+msgstr "Αντιστροφή πολικότητας"
 
 #: mixer_ui.cc:85
 msgid "Strips"
 msgstr "Διάδρομοι"
 
 #: mixer_ui.cc:110
-#, fuzzy
 msgid "Group"
-msgstr "Ανάμειξη ομάδων"
+msgstr ""
 
-#: mixer_ui.cc:211 mixer_ui.cc:370
+#: mixer_ui.cc:211
+#: mixer_ui.cc:370
 msgid "ardour: mixer"
 msgstr "ardour: μίκτης"
 
@@ -5096,116 +5178,97 @@ msgid "track display list item for renamed strip not found!"
 msgstr "Λίστα αναδείξεως καναλιών για μετονομασμένο διάδρομο δεν ευρέθη!"
 
 #: new_session_dialog.cc:39
-#, fuzzy
 msgid "New Session Name :"
-msgstr "Όνομα συνεδρίας:"
+msgstr "Νέο Όνομα Συνεδρίας:"
 
 #: new_session_dialog.cc:41
 msgid "Create Session Directory In :"
-msgstr ""
+msgstr "Δημιουργία Directory Συνεδρίας Στο:"
 
 #: new_session_dialog.cc:43
-#, fuzzy
 msgid "Use Session Template :"
-msgstr "Προσχέδιο συνεδρίας"
+msgstr "Χρήση Προσχεδίου Συνεδριών"
 
 #: new_session_dialog.cc:45
-#, fuzzy
 msgid "Channel Count"
-msgstr "Ακύρωση Εισαγωγής"
+msgstr "Αριθμός Καναλιών"
 
 #: new_session_dialog.cc:46
-#, fuzzy
 msgid "Create Monitor Bus"
-msgstr "Control Outs"
+msgstr "Δημιουργία Monitor Bus"
 
 #: new_session_dialog.cc:53
-#, fuzzy
 msgid "Create Master Bus"
-msgstr "χρήση των master outs"
+msgstr "Δημιουργία Master Bus"
 
 #: new_session_dialog.cc:55
-#, fuzzy
 msgid "Automatically Connect Inputs"
-msgstr "αυτόματη σύνδεση inputs καναλιών σε φυσικές θύρες"
+msgstr "αυτόματη σύνδεση Inputs"
 
-#: new_session_dialog.cc:56 new_session_dialog.cc:67
-#, fuzzy
+#: new_session_dialog.cc:56
+#: new_session_dialog.cc:67
 msgid "Port Limit"
-msgstr "Ξέχασέ το"
+msgstr "Όριο θυρών"
 
 #: new_session_dialog.cc:64
-#, fuzzy
 msgid "<b>Track/Bus Inputs</b>"
-msgstr "κανάλια/δίαυλοι"
+msgstr "<b> Inputs καναλιών/διάυλων</b>"
 
 #: new_session_dialog.cc:66
-#, fuzzy
 msgid "Automatically Connect Outputs"
-msgstr "χειροκίνητη σύνδεση των outputs των καναλιών"
+msgstr "Αυτόματη σύνδεση Οutputs"
 
 #: new_session_dialog.cc:75
 msgid "Connect to Master Bus"
-msgstr ""
+msgstr "Σύνδεση με Master Δίαυλο"
 
 #: new_session_dialog.cc:76
 msgid "Connect to Physical Outputs"
-msgstr ""
+msgstr "Συνδεση με Φυσικές Εξόδους"
 
 #: new_session_dialog.cc:80
-#, fuzzy
 msgid "<b>Track/Bus Outputs</b>"
-msgstr "Έξοδοι"
+msgstr "<b> Outputs καναλιών/διάυλων</b>"
 
 #: new_session_dialog.cc:83
-#, fuzzy
 msgid "Advanced Options"
-msgstr "Επεξ/στης Ρυθμίσεων"
+msgstr "Επιπλέον Ρυθμίσεις"
 
 #: new_session_dialog.cc:91
-#, fuzzy
 msgid "Open Recent Session"
-msgstr "Άνοιγμα συνεδρίας"
+msgstr "Άνοιγμα Πρόσφατης Συνεδρίας"
 
 #: new_session_dialog.cc:127
-#, fuzzy
 msgid "Open Session File :"
-msgstr "Άνοιγμα συνεδρίας"
+msgstr "Άνοιγμα Αρχείου Συνεδρίας:"
 
 #: new_session_dialog.cc:274
-#, fuzzy
 msgid "New Session"
-msgstr "Συνεδρία"
+msgstr "Νέα συνεδρία"
 
 #: new_session_dialog.cc:276
-#, fuzzy
 msgid "Open Session"
-msgstr "Άνοιγμα συνεδρίας"
+msgstr "Άνοιγμα Συνεδρίας"
 
 #: new_session_dialog.cc:281
-#, fuzzy
 msgid "ardour: session control"
-msgstr "ardour_νέα_συνεδρία"
+msgstr "ardour: Έλεγχος συνεδρίας"
 
 #: new_session_dialog.cc:310
-#, fuzzy
 msgid "select template"
-msgstr "Χωρίς προσχέδιο"
+msgstr "Επιλογή προσχεδίου"
 
 #: new_session_dialog.cc:316
-#, fuzzy
 msgid "select session file"
-msgstr "επιλογή περιοχών"
+msgstr "επιλογή αρχείου συνεδρίας"
 
 #: new_session_dialog.cc:325
-#, fuzzy
 msgid "select directory"
-msgstr "επιλογή περιοχών"
+msgstr "επιλογή directory"
 
 #: option_editor.cc:76
-#, fuzzy
 msgid "SMPTE offset is negative"
-msgstr "SMPTE Έναρξη"
+msgstr "To SMPTE είναι αρνητικό"
 
 #: option_editor.cc:102
 msgid "ardour: options editor"
@@ -5240,9 +5303,8 @@ msgid "25 FPS"
 msgstr "25 FPS"
 
 #: option_editor.cc:181
-#, fuzzy
 msgid "30 FPS"
-msgstr "30 FPS drop"
+msgstr ""
 
 #: option_editor.cc:187
 msgid "30 FPS drop"
@@ -5253,27 +5315,27 @@ msgid "session RAID path"
 msgstr "RAID path συνεδρίας"
 
 #: option_editor.cc:249
-#, fuzzy
 msgid "Soundfile Search Paths"
-msgstr "Βιβλιοθήκη Soundfiles"
+msgstr "Μονοπάτια αναζήτησης Soundfiles"
 
 #: option_editor.cc:254
-#, fuzzy
 msgid "Paths"
-msgstr "Paths/Αρχεία"
+msgstr "Μονοπάτια"
 
-#: option_editor.cc:268 option_editor.cc:274 option_editor.cc:723
+#: option_editor.cc:268
+#: option_editor.cc:274
+#: option_editor.cc:723
 #: option_editor.cc:750
 msgid "internal"
 msgstr "εσωτερικό"
 
 #: option_editor.cc:287
 msgid "Short crossfade length (msecs)"
-msgstr ""
+msgstr "Μικρό μήκος crossfade (msecs)"
 
 #: option_editor.cc:299
 msgid "Destructive crossfade length (msecs)"
-msgstr ""
+msgstr "Καταστροφικό μήκος crossfade (msecs)"
 
 #: option_editor.cc:367
 msgid "SMPTE Frames/second"
@@ -5283,28 +5345,29 @@ msgstr "SMPTE Καρέ/δεύτερα"
 msgid "SMPTE Offset"
 msgstr "SMPTE Έναρξη"
 
-#: option_editor.cc:462 option_editor.cc:469 option_editor.cc:472
+#: option_editor.cc:462
+#: option_editor.cc:469
+#: option_editor.cc:472
 #: option_editor.cc:618
-#, fuzzy
 msgid "online"
-msgstr "γραμμική"
+msgstr ""
 
 #. remember, we have to handle the i18n case where the relative
 #. lengths of the strings in language N is different than in english.
 #.
-#: option_editor.cc:469 option_editor.cc:470 option_editor.cc:615
-#, fuzzy
+#: option_editor.cc:469
+#: option_editor.cc:470
+#: option_editor.cc:615
 msgid "offline"
-msgstr "γραμμική"
+msgstr ""
 
 #: option_editor.cc:670
 msgid "Choose Click"
-msgstr ""
+msgstr "Επιλογή Μετρονόμου"
 
 #: option_editor.cc:689
-#, fuzzy
 msgid "Choose Click Emphasis"
-msgstr "Έμφαση χρήσεως όπως στο μετρονόμο"
+msgstr "Επιλογή Έμφασης Μετρονόμου"
 
 #: option_editor.cc:803
 msgid "Click audio file"
@@ -5330,7 +5393,8 @@ msgstr ""
 msgid "Edit using"
 msgstr "Επεξεργασία με"
 
-#: option_editor.cc:926 option_editor.cc:953
+#: option_editor.cc:926
+#: option_editor.cc:953
 msgid "+ button"
 msgstr "+ κουμπί"
 
@@ -5355,43 +5419,28 @@ msgid "  -h, --help                       Print this message\n"
 msgstr "  -h, --help                       Προβολή του παρόντος\n"
 
 #: opts.cc:49
-msgid ""
-"  -b, --bindings                   Print all possible keyboard binding "
-"names\n"
-msgstr ""
-"  -b, --bindings                   Προβολή όλων των πιθανών δεσμών "
-"πληκτρολογίου ονόματα\n"
+msgid "  -b, --bindings                   Print all possible keyboard binding names\n"
+msgstr "  -b, --bindings                   Προβολή όλων των πιθανών δεσμών πληκτρολογίου ονόματα\n"
 
 #: opts.cc:50
-#, fuzzy
 msgid "  -n, --show-splash                Show splash screen\n"
-msgstr "  -n, --no-splash                  Μήν δείξεις την εισαγωγική εικόνα\n"
+msgstr "  -n, --show-splash                Ανάδειξη εισαγωγικής εικόνας\n"
 
 #: opts.cc:51
-#, fuzzy
-msgid ""
-"  -c, --name  name                 Use a specific jack client name, default "
-"is ardour\n"
-msgstr ""
-"  -c, --jack-client-name  name     Χρήση συγκεκριμένου ονόματος για τον "
-"jack, το προκαθορισμένο είναι ardour\n"
+msgid "  -c, --name  name                 Use a specific jack client name, default is ardour\n"
+msgstr "  -c, --name  name                 Χρήση συγκεκριμένου jack client ονόματος, το default είναι ardour\n"
 
 #: opts.cc:52
-#, fuzzy
-msgid ""
-"  -N, --new session-name           Create a new session from the command "
-"line\n"
-msgstr "  [όνομα-συνεδρίας]                   Όνομα συνεδρίας προς φόρτωση\n"
+msgid "  -N, --new session-name           Create a new session from the command line\n"
+msgstr "  -N, --new session-name           Δημιουργία νέας συνεδρίας από γραμμή εντολών\n"
 
 #: opts.cc:53
-msgid ""
-"  -o, --use-hw-optimizations        Try to use h/w specific optimizations\n"
+msgid "  -o, --use-hw-optimizations        Try to use h/w specific optimizations\n"
 msgstr ""
 
 #: opts.cc:55
-#, fuzzy
 msgid "  -V, --novst                      Do not use VST support\n"
-msgstr "  -n, --no-splash                  Μήν δείξεις την εισαγωγική εικόνα\n"
+msgstr "  -V, --novst                      Χωρίς υποστήριξη VST\n"
 
 #: opts.cc:57
 msgid "  [session-name]                   Name of session to load\n"
@@ -5402,28 +5451,27 @@ msgid "  -C, --curvetest filename         Curve algorithm debugger\n"
 msgstr ""
 
 #: opts.cc:59
-#, fuzzy
 msgid "  -g, --gtktheme                   Allow GTK to load a theme\n"
-msgstr "  -h, --help                       Προβολή του παρόντος\n"
+msgstr "  -g, --gtktheme                   Χρηση theme του GTK\n"
 
 #: pan_automation_time_axis.cc:60
 msgid "You can't graphically edit panning of more than stream"
 msgstr ""
 
 #: pan_automation_time_axis.cc:80
-#, fuzzy
 msgid "add pan automation event"
-msgstr "πρόσθεση συμβάντος αυτοματισμού σε "
+msgstr "πρόσθεση συμβάντος αυτοματισμού pan"
 
-#: panner2d.cc:589 panner_ui.cc:435 plugin_ui.cc:834
-#, fuzzy
+#: panner2d.cc:589
+#: panner_ui.cc:435
+#: plugin_ui.cc:834
 msgid "Bypass"
-msgstr "bypass"
+msgstr ""
 
-#: panner_ui.cc:58 panner_ui.cc:225
-#, fuzzy
+#: panner_ui.cc:58
+#: panner_ui.cc:225
 msgid "link"
-msgstr "in"
+msgstr ""
 
 #: panner_ui.cc:69
 msgid "Pan automation mode"
@@ -5446,9 +5494,9 @@ msgid "L"
 msgstr "L"
 
 #: panner_ui.cc:335
-#, fuzzy, c-format
+#, c-format
 msgid "panner for channel %lu"
-msgstr "panner για το κανάλι %u"
+msgstr "panner για το κανάλι %lu"
 
 #: panner_ui.cc:337
 #, c-format
@@ -5456,28 +5504,24 @@ msgid "panner for channel %u"
 msgstr "panner για το κανάλι %u"
 
 #: panner_ui.cc:445
-#, fuzzy
 msgid "Reset all"
-msgstr "Επιλογή όλων"
+msgstr ""
 
 #: playlist_selector.cc:52
-#, fuzzy
 msgid "ardour: playlists"
-msgstr "ardour: plugins"
+msgstr ""
 
 #: playlist_selector.cc:59
 msgid "Playlists grouped by track"
-msgstr ""
+msgstr "Playlists ομαδοποιημένες ανά κανάλι"
 
 #: playlist_selector.cc:98
-#, fuzzy
 msgid "ardour: playlist for "
-msgstr "ardour: επεξεργαστής: "
+msgstr "ardour: playlist για"
 
 #: playlist_selector.cc:114
-#, fuzzy
 msgid "Other tracks"
-msgstr "νύξη καναλιού"
+msgstr "Άλλα κανάλια"
 
 #: playlist_selector.cc:130
 msgid "unassigned"
@@ -5496,22 +5540,23 @@ msgstr "Διαθέσιμα LADSPA plugins"
 msgid "Type"
 msgstr "Τύπωση"
 
-#: plugin_selector.cc:58 plugin_selector.cc:81
+#: plugin_selector.cc:58
+#: plugin_selector.cc:81
 msgid "# Inputs"
 msgstr "# Είσοδοι"
 
-#: plugin_selector.cc:59 plugin_selector.cc:82
+#: plugin_selector.cc:59
+#: plugin_selector.cc:82
 msgid "# Outputs"
 msgstr "# Έξοδοι"
 
 #: plugin_selector.cc:68
 msgid "Plugins to be Connected to Insert"
-msgstr ""
+msgstr "Plugins προς Σύνδεση με Insert"
 
 #: plugin_selector.cc:80
-#, fuzzy
 msgid "Available plugins"
-msgstr "Διαθέσιμα VST plugins"
+msgstr "Διαθέσιμα plugins"
 
 #: plugin_selector.cc:98
 msgid "Add a plugin to the effect list"
@@ -5534,26 +5579,20 @@ msgid "VST"
 msgstr "VST"
 
 #: plugin_ui.cc:84
-msgid ""
-"unknown type of editor-supplying plugin (note: no VST support in this "
-"version of ardour)"
-msgstr ""
-"άγνωστος τύπος προμηθευμένου plugin για τον editor(σημείωση: δεν υπάρχει "
-"υποστήριξη VST στην παρούσα έκδοση του ardour)"
+msgid "unknown type of editor-supplying plugin (note: no VST support in this version of ardour)"
+msgstr "άγνωστος τύπος προμηθευμένου plugin για τον editor(σημείωση: δεν υπάρχει υποστήριξη VST στην παρούσα έκδοση του ardour)"
 
 #: plugin_ui.cc:139
 msgid "<span size=\"large\">Presets</span>"
 msgstr ""
 
 #: plugin_ui.cc:230
-#, fuzzy
 msgid "Controls"
-msgstr "Control Outs"
+msgstr "Πίνακας Ελέγχου"
 
 #: plugin_ui.cc:267
 msgid "Plugin Editor: could not build control element for port %1"
-msgstr ""
-"Επεξεργαστής Plugin: δεν μπόρεσα να κτίσω στοιχείο ελέγχου για τη θύρα %1"
+msgstr "Επεξεργαστής Plugin: δεν μπόρεσα να κτίσω στοιχείο ελέγχου για τη θύρα %1"
 
 #: plugin_ui.cc:358
 #, fuzzy
@@ -5565,9 +5604,8 @@ msgid "Plugin preset %1 not found"
 msgstr "Προ-ρύθμιση plugin %1 δεν ευρέθη"
 
 #: plugin_ui.cc:864
-#, fuzzy
 msgid "Name of New Preset:"
-msgstr "Όνομα για νέα σύνδεση:"
+msgstr "Όνομα για νέας προρρύθμισης:"
 
 #: redirect_automation_line.cc:54
 msgid "redirect automation created for non-plugin"
@@ -5659,18 +5697,24 @@ msgid ""
 "in that way because the inputs and\n"
 "outputs do not work correctly."
 msgstr ""
+"Δεν γίνεται η σύνδεση του set των redirects\n"
+"με αυτό τον τροπο γιατί οι εισόδοι\n"
+"κ' εξόδοι δεν λειτουργούν καλά."
 
 #: redirect_box.cc:749
-#, fuzzy
 msgid "rename redirect"
-msgstr "ardour: μετονομασία redirect"
+msgstr "μετονομασία redirect"
 
-#: redirect_box.cc:826 redirect_box.cc:874
+#: redirect_box.cc:826
+#: redirect_box.cc:874
 msgid ""
 "Copying the set of redirects on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
 "could not match the configuration of this track."
 msgstr ""
+"Η αντιγραφή του set των redirects στο clipboard απέτυχε,\n"
+"πιθανόν γιατί το I/O configuration των plugins\n"
+"δεν ταίριαζε το configuration αυτού του καναλιού."
 
 #: redirect_box.cc:896
 msgid ""
@@ -5697,9 +5741,8 @@ msgid "ardour: %1"
 msgstr "ardour: %1"
 
 #: redirect_box.cc:982
-#, fuzzy
 msgid "ardour: %1: %2 (by %3)"
-msgstr "ardour: %1: %2"
+msgstr "ardour: %1: %2 (by %3)"
 
 #. new stuff
 #: redirect_box.cc:1054
@@ -5715,9 +5758,8 @@ msgid "New Send ..."
 msgstr "Νέο Send ..."
 
 #: redirect_box.cc:1068
-#, fuzzy
 msgid "Deselect All"
-msgstr "Επιλογή όλων"
+msgstr "Αποεπιλογή όλων"
 
 #: redirect_box.cc:1075
 #, fuzzy
@@ -5741,7 +5783,9 @@ msgstr "κλείδωμα"
 msgid "opaque"
 msgstr "αδιαφανής"
 
-#: region_editor.cc:49 region_editor.cc:192 region_editor.cc:226
+#: region_editor.cc:49
+#: region_editor.cc:192
+#: region_editor.cc:226
 msgid "active"
 msgstr "ενεργό"
 
@@ -5809,7 +5853,8 @@ msgstr "ΜΗΚΟΣ:"
 msgid "FADE IN"
 msgstr "FADE IN"
 
-#: region_editor.cc:193 region_editor.cc:227
+#: region_editor.cc:193
+#: region_editor.cc:227
 msgid "msecs"
 msgstr "msecs"
 
@@ -5830,28 +5875,24 @@ msgid "fade out edit"
 msgstr "επεξερ/σία fade out"
 
 #: regionview.cc:1146
-#, fuzzy
 msgid "add gain control point"
-msgstr "απαλοιφή σημείου ελέγχου"
+msgstr "Προσθεση σημείου ελέγχου gain"
 
 #: route_params_ui.cc:89
 msgid "Tracks/Buses"
 msgstr "κανάλια/δίαυλοι"
 
 #: route_params_ui.cc:109
-#, fuzzy
 msgid "Pre-fader Redirects"
-msgstr "Προ-Redirects"
+msgstr ""
 
 #: route_params_ui.cc:110
-#, fuzzy
 msgid "Post-fader Redirects"
-msgstr "Μετα-Redirects"
+msgstr ""
 
 #: route_params_ui.cc:144
-#, fuzzy
 msgid "ardour: track/bus inspector"
-msgstr "ardour: Εισαγωγή καναλιού/διαύλου"
+msgstr "ardour: Επιθεωρητής καναλιών/διαύλων"
 
 #: route_params_ui.cc:145
 msgid "ardour_route_parameters"
@@ -5866,18 +5907,16 @@ msgid "NO TRACK"
 msgstr "Κανένα κανάλι"
 
 #: route_params_ui.cc:695
-#, fuzzy
 msgid "ardour: track/bus inspector: "
-msgstr "ardour: Εισαγωγή καναλιού/διαύλου"
+msgstr "ardour: Επιθεωρητής καναλιών/διαύλων:"
 
 #: route_params_ui.cc:699
 msgid "No Route Selected"
 msgstr "Δεν επελέχθη διαδρομή"
 
 #: route_params_ui.cc:700
-#, fuzzy
 msgid "ardour: track/bus/inspector: no route selected"
-msgstr "ardour: παράμετροι διαδρομών: δεν επελέχθη διαδρομή"
+msgstr "ardour: Επιθεωρητής καναλιών/διαύλων: δεν επελέχθη διαδρομή"
 
 #. ctrl-shift-click applies change to all routes
 #: route_ui.cc:134
@@ -5886,7 +5925,8 @@ msgstr "αλλαγή σιγής"
 
 #. ctrl-shift-click applies change to all routes
 #. ctrl-alt-click: exclusively solo this track, not a toggle */
-#: route_ui.cc:209 route_ui.cc:219
+#: route_ui.cc:209
+#: route_ui.cc:219
 msgid "solo change"
 msgstr "αλλαγή σόλο"
 
@@ -5895,14 +5935,13 @@ msgid "rec-enable change"
 msgstr "αλλαγή rec-enable"
 
 #: route_ui.cc:479
-#, fuzzy
 msgid "Solo-safe"
-msgstr "Σόλο"
+msgstr ""
 
-#: route_ui.cc:487 route_ui.cc:530
-#, fuzzy
+#: route_ui.cc:487
+#: route_ui.cc:530
 msgid "MIDI Bind"
-msgstr "MIDI"
+msgstr "MIDI δεσμός"
 
 #: route_ui.cc:501
 msgid "Pre Fader"
@@ -5922,22 +5961,22 @@ msgstr "Main Outs"
 
 #: route_ui.cc:559
 msgid "mix group solo  change"
-msgstr "αλλαγή  solo ομάδας μίξεως"
+msgstr "αλλαγή  solo του mix group"
 
 #: route_ui.cc:593
 msgid "mix group mute change"
-msgstr "αλλαγή  mute ομάδας μίξεως"
+msgstr "αλλαγή  mute του mix group"
 
 #: route_ui.cc:609
 msgid "mix group rec-enable change"
-msgstr "αλλαγή  rec-enable ομάδας μίξεως"
+msgstr "αλλαγή  rec-enable της mix group"
 
-#: route_ui.cc:626 visual_time_axis.cc:237
+#: route_ui.cc:626
+#: visual_time_axis.cc:237
 msgid "ardour: color selection"
 msgstr "ardour: επιλογή χρωμάτων"
 
 #: route_ui.cc:702
-#, fuzzy
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "\n"
@@ -5945,6 +5984,7 @@ msgid ""
 "(cannot be undone)"
 msgstr ""
 "Στ'αλήθεια θέλετε να απαλοίψετε το κανάλι \"%1\" ?\n"
+"\n"
 "Πιθανόν να χάσετε και τη λίστα που χρησιμοποιείται από το κανάλι.\n"
 "(δεν μπορεί να ανακληθεί)"
 
@@ -5956,14 +5996,14 @@ msgstr ""
 "Στ'αλήθεια θέλετε να απαλοίψετε το κανάλι \"%1\" ?\n"
 "(δεν μπορεί να ανακληθεί)"
 
-#: route_ui.cc:708 visual_time_axis.cc:279
+#: route_ui.cc:708
+#: visual_time_axis.cc:279
 msgid "Yes, remove it."
 msgstr "Ναι, απάλοιψε το."
 
 #: route_ui.cc:737
-#, fuzzy
 msgid "New Name: "
-msgstr "νέο όνομα: "
+msgstr "Νέο Όνομα: "
 
 #: sfdb_ui.cc:58
 msgid "Add Field..."
@@ -5986,24 +6026,20 @@ msgid "Value"
 msgstr "Αξία"
 
 #: sfdb_ui.cc:161
-#, fuzzy
 msgid "channels"
-msgstr "Ακύρωση"
+msgstr "κανάλια"
 
 #: sfdb_ui.cc:161
-#, fuzzy
 msgid "samplerate"
-msgstr "διαχωρισμός"
+msgstr ""
 
 #: sfdb_ui.cc:162
-#, fuzzy
 msgid "resolution"
-msgstr "επιλογή διαστήματος"
+msgstr "ανάλυση"
 
 #: sfdb_ui.cc:162
-#, fuzzy
 msgid "format"
-msgstr "Κανονικό"
+msgstr ""
 
 #: sfdb_ui.cc:183
 msgid "Could not read file: %1 (%2)."
@@ -6014,9 +6050,8 @@ msgid "Could not access soundfile: "
 msgstr "Δεν γινόταν να διαβαστεί το soundfile: "
 
 #: sfdb_ui.cc:236
-#, fuzzy
 msgid "Name for Field"
-msgstr "Όνομα για περιοχή:"
+msgstr "Όνομα για Πεδίο:"
 
 #: sfdb_ui.cc:335
 msgid "Split Channels"
@@ -6024,16 +6059,15 @@ msgstr "Διαχωρισμός Καναλιών"
 
 #: sfdb_ui.cc:342
 msgid "Create a region for each channel"
-msgstr ""
+msgstr "Δημιουργία μίας περιοχής για κάθε κανάλι"
 
 #: sfdb_ui.cc:344
 msgid "Embed"
 msgstr ""
 
 #: sfdb_ui.cc:346
-#, fuzzy
 msgid "Link to an external file"
-msgstr "Προσθήκη εξωτερικού αρχείου ήχου"
+msgstr "Σύνδεση με εξωτερικό αρχείο"
 
 #: sfdb_ui.cc:348
 msgid "Import"
@@ -6041,65 +6075,81 @@ msgstr "Εισαγωγή"
 
 #: sfdb_ui.cc:350
 msgid "Copy a file to the session folder"
-msgstr ""
+msgstr "Αντιγραφή αρχείου στο φάκελο της συνεδρίας"
 
 #: sfdb_ui.cc:414
-#, fuzzy
 msgid "programming error: %1"
-msgstr "σφάλμα προγραμματισμού: "
+msgstr "σφάλμα προγραμματισμού: %1"
 
-#: tempo_dialog.cc:18 tempo_dialog.cc:35
+#: tempo_dialog.cc:18
+#: tempo_dialog.cc:35
 msgid "Beats per minute"
 msgstr "Κτύποι ανά λεπτό"
 
-#: tempo_dialog.cc:21 tempo_dialog.cc:38 tempo_dialog.cc:203
+#: tempo_dialog.cc:21
+#: tempo_dialog.cc:38
+#: tempo_dialog.cc:203
 #: tempo_dialog.cc:221
 msgid "Bar"
 msgstr "Μπάρα"
 
-#: tempo_dialog.cc:22 tempo_dialog.cc:39 tempo_dialog.cc:204
+#: tempo_dialog.cc:22
+#: tempo_dialog.cc:39
+#: tempo_dialog.cc:204
 #: tempo_dialog.cc:222
 msgid "Beat"
 msgstr "Κτύπος"
 
-#: tempo_dialog.cc:24 tempo_dialog.cc:41 tempo_dialog.cc:205
+#: tempo_dialog.cc:24
+#: tempo_dialog.cc:41
+#: tempo_dialog.cc:205
 #: tempo_dialog.cc:223
 msgid "Location"
 msgstr "Τοποθεσία"
 
-#: tempo_dialog.cc:199 tempo_dialog.cc:217
+#: tempo_dialog.cc:199
+#: tempo_dialog.cc:217
 msgid "Meter denominator"
 msgstr "Παρονομαστής Μέτρου"
 
-#: tempo_dialog.cc:200 tempo_dialog.cc:218
+#: tempo_dialog.cc:200
+#: tempo_dialog.cc:218
 msgid "Beats per bar"
 msgstr "Κτύποι ανά μπάρα"
 
-#: tempo_dialog.cc:236 tempo_dialog.cc:247
+#: tempo_dialog.cc:236
+#: tempo_dialog.cc:247
 msgid "whole (1)"
 msgstr "ολόκληρο (1)"
 
-#: tempo_dialog.cc:237 tempo_dialog.cc:249
+#: tempo_dialog.cc:237
+#: tempo_dialog.cc:249
 msgid "second (2)"
 msgstr "δεύτερο (2)"
 
-#: tempo_dialog.cc:238 tempo_dialog.cc:251
+#: tempo_dialog.cc:238
+#: tempo_dialog.cc:251
 msgid "third (3)"
 msgstr "τρίτο (3)"
 
-#: tempo_dialog.cc:239 tempo_dialog.cc:253 tempo_dialog.cc:261
+#: tempo_dialog.cc:239
+#: tempo_dialog.cc:253
+#: tempo_dialog.cc:261
 msgid "quarter (4)"
 msgstr "τέταρτο (4)"
 
-#: tempo_dialog.cc:240 tempo_dialog.cc:255
+#: tempo_dialog.cc:240
+#: tempo_dialog.cc:255
 msgid "eighth (8)"
 msgstr "όγδοο (8)"
 
-#: tempo_dialog.cc:241 tempo_dialog.cc:257
+#: tempo_dialog.cc:241
+#: tempo_dialog.cc:257
 msgid "sixteenth (16)"
 msgstr "δέκατο έκτο (16)"
 
-#: tempo_dialog.cc:242 tempo_dialog.cc:259
+#: tempo_dialog.cc:242
+#: tempo_dialog.cc:259
 msgid "thirty-second (32)"
 msgstr "τριακοστό-όγδοο (32)"
 
@@ -6152,13 +6202,14 @@ msgstr "νέα διάρκεια %1 καρέ είναι εκτός ορίων γ
 msgid "programming error: request for non-existent audio range (%1)!"
 msgstr "Σφάλμα προγραμματισμού: request για μη-υπάρχον ηχητικό διάστημα (%1)!"
 
-#: utils.cc:107 utils.cc:150
+#: utils.cc:107
+#: utils.cc:150
 msgid "bad XPM header %1"
 msgstr "εσφαλμένος XPM header %1"
 
 #: utils.cc:332
 msgid "missing RGBA style for \"%1\""
-msgstr ""
+msgstr "ελλειπές RGBA στύλ για \"%1\""
 
 #: visual_time_axis.cc:276
 msgid ""
@@ -6182,16 +6233,12 @@ msgstr "Κανάλι με αυτό το όνομα ήδη υπάρχει"
 #, fuzzy
 #~ msgid "set selected control point"
 #~ msgstr "απαλοιφή σημείου ελέγχου"
-
 #~ msgid "set selected regionview"
 #~ msgstr "θέση επιλεγμένης οπτικής περιοχής"
-
 #~ msgid "Start a new session\n"
 #~ msgstr "Αρχή καινούριας συνεδρίας\n"
-
 #~ msgid "via Session menu"
 #~ msgstr "μέσω του μενού Συνεδρίας"
-
 #~ msgid "dbFS"
 #~ msgstr "dbFS"
 
@@ -6206,63 +6253,46 @@ msgstr "Κανάλι με αυτό το όνομα ήδη υπάρχει"
 #, fuzzy
 #~ msgid "Track/Bus connection options"
 #~ msgstr "κανάλια/δίαυλοι"
-
 #~ msgid "RECORD"
 #~ msgstr "ΕΓΓΡΑΦΗ"
-
 #~ msgid "INPUT"
 #~ msgstr "ΕΙΣΟΔΟΣ"
-
 #~ msgid "OUTPUT"
 #~ msgstr "ΕΞΟΔΟΣ"
-
 #~ msgid "Gain automation mode"
 #~ msgstr "Λειτουργία αυτοματισμού Gain"
-
 #~ msgid "Gain automation type"
 #~ msgstr "Τύπος αυτοματισμού Gain"
-
 #~ msgid "trim"
 #~ msgstr "ισοστάθμιση"
-
 #~ msgid "gain automation mode"
 #~ msgstr "Λειτουργία αυτοματισμού gain"
-
 #~ msgid "gain automation state"
 #~ msgstr "Κατάσταση αυτοματισμού gain"
-
 #~ msgid "pan automation state"
 #~ msgstr "Κατάσταση αυτοματισμού pan"
-
 #~ msgid "REC"
 #~ msgstr "REC"
-
 #~ msgid "OUT"
 #~ msgstr "OUT"
-
 #~ msgid "aplay"
 #~ msgstr "aplay"
-
 #~ msgid "awrite"
 #~ msgstr "awrite"
-
 #~ msgid "no group"
 #~ msgstr "καμία ομάδα"
 
 #, fuzzy
 #~ msgid "normal"
 #~ msgstr "Κανονικό"
-
 #~ msgid "Disk r:%5.1f w:%5.1f MB/s"
 #~ msgstr "Δίσκοι r:%5.1f w:%5.1f MB/s"
-
 #~ msgid "file"
 #~ msgstr "αρχείο"
 
 #, fuzzy
 #~ msgid "ardour cleanup"
 #~ msgstr "ardour: εκκαθάριση"
-
 #~ msgid "close session"
 #~ msgstr "κλείσιμο συνεδρίας"
 
@@ -6273,139 +6303,100 @@ msgstr "Κανάλι με αυτό το όνομα ήδη υπάρχει"
 #, fuzzy
 #~ msgid "SetCrossfadeModel"
 #~ msgstr "Crossfade"
-
 #~ msgid "Play from"
 #~ msgstr "Αναπαρ/γή από"
-
 #~ msgid "Set from range"
 #~ msgstr "Θέση από διάστημα"
-
 #~ msgid "FORMAT"
 #~ msgstr "FORMAT"
 
 #, fuzzy
 #~ msgid "CD MARKER FILE TYPE"
 #~ msgstr "ΤΥΠΟΣ ΑΡΧΕΙΟΥ"
-
 #~ msgid "CHANNELS"
 #~ msgstr "ΚΑΝΑΛΙΑ"
-
 #~ msgid "FILE TYPE"
 #~ msgstr "ΤΥΠΟΣ ΑΡΧΕΙΟΥ"
-
 #~ msgid "SAMPLE FORMAT"
 #~ msgstr "FORMAT ΔΕΙΓΜΑΤΟΣ"
-
 #~ msgid "SAMPLE ENDIANNESS"
 #~ msgstr "SAMPLE ENDIANNESS"
-
 #~ msgid "SAMPLE RATE"
 #~ msgstr "ΡΥΘΜΟΣ ΔΕΙΓΜΑΤ/ΨΙΑΣ"
-
 #~ msgid "CONVERSION QUALITY"
 #~ msgstr "ΠΟΙΟΤΗΤΑ ΜΕΤΑΤΡΟΠΗΣ"
-
 #~ msgid "DITHER TYPE"
 #~ msgstr "ΤΥΠΟΣ DITHER"
 
 #, fuzzy
 #~ msgid "EXPORT CD MARKER FILE ONLY"
 #~ msgstr "ΤΥΠΟΣ ΑΡΧΕΙΟΥ"
-
 #~ msgid "EXPORT TO FILE"
 #~ msgstr "ΕΞΑΓΩΓΗ ΣΕ ΑΡΧΕΙΟ"
-
 #~ msgid "ardour: unplugged"
 #~ msgstr "ardour: unplugged"
-
 #~ msgid "pol"
 #~ msgstr "πολ"
-
 #~ msgid "To be added"
 #~ msgstr "Πρόκειται να προστεθούν"
-
 #~ msgid "Update"
 #~ msgstr "Ανανέωση"
-
 #~ msgid "save"
 #~ msgstr "αποθήκευση"
-
 #~ msgid "bypass"
 #~ msgstr "bypass"
-
 #~ msgid "Name for plugin settings:"
 #~ msgstr "Όνομα για ρυθμίσεις του plugin:"
-
 #~ msgid ""
 #~ "\"\n"
 #~ "\t ,<.>/?:;'[{}]~`!@#$%^&*()_-+="
 #~ msgstr ""
 #~ "\"\n"
 #~ "\t ,<.>/?:;'[{}]~`!@#$%^&*()_-+="
-
 #~ msgid "aeiou"
 #~ msgstr "aeiou"
-
 #~ msgid "AEIOU"
 #~ msgstr "AEIOU"
-
 #~ msgid "bcdfghjklmnpqrtvwxyz"
 #~ msgstr "bcdfghjklmnpqrtvwxyz"
-
 #~ msgid "BCDFGHJKLMNPQRTVWXYZ"
 #~ msgstr "BCDFGHJKLMNPQRTVWXYZ"
-
 #~ msgid "Authors"
 #~ msgstr "Δημιουργοί"
-
 #~ msgid "spring"
 #~ msgstr "έλασμα"
-
 #~ msgid ""
 #~ "follow\n"
 #~ "PH"
 #~ msgstr ""
 #~ "ακολουθία\n"
 #~ "Κερσ."
-
 #~ msgid "Sprung"
 #~ msgstr "Έλασμα"
-
 #~ msgid "Wheel"
 #~ msgstr "Τροχός"
-
 #~ msgid "rescan"
 #~ 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 "Άρση/Παύση ακολουθίας αναπαραγωγέα"
-
 #~ msgid "Select sprung or wheel behaviour"
 #~ msgstr "Επιλογή συμπεριφοράς ελάσματος ή τροχού"
-
 #~ msgid "keyboard_target: error setting binding state: invalid node"
 #~ msgstr ""
 #~ "keyboard_target: σφάλμα στη θέση καταστάσεως δεσμού πλήκτρων: ανύπαρκτος "
 #~ "κόμβος"
-
 #~ msgid "Image Compositor"
 #~ msgstr "Σύνθεση εικόνων"
-
 #~ msgid "Audio Library"
 #~ msgstr "Ηχητική βιβλιοθήκη"
-
 #~ msgid "Meter Bridge"
 #~ msgstr "Γέφυρα μετρητή"
-
 #~ msgid "Input Connections"
 #~ msgstr "Συνδέσεις Εισόδου"
-
 #~ msgid "Output Connections"
 #~ msgstr "Συνδέσεις Εξόδου"
 
@@ -6420,66 +6411,51 @@ msgstr "Κανάλι με αυτό το όνομα ήδη υπάρχει"
 #, fuzzy
 #~ msgid "Add Port"
 #~ msgstr "πρόσθεση θύρας"
-
 #~ msgid "Available Ports"
 #~ msgstr "Διαθέσιμες Θύρες"
-
 #~ msgid "ardour: connections"
 #~ msgstr "ardour: συνδέσεις"
-
 #~ msgid "in %d"
 #~ msgstr "σε %d"
 
 #, fuzzy
 #~ msgid "crossfade editor"
 #~ msgstr "επεξερ/σία fade in"
-
 #~ msgid "Regions/name"
 #~ msgstr "Περιοχες/όνομα"
-
 #~ msgid ""
 #~ "editor\n"
 #~ "mixer"
 #~ msgstr ""
 #~ "Μίκτης\n"
 #~ "Επεξεργαστή"
-
 #~ msgid "Invert"
 #~ msgstr "Αντιστροφή"
-
 #~ msgid "Edit:"
 #~ msgstr "Σύνταξη:"
-
 #~ msgid "incorrectly formatted URI list, ignored"
 #~ msgstr "λανθασμένα φορμαρισμένη URI λίστα, αγνοήθηκε"
-
 #~ msgid "Embed audio (link)"
 #~ msgstr "Εμφύτευση ήχου (link)"
-
 #~ msgid "Cancel cleanup"
 #~ msgstr "Ακύρωση εκκαθάρισης"
-
 #~ msgid "programming error: line canvas item has no line object pointer!"
 #~ msgstr ""
 #~ "Σφάλμα Προγραμματισμού: ο καμβάς της γραμμής δεν έχει δείκτη αναφοράς της "
 #~ "γραμμής!"
-
 #~ msgid ""
 #~ "programming error: no \"rect\" pointer associated with selection item"
 #~ msgstr ""
 #~ "Σφάλμα προγραμματισμού: κανένας  \"rect\" δείκτης δεν σχετίζεται με το "
 #~ "επιλεγμένο αντικείμενο"
-
 #~ msgid "Name for new edit group"
 #~ msgstr "Όνομα για νέα ομάδα επεξεργασίας"
 
 #, fuzzy
 #~ msgid "Import selected as tracks"
 #~ msgstr "Εισαγωγή επιλεγμένου(ων)"
-
 #~ msgid "ardour: audio import in progress"
 #~ msgstr "ardour: εισαγωγή ήχων εν εξελίξι"
-
 #~ msgid "You can't embed an audiofile until you have a session loaded."
 #~ msgstr ""
 #~ "Δεν γίνεται να εμφυτεύσετε ηχο-αρχεία μέχρι να φορτώσετε κάποια συνεδρία."
@@ -6487,158 +6463,108 @@ msgstr "Κανάλι με αυτό το όνομα ήδη υπάρχει"
 #, fuzzy
 #~ msgid "Insert selected as new tracks"
 #~ msgstr "θέση επιλεγμένης οπτικής καναλιού"
-
 #~ msgid "Insert selected"
 #~ msgstr "Προσθήκη επιλεγμένου(ων)"
 
 #, fuzzy
 #~ msgid "hidden"
 #~ msgstr "Κρυμμένο"
-
 #~ msgid "Sorting"
 #~ msgstr "Ταξινόμηση"
-
 #~ msgid "Regions/length"
 #~ msgstr "Περιοχές/διάρκεια"
-
 #~ msgid "Regions/start"
 #~ msgstr "Περιοχές/αρχή"
-
 #~ msgid "Regions/end"
 #~ msgstr "Περιοχές/τέλος"
-
 #~ msgid "Regions/file name"
 #~ msgstr "Περιοχές/όνομα αρχείου"
-
 #~ msgid "Regions/file size"
 #~ msgstr "Περιοχές/μέγεθος αρχείου"
-
 #~ msgid "Regions/file date"
 #~ msgstr "Περιοχές/ημ/νία αρχείου"
-
 #~ msgid "Regions/file system"
 #~ msgstr "Περιοχές/file system"
-
 #~ msgid "Show All AbstractTracks"
 #~ msgstr "Ανάδειξη όλων των Abstractκανάλιs"
-
 #~ msgid "Hide All AbstractTracks"
 #~ msgstr "Απόκρυψη όλων των Abstractκαναλιών"
-
 #~ msgid "slereg"
 #~ msgstr "slereg"
-
 #~ msgid "KeyboardTarget: empty string passed to add_binding."
 #~ msgstr "KeyboardTarget: κενή γραμμή  στην πρόσθεση_δεσμού."
-
 #~ msgid "KeyboardTarget: no translation found for \"%1\""
 #~ msgstr "KeyboardTarget: δεν ευρέθη μετάφραση για \"%1\""
-
 #~ msgid "KeyboardTarget: unknown action \"%1\""
 #~ msgstr "KeyboardTarget: άγνωστη ενέργεια \"%1\""
-
 #~ msgid "misformed binding node - ignored"
 #~ msgstr "παραμορφωμένος πομπός δεσμού - αγνοήθηκε"
-
 #~ msgid "ardour: soundfile selector"
 #~ msgstr "ardour: επιλογέας Soundfiles"
-
 #~ msgid "Add to Library..."
 #~ msgstr "Πρόσθεση στη Βιβλιοθήκη..."
-
 #~ msgid "Remove..."
 #~ msgstr "Απαλοιφή..."
-
 #~ msgid "Find..."
 #~ msgstr "Εύρεση..."
-
 #~ msgid "Add Folder"
 #~ msgstr "Πρόσθεση Φακέλου"
-
 #~ msgid "Add audio file or directory"
 #~ msgstr "Πρόσθεση αρχείου ήχου ή φακέλου"
-
 #~ msgid "Importing"
 #~ msgstr "Εισαγωγή εν εξελίξι"
-
 #~ msgid "%1 not added to database"
 #~ msgstr "%1 δεν προστέθηκε στην database"
-
 #~ msgid "Folder name:"
 #~ msgstr "Όνομα φακέλου:"
-
 #~ msgid "Should not be reached"
 #~ msgstr "Δεν θα έπρεπε να αγγιχτεί"
-
 #~ msgid "file \"%1\" could not be opened"
 #~ msgstr "το αρχείο \"%1\" δεν γινόταν να ανοιχτεί"
-
 #~ msgid "Field name:"
 #~ msgstr "Όνομα Πεδίου:"
-
 #~ msgid "Field value:"
 #~ msgstr "Αξία Πεδίου:"
-
 #~ msgid "Find"
 #~ msgstr "Εύρεση"
-
 #~ msgid "AND"
 #~ msgstr "AND"
-
 #~ msgid "ardour: locate soundfiles"
 #~ msgstr "ardour: εύρεση soundfiles"
-
 #~ msgid "Results"
 #~ msgstr "Αποτελέσματα"
-
 #~ msgid "Uris"
 #~ msgstr "Uris"
-
 #~ msgid "Create multi-channel region"
 #~ msgstr "Δημιουργία πολυκάναλης περιοχής"
-
 #~ msgid "Ardour: Search Results"
 #~ msgstr "Ardour: Αποτελέσματα Αναζητήσεως"
-
 #~ msgid "Hide All AudioTrack MixerStrips"
 #~ msgstr "Απόκρυψη όλων των ΔιαδρόμωνΜίξεως των καναλιών"
-
 #~ msgid "Show All AudioBus MixerStrips"
 #~ msgstr "Ανάδειξη όλων των ΔιαδρόμωνΜίξεως των διαύλων"
-
 #~ msgid "Hide All AudioBus MixerStrips"
 #~ msgstr "Απόκρυψη όλων των ΔιαδρόμωνΜίξεως των διαύλων"
-
 #~ msgid "Name for new mix group"
 #~ msgstr "Όνομα για νέα ομάδα μίξεως"
-
 #~ msgid "Create"
 #~ msgstr "Δημιουργία"
-
 #~ msgid "use control outs"
 #~ msgstr "χρήση των control outs"
-
 #~ msgid "automatically connect track outputs to master outs"
 #~ msgstr "αυτόματη σύνδεση outputs καναλιών σε master outs"
-
 #~ msgid "automatically connect track outputs to physical ports"
 #~ msgstr "αυτόματη σύνδεση outputs καναλιών σε φυσικές θύρες"
-
 #~ msgid "show again"
 #~ msgstr "δείξε πάλι"
-
 #~ msgid "Hardware Inputs: use"
 #~ msgstr "Hardware Είσοδοι: χρήση"
-
 #~ msgid "Hardware Outputs: use"
 #~ msgstr "Hardware Έξοδοι: χρήση"
-
 #~ msgid "new session setup"
 #~ msgstr "νέα δαρρύθμιση συνεδρίας"
-
 #~ msgid "This session will playback and record at %1 Hz"
 #~ msgstr "Αυτή η συνεδρία θα αναπαράγει και θα εγγράφει στα %1 Hz"
-
 #~ msgid ""
 #~ "This rate is set by JACK and cannot be changed.\n"
 #~ "If you want to use a different sample rate\n"
@@ -6648,62 +6574,44 @@ msgstr "Κανάλι με αυτό το όνομα ήδη υπάρχει"
 #~ "αλλάξει.\n"
 #~ "Αν επιθυμείτε να θέσετε διαφορετικό 'ρυθμό'\n"
 #~ "παρακαλώ βγείτε και επανεκκινήστε τον JACK"
-
 #~ msgid "blank"
 #~ msgstr "κενό"
-
 #~ msgid "No template - create tracks/busses manually"
 #~ msgstr "Χωρίς προσχέδιο - δημιουργία καναλιών/διαύλων χειροκίνητα"
-
 #~ msgid "Slave to MTC"
 #~ msgstr "Slave στον MTC"
-
 #~ msgid "Sync with JACK"
 #~ msgstr "Σύγχρονος με τον JACK"
-
 #~ msgid "never used but stops crashes"
 #~ msgstr "αχρησιμοποίητο αλλά σταματά τα crashes"
-
 #~ msgid "Narrow mixer strips"
 #~ msgstr "Στενοί διάδρομοι μείκτη"
 
 #, fuzzy
 #~ msgid "MMC control"
 #~ msgstr "MMC Θύρα"
-
 #~ msgid "Debug keyboard events"
 #~ msgstr "Debug γεγονότα πληκτρολογίου"
-
 #~ msgid "Misc"
 #~ msgstr "Διάφορα"
-
 #~ msgid "Display"
 #~ msgstr "Απεικόνιση"
-
 #~ msgid "Broadcast WAVE/floating point"
 #~ msgstr "Broadcast WAVE/μεταβλητής υποδ/λής"
-
 #~ msgid "WAVE/floating point"
 #~ msgstr "WAVE/μεταβλητής υποδ/λής"
-
 #~ msgid "Native Format"
 #~ msgstr "Εντόπιο Format"
-
 #~ msgid "--unknown--"
 #~ msgstr "--άγνωστο--"
-
 #~ msgid "in"
 #~ msgstr "in"
-
 #~ msgid "ins"
 #~ msgstr "ins"
-
 #~ msgid "out"
 #~ msgstr "out"
-
 #~ msgid "outs"
 #~ msgstr "outs"
-
 #~ msgid "Select all"
 #~ msgstr "Επιλογή όλων"
 
@@ -6714,55 +6622,41 @@ msgstr "Κανάλι με αυτό το όνομα ήδη υπάρχει"
 #, fuzzy
 #~ msgid "Sends"
 #~ msgstr "Δευτερόλεπτα"
-
 #~ msgid "Select all ..."
 #~ msgstr "Επιλογή όλων ..."
-
 #~ msgid "Pre Redirects"
 #~ msgstr "Προ-Redirects"
-
 #~ msgid "Post Redirects"
 #~ msgstr "Μετα-Redirects"
-
 #~ msgid "Seamless Looping"
 #~ msgstr "Αδιάσπαστο Looping"
 
 #, fuzzy
 #~ msgid "Align recorded material with:"
 #~ msgstr "Στοίχιση ληφθέντος υλικού με"
-
 #~ msgid "No toggle button pixmaps found to match toggle-button-[0-9]*.xpm$"
 #~ msgstr ""
 #~ "Δεν ευρέθησαν 'toggle button pixmaps' να ταιριάζουν στα toggle-button-[0-"
 #~ "9]*.xpm$"
-
 #~ msgid ""
 #~ "No small push button pixmaps found to match small-round-button-[0-9]*.xpm$"
 #~ msgstr ""
 #~ "Δεν ευρέθησαν 'small push button pixmaps' να ταιριάζουν στα small-round-"
 #~ "button-[0-9]*.xpm$"
-
 #~ msgid "No pixmaps found to match hslider[0-9]*.xpm$"
 #~ msgstr "Δεν ευρέθησαν 'pixmaps' να ταιριάζουν στα hslider[0-9]*.xpm$"
-
 #~ msgid "No pixmaps found to match vslider[0-9]*.xpm$"
 #~ msgstr "Δεν ευρέθησαν 'pixmaps' να ταιριάζουν vslider[0-9]*.xpm$"
-
 #~ msgid "Trace MIDI Input"
 #~ msgstr "Αναζήτηση MIDI Input"
-
 #~ msgid "Trace MIDI Output"
 #~ msgstr "Αναζήτηση MIDI Output"
-
 #~ msgid "30 FPS non-drop"
 #~ msgstr "30 FPS non-drop"
-
 #~ msgid "MTC Port"
 #~ msgstr "MTC Θύρα"
-
 #~ msgid "attempt to timestretch a non-audio track!"
 #~ msgstr "απόπειρα να χρονοκαμφθεί ένα μη-ηχητικό κανάλι!"
-
 #~ msgid "cannot create timestretch thread - operation not carried out"
 #~ msgstr ""
 #~ "δεν δημιουργήθηκε σύνδεσμος Χρονοκάμψης - η εργασία δεν ολοκληρώθηκε"
@@ -6774,43 +6668,30 @@ msgstr "Κανάλι με αυτό το όνομα ήδη υπάρχει"
 #, fuzzy
 #~ msgid "copy region(s) between tracks"
 #~ msgstr "αντιγραφή περιοχής μεταξύ καναλιών"
-
 #~ msgid "ardour: tempo editor"
 #~ msgstr "ardour: επεξεργαστής χρόνου"
-
 #~ msgid "mouse brush"
 #~ msgstr "βούρτσα ποντικιού"
-
 #~ msgid "ardour_add_track_bus"
 #~ msgstr "ardour_εισαγωγή_καναλιού_διαύλου"
-
 #~ msgid "ok"
 #~ msgstr "Εν τάξει"
-
 #~ msgid "apply"
 #~ msgstr "ενεργοποίηση"
-
 #~ msgid "fade"
 #~ msgstr "fade"
-
 #~ msgid "Edit left"
 #~ msgstr "Επεξεργασία αριστερού"
-
 #~ msgid "Edit right"
 #~ msgstr "Επεξεργασία δεξιού"
-
 #~ msgid "Edit fade"
 #~ msgstr "Επεξεργασία fade"
-
 #~ msgid "Bounce region"
 #~ msgstr "Αναπήδηση περιοχής"
-
 #~ msgid "clear connections"
 #~ msgstr "εκκαθάριση συνδέσεων"
-
 #~ msgid "add comments/notes here"
 #~ msgstr "πρόσθεση σχολίων/σημειώσεων εδώ"
-
 #~ msgid "Crossfades in use"
 #~ msgstr "Crossfades εν ενεργεία"
 
@@ -6821,41 +6702,30 @@ msgstr "Κανάλι με αυτό το όνομα ήδη υπάρχει"
 #, fuzzy
 #~ msgid "inside this computer"
 #~ msgstr "Απόκρυψη παρόντος καναλιού"
-
 #~ msgid "track %1 has no input connections [This Message To Be Expanded]"
 #~ msgstr "Το κανάλι %1 δεν εχει συνδέσεις  λήψεως[Μήνυμα προς επέκταση]"
-
 #~ msgid "SR: %u kHz"
 #~ msgstr "SR: %u kHz"
-
 #~ msgid "Route Parameters"
 #~ msgstr "Παράμετροι διαδρομών"
-
 #~ msgid "Use Other"
 #~ msgstr "Χρησιμοποίηση άλλου"
-
 #~ msgid "Display Automatic Regions"
 #~ msgstr "Ανάδειξη Αυτομάτων Περιοχών"
-
 #~ msgid "Edit tempo"
 #~ msgstr "Επεξ/σία Χρόνου"
-
 #~ msgid "Ardour is done. Come again. Have a nice day. Etc.\n"
 #~ msgstr "Ο Ardour τελείωσε. Να μας ξανάρθετε. Καλή ημέρα να έχετε. Κλπ.\n"
-
 #~ msgid "  -U, --ui-rcfile  path            Use a specific UI style file\n"
 #~ msgstr ""
 #~ "  -U, --ui-rcfile  path            Χρήση συγκεκριμένου αρχείου για UI "
 #~ "στυλ\n"
-
 #~ msgid "INPUTs"
 #~ msgstr "Είσοδος(οι)"
-
 #~ msgid "OUTPUTs"
 #~ msgstr "'Εξοδος(οι)"
-
 #~ msgid "ardour: route parameters"
 #~ msgstr "ardour: παράμετροι διαδρομών"
-
 #~ msgid "ardour: route parameters: "
 #~ msgstr "ardour: παράμετροι διαδρομών: "
+
diff --git a/gtk2_ardour/po/fr_FR.po b/gtk2_ardour/po/fr_FR.po
index c6911e89c6..642519cd38 100644
--- a/gtk2_ardour/po/fr_FR.po
+++ b/gtk2_ardour/po/fr_FR.po
@@ -1,254 +1,330 @@
-# SOME DESCRIPTIVE TITLE.
+# translation of fr_FR.po to français
+# French translation of gtk-ardour.
 # Copyright (C) 2004 Paul Davis
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# This file is distributed under the same license as the gtk-ardour package.
+# Alain Fréhel <alain.frehel@free.fr>, 2005.
+# Christophe Combelles <ccomb@free.fr>, 2005, 2006, 2007
+# 
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: gtk-ardour 0.334.5\n"
+"Project-Id-Version: Ardour 2.0rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-27 13:00-0400\n"
-"PO-Revision-Date: 2005-02-14 11:19-0500\n"
-"Last-Translator: Alain Fréhel <alain.frehel@free.fr>\n"
-"Language-Team: French <ardour-dev@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2007-04-08 11:00+0200\n"
+"PO-Revision-Date: 2007-04-09 13:24+0200\n"
+"Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
+"Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bit"
 
-#: about.cc:120
+#: gtk2_ardour/about.cc:120
 msgid "Paul Davis"
-msgstr ""
+msgstr "Paul Davis"
 
-#: about.cc:121
-#, fuzzy
+#: gtk2_ardour/about.cc:121
 msgid "Jesse Chappell"
-msgstr "Réinitialiser"
+msgstr "Jesse Chappell"
 
-#: about.cc:122
+#: gtk2_ardour/about.cc:122
 msgid "Taybin Rutkin"
-msgstr ""
+msgstr "Taybin Rutkin"
 
-#: about.cc:123
+#: gtk2_ardour/about.cc:123
 msgid "Marcus Andersson"
-msgstr ""
+msgstr "Marcus Andersson"
 
-#: about.cc:124
+#: gtk2_ardour/about.cc:124
 msgid "Jeremy Hall"
-msgstr ""
+msgstr "Jeremy Hall"
 
-#: about.cc:125
+#: gtk2_ardour/about.cc:125
 msgid "Steve Harris"
-msgstr ""
+msgstr "Steve Harris"
 
-#: about.cc:126
+#: gtk2_ardour/about.cc:126
 msgid "Tim Mayberry"
-msgstr ""
+msgstr "Tim Mayberry"
 
-#: about.cc:127
+#: gtk2_ardour/about.cc:127
 msgid "Mark Stewart"
-msgstr ""
+msgstr "Mark Stewart"
 
-#: about.cc:128
+#: gtk2_ardour/about.cc:128
 msgid "Sam Chessman"
-msgstr ""
+msgstr "Sam Chessman"
 
-#: about.cc:129
+#: gtk2_ardour/about.cc:129
 msgid "Jack O'Quin"
-msgstr ""
+msgstr "Jack O'Quin"
 
-#: about.cc:130
+#: gtk2_ardour/about.cc:130
 msgid "Matt Krai"
-msgstr ""
+msgstr "Matt Krai"
 
-#: about.cc:131
+#: gtk2_ardour/about.cc:131
 msgid "Ben Bell"
-msgstr ""
+msgstr "Ben Bell"
 
-#: about.cc:132
+#: gtk2_ardour/about.cc:132
 msgid "Gerard van Dongen"
-msgstr ""
+msgstr "Gerard van Dongen"
 
-#: about.cc:133
+#: gtk2_ardour/about.cc:133
 msgid "Thomas Charbonnel"
-msgstr ""
+msgstr "Thomas Charbonnel"
 
-#: about.cc:134
+#: gtk2_ardour/about.cc:134
 msgid "Nick Mainsbridge"
-msgstr ""
+msgstr "Nick Mainsbridge"
 
-#: about.cc:135
+#: gtk2_ardour/about.cc:135
 msgid "Colin Law"
-msgstr ""
+msgstr "Colin Law"
 
-#: about.cc:136
+#: gtk2_ardour/about.cc:136
 msgid "Sampo Savolainen"
-msgstr ""
+msgstr "Sampo Savolainen"
 
-#: about.cc:137
+#: gtk2_ardour/about.cc:137
 msgid "Joshua Leach"
-msgstr ""
+msgstr "Joshua Leach"
 
-#: about.cc:138
+#: gtk2_ardour/about.cc:138
 msgid "Rob Holland"
-msgstr ""
+msgstr "Rob Holland"
 
-#: about.cc:139
+#: gtk2_ardour/about.cc:139
 msgid "Per Sigmond"
-msgstr ""
+msgstr "Per Sigmond"
 
-#: about.cc:140
+#: gtk2_ardour/about.cc:140
 msgid "Doug Mclain"
-msgstr ""
+msgstr "Doug Mclain"
 
-#: about.cc:141
+#: gtk2_ardour/about.cc:141
 msgid "Petter Sundlöf"
-msgstr ""
+msgstr "Petter Sundlöf"
 
-#: about.cc:146
-#, fuzzy
+#: gtk2_ardour/about.cc:142
+msgid "Thorsten Wilms"
+msgstr "Thorsten Wilms"
+
+#: gtk2_ardour/about.cc:143
+msgid "Ben Loftis"
+msgstr "Ben Loftis"
+
+#: gtk2_ardour/about.cc:144
+msgid "Stefan Kersten"
+msgstr "Stefan Kersten"
+
+#: gtk2_ardour/about.cc:145
+msgid "Christopher George"
+msgstr "Christopher George"
+
+#: gtk2_ardour/about.cc:146
+msgid "Robert Jordens"
+msgstr "Robert Jordens"
+
+#: gtk2_ardour/about.cc:147
+msgid "Dave Robillard"
+msgstr "Dave Robillard"
+
+#: gtk2_ardour/about.cc:148
+msgid "Hans Fugal"
+msgstr "Hans Fugal"
+
+#: gtk2_ardour/about.cc:149
+msgid "Brian Ahr"
+msgstr "Brian Ahr"
+
+#: gtk2_ardour/about.cc:150
+msgid "Nimal Ratnayake"
+msgstr "Nimal Ratnayake"
+
+#: gtk2_ardour/about.cc:151
+msgid "Mike Täht"
+msgstr "Mike Täht"
+
+#: gtk2_ardour/about.cc:152
+msgid "John Anderson"
+msgstr "John Anderson"
+
+#: gtk2_ardour/about.cc:153
+msgid "Nedko Arnaudov"
+msgstr "Nedko Arnaudov"
+
+#: gtk2_ardour/about.cc:158
 msgid ""
 "French:\n"
 "\tAlain Fréhel <alain.frehel@free.fr>\n"
+"\tChristophe Combelles <ccomb@free.fr>\n"
 msgstr ""
-"Français :\n"
-"\tAlain Fréhel <alain.frehel@free.fr>"
+"français :\n"
+"\tAlain Fréhel <alain.frehel@free.fr>\n"
+"\tChristophe Combelles <ccomb@free.fr>\n"
 
-#: about.cc:147
-#, fuzzy
+#: gtk2_ardour/about.cc:159
 msgid ""
 "German:\n"
 "\tKarsten Petersen <kapet@kapet.de>\n"
+"\tSebastian Arnold <mail@sebastian-arnold.net>\n"
 msgstr ""
-"Allemand :\n"
-"\tKarsten Petersen <kapet@kapet.de>"
+"allemand :\n"
+"\tKarsten Petersen <kapet@kapet.de>\n"
+"\tSebastian Arnold <mail@sebastian-arnold.net>\n"
 
-#: about.cc:148
-#, fuzzy
+#: gtk2_ardour/about.cc:160
 msgid ""
 "Italian:\n"
 "\tFilippo Pappalardo <filippo@email.it>\n"
 msgstr ""
-"Italien :\n"
-"\tFilippo Pappalardo <filippo@email.it>"
+"italien :\n"
+"\tFilippo Pappalardo <filippo@email.it>\n"
 
-#: about.cc:149
-#, fuzzy
+#: gtk2_ardour/about.cc:161
 msgid ""
 "Portuguese:\n"
 "\tRui Nuno Capela <rncbc@rncbc.org>\n"
 msgstr ""
-"Portugais :\n"
-"\tRui Nuno Capela <rncbc@rncbc.org>"
+"portugais :\n"
+"\tRui Nuno Capela <rncbc@rncbc.org>\n"
 
-#: about.cc:150
-#, fuzzy
+#: gtk2_ardour/about.cc:162
 msgid ""
 "Brazilian Portuguese:\n"
 "\tAlexander da Franca Fernandes <alexander@nautae.eti.br>\n"
 "\tChris Ross <chris@tebibyte.org>\n"
 msgstr ""
-"Portugais du Brésil :\n"
+"portugais brésilien :\n"
 "\tAlexander da Franca Fernandes <alexander@nautae.eti.br>\n"
-"\tChris Ross <chris@tebibyte.org>"
+"\tChris Ross <chris@tebibyte.org>\n"
 
-#: about.cc:152
-#, fuzzy
+#: gtk2_ardour/about.cc:164
 msgid ""
 "Spanish:\n"
 "\t Alex Krohn <alexkrohn@fastmail.fm>\n"
 msgstr ""
-"Espagnol :\n"
-"\tAlex Krohn <alexkrohn@fastmail.fm>"
+"espagnol :\n"
+"\t Alex Krohn <alexkrohn@fastmail.fm>\n"
 
-#: about.cc:153
-#, fuzzy
+#: gtk2_ardour/about.cc:165
 msgid ""
 "Russian:\n"
 "\t Igor Blinov <pitstop@nm.ru>\n"
 msgstr ""
-"Russe :\n"
-"\tIgor Blinov <pitstop@nm.ru>"
+"russe :\n"
+"\t Igor Blinov <pitstop@nm.ru>\n"
 
-#: about.cc:181
-#, fuzzy
-msgid "Copyright (C) 1999-2005 Paul Davis\n"
-msgstr "Copyright (C) 1999-2005 Paul Davis"
+#: gtk2_ardour/about.cc:193
+msgid "Copyright (C) 1999-2007 Paul Davis\n"
+msgstr "Copyright © 1999-2007 Paul Davis\n"
 
-#: about.cc:182
-#, fuzzy
+#: gtk2_ardour/about.cc:194
 msgid ""
 "Ardour comes with ABSOLUTELY NO WARRANTY\n"
 "This is free software, and you are welcome to redistribute it\n"
 "under certain conditions; see the file COPYING for details.\n"
 msgstr ""
-"Copyright (C) 1999-2004 Paul Davis\n"
-"Copyright (C) 1999-2005 Paul Davis\n"
 "Ardour est distribué SANS AUCUNE GARANTIE\n"
-"Ceci est un logiciel libre, et vous êtes encouragés à le distribuer\n"
+"C'est un logiciel libre et vous êtes encouragé à le distribuer\n"
 "sous certaines conditions ; voir le fichier COPYING pour les détails.\n"
 
-#: about.cc:188
-#, fuzzy
+#: gtk2_ardour/about.cc:199
+msgid "visit http://www.ardour.org/"
+msgstr "visitez http://www.ardour.org"
+
+#: gtk2_ardour/about.cc:200
 msgid ""
 "%1\n"
-"(built with ardour/gtk %2.%3.%4 libardour: %5.%6.%7)"
+"(built from revision %2)"
 msgstr ""
-"Ardour: %1\n"
-"(fonctionnant avec ardour/gtk %2 libardour: %3.%4.%5)"
+"%1\n"
+"(revision %2)"
 
-#: actions.cc:261
-#, fuzzy
+#: gtk2_ardour/actions.cc:76
+msgid "badly formatted UI definition file"
+msgstr "fichier de définition d'IHM mal formatté"
+
+#: gtk2_ardour/actions.cc:78
+msgid "Ardour menu definition file not found"
+msgstr "fichier de définition du menu d'Ardour non trouvé"
+
+#: gtk2_ardour/actions.cc:82
+msgid "ardour will not work without a valid ardour.menus file"
+msgstr "ardour ne fonctionnera pas sans un fichier ardour.menus valide"
+
+#: gtk2_ardour/actions.cc:234
 msgid "programmer error: %1 %2"
-msgstr "erreur de programmation : "
+msgstr "programmer error: %1 %2"
 
-#: add_route_dialog.cc:62
-msgid "ardour: add track/bus"
-msgstr "ardour : ajouter piste/bus"
+#: gtk2_ardour/actions.cc:253
+msgid "Unknown action name: %1"
+msgstr "Nom d'action inconnu : %1"
 
-#. path = "1"
-#: add_route_dialog.cc:63 editor_route_list.cc:73
-msgid "Tracks"
-msgstr "Pistes"
-
-#. path = "0"
-#: add_route_dialog.cc:64 editor_route_list.cc:70
-msgid "Busses"
-msgstr "Bus"
-
-#: add_route_dialog.cc:96 plugin_ui.cc:833
-msgid "Add"
-msgstr "Ajouter"
-
-#: add_route_dialog.cc:114
-msgid "Name (template)"
-msgstr "Nom (modèle)"
-
-#: add_route_dialog.cc:120
-#, fuzzy
-msgid "Channel Configuration"
-msgstr "Configuration"
-
-#: add_route_dialog.cc:177 editor.cc:134 editor.cc:3688 time_axis_view.cc:552
-msgid "Normal"
-msgstr "Normal"
-
-#: add_route_dialog.cc:179
-#, fuzzy
-msgid "Tape"
-msgstr "État"
-
-#: add_route_dialog.cc:196
-#, fuzzy
+#: gtk2_ardour/add_route_dialog.cc:40 gtk2_ardour/add_route_dialog.cc:195
 msgid "Mono"
 msgstr "mono"
 
-#: add_route_dialog.cc:198
-#, fuzzy
+#: gtk2_ardour/add_route_dialog.cc:41 gtk2_ardour/add_route_dialog.cc:197
 msgid "Stereo"
 msgstr "stéréo"
 
-#. preroll stuff
-#: ardour_ui.cc:106
+#: gtk2_ardour/add_route_dialog.cc:42
+msgid "3 Channels"
+msgstr "3 voies"
+
+#: gtk2_ardour/add_route_dialog.cc:43
+msgid "4 Channels"
+msgstr "4 voies"
+
+#: gtk2_ardour/add_route_dialog.cc:44
+msgid "6 Channels"
+msgstr "6 voies"
+
+#: gtk2_ardour/add_route_dialog.cc:45
+msgid "8 Channels"
+msgstr "8 voies"
+
+#: gtk2_ardour/add_route_dialog.cc:46
+msgid "Manual Setup"
+msgstr "Config manuelle"
+
+#: gtk2_ardour/add_route_dialog.cc:51 gtk2_ardour/add_route_dialog.cc:176
+#: gtk2_ardour/editor.cc:128 gtk2_ardour/editor.cc:2994
+#: gtk2_ardour/editor_actions.cc:288 gtk2_ardour/time_axis_view.cc:589
+msgid "Normal"
+msgstr "Normal"
+
+#: gtk2_ardour/add_route_dialog.cc:52 gtk2_ardour/add_route_dialog.cc:178
+msgid "Tape"
+msgstr "Bande"
+
+#: gtk2_ardour/add_route_dialog.cc:61
+msgid "ardour: add track/bus"
+msgstr "ardour : ajouter piste ou bus"
+
+#: gtk2_ardour/add_route_dialog.cc:62 gtk2_ardour/editor_route_list.cc:72
+msgid "Tracks"
+msgstr "Pistes"
+
+#: gtk2_ardour/add_route_dialog.cc:63 gtk2_ardour/editor_route_list.cc:69
+msgid "Busses"
+msgstr "Bus"
+
+#: gtk2_ardour/add_route_dialog.cc:95 gtk2_ardour/plugin_ui.cc:151
+msgid "Add"
+msgstr "Ajouter"
+
+#: gtk2_ardour/add_route_dialog.cc:113
+msgid "Name (template)"
+msgstr "Nom (modèle)"
+
+#: gtk2_ardour/add_route_dialog.cc:119
+msgid "Channel Configuration"
+msgstr "Configuration"
+
+#: gtk2_ardour/ardour_ui.cc:110
 msgid ""
 "pre\n"
 "roll"
@@ -256,7 +332,7 @@ msgstr ""
 "pré\n"
 "roll"
 
-#: ardour_ui.cc:107
+#: gtk2_ardour/ardour_ui.cc:111
 msgid ""
 "post\n"
 "roll"
@@ -264,76 +340,73 @@ msgstr ""
 "post\n"
 "roll"
 
-#. transport
-#: ardour_ui.cc:115
-#, fuzzy
-msgid ""
-"time\n"
-"master"
-msgstr "JACK horloge maître"
-
-#: ardour_ui.cc:117
+#: gtk2_ardour/ardour_ui.cc:137
 msgid "% "
 msgstr "% "
 
-#: ardour_ui.cc:119
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:139 gtk2_ardour/ardour_ui_ed.cc:294
+msgid "Punch In"
+msgstr "Punch In"
+
+#: gtk2_ardour/ardour_ui.cc:140 gtk2_ardour/ardour_ui_ed.cc:297
+msgid "Punch Out"
+msgstr "Punch Out"
+
+#: gtk2_ardour/ardour_ui.cc:141 gtk2_ardour/ardour_ui_ed.cc:309
+msgid "Auto Return"
+msgstr "retour auto"
+
+#: gtk2_ardour/ardour_ui.cc:142 gtk2_ardour/ardour_ui_ed.cc:306
+msgid "Auto Play"
+msgstr "Lecture auto"
+
+#: gtk2_ardour/ardour_ui.cc:143 gtk2_ardour/ardour_ui_ed.cc:303
+msgid "Auto Input"
+msgstr "monit. auto"
+
+#: gtk2_ardour/ardour_ui.cc:144 gtk2_ardour/ardour_ui_ed.cc:300
+#: gtk2_ardour/option_editor.cc:133
+msgid "Click"
+msgstr "Métronome"
+
+#: gtk2_ardour/ardour_ui.cc:145
 msgid ""
-"punch\n"
-"in"
+"time\n"
+"master"
 msgstr ""
-"punch\n"
-"in"
+"Horloge\n"
+"maître"
 
-#: ardour_ui.cc:120
-msgid ""
-"punch\n"
-"out"
-msgstr ""
-"punch\n"
-"out"
+#: gtk2_ardour/ardour_ui.cc:147
+msgid "AUDITION"
+msgstr "EN ÉCOUTE"
 
-#: ardour_ui.cc:121
-msgid ""
-"auto\n"
-"return"
-msgstr ""
-"retour\n"
-"auto"
-
-#: ardour_ui.cc:122
-msgid ""
-"auto\n"
-"play"
-msgstr ""
-"lecture\n"
-"auto."
-
-#: ardour_ui.cc:123
-msgid ""
-"auto\n"
-"input"
-msgstr ""
-"entrée\n"
-"auto."
-
-#: ardour_ui.cc:124
-msgid "click"
-msgstr "clic"
-
-#: ardour_ui.cc:125
-msgid "AUDITIONING"
-msgstr "ECOUTE"
-
-#: ardour_ui.cc:126
+#: gtk2_ardour/ardour_ui.cc:148
 msgid "SOLO"
 msgstr "SOLO"
 
-#: ardour_ui.cc:375
+#: gtk2_ardour/ardour_ui.cc:476
+msgid ""
+"WARNING: Your system has a limit for maximum amount of locked memory. This "
+"might cause Ardour to run out of memory before your system runs out of "
+"memory. \n"
+"\n"
+"You can view the memory limit with 'ulimit -l', and it is normally "
+"controlled by /etc/security/limits.conf"
+msgstr ""
+"AVERTISSEMENT : votre système possède une limite supérieure pour la quantité maximale de mémoire verrouillée. Ceci peut empêcher Ardour d'accéder à toute la mémoire disponible sur votre système.\n"
+"\n"
+"Vous pouvez connaître la limite actuelle avec la commande « ulimit -l » et celle-ci est habituellement contrôlée par le fichier /etc/security/limits.conf."
+
+#: gtk2_ardour/ardour_ui.cc:484
+msgid "Do not show this window again"
+msgstr "Ne plus afficher cette fenêtre"
+
+#: gtk2_ardour/ardour_ui.cc:505
 msgid "quit"
 msgstr "quitter"
 
-#: ardour_ui.cc:384
+#: gtk2_ardour/ardour_ui.cc:514
 msgid ""
 "Ardour was unable to save your session.\n"
 "\n"
@@ -341,33 +414,37 @@ msgid ""
 "\n"
 "\"Just quit\" option."
 msgstr ""
+"Votre session n'a pas pu être enregistrée !\n"
+"\n"
+"Si vous souhaitez quand-même quitter,\n"
+"\n"
+"cliquez sur le bouton « Quitter sans enregistrer »."
 
-#: ardour_ui.cc:403
+#: gtk2_ardour/ardour_ui.cc:538
 msgid "ardour: save session?"
 msgstr "ardour : enregistrer la session ?"
 
-#: ardour_ui.cc:410
+#: gtk2_ardour/ardour_ui.cc:545
 msgid "Don't %1"
 msgstr "Ne pas %1"
 
-#: ardour_ui.cc:412
+#: gtk2_ardour/ardour_ui.cc:547
 msgid "Just %1"
-msgstr "Juste %1"
+msgstr "%1 sans enregistrer"
 
-#: ardour_ui.cc:414
+#: gtk2_ardour/ardour_ui.cc:549
 msgid "Save and %1"
 msgstr "Enregistrer et %1"
 
-#: ardour_ui.cc:426
+#: gtk2_ardour/ardour_ui.cc:561
 msgid "session"
-msgstr "session"
+msgstr "La session"
 
-#: ardour_ui.cc:428
+#: gtk2_ardour/ardour_ui.cc:563
 msgid "snapshot"
-msgstr "Instantané"
+msgstr "Le cliché"
 
-#: ardour_ui.cc:430
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:565
 msgid ""
 "The %1\"%2\"\n"
 "has not been saved.\n"
@@ -377,224 +454,239 @@ msgid ""
 "\n"
 "What do you want to do?"
 msgstr ""
-"La session \"%1\"\n"
-"n'a pas été enregistrée.\n"
+"%1 « %2 » n'a pas été enregistré(e).\n"
 "\n"
-"Les changements effectués cette fois-ci\n"
-"seront perdus à moins que vous ne les enregistriez.\n"
+"Tous les changements seront perdus\n"
+"à moins de les enregistrer.\n"
 "\n"
 "Que voulez-vous faire ?"
 
-#: ardour_ui.cc:444
+#: gtk2_ardour/ardour_ui.cc:579
 msgid "Prompter"
-msgstr "Prompter"
+msgstr "Question"
 
-#: ardour_ui.cc:503
+#: gtk2_ardour/ardour_ui.cc:639
 #, c-format
 msgid "disconnected"
 msgstr "déconnecté"
 
-#: ardour_ui.cc:510
+#: gtk2_ardour/ardour_ui.cc:646
 #, c-format
-msgid "SR: %.1f kHz / %4.1f msecs"
-msgstr "F.E. : %.1f kHz / %4.1f ms"
+msgid "%.1f kHz / %4.1f ms"
+msgstr "%.1f kHz / %4.1f ms"
 
-#: ardour_ui.cc:514
+#: gtk2_ardour/ardour_ui.cc:650
 #, c-format
-msgid "SR: %u kHz / %4.1f msecs"
-msgstr "F.E. : %u kHz / %4.1f ms"
+msgid "%u kHz / %4.1f ms"
+msgstr "%u kHz/%4.1f ms"
 
-#: ardour_ui.cc:527
+#: gtk2_ardour/ardour_ui.cc:663
 #, c-format
-msgid "DSP Load: %.1f%%"
-msgstr "Charge DSP : %.1f%%"
+msgid "DSP: %5.1f%%"
+msgstr "DSP=%5.1f%%"
 
-#: ardour_ui.cc:537
+#: gtk2_ardour/ardour_ui.cc:673
 #, c-format
 msgid "Buffers p:%<PRIu32>%% c:%<PRIu32>%%"
-msgstr "Tampons p:%<PRIu32>%% c:%<PRIu32>%%"
+msgstr "Buffers: (lect=%<PRIu32>%% enr=%<PRIu32>%%)"
 
-#: ardour_ui.cc:564
-msgid "space: 24hrs+"
-msgstr "espace : 24hrs+"
+#: gtk2_ardour/ardour_ui.cc:701
+msgid "Disk: 24hrs+"
+msgstr "Reste : +24h"
 
-#: ardour_ui.cc:594
+#: gtk2_ardour/ardour_ui.cc:721
 #, c-format
-msgid "space: %02dh:%02dm:%02ds"
-msgstr "espace: %02dh:%02dm:%02ds"
+msgid "Disk: %02dh:%02dm:%02ds"
+msgstr "Reste %02dh %02dmin %02ds"
 
-#: ardour_ui.cc:633
-msgid "programming error: impossible control method"
-msgstr "erreur de programmation : méthode de contrôle impossible"
-
-#: ardour_ui.cc:741 new_session_dialog.cc:294
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:834 gtk2_ardour/new_session_dialog.cc:362
 msgid "Recent Sessions"
-msgstr "ouvrir session"
+msgstr "Sessions récentes"
 
-#. ardour sessions are folders
-#: ardour_ui.cc:834
+#: gtk2_ardour/ardour_ui.cc:927
 msgid "open session"
-msgstr "ouvrir session"
+msgstr "Ouvrir une session"
 
-#: ardour_ui.cc:840
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:933
 msgid "Ardour sessions"
-msgstr "ardour_nouvelle_session"
+msgstr "Sessions Ardour"
 
-#: ardour_ui.cc:873
+#: gtk2_ardour/ardour_ui.cc:966
 msgid "Patience is a virtue.\n"
-msgstr "La patience est une vertue.\n"
+msgstr "La patience est une vertu.\n"
 
-#: ardour_ui.cc:882
-msgid "You cannot add a track without a session already loaded."
+#: gtk2_ardour/ardour_ui.cc:976
+msgid "You cannot add a track or bus without a session already loaded."
 msgstr ""
-"Vous ne pouvez pas ajouter une piste sans qu'une session ait été chargée."
+"Vous ne pouvez pas ajouter une piste ou un bus sans avoir ouvert une session."
 
-#: ardour_ui.cc:889
-msgid "could not create new audio track"
+#: gtk2_ardour/ardour_ui.cc:986 gtk2_ardour/ardour_ui.cc:999
+msgid "could not create a new audio track"
 msgstr "impossible de créer une nouvelle piste audio"
 
-#: ardour_ui.cc:893
-msgid "could not create new audio bus"
-msgstr "impossible de créer un nouveau bus audio"
+#: gtk2_ardour/ardour_ui.cc:988
+msgid "could only create %1 of %2 new audio %3"
+msgstr "Ardour n'a pu créer que %1 %3 audio au lieu de %2"
 
-#: ardour_ui.cc:912
+#: gtk2_ardour/ardour_ui.cc:989
+msgid "tracks"
+msgstr "pistes"
+
+#: gtk2_ardour/ardour_ui.cc:989
+msgid "busses"
+msgstr "bus"
+
+#: gtk2_ardour/ardour_ui.cc:1001
+msgid "could not create %1 new audio tracks"
+msgstr "impossible de créer %1 nouvelles pistes audios"
+
+#: gtk2_ardour/ardour_ui.cc:1022
 msgid ""
 "There are insufficient JACK ports available\n"
 "to create a new track or bus.\n"
 "You should save Ardour, exit and\n"
 "restart JACK with more ports."
 msgstr ""
-"Il n'y a pas assez de ports JACK disponibles\n"
-"pour créer une nouvelle piste ou bus.\n"
-"Vous devriez enregistrer, quitter, puis\n"
+"Il n'y a plus assez de ports JACK disponibles\n"
+"pour créer une nouvelle piste ou un nouveau bus.\n"
+"Vous devriez enregistrer la session, quitter, puis\n"
 "redémarrer JACK avec plus de ports."
 
-#: ardour_ui.cc:1036
+#: gtk2_ardour/ardour_ui.cc:1142
 msgid ""
 "Please create 1 or more track\n"
 "before trying to record.\n"
 "Check the Session menu."
 msgstr ""
-"Veuillez créer une ou plusieurs pistes supplémentaires\n"
-"avant d'essayer d'enregistrer.\n"
-"Regardez dans le menu Session."
+"Pour pouvoir enregistrer, vous devez ajouter au moins une piste.\n"
+"Rendez-vous dans le menu « Session »."
 
-#: ardour_ui.cc:1265
+#: gtk2_ardour/ardour_ui.cc:1387
 msgid ""
 "JACK has either been shutdown or it\n"
 "disconnected Ardour because Ardour\n"
 "was not fast enough. You can save the\n"
 "session and/or try to reconnect to JACK ."
 msgstr ""
-"Soit JACK a été arrêté, soit il a déconnecté\n"
-"Ardour parce que celui-ci n'était pas assez rapide.\n"
+"JACK a été arrêté ou a déconnecté Ardour\n"
+"parce que celui-ci n'était pas assez rapide.\n"
 "Vous devriez enregistrer la session\n"
-"et/ou essayer de le reconnecter à JACK."
+"ou essayer de reconnecter Ardour à JACK."
 
-#: ardour_ui.cc:1282
-msgid "Unable to create all required ports"
-msgstr ""
-
-#: ardour_ui.cc:1290
+#: gtk2_ardour/ardour_ui.cc:1404
 msgid "Unable to start the session running"
 msgstr "Impossible de lancer la session"
 
-#: ardour_ui.cc:1426
-msgid "No Stream"
-msgstr "Pas de flux"
-
-#: ardour_ui.cc:1453 ardour_ui.cc:1472
+#: gtk2_ardour/ardour_ui.cc:1504 gtk2_ardour/ardour_ui.cc:1523
+#: gtk2_ardour/audio_clock.cc:461
 msgid "none"
 msgstr "aucun"
 
-#: ardour_ui.cc:1462 ardour_ui.cc:1481
+#: gtk2_ardour/ardour_ui.cc:1513 gtk2_ardour/ardour_ui.cc:1532
 msgid "off"
-msgstr "arrêt"
+msgstr "stop"
 
-#: ardour_ui.cc:1505
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:1558
 msgid "Name of New Snapshot"
-msgstr "Nom de l'instantané"
+msgstr "Nom du nouveau cliché :"
 
-#: ardour_ui.cc:1651
+#: gtk2_ardour/ardour_ui.cc:1698
 msgid "Name for mix template:"
-msgstr "Nom du modèle de mélange : "
+msgstr "Nom du modèle de session :"
 
-#: ardour_ui.cc:1652
+#: gtk2_ardour/ardour_ui.cc:1699
 msgid "-template"
 msgstr "-modèle"
 
-#: ardour_ui.cc:1809
+#: gtk2_ardour/ardour_ui.cc:1723 gtk2_ardour/ardour_ui.cc:1740
+msgid ""
+"Ardour is not connected to JACK at this time. Creating new sessions is not "
+"possible."
+msgstr ""
+"Ardour n'est pas connecté à JACK. Il n'est pas possible de créer de nouvelles sessions."
+
+#: gtk2_ardour/ardour_ui.cc:1833
+msgid ""
+"This session\n"
+"%1\n"
+"already exists. Do you want to open it?"
+msgstr ""
+"Cette session existe déjà :\n"
+"%1\n"
+"Voulez-vous l'ouvrir ?"
+
+#: gtk2_ardour/ardour_ui.cc:1956
 msgid ""
 "You do not have write access to this session.\n"
 "This prevents the session from being loaded."
 msgstr ""
+"Vous n'avez pas les droits d'écriture sur cette session.\n"
+"La session ne peut pas être chargée."
 
-#: ardour_ui.cc:1822 ardour_ui.cc:1877
+#: gtk2_ardour/ardour_ui.cc:1968
 msgid "Session \"%1 (snapshot %2)\" did not load successfully"
-msgstr "La session \"%1 (instantané %2)\" ne s'est pas chargée correctement"
+msgstr "La session « %1 (cliché %2) » ne s'est pas chargée correctement"
 
-#: ardour_ui.cc:1933
+#: gtk2_ardour/ardour_ui.cc:2018
+msgid "Could not create session in \"%1\""
+msgstr "Impossible de créer une session dans « %1 »"
+
+#: gtk2_ardour/ardour_ui.cc:2078
 msgid "No audio files were ready for cleanup"
-msgstr ""
+msgstr "Aucun fichier audio n'est susceptible d'être nettoyé"
 
-#: ardour_ui.cc:1937
+#: gtk2_ardour/ardour_ui.cc:2082
 msgid ""
 "If this seems suprising, \n"
 "check for any existing snapshots.\n"
 "These may still include regions that\n"
 "require some unused files to continue to exist."
 msgstr ""
+"Si cela vous paraît surprenant, vérifiez les éventuels clichés.\n"
+"Ceux-ci peuvent contenir des régions ayant besoin de certains\n"
+"fichiers audio inutilisés pour exister."
 
-#: ardour_ui.cc:1946
+#: gtk2_ardour/ardour_ui.cc:2091
 msgid "ardour: cleanup"
 msgstr "ardour : nettoyage"
 
-#: ardour_ui.cc:1982 ardour_ui.cc:1988
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:2127 gtk2_ardour/ardour_ui.cc:2133
 msgid "files were"
-msgstr "fichiers"
+msgstr " "
 
-#: ardour_ui.cc:1984 ardour_ui.cc:1990
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:2129 gtk2_ardour/ardour_ui.cc:2135
 msgid "file was"
-msgstr "fichiers"
+msgstr " "
 
-#: ardour_ui.cc:2031
+#: gtk2_ardour/ardour_ui.cc:2176
 msgid "Are you sure you want to cleanup?"
-msgstr ""
+msgstr "Voulez-vous vraiment lancer le nettoyage ?"
 
-#: ardour_ui.cc:2036
+#: gtk2_ardour/ardour_ui.cc:2181
 msgid ""
 "Cleanup is a destructive operation.\n"
 "ALL undo/redo information will be lost if you cleanup.\n"
 "After cleanup, unused audio files will be moved to a \"dead sounds\" "
 "location."
 msgstr ""
+"Le nettoyage est une opération destructrice.\n"
+"TOUTES les opérations d'annulation seront perdues.\n"
+"Les fichiers audio inutilisés seront déplacés dans un dossier « dead_sounds "
+"»."
 
-#: ardour_ui.cc:2042
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:2187
 msgid "Clean Up"
 msgstr "Nettoyer"
 
-#: ardour_ui.cc:2045
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:2190
 msgid "CleanupDialog"
-msgstr "Nettoyer"
+msgstr "Fenêtre de nettoyage"
 
-#: ardour_ui.cc:2046
-#, fuzzy
-msgid "ardour_cleanup"
-msgstr "ardour : nettoyage"
-
-#: ardour_ui.cc:2065
+#: gtk2_ardour/ardour_ui.cc:2218
 msgid "cleaned files"
 msgstr "fichiers nettoyés"
 
-#: ardour_ui.cc:2066
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:2219
 msgid ""
 "The following %1 %2 not in use and \n"
 "have been moved to:\n"
@@ -604,59 +696,51 @@ msgid ""
 "release an additional\n"
 "%4 %5bytes of disk space.\n"
 msgstr ""
-"Les %1 %2 fichiers suivants n'étaient pas utilisés.\n"
-"La prochaine fois que vous viderez la corbeille,\n"
-"%3 %4-octets d'espace disque supplémentaires seront\n"
-"libérés"
+"%1%2Voici les fichier inutilisés déplacés dans :\n"
+"%3. \n"
+"\n"
+"Vider la corbeille libérera\n"
+"un espace supplémentaire de\n"
+"%4 %5bytes.\n"
 
-#: ardour_ui.cc:2091
+#: gtk2_ardour/ardour_ui.cc:2247
 msgid "deleted file"
-msgstr "fichiers effacés"
+msgstr "fichier effacé"
 
-#: ardour_ui.cc:2092
-#, fuzzy
+#: gtk2_ardour/ardour_ui.cc:2248
 msgid ""
 "The following %1 %2 deleted from\n"
 "%3,\n"
 "releasing %4 %5bytes of disk space"
 msgstr ""
-"Les %1 fichier%2 suivant%2 seront effacé%2, libérant %3 %4-octets d'espace "
-"disque"
+"%1%2Voici les fichiers effacés de \n"
+"%3,\n"
+"%4 %5octets d'espace disque ont été libérés."
 
-#: ardour_ui.cc:2215
+#: gtk2_ardour/ardour_ui.cc:2366
 msgid "Recording was stopped because your system could not keep up."
 msgstr ""
-"L'enregistrement a été stoppé parce que votre système ne peut pas suivre."
+"L'enregistrement s'est arrêté car votre système n'était pas assez rapide."
 
-#: ardour_ui.cc:2238
+#: gtk2_ardour/ardour_ui.cc:2377
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with Ardour.\n"
 "\n"
 "Specifically, it failed to write data to disk\n"
 "quickly enough to keep up with recording.\n"
-msgstr ""
-"Le disque dur n'arrive pas\n"
-"à suivre Ardour.\n"
-"\n"
-"Plus précisement, il a été incapable d'écrire les données\n"
-"sur le disque assez rapidement pour suivre l'enregistrement.\n"
+msgstr "Le disque dur n'est pas assez rapide en écriture.\n"
 
-#: ardour_ui.cc:2257
+#: gtk2_ardour/ardour_ui.cc:2396
 msgid ""
 "The disk system on your computer\n"
 "was not able to keep up with Ardour.\n"
 "\n"
 "Specifically, it failed to read data from disk\n"
 "quickly enough to keep up with playback.\n"
-msgstr ""
-"Le disque dur n'arrive pas\n"
-"à suivre Ardour.\n"
-"\n"
-"Plus précisement, il a été incapable de lire les données\n"
-"sur le disque assez rapidement pour suivre la lecture.\n"
+msgstr "Le disque dur n'est pas assez rapide en lecture.\n"
 
-#: ardour_ui.cc:2283
+#: gtk2_ardour/ardour_ui.cc:2417
 msgid ""
 "This session appears to have been in\n"
 "middle of recording when ardour or\n"
@@ -666,4177 +750,3973 @@ msgid ""
 "you, or it can ignore it. Please decide\n"
 "what you would like to do.\n"
 msgstr ""
-"Cette session semble avoir été interrompue\n"
-"au milieu d'un enregistrement lorsque ardour ou\n"
-"l'ordinateur s'est arrêté.\n"
+"Cette session a été interrompue pendant un enregistrement.\n"
+"(à cause d'un arrêt brutal d'Ardour ou de l'ordinateur)\n"
 "\n"
-"Ardour peut récupérer pour vous tout ce qui a été enregistré,\n"
-"ou vous pouvez l'ignorer. Veuillez décider\n"
-"sur ce que vous voulez faire.\n"
+"Vous pouvez récupérer ou ignorer les données de l'enregistrement.\n"
 
-#: ardour_ui.cc:2293
+#: gtk2_ardour/ardour_ui.cc:2427
 msgid "Recover from crash"
-msgstr "Récupérer après un plantage"
+msgstr "Récupérer les données"
 
-#: ardour_ui.cc:2294
+#: gtk2_ardour/ardour_ui.cc:2428
 msgid "Ignore crash data"
-msgstr "Ignorer les données du plantage"
+msgstr "Ignorer les données"
 
-#: ardour_ui.cc:2312
+#: gtk2_ardour/ardour_ui.cc:2446
 msgid "Could not disconnect from JACK"
 msgstr "Impossible de se déconnecter de JACK"
 
-#: ardour_ui.cc:2325
+#: gtk2_ardour/ardour_ui.cc:2459
 msgid "Could not reconnect to JACK"
 msgstr "Impossible de se reconnecter à JACK"
 
-#: ardour_ui2.cc:60
+#: gtk2_ardour/ardour_ui2.cc:62
 msgid "UI: cannot setup editor"
 msgstr "IHM : impossible d'initialiser l'éditeur"
 
-#: ardour_ui2.cc:65
+#: gtk2_ardour/ardour_ui2.cc:67
 msgid "UI: cannot setup mixer"
 msgstr "IHM : impossible d'initialiser la console de mixage"
 
-#: ardour_ui2.cc:91
-msgid "MMC + Local"
-msgstr "MMC + Local"
-
-#: ardour_ui2.cc:92
-msgid "MMC"
-msgstr "MMC"
-
-#: ardour_ui2.cc:93
-msgid "Local"
-msgstr "Local"
-
-#: ardour_ui2.cc:110
-msgid "MMC ID"
-msgstr "ID MMC"
-
-#: ardour_ui2.cc:291
+#: gtk2_ardour/ardour_ui2.cc:243
 msgid "Play from playhead"
-msgstr "Jouer depuis la tête de lecture"
+msgstr "Démarrer la lecture"
 
-#: ardour_ui2.cc:292
+#: gtk2_ardour/ardour_ui2.cc:244
 msgid "Stop playback"
-msgstr "Arrêter la lecture"
+msgstr "Stopper la lecture"
 
-#: ardour_ui2.cc:293
+#: gtk2_ardour/ardour_ui2.cc:245
 msgid "Play range/selection"
-msgstr "Jouer l'intervalle/la sélection"
+msgstr "Lire la zone de sélection"
 
-#: ardour_ui2.cc:294
+#: gtk2_ardour/ardour_ui2.cc:246
 msgid "Go to start of session"
-msgstr "Aller au début de la session"
+msgstr "début de la session"
 
-#: ardour_ui2.cc:295
+#: gtk2_ardour/ardour_ui2.cc:247
 msgid "Go to end of session"
-msgstr "Aller à la fin de la session"
+msgstr "fin de session"
 
-#: ardour_ui2.cc:296
+#: gtk2_ardour/ardour_ui2.cc:248
 msgid "Play loop range"
-msgstr "Jouer l'intervalle de boucle"
+msgstr "Lire la boucle"
 
-#: ardour_ui2.cc:297
+#: gtk2_ardour/ardour_ui2.cc:250
 msgid "Return to last playback start when stopped"
-msgstr "Revenir au dernier départ de lecture lors de l'arrêt"
+msgstr "Revenir en début de lecture lors de l'arrêt"
 
-#: ardour_ui2.cc:298
+#: gtk2_ardour/ardour_ui2.cc:251
 msgid "Start playback after any locate"
-msgstr "Démarrer la lecture aprés chaque locate"
+msgstr "Démarrer quand la tête de lecture est déplacée"
 
-#: ardour_ui2.cc:299
+#: gtk2_ardour/ardour_ui2.cc:252
 msgid "Be sensible about input monitoring"
-msgstr "Être raisonnable avec la pré-écoute des entrées"
+msgstr "Monitoring d'entrée automatique"
 
-#: ardour_ui2.cc:300
+#: gtk2_ardour/ardour_ui2.cc:253
 msgid "Start recording at auto-punch start"
-msgstr "Démarrer l'enregistrement en début d'auto-punch"
+msgstr "Ne démarrer l'enregistrement qu'au point punch-in"
 
-#: ardour_ui2.cc:301
+#: gtk2_ardour/ardour_ui2.cc:254
 msgid "Stop recording at auto-punch end"
-msgstr "Arrêter l'enregistrement en fin d'auto-punch"
+msgstr "Arrêter l'enregistrement au point punch-out"
 
-#: ardour_ui2.cc:302
+#: gtk2_ardour/ardour_ui2.cc:255
 msgid "Enable/Disable audio click"
-msgstr "Activer/Désactiver le clic sonore"
+msgstr "(dés)activer le métronome"
 
-#: ardour_ui2.cc:303
-#, fuzzy
+#: gtk2_ardour/ardour_ui2.cc:256
 msgid "Positional sync source"
-msgstr "Synchro. positionelle"
+msgstr "Source de synchro de position"
 
-#: ardour_ui2.cc:304
+#: gtk2_ardour/ardour_ui2.cc:257
 msgid "Does Ardour control the time?"
-msgstr ""
+msgstr "Est-ce qu'Ardour contrôle l'horloge ?"
 
-#: ardour_ui2.cc:305
-#, fuzzy
+#: gtk2_ardour/ardour_ui2.cc:258
 msgid "Shuttle speed control"
-msgstr "Contrôle de la vitesse avec molette"
+msgstr "Variateur de vitesse"
 
-#: ardour_ui2.cc:306
-#, fuzzy, c-format
+#: gtk2_ardour/ardour_ui2.cc:259
+#, c-format
 msgid "Select semitones or %%-age for speed display"
-msgstr "Sélectionner les demi-tons ou le %-age pour l'affichage de la vitesse"
+msgstr "Vitesse affichée en %% ou en demi-tons"
 
-#: ardour_ui2.cc:307
+#: gtk2_ardour/ardour_ui2.cc:260
 msgid "Current transport speed"
-msgstr "Vitesse de transport courante"
+msgstr "Vitesse de lecture actuelle"
 
-#: ardour_ui2.cc:330
+#: gtk2_ardour/ardour_ui2.cc:280
 msgid "Primary clock"
 msgstr "Horloge principale"
 
-#: ardour_ui2.cc:331
+#: gtk2_ardour/ardour_ui2.cc:281
 msgid "secondary clock"
 msgstr "Horloge secondaire"
 
-#. XXX: this should really be saved in instant.xml or something similar and restored from there
-#. Combo's are stupid - they steal space from the entry for the button
-#: ardour_ui2.cc:388 ardour_ui2.cc:833 ardour_ui2.cc:846 ardour_ui2.cc:909
-#: ardour_ui2.cc:911
-msgid "sprung"
+#: gtk2_ardour/ardour_ui2.cc:307
+msgid ""
+"When active, something is soloed.\n"
+"Click to de-solo everything"
 msgstr ""
+"Actif lorsque quelque chose est en solo\n"
+"Cliquez pour désactiver tous les solos."
 
-#: ardour_ui2.cc:389 ardour_ui2.cc:835 ardour_ui2.cc:857
+#: gtk2_ardour/ardour_ui2.cc:308
+msgid ""
+"When active, auditioning is taking place\n"
+"Click to stop the audition"
+msgstr ""
+"Actif lorsqu'une écoute est en cours\n"
+"Cliquez pour stopper l'écoute."
+
+#: gtk2_ardour/ardour_ui2.cc:336 gtk2_ardour/ardour_ui2.cc:775
+#: gtk2_ardour/ardour_ui2.cc:831 gtk2_ardour/ardour_ui_options.cc:918
+msgid "sprung"
+msgstr "ressort"
+
+#: gtk2_ardour/ardour_ui2.cc:337 gtk2_ardour/ardour_ui2.cc:777
+#: gtk2_ardour/ardour_ui_options.cc:929
 msgid "wheel"
-msgstr "roulette"
+msgstr "molette"
 
-#: ardour_ui2.cc:451
-msgid "ardour: clock"
-msgstr "ardour : horloge"
-
-#: ardour_ui2.cc:596
-#, fuzzy
+#: gtk2_ardour/ardour_ui2.cc:545
 msgid "Maximum speed"
-msgstr "varispeed"
+msgstr "Vitesse maximale"
 
-#: ardour_ui2.cc:823
-msgid "st"
-msgstr "er"
+#: gtk2_ardour/ardour_ui2.cc:787 gtk2_ardour/ardour_ui2.cc:810
+msgid "stop"
+msgstr "Stop"
 
-#: ardour_ui2.cc:867 ardour_ui2.cc:890 ardour_ui2.cc:907
-msgid "stopped"
-msgstr "arrêté"
+#: gtk2_ardour/ardour_ui2.cc:829
+msgid "-0.55"
+msgstr "-0.55"
 
-#: ardour_ui_dialogs.cc:153 playlist_selector.cc:70
-#, fuzzy
+#: gtk2_ardour/ardour_ui_dependents.cc:84
+msgid "Ardour key bindings file not found at \"%1\" or contains errors."
+msgstr "Le fichier des raccourcis claviers d'Ardour est absent de \"%1\" ou il contient des erreurs."
+
+#: gtk2_ardour/ardour_ui_dialogs.cc:163 gtk2_ardour/playlist_selector.cc:73
 msgid "close"
-msgstr "Fermer"
+msgstr "fermer"
 
-#: ardour_ui_dialogs.cc:360 ardour_ui_ed.cc:184
-#, fuzzy
-msgid "Sound File Browser"
-msgstr "Bibliothèque audio"
-
-#. menus + submenus that need action items
-#: ardour_ui_ed.cc:72
+#: gtk2_ardour/ardour_ui_ed.cc:81
 msgid "Session"
 msgstr "Session"
 
-#: ardour_ui_ed.cc:73 ardour_ui_ed.cc:130 editor.cc:1836 export_dialog.cc:350
-#: export_dialog.cc:1059 export_dialog.cc:1063
+#: gtk2_ardour/ardour_ui_ed.cc:82 gtk2_ardour/ardour_ui_ed.cc:143
+#: gtk2_ardour/editor.cc:1625 gtk2_ardour/export_dialog.cc:125
+#: gtk2_ardour/export_dialog.cc:352 gtk2_ardour/export_dialog.cc:1061
+#: gtk2_ardour/export_dialog.cc:1065
 msgid "Export"
 msgstr "Exporter"
 
-#: ardour_ui_ed.cc:74
+#: gtk2_ardour/ardour_ui_ed.cc:83
 msgid "Cleanup"
 msgstr "Nettoyer"
 
-#: ardour_ui_ed.cc:75 option_editor.cc:126
+#: gtk2_ardour/ardour_ui_ed.cc:84 gtk2_ardour/option_editor.cc:130
 msgid "Sync"
-msgstr "Synchro."
+msgstr "Synchro"
 
-#: ardour_ui_ed.cc:76 ardour_ui_ed.cc:77
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:85 gtk2_ardour/ardour_ui_ed.cc:86
 msgid "Options"
-msgstr "Éditeur d'options"
+msgstr "Options"
 
-#: ardour_ui_ed.cc:78
+#: gtk2_ardour/ardour_ui_ed.cc:87
 msgid "Help"
-msgstr ""
+msgstr "Aide"
 
-#: ardour_ui_ed.cc:79
+#: gtk2_ardour/ardour_ui_ed.cc:88
 msgid "KeyMouse Actions"
-msgstr ""
+msgstr "Souris"
 
-#: ardour_ui_ed.cc:80
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:89
 msgid "Audio File Format"
-msgstr "Trames audio"
+msgstr "Format de fichiers audio"
 
-#: ardour_ui_ed.cc:81
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:90
 msgid "Header"
-msgstr "Pré fader"
+msgstr "En-tête"
 
-#: ardour_ui_ed.cc:82
+#: gtk2_ardour/ardour_ui_ed.cc:91
 msgid "Data"
-msgstr ""
+msgstr "Contenu"
 
-#: ardour_ui_ed.cc:83
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:92
 msgid "Control Surfaces"
-msgstr "Sorties de contrôle"
+msgstr "Télécommandes"
 
-#. the real actions
-#: ardour_ui_ed.cc:87 audio_time_axis.cc:1854 new_session_dialog.cc:529
+#: gtk2_ardour/ardour_ui_ed.cc:93
+msgid "Metering"
+msgstr "VU-mètre"
+
+#: gtk2_ardour/ardour_ui_ed.cc:94
+msgid "Fall off rate"
+msgstr "Taux de chute"
+
+#: gtk2_ardour/ardour_ui_ed.cc:95
+msgid "Hold Time"
+msgstr "Temps de maintien"
+
+#: gtk2_ardour/ardour_ui_ed.cc:99 gtk2_ardour/route_time_axis.cc:1308
+#: gtk2_ardour/new_session_dialog.cc:619
 msgid "New"
-msgstr "Nouveau"
+msgstr "Nouvelle..."
 
-#: ardour_ui_ed.cc:89 new_session_dialog.cc:517
+#: gtk2_ardour/ardour_ui_ed.cc:101 gtk2_ardour/new_session_dialog.cc:606
 msgid "Open"
-msgstr "Ouvrir"
+msgstr "Ouvrir..."
 
-#: ardour_ui_ed.cc:90
+#: gtk2_ardour/ardour_ui_ed.cc:102
 msgid "Recent"
-msgstr "Récent"
+msgstr "Sessions récentes..."
 
-#: ardour_ui_ed.cc:91 io_selector.cc:58 io_selector.cc:792
+#: gtk2_ardour/ardour_ui_ed.cc:103 gtk2_ardour/io_selector.cc:59
+#: gtk2_ardour/io_selector.cc:747 gtk2_ardour/connection_editor.cc:58
 msgid "Close"
 msgstr "Fermer"
 
-#: ardour_ui_ed.cc:94 route_params_ui.cc:514
+#: gtk2_ardour/ardour_ui_ed.cc:106 gtk2_ardour/route_params_ui.cc:513
 msgid "Add Track/Bus"
-msgstr "Ajouter piste/bus"
+msgstr "Ajouter piste ou bus..."
 
-#: ardour_ui_ed.cc:105
+#: gtk2_ardour/ardour_ui_ed.cc:118
 msgid "Connect"
 msgstr "Connecter"
 
-#. </CMT Additions>
-#: ardour_ui_ed.cc:113
+#: gtk2_ardour/ardour_ui_ed.cc:126
 msgid "Snapshot"
-msgstr "Instantané"
+msgstr "Prendre un cliché..."
 
-#: ardour_ui_ed.cc:116
+#: gtk2_ardour/ardour_ui_ed.cc:129
 msgid "Save Template..."
-msgstr "Enregistrer le modèle..."
+msgstr "Enregistrer comme modèle..."
 
-#: ardour_ui_ed.cc:119
+#: gtk2_ardour/ardour_ui_ed.cc:132
 msgid "Export session to audiofile..."
-msgstr "Exporter la session dans un fichier audio..."
+msgstr "la session vers un fichier audio..."
 
-#: ardour_ui_ed.cc:122
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:135
 msgid "Export selection to audiofile..."
-msgstr "Exporter la session dans un fichier audio..."
+msgstr "la sélection vers un fichier audio..."
 
-#: ardour_ui_ed.cc:126
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:139
 msgid "Export range markers to audiofile..."
-msgstr "Exporter la range dans un fichier audio..."
+msgstr "les intervalles vers des fichiers audio..."
 
-#: ardour_ui_ed.cc:133
+#: gtk2_ardour/ardour_ui_ed.cc:146
 msgid "Cleanup unused sources"
-msgstr "Nettoyer les sources inutilisées"
+msgstr "les fichiers audio inutilisés..."
 
-#: ardour_ui_ed.cc:135
+#: gtk2_ardour/ardour_ui_ed.cc:148
 msgid "Flush wastebasket"
-msgstr "Vider la corbeille"
+msgstr "Vider la corbeille..."
 
-#: ardour_ui_ed.cc:141 ardour_ui_options.cc:408 ardour_ui_options.cc:417
-#: ardour_ui_options.cc:489
+#: gtk2_ardour/ardour_ui_ed.cc:154
 msgid "JACK"
 msgstr "JACK"
 
-#: ardour_ui_ed.cc:142
+#: gtk2_ardour/ardour_ui_ed.cc:155
 msgid "Latency"
-msgstr "Latence"
+msgstr "Latence (trames/période)"
 
-#: ardour_ui_ed.cc:144
+#: gtk2_ardour/ardour_ui_ed.cc:157
 msgid "Reconnect"
 msgstr "Reconnecter"
 
-#: ardour_ui_ed.cc:147 mixer_strip.cc:497 mixer_strip.cc:565
+#: gtk2_ardour/ardour_ui_ed.cc:160 gtk2_ardour/mixer_strip.cc:510
+#: gtk2_ardour/mixer_strip.cc:572
 msgid "Disconnect"
 msgstr "Déconnecter"
 
-#: ardour_ui_ed.cc:174
+#: gtk2_ardour/ardour_ui_ed.cc:187
 msgid "Windows"
 msgstr "Fenêtres"
 
-#: ardour_ui_ed.cc:175
-msgid "start prefix"
-msgstr ""
-
-#: ardour_ui_ed.cc:176
+#: gtk2_ardour/ardour_ui_ed.cc:188
 msgid "Quit"
 msgstr "Quitter"
 
-#. windows visibility actions
-#: ardour_ui_ed.cc:180
+#: gtk2_ardour/ardour_ui_ed.cc:192
 msgid "Maximise Editor Space"
-msgstr ""
+msgstr "Plein écran"
 
-#: ardour_ui_ed.cc:182
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:194
 msgid "Show Editor"
-msgstr "Éditeur"
+msgstr "Éditeur..."
 
-#: ardour_ui_ed.cc:183
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:195
 msgid "Show Mixer"
-msgstr "Console de mixage"
+msgstr "Console de mixage..."
 
-#: ardour_ui_ed.cc:185
+#: gtk2_ardour/ardour_ui_ed.cc:196 gtk2_ardour/option_editor.cc:103
 msgid "Options Editor"
-msgstr "Éditeur d'options"
+msgstr "Options..."
 
-#: ardour_ui_ed.cc:186
+#: gtk2_ardour/ardour_ui_ed.cc:197 gtk2_ardour/route_params_ui.cc:143
+#: gtk2_ardour/route_params_ui.cc:659
 msgid "Track/Bus Inspector"
-msgstr "Inspecteur de pistes/bus"
+msgstr "Pistes et bus..."
 
-#: ardour_ui_ed.cc:188
+#: gtk2_ardour/ardour_ui_ed.cc:199 gtk2_ardour/connection_editor.cc:146
+#: gtk2_ardour/connection_editor.cc:147
 msgid "Connections"
-msgstr "Connexions"
+msgstr "Connexions..."
 
-#: ardour_ui_ed.cc:190
+#: gtk2_ardour/ardour_ui_ed.cc:201 gtk2_ardour/location_ui.cc:577
 msgid "Locations"
-msgstr "Emplacements"
+msgstr "Repères et intervalles..."
 
-#: ardour_ui_ed.cc:192
+#: gtk2_ardour/ardour_ui_ed.cc:203
 msgid "Big Clock"
-msgstr "Grande horloge"
+msgstr "Grande horloge..."
 
-#: ardour_ui_ed.cc:194
+#: gtk2_ardour/ardour_ui_ed.cc:205
 msgid "About"
-msgstr "À propos"
+msgstr "À propos..."
 
-#: ardour_ui_ed.cc:195
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:206
 msgid "Colors"
-msgstr "Couleur"
+msgstr "Couleurs..."
 
-#: ardour_ui_ed.cc:197
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:208
 msgid "Add Audio Track"
-msgstr "Ajouter piste/bus"
+msgstr "Ajouter une piste audio"
 
-#: ardour_ui_ed.cc:199
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:210
 msgid "Add Audio Bus"
-msgstr "Cacher tous les BusAudio"
+msgstr "Ajouter un bus audio"
 
-#: ardour_ui_ed.cc:201
+#: gtk2_ardour/ardour_ui_ed.cc:212
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ardour_ui_ed.cc:203 editor_actions.cc:255
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:214 gtk2_ardour/editor_actions.cc:258
 msgid "Remove Last Capture"
-msgstr "Enlever la dernière capture"
+msgstr "Détruire le dernier enregistr."
 
-#. do-nothing action for the "transport" menu bar item
-#: ardour_ui_ed.cc:210
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:221
 msgid "Transport"
-msgstr "Traducteurs"
+msgstr "Commandes"
 
-#. these two are not used by key bindings, instead use ToggleRoll for that. these two do show up in
-#. menus and via button proxies.
-#.
-#: ardour_ui_ed.cc:216 sfdb_ui.cc:57
+#: gtk2_ardour/ardour_ui_ed.cc:227 gtk2_ardour/sfdb_ui.cc:62
 msgid "Stop"
 msgstr "Arrêter"
 
-#: ardour_ui_ed.cc:219
+#: gtk2_ardour/ardour_ui_ed.cc:230
 msgid "Roll"
-msgstr ""
+msgstr "Roll"
 
-#: ardour_ui_ed.cc:223
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:234
 msgid "Start/Stop"
-msgstr "Début :"
+msgstr "Lecture/Arrêt"
 
-#: ardour_ui_ed.cc:226
+#: gtk2_ardour/ardour_ui_ed.cc:237
 msgid "Stop + Forget Capture"
-msgstr ""
+msgstr "Arrêt avec destruction"
 
-#: ardour_ui_ed.cc:229
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:247
+msgid "Transition To Roll"
+msgstr "Lecture avant"
+
+#: gtk2_ardour/ardour_ui_ed.cc:251
+msgid "Transition To Reverse"
+msgstr "Lecture arrière"
+
+#: gtk2_ardour/ardour_ui_ed.cc:256
 msgid "Play Loop Range"
-msgstr "Jouer l'intervalle de boucle"
+msgstr "Lire la boucle"
 
-#: ardour_ui_ed.cc:232
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:259
 msgid "Play Selection"
-msgstr "Jouer l'emplacement sélectionné"
+msgstr "Lire la zone de sélection"
 
-#: ardour_ui_ed.cc:236
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:263
 msgid "Enable Record"
-msgstr "Enregistrer"
+msgstr "enregistrement"
 
-#: ardour_ui_ed.cc:239
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:266
 msgid "Rewind"
-msgstr "Région"
+msgstr "Rembobiner"
 
-#: ardour_ui_ed.cc:242
+#: gtk2_ardour/ardour_ui_ed.cc:269
 msgid "Rewind (Slow)"
-msgstr ""
+msgstr "Rembobiner (lent)"
 
-#: ardour_ui_ed.cc:245
+#: gtk2_ardour/ardour_ui_ed.cc:272
 msgid "Rewind (Fast)"
-msgstr ""
+msgstr "Rembobiner (rapide)"
 
-#: ardour_ui_ed.cc:248
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:275
 msgid "Forward"
-msgstr "décaler vers l'avant"
+msgstr "Avance rapide"
 
-#: ardour_ui_ed.cc:251
+#: gtk2_ardour/ardour_ui_ed.cc:278
 msgid "Forward (Slow)"
-msgstr ""
+msgstr "Avancer (lent)"
 
-#: ardour_ui_ed.cc:254
+#: gtk2_ardour/ardour_ui_ed.cc:281
 msgid "Forward (Fast)"
-msgstr ""
+msgstr "Avancer (rapide)"
 
-#: ardour_ui_ed.cc:257
+#: gtk2_ardour/ardour_ui_ed.cc:284
 msgid "Goto Zero"
-msgstr ""
+msgstr "temps zéro"
 
-#: ardour_ui_ed.cc:260
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:287
 msgid "Goto Start"
-msgstr "Début :"
+msgstr "début"
 
-#: ardour_ui_ed.cc:263
+#: gtk2_ardour/ardour_ui_ed.cc:290
 msgid "Goto End"
-msgstr ""
+msgstr "fin"
 
-#. XXX the newline in the displayed names of these action is really wrong, but its because we want the button
-#. that proxies for these action to be more compact. It would be nice to find a way to override the action
-#. name appearance on the buttons.
-#.
-#: ardour_ui_ed.cc:272
-#, fuzzy
-msgid ""
-"Punch\n"
-"in"
-msgstr ""
-"punch\n"
-"in"
+#: gtk2_ardour/ardour_ui_ed.cc:313
+msgid "Sync startup to video"
+msgstr "Sync début avec vidéo"
 
-#: ardour_ui_ed.cc:275
-#, fuzzy
-msgid ""
-"Punch\n"
-"out"
-msgstr ""
-"punch\n"
-"out"
+#: gtk2_ardour/ardour_ui_ed.cc:314
+msgid "Time master"
+msgstr "Horloge maître"
 
-#: ardour_ui_ed.cc:278 option_editor.cc:129
-msgid "Click"
-msgstr "Clic"
-
-#: ardour_ui_ed.cc:281
-#, fuzzy
-msgid ""
-"Auto\n"
-"input"
-msgstr ""
-"entrée\n"
-"auto."
-
-#: ardour_ui_ed.cc:284
-#, fuzzy
-msgid ""
-"Auto\n"
-"play"
-msgstr ""
-"lecture\n"
-"auto."
-
-#: ardour_ui_ed.cc:287
-#, fuzzy
-msgid ""
-"Auto\n"
-"return"
-msgstr ""
-"retour\n"
-"auto"
-
-#: ardour_ui_ed.cc:291
-#, fuzzy
-msgid ""
-"Time\n"
-"master"
-msgstr "JACK horloge maître"
-
-#: ardour_ui_ed.cc:294
+#: gtk2_ardour/ardour_ui_ed.cc:317
 msgid "Toggle Record Enable Track1"
-msgstr ""
+msgstr "Bascule Enregistrement piste 1"
 
-#: ardour_ui_ed.cc:296
+#: gtk2_ardour/ardour_ui_ed.cc:319
 msgid "Toggle Record Enable Track2"
-msgstr ""
+msgstr "Bascule Enregistrement piste 2"
 
-#: ardour_ui_ed.cc:298
+#: gtk2_ardour/ardour_ui_ed.cc:321
 msgid "Toggle Record Enable Track3"
-msgstr ""
+msgstr "Bascule Enregistrement piste 3"
 
-#: ardour_ui_ed.cc:300
+#: gtk2_ardour/ardour_ui_ed.cc:323
 msgid "Toggle Record Enable Track4"
-msgstr ""
+msgstr "Bascule Enregistrement piste 4"
 
-#: ardour_ui_ed.cc:302
+#: gtk2_ardour/ardour_ui_ed.cc:325
 msgid "Toggle Record Enable Track5"
-msgstr ""
+msgstr "Bascule Enregistrement piste 5"
 
-#: ardour_ui_ed.cc:304
+#: gtk2_ardour/ardour_ui_ed.cc:327
 msgid "Toggle Record Enable Track6"
-msgstr ""
+msgstr "Bascule Enregistrement piste 6"
 
-#: ardour_ui_ed.cc:306
+#: gtk2_ardour/ardour_ui_ed.cc:329
 msgid "Toggle Record Enable Track7"
-msgstr ""
+msgstr "Bascule Enregistrement piste 7"
 
-#: ardour_ui_ed.cc:308
+#: gtk2_ardour/ardour_ui_ed.cc:331
 msgid "Toggle Record Enable Track8"
-msgstr ""
+msgstr "Bascule Enregistrement piste 8"
 
-#: ardour_ui_ed.cc:310
+#: gtk2_ardour/ardour_ui_ed.cc:333
 msgid "Toggle Record Enable Track9"
-msgstr ""
+msgstr "Bascule Enregistrement piste 9"
 
-#: ardour_ui_ed.cc:312
+#: gtk2_ardour/ardour_ui_ed.cc:335
 msgid "Toggle Record Enable Track10"
-msgstr ""
+msgstr "Bascule Enregistrement piste 10"
 
-#: ardour_ui_ed.cc:314
+#: gtk2_ardour/ardour_ui_ed.cc:337
 msgid "Toggle Record Enable Track11"
-msgstr ""
+msgstr "Bascule Enregistrement piste 11"
 
-#: ardour_ui_ed.cc:316
+#: gtk2_ardour/ardour_ui_ed.cc:339
 msgid "Toggle Record Enable Track12"
-msgstr ""
+msgstr "Bascule Enregistrement piste 12"
 
-#: ardour_ui_ed.cc:318
+#: gtk2_ardour/ardour_ui_ed.cc:341
 msgid "Toggle Record Enable Track13"
-msgstr ""
+msgstr "Bascule Enregistrement piste 13"
 
-#: ardour_ui_ed.cc:320
+#: gtk2_ardour/ardour_ui_ed.cc:343
 msgid "Toggle Record Enable Track14"
-msgstr ""
+msgstr "Bascule Enregistrement piste 14"
 
-#: ardour_ui_ed.cc:322
+#: gtk2_ardour/ardour_ui_ed.cc:345
 msgid "Toggle Record Enable Track15"
-msgstr ""
+msgstr "Bascule Enregistrement piste 15"
 
-#: ardour_ui_ed.cc:324
+#: gtk2_ardour/ardour_ui_ed.cc:347
 msgid "Toggle Record Enable Track16"
-msgstr ""
+msgstr "Bascule Enregistrement piste 16"
 
-#: ardour_ui_ed.cc:326
+#: gtk2_ardour/ardour_ui_ed.cc:349
 msgid "Toggle Record Enable Track17"
-msgstr ""
+msgstr "Bascule Enregistrement piste 17"
 
-#: ardour_ui_ed.cc:328
+#: gtk2_ardour/ardour_ui_ed.cc:351
 msgid "Toggle Record Enable Track18"
-msgstr ""
+msgstr "Bascule Enregistrement piste 18"
 
-#: ardour_ui_ed.cc:330
+#: gtk2_ardour/ardour_ui_ed.cc:353
 msgid "Toggle Record Enable Track19"
-msgstr ""
+msgstr "Bascule Enregistrement piste 19"
 
-#: ardour_ui_ed.cc:332
+#: gtk2_ardour/ardour_ui_ed.cc:355
 msgid "Toggle Record Enable Track20"
-msgstr ""
+msgstr "Bascule Enregistrement piste 20"
 
-#: ardour_ui_ed.cc:334
+#: gtk2_ardour/ardour_ui_ed.cc:357
 msgid "Toggle Record Enable Track21"
-msgstr ""
+msgstr "Bascule Enregistrement piste 21"
 
-#: ardour_ui_ed.cc:336
+#: gtk2_ardour/ardour_ui_ed.cc:359
 msgid "Toggle Record Enable Track22"
-msgstr ""
+msgstr "Bascule Enregistrement piste 22"
 
-#: ardour_ui_ed.cc:338
+#: gtk2_ardour/ardour_ui_ed.cc:361
 msgid "Toggle Record Enable Track23"
-msgstr ""
+msgstr "Bascule Enregistrement piste 23"
 
-#: ardour_ui_ed.cc:340
+#: gtk2_ardour/ardour_ui_ed.cc:363
 msgid "Toggle Record Enable Track24"
-msgstr ""
+msgstr "Bascule Enregistrement piste 24"
 
-#: ardour_ui_ed.cc:342
+#: gtk2_ardour/ardour_ui_ed.cc:365
 msgid "Toggle Record Enable Track25"
-msgstr ""
+msgstr "Bascule Enregistrement piste 25"
 
-#: ardour_ui_ed.cc:344
+#: gtk2_ardour/ardour_ui_ed.cc:367
 msgid "Toggle Record Enable Track26"
-msgstr ""
+msgstr "Bascule Enregistrement piste 26"
 
-#: ardour_ui_ed.cc:346
+#: gtk2_ardour/ardour_ui_ed.cc:369
 msgid "Toggle Record Enable Track27"
-msgstr ""
+msgstr "Bascule Enregistrement piste 27"
 
-#: ardour_ui_ed.cc:348
+#: gtk2_ardour/ardour_ui_ed.cc:371
 msgid "Toggle Record Enable Track28"
-msgstr ""
+msgstr "Bascule Enregistrement piste 28"
 
-#: ardour_ui_ed.cc:350
+#: gtk2_ardour/ardour_ui_ed.cc:373
 msgid "Toggle Record Enable Track29"
-msgstr ""
+msgstr "Bascule Enregistrement piste 29"
 
-#: ardour_ui_ed.cc:352
+#: gtk2_ardour/ardour_ui_ed.cc:375
 msgid "Toggle Record Enable Track30"
-msgstr ""
+msgstr "Bascule Enregistrement piste 30"
 
-#: ardour_ui_ed.cc:354
+#: gtk2_ardour/ardour_ui_ed.cc:377
 msgid "Toggle Record Enable Track31"
-msgstr ""
+msgstr "Bascule Enregistrement piste 31"
 
-#: ardour_ui_ed.cc:356
+#: gtk2_ardour/ardour_ui_ed.cc:379
 msgid "Toggle Record Enable Track32"
-msgstr ""
+msgstr "Bascule Enregistrement piste 32"
 
-#: ardour_ui_ed.cc:361
+#: gtk2_ardour/ardour_ui_ed.cc:384
 msgid "Percentage"
-msgstr "Pourcentage"
+msgstr "pourcentage"
 
-#: ardour_ui_ed.cc:362
+#: gtk2_ardour/ardour_ui_ed.cc:385
 msgid "Semitones"
-msgstr "Demi-tons"
+msgstr "demi-tons"
 
-#: ardour_ui_ed.cc:366
+#: gtk2_ardour/ardour_ui_ed.cc:389
 msgid "Send MTC"
-msgstr "Envoyer MTC"
+msgstr "Envoi MTC (Midi Time Code)"
 
-#: ardour_ui_ed.cc:368
+#: gtk2_ardour/ardour_ui_ed.cc:391
 msgid "Send MMC"
-msgstr "Envoyer MMC"
+msgstr "Envoi MMC (Midi Machine Control)"
 
-#: ardour_ui_ed.cc:370
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:393
 msgid "Use MMC"
-msgstr "Envoyer MMC"
+msgstr "Réception MMC (Midi Machine Control)"
 
-#: ardour_ui_ed.cc:372
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:395
 msgid "Send MIDI feedback"
-msgstr "Envoyer le retour de paramètre MIDI"
+msgstr "Envoi des réponses MIDI"
 
-#: ardour_ui_ed.cc:374
-#, fuzzy
-msgid "Use MIDI control"
-msgstr "Port MMC"
+#: gtk2_ardour/ardour_ui_ed.cc:400
+msgid "Use OSC"
+msgstr "Utiliser OSC (OpenSound Control)"
 
-#: ardour_ui_ed.cc:377
-#, fuzzy
-msgid "Connect new track inputs to hardware"
-msgstr "Auto-connexion des nouvelles pistes"
-
-#: ardour_ui_ed.cc:396
-#, fuzzy
-msgid "Connect new track outputs to hardware"
-msgstr "Auto-connexion des nouvelles pistes"
-
-#: ardour_ui_ed.cc:398
-#, fuzzy
-msgid "Connect new track outputs to master"
-msgstr "connecter les sorties de piste aux sorties maître automatiquement"
-
-#: ardour_ui_ed.cc:400
-#, fuzzy
-msgid "Manually connect new track outputs"
-msgstr "connecter les sorties de piste manuellement"
-
-#: ardour_ui_ed.cc:405
-#, fuzzy
-msgid "Hardware monitoring"
-msgstr "Utiliser la pré-écoute matérielle"
-
-#: ardour_ui_ed.cc:406
-#, fuzzy
-msgid "Software monitoring"
-msgstr "Utiliser la pré-écoute logicielle"
-
-#: ardour_ui_ed.cc:407
-#, fuzzy
-msgid "External monitoring"
-msgstr "Utiliser la pré-écoute matérielle"
-
-#. Configuration object options (i.e. not session specific)
-#: ardour_ui_ed.cc:411
+#: gtk2_ardour/ardour_ui_ed.cc:405
 msgid "Stop plugins with transport"
-msgstr "Arrêter les greffons avec le transport"
+msgstr "Arrêt des plugins lors des déplacements"
 
-#: ardour_ui_ed.cc:412
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:406
 msgid "Verify remove last capture"
-msgstr "Enlever la dernière capture"
+msgstr "Confirmer la destruction du dernier enregistr."
 
-#: ardour_ui_ed.cc:413
+#: gtk2_ardour/ardour_ui_ed.cc:407
 msgid "Stop recording on xrun"
-msgstr "Arrêter l'enregistrement en cas de xrun"
+msgstr "Arrêt d'enregistr. en cas de désynchro (xrun)"
 
-#: ardour_ui_ed.cc:414
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:408
 msgid "Stop transport at session end"
-msgstr "Arrêter le transport à la fin de la session"
+msgstr "Stopper la lecture en fin de session"
 
-#: ardour_ui_ed.cc:415
+#: gtk2_ardour/ardour_ui_ed.cc:409
 msgid "-12dB gain reduce ffwd/rewind"
-msgstr ""
+msgstr "-12 dB pendant le déplacement rapide"
 
-#: ardour_ui_ed.cc:416
+#: gtk2_ardour/ardour_ui_ed.cc:410
 msgid "Rec-enable stays engaged at stop"
-msgstr ""
+msgstr "Rester en enregistrement à l'arrêt"
 
-#. session options
-#: ardour_ui_ed.cc:420
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:411
+msgid "Region equivalents overlap"
+msgstr "Chevauch. des régions équivalentes"
+
+#: gtk2_ardour/ardour_ui_ed.cc:413
 msgid "Do not run plugins while recording"
-msgstr "Activer les greffons durant l'enregistrement"
+msgstr "Arrêt des plugins à l'enregistrement"
 
-#: ardour_ui_ed.cc:423
-#, fuzzy
+#: gtk2_ardour/ardour_ui_ed.cc:416
 msgid "Latched solo"
-msgstr "Solo collé"
+msgstr "Plusieurs solos possibles"
 
-#: ardour_ui_ed.cc:428
-#, fuzzy
-msgid "Solo in-place"
-msgstr "Solo-safe"
+#: gtk2_ardour/ardour_ui_ed.cc:418
+msgid "Show solo muting"
+msgstr "Le solo montre les sourdines"
 
-#: ardour_ui_ed.cc:430
-msgid "Solo via bus"
-msgstr "Solo via le bus"
-
-#: ardour_ui_ed.cc:433
-msgid "Automatically create crossfades"
-msgstr "Créer des fondus enchaînés automatiquement"
-
-#: ardour_ui_ed.cc:435
-#, fuzzy
-msgid "Unmute new full crossfades"
-msgstr "Montrer tous les fondus enchaînés"
-
-#: ardour_ui_options.cc:406 ardour_ui_options.cc:416 ardour_ui_options.cc:483
-msgid "Internal"
-msgstr "Interne"
-
-#: ardour_ui_options.cc:407 ardour_ui_options.cc:486
-#, fuzzy
-msgid "MTC"
-msgstr "TOC"
-
-#: audio_clock.cc:1742 editor.cc:188
-msgid "SMPTE"
-msgstr "SMPTE"
-
-#: audio_clock.cc:1743 editor.cc:187 editor_rulers.cc:360
-msgid "Bars:Beats"
-msgstr "Mesures:Temps"
-
-#: audio_clock.cc:1744
-msgid "Minutes:Seconds"
-msgstr "Minutes:Secondes"
-
-#: audio_clock.cc:1745
-msgid "Audio Frames"
-msgstr "Trames audio"
-
-#.
-#. Slowest = 6.6dB/sec falloff at update rate of 40ms
-#. Slow    = 6.8dB/sec falloff at update rate of 40ms
-#.
-#: audio_clock.cc:1746 editor_actions.cc:375 editor_actions.cc:383
-#: gain_meter.cc:172 panner_ui.cc:89 plugin_ui.cc:392 plugin_ui.cc:635
+#: gtk2_ardour/ardour_ui_ed.cc:426 gtk2_ardour/ardour_ui_ed.cc:434
+#: gtk2_ardour/audio_clock.cc:1805
 msgid "Off"
-msgstr "Arrêt"
+msgstr "(rien)"
 
-#: audio_clock.cc:1748
-msgid "Mode"
-msgstr "Mode"
-
-#: audio_time_axis.cc:91
-msgid "m"
-msgstr "m"
-
-#: audio_time_axis.cc:91
-msgid "s"
-msgstr "s"
-
-#: audio_time_axis.cc:91
-msgid "r"
-msgstr "r"
-
-#: audio_time_axis.cc:95
-msgid "g"
-msgstr "g"
-
-#. group
-#: audio_time_axis.cc:96
-msgid "p"
-msgstr "p"
-
-#: audio_time_axis.cc:97 automation_time_axis.cc:32 visual_time_axis.cc:74
-msgid "h"
-msgstr "h"
-
-#. height
-#: audio_time_axis.cc:98
-msgid "a"
-msgstr "a"
-
-#: audio_time_axis.cc:99 visual_time_axis.cc:73
-msgid "v"
-msgstr "v"
-
-#: audio_time_axis.cc:168 mixer_strip.cc:86
-msgid "Record"
-msgstr "Enregistrer"
-
-#: audio_time_axis.cc:169 editor_actions.cc:37 mixer_strip.cc:86
-msgid "Solo"
-msgstr "Solo"
-
-#: audio_time_axis.cc:170 editor.cc:1760 editor.cc:1859 mixer_strip.cc:86
-#: panner_ui.cc:427
-msgid "Mute"
-msgstr "Muet"
-
-#: audio_time_axis.cc:171
-msgid "Edit Group"
-msgstr "Groupe d'édition"
-
-#: audio_time_axis.cc:172 visual_time_axis.cc:92
-msgid "Display Height"
-msgstr "Hauteur de l'affichage"
-
-#: audio_time_axis.cc:173
-msgid "Playlist"
-msgstr "Liste de lecture"
-
-#: audio_time_axis.cc:174 audio_time_axis.cc:741
-msgid "Automation"
-msgstr "Automatisation"
-
-#: audio_time_axis.cc:175 visual_time_axis.cc:93
-msgid "Visual options"
-msgstr "Options d'affichage"
-
-#: audio_time_axis.cc:176 visual_time_axis.cc:94
-msgid "Hide this track"
-msgstr "Cacher cette piste"
-
-#: audio_time_axis.cc:333 mixer_strip.cc:927
-msgid "No group"
-msgstr "Pas de groupe"
-
-#: audio_time_axis.cc:702 automation_time_axis.cc:450
-#: imageframe_time_axis.cc:255 marker_time_axis.cc:211
-msgid "Height"
-msgstr "Hauteur"
-
-#: audio_time_axis.cc:703 color_manager.cc:41 imageframe_time_axis.cc:256
-#: marker_time_axis.cc:212
-msgid "Color"
-msgstr "Couleur"
-
-#: audio_time_axis.cc:707
-#, fuzzy
-msgid "Hide all crossfades"
-msgstr "Cacher tous les fondus enchaînés"
-
-#: audio_time_axis.cc:708
-#, fuzzy
-msgid "Show all crossfades"
-msgstr "Montrer tous les fondus enchaînés"
-
-#: audio_time_axis.cc:712 mixer_strip.cc:1011
-#, fuzzy
-msgid "Remote Control ID"
-msgstr "Enlever le point de contrôle"
-
-#: audio_time_axis.cc:718
-#, fuzzy
-msgid "Show all automation"
-msgstr "montrer toute l'automatisation"
-
-#: audio_time_axis.cc:721
-#, fuzzy
-msgid "Show existing automation"
-msgstr "montrer l'automatisation existante"
-
-#: audio_time_axis.cc:724
-#, fuzzy
-msgid "Hide all automation"
-msgstr "cacher toute l'automatisation"
-
-#: audio_time_axis.cc:729
-#, fuzzy
-msgid "Fader"
-msgstr "Fondu"
-
-#: audio_time_axis.cc:734
-#, fuzzy
-msgid "Pan"
-msgstr "panoramique"
-
-#: audio_time_axis.cc:739
-msgid "Plugins"
-msgstr "Greffons"
-
-#: audio_time_axis.cc:747
-msgid "Show waveforms"
-msgstr "Montrer les formes d'onde"
-
-#: audio_time_axis.cc:755
-msgid "Traditional"
-msgstr "Traditionnel"
-
-#: audio_time_axis.cc:758
-msgid "Rectified"
-msgstr "Rectifié"
-
-#: audio_time_axis.cc:761
-msgid "Waveform"
-msgstr "Forme d'onde"
-
-#: audio_time_axis.cc:771
-msgid "Align with existing material"
-msgstr ""
-
-#: audio_time_axis.cc:776
-msgid "Align with capture time"
-msgstr ""
-
-#: audio_time_axis.cc:782
-#, fuzzy
-msgid "Alignment"
-msgstr "Aligner"
-
-#: audio_time_axis.cc:788 editor.cc:527 editor_actions.cc:60
-#: mixer_strip.cc:1000 mixer_ui.cc:111
-msgid "Active"
-msgstr "Actif"
-
-#: audio_time_axis.cc:793 editor.cc:1922 editor_actions.cc:320
-#: editor_markers.cc:508 imageframe_time_axis.cc:259 location_ui.cc:57
-#: marker_time_axis.cc:215 mixer_strip.cc:1014
-msgid "Remove"
-msgstr "Enlever"
-
-#: audio_time_axis.cc:833
-msgid "Name for playlist"
-msgstr "Nom de la liste de lecture"
-
-#: audio_time_axis.cc:835 audio_time_axis.cc:1851 editor_markers.cc:827
-#: editor_mouse.cc:4673 imageframe_time_axis.cc:248 marker_time_axis.cc:208
-#: meter_bridge_strip.cc:224 mixer_strip.cc:998 redirect_box.cc:751
-#: redirect_box.cc:1065 route_ui.cc:739 visual_time_axis.cc:326
-msgid "Rename"
-msgstr "Renommer"
-
-#: audio_time_axis.cc:868 audio_time_axis.cc:908
-#, fuzzy
-msgid "Name for Playlist"
-msgstr "Nom de la liste de lecture"
-
-#: audio_time_axis.cc:1126 visual_time_axis.cc:383
-msgid "a track already exists with that name"
-msgstr "une piste avec le même nom existe déjà"
-
-#: audio_time_axis.cc:1167 editor.cc:218
-msgid "gain"
-msgstr "gain"
-
-#: audio_time_axis.cc:1207
-msgid "pan"
-msgstr "panoramique"
-
-#: audio_time_axis.cc:1410 editor.cc:1483 selection.cc:634
-msgid "programming error: "
-msgstr "erreur de programmation : "
-
-#: audio_time_axis.cc:1848
-msgid "Current: %1"
-msgstr "Courant : %1"
-
-#: audio_time_axis.cc:1855
-msgid "New Copy"
-msgstr "Nouvelle copie"
-
-#: audio_time_axis.cc:1857
-#, fuzzy
-msgid "Clear Current"
-msgstr "Effacer courante"
-
-#: audio_time_axis.cc:1859 editor.cc:2024 editor.cc:2100
-msgid "Select"
-msgstr "Sélectionner"
-
-#: automation_line.cc:884
-#, fuzzy
-msgid "automation event move"
-msgstr "déplacement d'évenement d'automatisation"
-
-#: automation_line.cc:886
-#, fuzzy
-msgid "automation range drag"
-msgstr "déplacement d'intervalle d'automatisation"
-
-#: automation_line.cc:1015 region_gain_line.cc:62
-#, fuzzy
-msgid "remove control point"
-msgstr "Enlever le point de contrôle"
-
-#: automation_time_axis.cc:33 editor_ops.cc:2885
-msgid "clear"
-msgstr "effacer"
-
-#: automation_time_axis.cc:75
-msgid "track height"
-msgstr ""
-
-#: automation_time_axis.cc:76
-#, fuzzy
-msgid "automation state"
-msgstr "état de l'automatisation de panoramique"
-
-#: automation_time_axis.cc:77
-#, fuzzy
-msgid "clear track"
-msgstr "effacer les intervalles"
-
-#: automation_time_axis.cc:78
-#, fuzzy
-msgid "hide track"
-msgstr "décaler la piste"
-
-#: automation_time_axis.cc:184 automation_time_axis.cc:213
-#: automation_time_axis.cc:461
-msgid "Manual"
-msgstr ""
-
-#: automation_time_axis.cc:186 automation_time_axis.cc:224
-#: automation_time_axis.cc:465 editor.cc:2001 editor.cc:2082 gain_meter.cc:174
-#: panner_ui.cc:91 plugin_ui.cc:395 plugin_ui.cc:637 sfdb_ui.cc:56
-msgid "Play"
-msgstr "Jouer"
-
-#: automation_time_axis.cc:188 automation_time_axis.cc:235
-#: automation_time_axis.cc:469 gain_meter.cc:176 panner_ui.cc:93
-#: plugin_ui.cc:398 plugin_ui.cc:639
-#, fuzzy
-msgid "Write"
-msgstr "écrire"
-
-#: automation_time_axis.cc:190 automation_time_axis.cc:246
-#: automation_time_axis.cc:473 gain_meter.cc:178 panner_ui.cc:95
-#: plugin_ui.cc:401 plugin_ui.cc:641
-#, fuzzy
-msgid "Touch"
-msgstr "toucher"
-
-#: automation_time_axis.cc:257 option_editor.cc:183 option_editor.cc:189
-#: plugin_ui.cc:404
-msgid "???"
-msgstr "???"
-
-#: automation_time_axis.cc:271
-#, fuzzy
-msgid "clear automation"
-msgstr "effacer l'automatisation"
-
-#: automation_time_axis.cc:452 editor_actions.cc:318
-msgid "Hide"
-msgstr "Cacher"
-
-#: automation_time_axis.cc:454 crossfade_edit.cc:78 redirect_box.cc:1057
-msgid "Clear"
-msgstr "Effacer"
-
-#: automation_time_axis.cc:477
-msgid "State"
-msgstr "État"
-
-#: canvas-imageframe.c:104
-msgid "pixbuf"
-msgstr ""
-
-#: canvas-imageframe.c:105
-msgid "the pixbuf"
-msgstr ""
-
-#: canvas-imageframe.c:110
-msgid "x"
-msgstr ""
-
-#: canvas-imageframe.c:111 canvas-simpleline.c:111 canvas-simplerect.c:107
-msgid "x coordinate of upper left corner of rect"
-msgstr ""
-
-#: canvas-imageframe.c:120
-msgid "y"
-msgstr ""
-
-#: canvas-imageframe.c:121 canvas-simpleline.c:121 canvas-simplerect.c:117
-msgid "y coordinate of upper left corner of rect "
-msgstr ""
-
-#: canvas-imageframe.c:129
-#, fuzzy
-msgid "width"
-msgstr "écrire"
-
-#: canvas-imageframe.c:130
-msgid "the width"
-msgstr ""
-
-#: canvas-imageframe.c:139
-msgid "drawwidth"
-msgstr ""
-
-#: canvas-imageframe.c:140
-msgid "drawn width"
-msgstr ""
-
-#: canvas-imageframe.c:148
-#, fuzzy
-msgid "height"
-msgstr "Hauteur"
-
-#: canvas-imageframe.c:149
-#, fuzzy
-msgid "the height"
-msgstr "Hauteur"
-
-#: canvas-imageframe.c:157
-msgid "anchor"
-msgstr ""
-
-#: canvas-imageframe.c:158
-msgid "the anchor"
-msgstr ""
-
-#: canvas-simpleline.c:110 canvas-simplerect.c:106
-msgid "x1"
-msgstr ""
-
-#: canvas-simpleline.c:120 canvas-simplerect.c:116
-msgid "y1"
-msgstr ""
-
-#: canvas-simpleline.c:131 canvas-simplerect.c:127
-msgid "x2"
-msgstr ""
-
-#: canvas-simpleline.c:132 canvas-simplerect.c:128
-msgid "x coordinate of lower right corner of rect"
-msgstr ""
-
-#: canvas-simpleline.c:141 canvas-simplerect.c:137
-msgid "y2"
-msgstr ""
-
-#: canvas-simpleline.c:142 canvas-simplerect.c:138
-msgid "y coordinate of lower right corner of rect "
-msgstr ""
-
-#: canvas-simpleline.c:150
-msgid "color rgba"
-msgstr ""
-
-#: canvas-simpleline.c:151
-#, fuzzy
-msgid "color of line"
-msgstr "linéaire"
-
-#: canvas-simplerect.c:148
-msgid "outline pixels"
-msgstr ""
-
-#: canvas-simplerect.c:149
-msgid "width in pixels of outline"
-msgstr ""
-
-#: canvas-simplerect.c:159
-msgid "outline what"
-msgstr ""
-
-#: canvas-simplerect.c:160
-msgid "which boundaries to outline (mask)"
-msgstr ""
-
-#: canvas-simplerect.c:171
-#, fuzzy
-msgid "fill"
-msgstr "fichier"
-
-#: canvas-simplerect.c:172
-#, fuzzy
-msgid "fill rectangle"
-msgstr "remplir la sélection"
-
-#: canvas-simplerect.c:179
-msgid "draw"
-msgstr ""
-
-#: canvas-simplerect.c:180
-#, fuzzy
-msgid "draw rectangle"
-msgstr " intervalle"
-
-#: canvas-simplerect.c:188
-msgid "outline color rgba"
-msgstr ""
-
-#: canvas-simplerect.c:189
-msgid "color of outline"
-msgstr ""
-
-#: canvas-simplerect.c:199
-msgid "fill color rgba"
-msgstr ""
-
-#: canvas-simplerect.c:200
-msgid "color of fill"
-msgstr ""
-
-#: color_manager.cc:40
-#, fuzzy
-msgid "Object"
-msgstr "objet"
-
-#: color_manager.cc:78
-#, fuzzy
-msgid "cannot open color definition file %1: %2"
-msgstr "impossible d'ouvrir l'image de l'écran de démarrage \"%1\""
-
-#: crossfade_edit.cc:75
-msgid "ardour: x-fade edit"
-msgstr "ardour : édition fondu enchaîné"
-
-#: crossfade_edit.cc:79 panner_ui.cc:443
-msgid "Reset"
-msgstr "Réinitialiser"
-
-#: crossfade_edit.cc:80
-msgid "Fade"
-msgstr "Fondu"
-
-#: crossfade_edit.cc:81
-#, fuzzy
-msgid "Out (dry)"
-msgstr "Sortie (sec)"
-
-#: crossfade_edit.cc:82
-#, fuzzy
-msgid "Out"
-msgstr "Sortie"
-
-#: crossfade_edit.cc:83
-#, fuzzy
-msgid "In (dry)"
-msgstr "Entrée (sec)"
-
-#: crossfade_edit.cc:84
-msgid "In"
-msgstr "Entrée"
-
-#: crossfade_edit.cc:86
-#, fuzzy
-msgid "With Pre-roll"
-msgstr "Avec pré-roll"
-
-#: crossfade_edit.cc:87
-#, fuzzy
-msgid "With Post-roll"
-msgstr "Avec post-roll"
-
-#: crossfade_edit.cc:95
-msgid "Fade In"
-msgstr "Fondu d'ouverture"
-
-#: crossfade_edit.cc:96
-msgid "Fade Out"
-msgstr "Fondu de fermeture"
-
-#: crossfade_edit.cc:172 editor.cc:1835 editor_actions.cc:316
-#: option_editor.cc:130
-msgid "Audition"
-msgstr "Audition"
-
-#: editor.cc:104 editor.cc:3616
-msgid "Slide"
-msgstr "Curseur"
-
-#: editor.cc:105 editor.cc:3614
-msgid "Splice"
-msgstr "Réunion"
-
-#. note that this menu list starts at zero, not 1, because zero
-#. is a valid, if useless, ID.
-#.
-#. leave some breathing room
-#: editor.cc:110 editor.cc:3671 export_dialog.cc:78 export_dialog.cc:92
-#: export_dialog.cc:893 export_dialog.cc:1225 route_ui.cc:437
-msgid "None"
-msgstr "Aucun"
-
-#: editor.cc:111 editor.cc:3659
-#, fuzzy
-msgid "CD Frames"
-msgstr "Trames CD"
-
-#: editor.cc:112 editor.cc:3661
-#, fuzzy
-msgid "SMPTE Frames"
-msgstr "Trames SMPTE"
-
-#: editor.cc:113 editor.cc:3663
-msgid "SMPTE Seconds"
-msgstr "Secondes SMPTE"
-
-#: editor.cc:114 editor.cc:3665
-msgid "SMPTE Minutes"
-msgstr "Minutes SMPTE"
-
-#: editor.cc:115 editor.cc:3667
-msgid "Seconds"
-msgstr "Secondes"
-
-#: editor.cc:116 editor.cc:3669
-msgid "Minutes"
-msgstr "Minutes"
-
-#: editor.cc:117 editor.cc:3641
-msgid "Beats/32"
-msgstr "Temps/32"
-
-#: editor.cc:118 editor.cc:3639
-msgid "Beats/16"
-msgstr "Temps/16"
-
-#: editor.cc:119 editor.cc:3637
-msgid "Beats/8"
-msgstr "Temps/8"
-
-#: editor.cc:120 editor.cc:3635
-msgid "Beats/4"
-msgstr "Temps/4"
-
-#: editor.cc:121 editor.cc:3633
-msgid "Beats/3"
-msgstr "Temps/3"
-
-#: editor.cc:122 editor.cc:3643
-msgid "Beats"
-msgstr "Temps"
-
-#: editor.cc:123 editor.cc:3645
-msgid "Bars"
-msgstr "Mesures"
-
-#: editor.cc:124 editor.cc:3647
-msgid "Marks"
-msgstr "Marques"
-
-#: editor.cc:125 editor.cc:144 editor.cc:3649 editor.cc:3715
-msgid "Edit Cursor"
-msgstr "Curseur d'édition"
-
-#: editor.cc:126 editor.cc:3651
-#, fuzzy
-msgid "Region starts"
-msgstr "Débuts de régions"
-
-#: editor.cc:127 editor.cc:3653
-#, fuzzy
-msgid "Region ends"
-msgstr "Fins de régions"
-
-#: editor.cc:128 editor.cc:3657
-#, fuzzy
-msgid "Region syncs"
-msgstr "Syncro. de régions"
-
-#: editor.cc:129 editor.cc:3655
-#, fuzzy
-msgid "Region bounds"
-msgstr "Limites de régions"
-
-#: editor.cc:135 editor.cc:3690
-msgid "Magnetic"
-msgstr "Magnétique"
-
-#: editor.cc:140 editor.cc:3707 export_dialog.cc:140 export_dialog.cc:156
-#: export_dialog.cc:1068 export_dialog.cc:1072
-msgid "Left"
-msgstr "Gauche"
-
-#: editor.cc:141 editor.cc:3709 export_dialog.cc:141 export_dialog.cc:157
-msgid "Right"
-msgstr "Droite"
-
-#: editor.cc:142 editor.cc:3711
-msgid "Center"
-msgstr "Centre"
-
-#: editor.cc:143 editor.cc:3713
-msgid "Playhead"
-msgstr "Tête de lecture"
-
-#. time display buttons
-#: editor.cc:186
-msgid "Mins:Secs"
-msgstr "Mins:Secs"
-
-#: editor.cc:189 editor_rulers.cc:354
-msgid "Frames"
-msgstr "Trames"
-
-#: editor.cc:190 editor_rulers.cc:374
-msgid "Tempo"
-msgstr "Tempo"
-
-#: editor.cc:191 editor_rulers.cc:368
-msgid "Meter"
-msgstr "Vu-mètre"
-
-#: editor.cc:192 editor_rulers.cc:380
-msgid "Location Markers"
-msgstr "Marqueurs d'emplacements"
-
-#: editor.cc:193 editor_rulers.cc:386
-msgid "Range Markers"
-msgstr "Marqueurs d'intervalle"
-
-#: editor.cc:194 editor_rulers.cc:392
-msgid "Loop/Punch Ranges"
-msgstr "Intervalles de boucle/punch"
-
-#: editor.cc:216
-msgid "range"
-msgstr "intervalle"
-
-#: editor.cc:217
-msgid "object"
-msgstr "objet"
-
-#: editor.cc:219
-msgid "zoom"
-msgstr "zoom"
-
-#: editor.cc:220
-#, fuzzy
-msgid "timefx"
-msgstr "Effet temporel"
-
-#: editor.cc:221
-msgid "listen"
-msgstr "écouter"
-
-#: editor.cc:223
-msgid "mode"
-msgstr "mode"
-
-#: editor.cc:224
-msgid "automation"
-msgstr "automatisation"
-
-#: editor.cc:226
-msgid "Edit Mode"
-msgstr "Mode d'édition"
-
-#: editor.cc:227 editor_actions.cc:284
-#, fuzzy
-msgid "Snap To"
-msgstr "Snap to"
-
-#: editor.cc:228
-#, fuzzy
-msgid "Snap Mode"
-msgstr "Snap mode"
-
-#: editor.cc:229
-msgid "Zoom Focus"
-msgstr "Focus du zoom"
-
-#. </CMT Additions>
-#. nudge
-#: editor.cc:237 editor.cc:1900 editor.cc:2066 editor.cc:2122
-msgid "Nudge"
-msgstr "Décaler"
-
-#: editor.cc:470
-msgid "Zoom in"
-msgstr "Zoom avant"
-
-#: editor.cc:471
-msgid "Zoom out"
-msgstr "Zoom arrière"
-
-#: editor.cc:474
-msgid "Zoom to session"
-msgstr "Zoomer vers la session"
-
-#: editor.cc:489
-#, fuzzy
-msgid "Zoom Span"
-msgstr "Largeur du zoom"
-
-#: editor.cc:502 editor.cc:528 editor_actions.cc:62 mixer_ui.cc:86
-#: mixer_ui.cc:112
-#, fuzzy
-msgid "Visible"
-msgstr "visible"
-
-#: editor.cc:503 editor.cc:526
-#, fuzzy
-msgid "Name"
-msgstr "Trames"
-
-#: editor.cc:602 editor.cc:669
-#, fuzzy
-msgid "Regions"
-msgstr "Région"
-
-#: editor.cc:642 editor.cc:681
-msgid "Chunks"
-msgstr "Fragments"
-
-#: editor.cc:672
-#, fuzzy
-msgid "Tracks/Busses"
-msgstr "Pistes/Bus"
-
-#: editor.cc:675
-msgid "Snapshots"
-msgstr "Instantanés"
-
-#: editor.cc:678
-msgid "Edit Groups"
-msgstr "Groupes d'édition"
-
-#: editor.cc:727
-msgid "Nudge region/selection forwards"
-msgstr "Décaller région/sélection vers l'avant"
-
-#: editor.cc:728
-msgid "Nudge region/selection backwards"
-msgstr "Décaller région/sélection vers l'arrière"
-
-#: editor.cc:735 editor_mixer.cc:299
-msgid "ardour: editor"
-msgstr "ardour : éditeur"
-
-#: editor.cc:736
-msgid "ardour_editor"
-msgstr "ardour_éditeur"
-
-#: editor.cc:1183
-msgid "ardour: editor: "
-msgstr "ardour : éditeur : "
-
-#. force name
-#: editor.cc:1268 editor.cc:1277 editor_markers.cc:870
-msgid "Loop"
-msgstr "Boucle"
-
-#. force name
-#: editor.cc:1282 editor.cc:1291 editor_markers.cc:896
-msgid "Punch"
-msgstr "Insérer"
-
-#: editor.cc:1439 editor_mouse.cc:1742
-msgid "programming error: fade in canvas item has no regionview data pointer!"
-msgstr "programming error: fade in canvas item has no regionview data pointer!"
-
-#: editor.cc:1451 editor.cc:1468 redirect_box.cc:1073
-msgid "Deactivate"
-msgstr "Désactiver"
-
-#. activation
-#: editor.cc:1453 editor.cc:1470 redirect_box.cc:1071
-msgid "Activate"
-msgstr "Activer"
-
-#: editor.cc:1458 editor.cc:1475
-msgid "Linear"
-msgstr "Linéaire"
-
-#: editor.cc:1459 editor.cc:1476 editor_actions.cc:376
+#: gtk2_ardour/ardour_ui_ed.cc:427 gtk2_ardour/editor.cc:1246
+#: gtk2_ardour/editor.cc:1263
 msgid "Slowest"
-msgstr "Plus lent"
+msgstr "Très lent"
 
-#: editor.cc:1460 editor.cc:1477 editor_actions.cc:377
+#: gtk2_ardour/ardour_ui_ed.cc:428 gtk2_ardour/editor.cc:1247
+#: gtk2_ardour/editor.cc:1264
 msgid "Slow"
 msgstr "Lent"
 
-#: editor.cc:1461 editor.cc:1478 editor_actions.cc:379
+#: gtk2_ardour/ardour_ui_ed.cc:429 gtk2_ardour/ardour_ui_ed.cc:436
+msgid "Medium"
+msgstr "Moyen"
+
+#: gtk2_ardour/ardour_ui_ed.cc:430 gtk2_ardour/editor.cc:1248
+#: gtk2_ardour/editor.cc:1265
 msgid "Fast"
 msgstr "Rapide"
 
-#: editor.cc:1462 editor.cc:1479 editor_actions.cc:381
-msgid "Fastest"
+#: gtk2_ardour/ardour_ui_ed.cc:431
+msgid "Faster"
 msgstr "Plus rapide"
 
-#: editor.cc:1589 editor.cc:1597
+#: gtk2_ardour/ardour_ui_ed.cc:432 gtk2_ardour/editor.cc:1249
+#: gtk2_ardour/editor.cc:1266
+msgid "Fastest"
+msgstr "Très rapide"
+
+#: gtk2_ardour/ardour_ui_ed.cc:435 gtk2_ardour/editor_actions.cc:58
+msgid "Short"
+msgstr "Court"
+
+#: gtk2_ardour/ardour_ui_ed.cc:437
+msgid "Long"
+msgstr "Long"
+
+#: gtk2_ardour/ardour_ui_ed.cc:455
+msgid "Hardware monitoring"
+msgstr "Monitoring matériel"
+
+#: gtk2_ardour/ardour_ui_ed.cc:456
+msgid "Software monitoring"
+msgstr "Monitoring logiciel"
+
+#: gtk2_ardour/ardour_ui_ed.cc:457
+msgid "External monitoring"
+msgstr "Monitoring externe"
+
+#: gtk2_ardour/ardour_ui_ed.cc:461
+msgid "Solo in-place"
+msgstr "Solo en direct"
+
+#: gtk2_ardour/ardour_ui_ed.cc:463
+msgid "Solo via bus"
+msgstr "Solo via le bus"
+
+#: gtk2_ardour/ardour_ui_ed.cc:468
+msgid "Auto-connect inputs to physical inputs"
+msgstr "entrées audio → pistes Ardour"
+
+#: gtk2_ardour/ardour_ui_ed.cc:470
+msgid "Manually connect inputs"
+msgstr "Pas d'entrées automatiques"
+
+#: gtk2_ardour/ardour_ui_ed.cc:475
+msgid "Auto-connect outputs to physical outs"
+msgstr "Pistes Ardour → sorties physiques"
+
+#: gtk2_ardour/ardour_ui_ed.cc:477
+msgid "Auto-connect outputs to master bus"
+msgstr "Pistes ardour → bus général"
+
+#: gtk2_ardour/ardour_ui_ed.cc:479
+msgid "Manually connect outputs"
+msgstr "Pas de sorties automatiques"
+
+#: gtk2_ardour/ardour_ui_ed.cc:484
+msgid "Remote ID assigned by User"
+msgstr "identifiant assigné manuellement"
+
+#: gtk2_ardour/ardour_ui_ed.cc:486
+msgid "Remote ID follows order of Mixer"
+msgstr "identifiant donné par la Console de mixage"
+
+#: gtk2_ardour/ardour_ui_ed.cc:488
+msgid "Remote ID follows order of Editor"
+msgstr "identifiant donné par l'Éditeur"
+
+#: gtk2_ardour/ardour_ui_ed.cc:637 gtk2_ardour/ladspa_pluginui.cc:168
+msgid "Controls"
+msgstr "contrôles"
+
+#: gtk2_ardour/ardour_ui_ed.cc:641
+msgid "Feedback"
+msgstr "Motorisation"
+
+#: gtk2_ardour/ardour_ui_ed.cc:725
+msgid "Clock"
+msgstr "Horloge"
+
+#: gtk2_ardour/ardour_ui_options.cc:112 gtk2_ardour/ardour_ui_options.cc:139
+#: gtk2_ardour/editor_actions.cc:725 gtk2_ardour/editor_actions.cc:953
+#: gtk2_ardour/editor_actions.cc:966 gtk2_ardour/editor_actions.cc:1030
+#: gtk2_ardour/sfdb_ui.cc:536 gtk2_ardour/audio_streamview.cc:173
+msgid "programming error: %1"
+msgstr "programming error: %1"
+
+#: gtk2_ardour/ardour_ui_options.cc:218
+msgid "programming error: unknown solo model in ARDOUR_UI::set_solo_model: %1"
+msgstr "programming error: unknown solo model in ARDOUR_UI::set_solo_model: %1"
+
+#: gtk2_ardour/ardour_ui_options.cc:251
+msgid ""
+"programming error: unknown remote model in ARDOUR_UI::set_remote_model: %1"
+msgstr ""
+"programming error: unknown remote model in ARDOUR_UI::set_remote_model: %1"
+
+#: gtk2_ardour/ardour_ui_options.cc:285
+msgid ""
+"programming error: unknown monitor model in ARDOUR_UI::set_monitor_model: %1"
+msgstr ""
+"programming error: unknown monitor model in ARDOUR_UI::set_monitor_model: %1"
+
+#: gtk2_ardour/ardour_ui_options.cc:577
+msgid ""
+"programming error: unknown file header format passed to ARDOUR_UI::"
+"map_file_data_format: %1"
+msgstr ""
+"programming error: unknown file header format passed to ARDOUR_UI::"
+"map_file_data_format: %1"
+
+#: gtk2_ardour/ardour_ui_options.cc:609
+msgid ""
+"programming error: unknown file data format passed to ARDOUR_UI::"
+"map_file_data_format: %1"
+msgstr ""
+"programming error: unknown file data format passed to ARDOUR_UI::"
+"map_file_data_format: %1"
+
+#: gtk2_ardour/ardour_ui_options.cc:940
+msgid "ST"
+msgstr "½ton"
+
+#: gtk2_ardour/audio_clock.cc:1801 gtk2_ardour/editor.cc:181
+msgid "Timecode"
+msgstr "Timecode"
+
+#: gtk2_ardour/audio_clock.cc:1802 gtk2_ardour/editor.cc:180
+#: gtk2_ardour/editor_rulers.cc:395
+msgid "Bars:Beats"
+msgstr "mesures:temps"
+
+#: gtk2_ardour/audio_clock.cc:1803
+msgid "Minutes:Seconds"
+msgstr "minutes:secondes"
+
+#: gtk2_ardour/audio_clock.cc:1804
+msgid "Audio Frames"
+msgstr "trames audio"
+
+#: gtk2_ardour/audio_clock.cc:1807
+msgid "Mode"
+msgstr "Mode"
+
+#: gtk2_ardour/route_time_axis.cc:87
+msgid "m"
+msgstr "m"
+
+#: gtk2_ardour/route_time_axis.cc:87
+msgid "s"
+msgstr "s"
+
+#: gtk2_ardour/route_time_axis.cc:87
+msgid "r"
+msgstr "r"
+
+#: gtk2_ardour/route_time_axis.cc:91
+msgid "g"
+msgstr "g"
+
+#: gtk2_ardour/route_time_axis.cc:92
+msgid "p"
+msgstr "p"
+
+#: gtk2_ardour/route_time_axis.cc:93 gtk2_ardour/automation_time_axis.cc:36
+#: gtk2_ardour/visual_time_axis.cc:73
+msgid "h"
+msgstr "h"
+
+#: gtk2_ardour/route_time_axis.cc:94
+msgid "a"
+msgstr "a"
+
+#: gtk2_ardour/route_time_axis.cc:95 gtk2_ardour/visual_time_axis.cc:72
+msgid "v"
+msgstr "v"
+
+#: gtk2_ardour/route_time_axis.cc:148 gtk2_ardour/mixer_strip.cc:86
+msgid "Record"
+msgstr "Enregistrement"
+
+#: gtk2_ardour/route_time_axis.cc:156 gtk2_ardour/editor_actions.cc:38
+#: gtk2_ardour/mixer_strip.cc:86 gtk2_ardour/mixer_strip.cc:426
+msgid "Solo"
+msgstr "Solo"
+
+#: gtk2_ardour/route_time_axis.cc:157 gtk2_ardour/editor.cc:1549
+#: gtk2_ardour/editor.cc:1639 gtk2_ardour/mixer_strip.cc:86
+#: gtk2_ardour/mixer_strip.cc:425 gtk2_ardour/panner_ui.cc:404
+msgid "Mute"
+msgstr "Muet"
+
+#: gtk2_ardour/route_time_axis.cc:158
+msgid "Edit Group"
+msgstr "Groupe"
+
+#: gtk2_ardour/route_time_axis.cc:159 gtk2_ardour/visual_time_axis.cc:91
+msgid "Display Height"
+msgstr "hauteur de piste"
+
+#: gtk2_ardour/route_time_axis.cc:160
+msgid "Playlist"
+msgstr "Liste de lecture"
+
+#: gtk2_ardour/route_time_axis.cc:161 gtk2_ardour/route_time_axis.cc:414
+msgid "Automation"
+msgstr "Automatisation"
+
+#: gtk2_ardour/route_time_axis.cc:162 gtk2_ardour/visual_time_axis.cc:92
+msgid "Visual options"
+msgstr "Options d'affichage"
+
+#: gtk2_ardour/route_time_axis.cc:163 gtk2_ardour/visual_time_axis.cc:93
+msgid "Hide this track"
+msgstr "Cacher la piste"
+
+#: gtk2_ardour/route_time_axis.cc:265 gtk2_ardour/mixer_strip.cc:910
+msgid "No group"
+msgstr "Aucun groupe"
+
+#: gtk2_ardour/route_time_axis.cc:375
+msgid "Show all automation"
+msgstr "afficher toute l'automatisation"
+
+#: gtk2_ardour/route_time_axis.cc:378
+msgid "Show existing automation"
+msgstr "afficher l'automatisation existante"
+
+#: gtk2_ardour/route_time_axis.cc:381
+msgid "Hide all automation"
+msgstr "cacher toute l'automatisation"
+
+#: gtk2_ardour/route_time_axis.cc:384
+msgid "Plugins"
+msgstr "Plugins"
+
+#: gtk2_ardour/route_time_axis.cc:405 gtk2_ardour/automation_time_axis.cc:431
+#: gtk2_ardour/imageframe_time_axis.cc:254 gtk2_ardour/marker_time_axis.cc:210
+msgid "Height"
+msgstr "Hauteur"
+
+#: gtk2_ardour/route_time_axis.cc:406 gtk2_ardour/color_manager.cc:41
+#: gtk2_ardour/imageframe_time_axis.cc:255 gtk2_ardour/marker_time_axis.cc:211
+msgid "Color"
+msgstr "Couleur"
+
+#: gtk2_ardour/route_time_axis.cc:411 gtk2_ardour/mixer_strip.cc:995
+msgid "Remote Control ID"
+msgstr "Identifiant de contrôleur"
+
+#: gtk2_ardour/route_time_axis.cc:429
+msgid "Align with existing material"
+msgstr "aligner avec le contenu actuel"
+
+#: gtk2_ardour/route_time_axis.cc:435
+msgid "Align with capture time"
+msgstr "aligner avec l'enregistrement"
+
+#: gtk2_ardour/route_time_axis.cc:441
+msgid "Alignment"
+msgstr "Alignement"
+
+#: gtk2_ardour/route_time_axis.cc:447
+msgid "Normal mode"
+msgstr "Mode normal"
+
+#: gtk2_ardour/route_time_axis.cc:450
+msgid "Tape mode"
+msgstr "Mode cassette"
+
+#: gtk2_ardour/route_time_axis.cc:466 gtk2_ardour/editor.cc:487
+#: gtk2_ardour/editor_actions.cc:61 gtk2_ardour/mixer_strip.cc:984
+#: gtk2_ardour/mixer_ui.cc:108
+msgid "Active"
+msgstr "Actif"
+
+#: gtk2_ardour/route_time_axis.cc:471 gtk2_ardour/editor.cc:1729
+#: gtk2_ardour/editor.cc:3439 gtk2_ardour/editor_actions.cc:328
+#: gtk2_ardour/editor_markers.cc:529 gtk2_ardour/imageframe_time_axis.cc:258
+#: gtk2_ardour/location_ui.cc:58 gtk2_ardour/marker_time_axis.cc:214
+#: gtk2_ardour/mixer_strip.cc:998
+msgid "Remove"
+msgstr "Supprimer"
+
+#: gtk2_ardour/route_time_axis.cc:496 gtk2_ardour/route_time_axis.cc:551
+#: gtk2_ardour/route_time_axis.cc:816 gtk2_ardour/editor_actions.cc:1017
+msgid "programming error: %1 %2"
+msgstr "programming error: %1 %2"
+
+#: gtk2_ardour/route_time_axis.cc:840
+msgid "Name for playlist"
+msgstr "Nom de la liste de lecture"
+
+#: gtk2_ardour/route_time_axis.cc:842 gtk2_ardour/route_time_axis.cc:1305
+#: gtk2_ardour/editor.cc:3444 gtk2_ardour/editor_markers.cc:875
+#: gtk2_ardour/editor_mouse.cc:4752 gtk2_ardour/imageframe_time_axis.cc:247
+#: gtk2_ardour/marker_time_axis.cc:207 gtk2_ardour/mixer_strip.cc:982
+#: gtk2_ardour/redirect_box.cc:825 gtk2_ardour/redirect_box.cc:1155
+#: gtk2_ardour/route_ui.cc:807 gtk2_ardour/visual_time_axis.cc:330
+msgid "Rename"
+msgstr "Renommer"
+
+#: gtk2_ardour/route_time_axis.cc:884 gtk2_ardour/route_time_axis.cc:930
+msgid "Name for Playlist"
+msgstr "Nom de la liste de lecture"
+
+#: gtk2_ardour/route_time_axis.cc:1133 gtk2_ardour/visual_time_axis.cc:340
+#: gtk2_ardour/visual_time_axis.cc:387
+msgid "A track already exists with that name"
+msgstr "Une piste portant le même nom existe déjà"
+
+#: gtk2_ardour/route_time_axis.cc:1309
+msgid "New Copy"
+msgstr "Nouvelle copie"
+
+#: gtk2_ardour/route_time_axis.cc:1311
+msgid "Clear Current"
+msgstr "Effacer actuelle"
+
+#: gtk2_ardour/route_time_axis.cc:1314
+msgid "Select from all ..."
+msgstr "Choisir..."
+
+#: gtk2_ardour/route_time_axis.cc:1520 gtk2_ardour/editor.cc:1271
+#: gtk2_ardour/selection.cc:661 gtk2_ardour/selection.cc:700
+msgid "programming error: "
+msgstr "programming error: "
+
+#: gtk2_ardour/audio_time_axis.cc:213
+msgid "Fader"
+msgstr "Atténuateur"
+
+#: gtk2_ardour/audio_time_axis.cc:218
+msgid "Pan"
+msgstr "panoramique"
+
+#: gtk2_ardour/audio_time_axis.cc:233
+msgid "Hide all crossfades"
+msgstr "Cacher les fondus enchaînés"
+
+#: gtk2_ardour/audio_time_axis.cc:234
+msgid "Show all crossfades"
+msgstr "afficher tous les fondus enchaînés"
+
+#: gtk2_ardour/audio_time_axis.cc:241
+msgid "Show waveforms"
+msgstr "Afficher les formes d'ondes"
+
+#: gtk2_ardour/audio_time_axis.cc:251
+msgid "Traditional"
+msgstr "Traditionnel"
+
+#: gtk2_ardour/audio_time_axis.cc:254
+msgid "Rectified"
+msgstr "Redressé"
+
+#: gtk2_ardour/audio_time_axis.cc:261 gtk2_ardour/editor.cc:1245
+#: gtk2_ardour/editor.cc:1262
+msgid "Linear"
+msgstr "Linéaire"
+
+#: gtk2_ardour/audio_time_axis.cc:264
+msgid "Logarithmic"
+msgstr "logarithmique"
+
+#: gtk2_ardour/audio_time_axis.cc:281
+msgid "Waveform"
+msgstr "Forme d'onde"
+
+#: gtk2_ardour/audio_time_axis.cc:353
+msgid "gain"
+msgstr "gain"
+
+#: gtk2_ardour/audio_time_axis.cc:393
+msgid "pan"
+msgstr "panoramique"
+
+#: gtk2_ardour/automation_line.cc:794
+msgid "automation event move"
+msgstr "déplacement d'événement d'automatisation"
+
+#: gtk2_ardour/automation_line.cc:796
+msgid "automation range drag"
+msgstr "déplacement d'intervalle d'automatisation"
+
+#: gtk2_ardour/automation_line.cc:1021 gtk2_ardour/region_gain_line.cc:64
+msgid "remove control point"
+msgstr "retrait de point de contrôle"
+
+#: gtk2_ardour/automation_time_axis.cc:37 gtk2_ardour/editor_ops.cc:2650
+msgid "clear"
+msgstr "effacer"
+
+#: gtk2_ardour/automation_time_axis.cc:78
+msgid "track height"
+msgstr "hauteur de piste"
+
+#: gtk2_ardour/automation_time_axis.cc:79
+msgid "automation state"
+msgstr "état de l'automatisation"
+
+#: gtk2_ardour/automation_time_axis.cc:80
+msgid "clear track"
+msgstr "effacer la piste"
+
+#: gtk2_ardour/automation_time_axis.cc:81
+msgid "hide track"
+msgstr "cacher la piste"
+
+#: gtk2_ardour/automation_time_axis.cc:188
+#: gtk2_ardour/automation_time_axis.cc:217
+#: gtk2_ardour/automation_time_axis.cc:442 gtk2_ardour/gain_meter.cc:159
+#: gtk2_ardour/ladspa_pluginui.cc:332 gtk2_ardour/ladspa_pluginui.cc:576
+#: gtk2_ardour/panner_ui.cc:88
+msgid "Manual"
+msgstr "Manuel"
+
+#: gtk2_ardour/automation_time_axis.cc:190
+#: gtk2_ardour/automation_time_axis.cc:228
+#: gtk2_ardour/automation_time_axis.cc:446 gtk2_ardour/editor.cc:1807
+#: gtk2_ardour/editor.cc:1888 gtk2_ardour/gain_meter.cc:161
+#: gtk2_ardour/ladspa_pluginui.cc:335 gtk2_ardour/ladspa_pluginui.cc:578
+#: gtk2_ardour/panner_ui.cc:90 gtk2_ardour/sfdb_ui.cc:61
+msgid "Play"
+msgstr "Lire"
+
+#: gtk2_ardour/automation_time_axis.cc:192
+#: gtk2_ardour/automation_time_axis.cc:239
+#: gtk2_ardour/automation_time_axis.cc:450 gtk2_ardour/gain_meter.cc:163
+#: gtk2_ardour/ladspa_pluginui.cc:338 gtk2_ardour/ladspa_pluginui.cc:580
+#: gtk2_ardour/panner_ui.cc:92
+msgid "Write"
+msgstr "écrire"
+
+#: gtk2_ardour/automation_time_axis.cc:194
+#: gtk2_ardour/automation_time_axis.cc:250
+#: gtk2_ardour/automation_time_axis.cc:454 gtk2_ardour/gain_meter.cc:165
+#: gtk2_ardour/ladspa_pluginui.cc:341 gtk2_ardour/ladspa_pluginui.cc:582
+#: gtk2_ardour/panner_ui.cc:94
+msgid "Touch"
+msgstr "Reprise"
+
+#: gtk2_ardour/automation_time_axis.cc:261 gtk2_ardour/ladspa_pluginui.cc:344
+msgid "???"
+msgstr "???"
+
+#: gtk2_ardour/automation_time_axis.cc:275
+msgid "clear automation"
+msgstr "effacer l'automatisation"
+
+#: gtk2_ardour/automation_time_axis.cc:433 gtk2_ardour/editor_actions.cc:326
+msgid "Hide"
+msgstr "Cacher"
+
+#: gtk2_ardour/automation_time_axis.cc:435 gtk2_ardour/crossfade_edit.cc:78
+#: gtk2_ardour/redirect_box.cc:1147 gtk2_ardour/connection_editor.cc:56
+msgid "Clear"
+msgstr "Effacer"
+
+#: gtk2_ardour/automation_time_axis.cc:458
+msgid "State"
+msgstr "État"
+
+#: gtk2_ardour/canvas-imageframe.c:104
+msgid "pixbuf"
+msgstr "pixbuf"
+
+#: gtk2_ardour/canvas-imageframe.c:105
+msgid "the pixbuf"
+msgstr "le pixbuf"
+
+#: gtk2_ardour/canvas-imageframe.c:110
+msgid "x"
+msgstr "x"
+
+#: gtk2_ardour/canvas-imageframe.c:111 gtk2_ardour/canvas-simpleline.c:111
+#: gtk2_ardour/canvas-simplerect.c:107
+msgid "x coordinate of upper left corner of rect"
+msgstr "coordonnée x du coin supérieur gauche du rectangle"
+
+#: gtk2_ardour/canvas-imageframe.c:120
+msgid "y"
+msgstr "y"
+
+#: gtk2_ardour/canvas-imageframe.c:121 gtk2_ardour/canvas-simpleline.c:121
+#: gtk2_ardour/canvas-simplerect.c:117
+msgid "y coordinate of upper left corner of rect "
+msgstr "coordonnée y du coin supérieur gauche du rectangle"
+
+#: gtk2_ardour/canvas-imageframe.c:129
+msgid "width"
+msgstr "largeur"
+
+#: gtk2_ardour/canvas-imageframe.c:130
+msgid "the width"
+msgstr "la largeur"
+
+#: gtk2_ardour/canvas-imageframe.c:139
+msgid "drawwidth"
+msgstr "largeur"
+
+#: gtk2_ardour/canvas-imageframe.c:140
+msgid "drawn width"
+msgstr "largeur dessinée"
+
+#: gtk2_ardour/canvas-imageframe.c:148
+msgid "height"
+msgstr "hauteur"
+
+#: gtk2_ardour/canvas-imageframe.c:149
+msgid "the height"
+msgstr "la hauteur"
+
+#: gtk2_ardour/canvas-imageframe.c:157
+msgid "anchor"
+msgstr "ancre"
+
+#: gtk2_ardour/canvas-imageframe.c:158
+msgid "the anchor"
+msgstr "l'ancre"
+
+#: gtk2_ardour/canvas-simpleline.c:110 gtk2_ardour/canvas-simplerect.c:106
+msgid "x1"
+msgstr "x1"
+
+#: gtk2_ardour/canvas-simpleline.c:120 gtk2_ardour/canvas-simplerect.c:116
+msgid "y1"
+msgstr "y1"
+
+#: gtk2_ardour/canvas-simpleline.c:131 gtk2_ardour/canvas-simplerect.c:127
+msgid "x2"
+msgstr "x2"
+
+#: gtk2_ardour/canvas-simpleline.c:132 gtk2_ardour/canvas-simplerect.c:128
+msgid "x coordinate of lower right corner of rect"
+msgstr "coordonnée x du coin inférieur droit du rectangle"
+
+#: gtk2_ardour/canvas-simpleline.c:141 gtk2_ardour/canvas-simplerect.c:137
+msgid "y2"
+msgstr "y2"
+
+#: gtk2_ardour/canvas-simpleline.c:142 gtk2_ardour/canvas-simplerect.c:138
+msgid "y coordinate of lower right corner of rect "
+msgstr "coordonnée y du coin inférieur droit du rectangle"
+
+#: gtk2_ardour/canvas-simpleline.c:150
+msgid "color rgba"
+msgstr "couleur RGBA"
+
+#: gtk2_ardour/canvas-simpleline.c:151
+msgid "color of line"
+msgstr "couleur de la ligne"
+
+#: gtk2_ardour/canvas-simplerect.c:148
+msgid "outline pixels"
+msgstr "contour"
+
+#: gtk2_ardour/canvas-simplerect.c:149
+msgid "width in pixels of outline"
+msgstr "nombre de pixels du contour"
+
+#: gtk2_ardour/canvas-simplerect.c:159
+msgid "outline what"
+msgstr "surligne quoi"
+
+#: gtk2_ardour/canvas-simplerect.c:160
+msgid "which boundaries to outline (mask)"
+msgstr "quels contours surligner (masque)"
+
+#: gtk2_ardour/canvas-simplerect.c:171
+msgid "fill"
+msgstr "remplir"
+
+#: gtk2_ardour/canvas-simplerect.c:172
+msgid "fill rectangle"
+msgstr "remplir le rectangle"
+
+#: gtk2_ardour/canvas-simplerect.c:179
+msgid "draw"
+msgstr "dessiner"
+
+#: gtk2_ardour/canvas-simplerect.c:180
+msgid "draw rectangle"
+msgstr "dessiner un rectangle"
+
+#: gtk2_ardour/canvas-simplerect.c:188
+msgid "outline color rgba"
+msgstr "couleur RGBA contour"
+
+#: gtk2_ardour/canvas-simplerect.c:189
+msgid "color of outline"
+msgstr "couleur du contour"
+
+#: gtk2_ardour/canvas-simplerect.c:199
+msgid "fill color rgba"
+msgstr "couleur RGBA remplissage"
+
+#: gtk2_ardour/canvas-simplerect.c:200
+msgid "color of fill"
+msgstr "couleur du remplissage"
+
+#: gtk2_ardour/color_manager.cc:40
+msgid "Object"
+msgstr "Objet"
+
+#: gtk2_ardour/color_manager.cc:78
+msgid "cannot open color definition file %1: %2"
+msgstr "impossible d'ouvrir le fichier de définition de couleurs %1 : %2"
+
+#: gtk2_ardour/crossfade_edit.cc:75
+msgid "ardour: x-fade edit"
+msgstr "ardour : édition fondu enchaîné"
+
+#: gtk2_ardour/crossfade_edit.cc:79 gtk2_ardour/panner_ui.cc:420
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: gtk2_ardour/crossfade_edit.cc:80
+msgid "Fade"
+msgstr "Fondu"
+
+#: gtk2_ardour/crossfade_edit.cc:81
+msgid "Out (dry)"
+msgstr "descente (brute)"
+
+#: gtk2_ardour/crossfade_edit.cc:82
+msgid "Out"
+msgstr "descente"
+
+#: gtk2_ardour/crossfade_edit.cc:83
+msgid "In (dry)"
+msgstr "montée (brute)"
+
+#: gtk2_ardour/crossfade_edit.cc:84
+msgid "In"
+msgstr "montée"
+
+#: gtk2_ardour/crossfade_edit.cc:86
+msgid "With Pre-roll"
+msgstr "Avec pré-roll"
+
+#: gtk2_ardour/crossfade_edit.cc:87
+msgid "With Post-roll"
+msgstr "Avec post-roll"
+
+#: gtk2_ardour/crossfade_edit.cc:95
+msgid "Fade In"
+msgstr "Type de montée"
+
+#: gtk2_ardour/crossfade_edit.cc:96
+msgid "Fade Out"
+msgstr "Type de descente"
+
+#: gtk2_ardour/crossfade_edit.cc:172 gtk2_ardour/editor.cc:1624
+#: gtk2_ardour/editor_actions.cc:324 gtk2_ardour/option_editor.cc:134
+msgid "Audition"
+msgstr "écoute"
+
+#: gtk2_ardour/editor.cc:104 gtk2_ardour/editor.cc:2978
+#: gtk2_ardour/editor_actions.cc:402 gtk2_ardour/export_dialog.cc:78
+#: gtk2_ardour/export_dialog.cc:92 gtk2_ardour/export_dialog.cc:895
+#: gtk2_ardour/export_dialog.cc:1227 gtk2_ardour/route_ui.cc:506
+msgid "None"
+msgstr "(aucun)"
+
+#: gtk2_ardour/editor.cc:105 gtk2_ardour/editor.cc:2966
+msgid "CD Frames"
+msgstr "trames de CD"
+
+#: gtk2_ardour/editor.cc:106 gtk2_ardour/editor.cc:2968
+msgid "SMPTE Frames"
+msgstr "trames SMPTE"
+
+#: gtk2_ardour/editor.cc:107 gtk2_ardour/editor.cc:2970
+msgid "SMPTE Seconds"
+msgstr "secondes SMPTE"
+
+#: gtk2_ardour/editor.cc:108 gtk2_ardour/editor.cc:2972
+msgid "SMPTE Minutes"
+msgstr "minutes SMPTE"
+
+#: gtk2_ardour/editor.cc:109 gtk2_ardour/editor.cc:2974
+msgid "Seconds"
+msgstr "secondes"
+
+#: gtk2_ardour/editor.cc:110 gtk2_ardour/editor.cc:2976
+msgid "Minutes"
+msgstr "minutes"
+
+#: gtk2_ardour/editor.cc:111 gtk2_ardour/editor.cc:2948
+msgid "Beats/32"
+msgstr "32ème de temps"
+
+#: gtk2_ardour/editor.cc:112 gtk2_ardour/editor.cc:2946
+msgid "Beats/16"
+msgstr "16ème de temps"
+
+#: gtk2_ardour/editor.cc:113 gtk2_ardour/editor.cc:2944
+msgid "Beats/8"
+msgstr "8ème de temps"
+
+#: gtk2_ardour/editor.cc:114 gtk2_ardour/editor.cc:2942
+msgid "Beats/4"
+msgstr "quart de temps"
+
+#: gtk2_ardour/editor.cc:115 gtk2_ardour/editor.cc:2940
+msgid "Beats/3"
+msgstr "tiers de temps"
+
+#: gtk2_ardour/editor.cc:116 gtk2_ardour/editor.cc:2950
+msgid "Beats"
+msgstr "temps"
+
+#: gtk2_ardour/editor.cc:117 gtk2_ardour/editor.cc:2952
+msgid "Bars"
+msgstr "mesures"
+
+#: gtk2_ardour/editor.cc:118 gtk2_ardour/editor.cc:2954
+msgid "Marks"
+msgstr "Repères"
+
+#: gtk2_ardour/editor.cc:119 gtk2_ardour/editor.cc:138
+#: gtk2_ardour/editor.cc:2956 gtk2_ardour/editor.cc:3021
+msgid "Edit Cursor"
+msgstr "curseur d'édition"
+
+#: gtk2_ardour/editor.cc:120 gtk2_ardour/editor.cc:2958
+msgid "Region starts"
+msgstr "débuts de régions"
+
+#: gtk2_ardour/editor.cc:121 gtk2_ardour/editor.cc:2960
+msgid "Region ends"
+msgstr "fins de régions"
+
+#: gtk2_ardour/editor.cc:122 gtk2_ardour/editor.cc:2964
+msgid "Region syncs"
+msgstr "synchro de régions"
+
+#: gtk2_ardour/editor.cc:123 gtk2_ardour/editor.cc:2962
+msgid "Region bounds"
+msgstr "limites de régions"
+
+#: gtk2_ardour/editor.cc:129 gtk2_ardour/editor.cc:2996
+#: gtk2_ardour/editor_actions.cc:289
+msgid "Magnetic"
+msgstr "Magnétique"
+
+#: gtk2_ardour/editor.cc:134 gtk2_ardour/editor.cc:3013
+#: gtk2_ardour/export_dialog.cc:142 gtk2_ardour/export_dialog.cc:158
+#: gtk2_ardour/export_dialog.cc:1070 gtk2_ardour/export_dialog.cc:1074
+msgid "Left"
+msgstr "gauche"
+
+#: gtk2_ardour/editor.cc:135 gtk2_ardour/editor.cc:3015
+#: gtk2_ardour/export_dialog.cc:143 gtk2_ardour/export_dialog.cc:159
+msgid "Right"
+msgstr "droite"
+
+#: gtk2_ardour/editor.cc:136 gtk2_ardour/editor.cc:3017
+msgid "Center"
+msgstr "centre"
+
+#: gtk2_ardour/editor.cc:137 gtk2_ardour/editor.cc:3019
+msgid "Playhead"
+msgstr "tête de lecture"
+
+#: gtk2_ardour/editor.cc:179
+msgid "Mins:Secs"
+msgstr "min:s"
+
+#: gtk2_ardour/editor.cc:182 gtk2_ardour/editor_rulers.cc:389
+msgid "Frames"
+msgstr "trames"
+
+#: gtk2_ardour/editor.cc:183 gtk2_ardour/editor_rulers.cc:409
+msgid "Tempo"
+msgstr "tempo"
+
+#: gtk2_ardour/editor.cc:184 gtk2_ardour/editor_rulers.cc:403
+msgid "Meter"
+msgstr "mesure"
+
+#: gtk2_ardour/editor.cc:185 gtk2_ardour/editor_rulers.cc:415
+msgid "Location Markers"
+msgstr "repères"
+
+#: gtk2_ardour/editor.cc:186 gtk2_ardour/editor_rulers.cc:421
+msgid "Range Markers"
+msgstr "intervalles"
+
+#: gtk2_ardour/editor.cc:187 gtk2_ardour/editor_rulers.cc:427
+msgid "Loop/Punch Ranges"
+msgstr "boucle et punch-in/out"
+
+#: gtk2_ardour/editor.cc:205
+msgid "mode"
+msgstr "mode"
+
+#: gtk2_ardour/editor.cc:206
+msgid "automation"
+msgstr "automatisation"
+
+#: gtk2_ardour/editor.cc:462 gtk2_ardour/editor.cc:488
+#: gtk2_ardour/editor_actions.cc:63 gtk2_ardour/mixer_ui.cc:83
+#: gtk2_ardour/mixer_ui.cc:109 gtk2_ardour/analysis_window.cc:63
+msgid "Show"
+msgstr "Afficher"
+
+#: gtk2_ardour/editor.cc:463 gtk2_ardour/editor.cc:486
+msgid "Name"
+msgstr "Nom"
+
+#: gtk2_ardour/editor.cc:561 gtk2_ardour/editor.cc:628
+msgid "Regions"
+msgstr "Régions"
+
+#: gtk2_ardour/editor.cc:600 gtk2_ardour/editor.cc:640
+msgid "Chunks"
+msgstr "Fragments"
+
+#: gtk2_ardour/editor.cc:631
+msgid "Tracks/Busses"
+msgstr "Pistes / Bus"
+
+#: gtk2_ardour/editor.cc:634
+msgid "Snapshots"
+msgstr "Clichés"
+
+#: gtk2_ardour/editor.cc:637
+msgid "Edit Groups"
+msgstr "Groupes"
+
+#: gtk2_ardour/editor.cc:688
+msgid "Nudge Region/Selection Forwards"
+msgstr "Décaler vers la droite (région ou sélection)"
+
+#: gtk2_ardour/editor.cc:689
+msgid "Nudge Region/Selection Backwards"
+msgstr "Décaler vers la gauche (région ou sélection)"
+
+#: gtk2_ardour/editor.cc:719 gtk2_ardour/editor_mixer.cc:352
+msgid "Editor"
+msgstr "Éditeur"
+
+#: gtk2_ardour/editor.cc:1095 gtk2_ardour/editor.cc:1103
+#: gtk2_ardour/editor_markers.cc:919
+msgid "Loop"
+msgstr "Boucle"
+
+#: gtk2_ardour/editor.cc:1108 gtk2_ardour/editor.cc:1116
+#: gtk2_ardour/editor_markers.cc:947
+msgid "Punch"
+msgstr "Punch in/out"
+
+#: gtk2_ardour/editor.cc:1226 gtk2_ardour/editor_mouse.cc:1691
+msgid "programming error: fade in canvas item has no regionview data pointer!"
+msgstr "programming error: fade in canvas item has no regionview data pointer!"
+
+#: gtk2_ardour/editor.cc:1238 gtk2_ardour/editor.cc:1255
+#: gtk2_ardour/redirect_box.cc:1163
+msgid "Deactivate"
+msgstr "Désactiver"
+
+#: gtk2_ardour/editor.cc:1240 gtk2_ardour/editor.cc:1257
+#: gtk2_ardour/redirect_box.cc:1161
+msgid "Activate"
+msgstr "Activer"
+
+#: gtk2_ardour/editor.cc:1378 gtk2_ardour/editor.cc:1386
+#: gtk2_ardour/editor_ops.cc:2543
 msgid "Freeze"
 msgstr "Bloquer"
 
-#: editor.cc:1593
+#: gtk2_ardour/editor.cc:1382
 msgid "Unfreeze"
 msgstr "Débloquer"
 
-#: editor.cc:1762 editor.cc:1857
-#, fuzzy
+#: gtk2_ardour/editor.cc:1551
 msgid "Unmute"
-msgstr "Non muet"
+msgstr "Réactiver"
 
-#. non-operative menu items for menu bar
-#. show editors
-#: editor.cc:1766 editor.cc:2046 editor.cc:2748 editor_actions.cc:27
-#: editor_markers.cc:507 mixer_strip.cc:495 mixer_strip.cc:563
-#: redirect_box.cc:1079
+#: gtk2_ardour/editor.cc:1555 gtk2_ardour/editor.cc:1852
+#: gtk2_ardour/editor_actions.cc:28 gtk2_ardour/editor_markers.cc:528
+#: gtk2_ardour/mixer_strip.cc:508 gtk2_ardour/mixer_strip.cc:570
+#: gtk2_ardour/redirect_box.cc:1169
 msgid "Edit"
 msgstr "Édition"
 
-#: editor.cc:1771
+#: gtk2_ardour/editor.cc:1560
 msgid "Convert to short"
-msgstr "Convertir en court"
+msgstr "Convertir en fondu rapide"
 
-#: editor.cc:1773
+#: gtk2_ardour/editor.cc:1562
 msgid "Convert to full"
-msgstr "Convertir en complet"
+msgstr "Convertir en fondu long"
 
-#: editor.cc:1784
-#, fuzzy
+#: gtk2_ardour/editor.cc:1573
 msgid "Crossfade"
-msgstr "Modèle de fondu enchaîné"
+msgstr "Fondu enchaîné"
 
-#: editor.cc:1827
+#: gtk2_ardour/editor.cc:1616
 msgid "Popup region editor"
-msgstr "Ouvrir l'éditeur de région"
+msgstr "Éditeur de région..."
 
-#: editor.cc:1828
+#: gtk2_ardour/editor.cc:1617
 msgid "Raise to top layer"
-msgstr "Monter vers la couche du haut"
+msgstr "Monter tout en haut"
 
-#: editor.cc:1829
+#: gtk2_ardour/editor.cc:1618
 msgid "Lower to bottom layer"
-msgstr "Descendre vers la couche du bas"
+msgstr "Descendre tout en bas"
 
-#: editor.cc:1831
+#: gtk2_ardour/editor.cc:1620
 msgid "Define sync point"
-msgstr "Définir le point de synchronisation"
+msgstr "Placer le point de synchro"
 
-#: editor.cc:1832
+#: gtk2_ardour/editor.cc:1621
 msgid "Remove sync point"
-msgstr "Enlever le point de synchronisation"
+msgstr "Enlever le point de synchro"
 
-#: editor.cc:1837
+#: gtk2_ardour/editor.cc:1626
 msgid "Bounce"
-msgstr "Bounce"
+msgstr "Copier vers un fichier audio (bounce)"
 
-#: editor.cc:1840
-#, fuzzy
+#: gtk2_ardour/editor.cc:1629
 msgid "Analyze region"
-msgstr "Jouer la région"
+msgstr "Analyse la région"
 
-#: editor.cc:1852
+#: gtk2_ardour/editor.cc:1634
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: editor.cc:1853
-msgid "Unlock"
-msgstr "Déverrouiller"
+#: gtk2_ardour/editor.cc:1644
+msgid "Opaque"
+msgstr "Opaque"
 
-#: editor.cc:1863
+#: gtk2_ardour/editor.cc:1650
 msgid "Original position"
-msgstr "Position d'origine"
+msgstr "Remettre à sa position d'origine"
 
-#: editor.cc:1869
-msgid "Toggle envelope visibility"
-msgstr ""
+#: gtk2_ardour/editor.cc:1662
+msgid "Reset Envelope"
+msgstr "Réinitialiser l'enveloppe"
 
-#: editor.cc:1870
-#, fuzzy
-msgid "Toggle envelope active"
-msgstr "Activer"
+#: gtk2_ardour/editor.cc:1664
+msgid "Envelope Visible"
+msgstr "Enveloppe Visible"
 
-#: editor.cc:1874
+#: gtk2_ardour/editor.cc:1671
+msgid "Envelope Active"
+msgstr "Enveloppe Active"
+
+#: gtk2_ardour/editor.cc:1681
 msgid "DeNormalize"
 msgstr "Dénormaliser"
 
-#: editor.cc:1876
+#: gtk2_ardour/editor.cc:1683
 msgid "Normalize"
 msgstr "Normaliser"
 
-#: editor.cc:1879
-#, fuzzy
+#: gtk2_ardour/editor.cc:1686
 msgid "Reverse"
-msgstr "Retourner"
+msgstr "Inverser"
 
-#. range related stuff
-#: editor.cc:1885
-#, fuzzy
+#: gtk2_ardour/editor.cc:1692 gtk2_ardour/editor.cc:1774
 msgid "Add Range Markers"
-msgstr "Marqueurs d'intervalle"
+msgstr "Ajoute des repères d'intervalle"
 
-#: editor.cc:1886
-#, fuzzy
-msgid "Set Range"
-msgstr "Séparer l'intervalle"
+#: gtk2_ardour/editor.cc:1693
+msgid "Set Range Selection"
+msgstr "zone de sélection depuis la région"
 
-#: editor.cc:1895
+#: gtk2_ardour/editor.cc:1702
 msgid "Nudge fwd"
-msgstr "Décaler vers l'avant"
+msgstr "Décaler à droite"
 
-#: editor.cc:1896
-#, fuzzy
+#: gtk2_ardour/editor.cc:1703
 msgid "Nudge bwd"
-msgstr "Décaler vers l'arrière"
+msgstr "Décaler à gauche"
 
-#: editor.cc:1897
+#: gtk2_ardour/editor.cc:1704
 msgid "Nudge fwd by capture offset"
-msgstr "Décaler vers l'avant du décalage de la capture"
+msgstr "Décaler à droite de l'offset de capture"
 
-#: editor.cc:1898
+#: gtk2_ardour/editor.cc:1705
 msgid "Nudge bwd by capture offset"
-msgstr "Décaler vers l'arrière du décallage de la capture"
+msgstr "Décaler à gauche de l'offset de capture"
 
-#: editor.cc:1907
+#: gtk2_ardour/editor.cc:1707 gtk2_ardour/editor.cc:1872
+#: gtk2_ardour/editor.cc:1928
+msgid "Nudge"
+msgstr "décaler"
+
+#: gtk2_ardour/editor.cc:1714
 msgid "Start to edit cursor"
-msgstr "Démarrer depuis le curseur d'édition"
+msgstr "début au curseur d'édition"
 
-#: editor.cc:1908
+#: gtk2_ardour/editor.cc:1715
 msgid "Edit cursor to end"
-msgstr "Curseur d'édition à la fin"
+msgstr "fin au curseur d'édition"
 
-#: editor.cc:1910 gain_meter.cc:181 gain_meter.cc:813 panner_ui.cc:98
-#: panner_ui.cc:803
+#: gtk2_ardour/editor.cc:1717 gtk2_ardour/gain_meter.cc:168
+#: gtk2_ardour/gain_meter.cc:880 gtk2_ardour/panner_ui.cc:97
+#: gtk2_ardour/panner_ui.cc:780
 msgid "Trim"
-msgstr "Élaguer"
+msgstr "Raccourcir"
 
-#: editor.cc:1913
+#: gtk2_ardour/editor.cc:1720
 msgid "Split"
 msgstr "Séparer"
 
-#: editor.cc:1916
+#: gtk2_ardour/editor.cc:1723
 msgid "Make mono regions"
 msgstr "Créer des régions mono"
 
-#: editor.cc:1919
+#: gtk2_ardour/editor.cc:1726
 msgid "Duplicate"
 msgstr "Dupliquer"
 
-#: editor.cc:1920
+#: gtk2_ardour/editor.cc:1727
 msgid "Fill Track"
 msgstr "Remplir la piste"
 
-#: editor.cc:1924
-msgid "Destroy"
-msgstr "Détruire"
-
-#: editor.cc:1954
+#: gtk2_ardour/editor.cc:1759
 msgid "Play range"
-msgstr "Jouer l'intervalle"
+msgstr "Lire"
 
-#: editor.cc:1955
+#: gtk2_ardour/editor.cc:1760
 msgid "Loop range"
-msgstr "Boucler sur l'intervalle"
+msgstr "Lire en boucle"
 
-#: editor.cc:1959
-#, fuzzy
+#: gtk2_ardour/editor.cc:1764
 msgid "Analyze range"
-msgstr "Jouer l'intervalle"
+msgstr "Analyse la zone de sélection"
 
-#: editor.cc:1963
-#, fuzzy
+#: gtk2_ardour/editor.cc:1768
 msgid "Separate range to track"
-msgstr "Séparer l'intervalle"
+msgstr "Découper la région"
 
-#: editor.cc:1964
-#, fuzzy
+#: gtk2_ardour/editor.cc:1769
 msgid "Separate range to region list"
-msgstr "définir les régions sélectionnées"
+msgstr "Copier vers la liste des régions"
 
-#: editor.cc:1967
-#, fuzzy
+#: gtk2_ardour/editor.cc:1772
 msgid "Select all in range"
-msgstr "Tout sélectionner dans la piste"
+msgstr "Sélectionner tout dans la zone"
 
-#: editor.cc:1969 editor.cc:2014
-#, fuzzy
+#: gtk2_ardour/editor.cc:1775 gtk2_ardour/editor.cc:1820
 msgid "Set range to loop range"
-msgstr "Sélectionner l'intervalle de boucle"
+msgstr "Créer l'intervalle de boucle"
 
-#: editor.cc:1970 editor.cc:2015
-#, fuzzy
+#: gtk2_ardour/editor.cc:1776 gtk2_ardour/editor.cc:1821
 msgid "Set range to punch range"
-msgstr "Sélectionner l'intervalle d'insertion"
+msgstr "Créer l'intervalle de punch in/out"
 
-#: editor.cc:1972
-#, fuzzy
+#: gtk2_ardour/editor.cc:1778
 msgid "Crop region to range"
-msgstr "Découper la région vers l'intervalle"
+msgstr "Raccourcir la région à la zone"
 
-#: editor.cc:1973
-#, fuzzy
+#: gtk2_ardour/editor.cc:1779
 msgid "Fill range with region"
-msgstr "Remplir l'intervalle avec une région"
+msgstr "Remplir avec la région choisie dans la liste"
 
-#: editor.cc:1974
-#, fuzzy
+#: gtk2_ardour/editor.cc:1780
 msgid "Duplicate range"
 msgstr "Dupliquer"
 
-#: editor.cc:1975
+#: gtk2_ardour/editor.cc:1781
 msgid "Create chunk from range"
-msgstr "Nouveau fragment à partir de l'intervalle"
+msgstr "Nouveau fragment depuis la sélection"
 
-#: editor.cc:1977
-#, fuzzy
+#: gtk2_ardour/editor.cc:1783
 msgid "Bounce range"
-msgstr "Bounce intervalle"
+msgstr "Copier la sélection vers un fichier audio (bounce)"
 
-#: editor.cc:1978
-#, fuzzy
+#: gtk2_ardour/editor.cc:1784
 msgid "Export range"
-msgstr "Région"
+msgstr "Exporter"
 
-#: editor.cc:1980
+#: gtk2_ardour/editor.cc:1786
 msgid "Range"
-msgstr "Intervalle"
+msgstr "Zone de sélection"
 
-#: editor.cc:1995 editor.cc:2080
+#: gtk2_ardour/editor.cc:1801 gtk2_ardour/editor.cc:1886
 msgid "Play from edit cursor"
-msgstr "Jouer à partir du curseur d'édition"
+msgstr "Lire depuis le curseur d'édition"
 
-#: editor.cc:1996 editor.cc:2081
+#: gtk2_ardour/editor.cc:1802 gtk2_ardour/editor.cc:1887
 msgid "Play from start"
-msgstr "Jouer depuis le début"
+msgstr "Lire depuis le début"
 
-#: editor.cc:1997
+#: gtk2_ardour/editor.cc:1803
 msgid "Play region"
-msgstr "Jouer la région"
+msgstr "Lire la région"
 
-#: editor.cc:1999
+#: gtk2_ardour/editor.cc:1805
 msgid "Loop Region"
-msgstr "Boucler sur la région"
+msgstr "Lire la région en boucle"
 
-#: editor.cc:2009 editor.cc:2090
+#: gtk2_ardour/editor.cc:1815 gtk2_ardour/editor.cc:1896
 msgid "Select All in track"
-msgstr "Tout sélectionner dans la piste"
+msgstr "Sélectionner tout dans la piste"
 
-#: editor.cc:2010 editor.cc:2091 redirect_box.cc:1067
+#: gtk2_ardour/editor.cc:1816 gtk2_ardour/editor.cc:1897
+#: gtk2_ardour/redirect_box.cc:1157
 msgid "Select All"
-msgstr "Tout sélectionner"
+msgstr "Sélectionner tout"
 
-#: editor.cc:2011 editor.cc:2092
-#, fuzzy
+#: gtk2_ardour/editor.cc:1817 gtk2_ardour/editor.cc:1898
 msgid "Invert selection in track"
-msgstr "Inverser dans la piste"
+msgstr "Inverser la sélection dans la piste"
 
-#: editor.cc:2012 editor.cc:2093
-#, fuzzy
+#: gtk2_ardour/editor.cc:1818 gtk2_ardour/editor.cc:1899
 msgid "Invert selection"
-msgstr "déplacer la sélection"
+msgstr "inverser la sélection"
 
-#: editor.cc:2017 editor.cc:2095
-#, fuzzy
+#: gtk2_ardour/editor.cc:1823 gtk2_ardour/editor.cc:1901
 msgid "Select all after edit cursor"
-msgstr "Démarrer depuis le curseur d'édition"
+msgstr "Sélectionner tout après le curseur d'édition"
 
-#: editor.cc:2018 editor.cc:2096
-#, fuzzy
+#: gtk2_ardour/editor.cc:1824 gtk2_ardour/editor.cc:1902
 msgid "Select all before edit cursor"
-msgstr "Démarrer depuis le curseur d'édition"
+msgstr "sélectionner tout avant le curseur d'édition"
 
-#: editor.cc:2019 editor.cc:2097
-#, fuzzy
+#: gtk2_ardour/editor.cc:1825 gtk2_ardour/editor.cc:1903
 msgid "Select all after playhead"
-msgstr "Jouer depuis la tête de lecture"
+msgstr "Sélectionner tout après la tête de lecture"
 
-#: editor.cc:2020 editor.cc:2098
-#, fuzzy
+#: gtk2_ardour/editor.cc:1826 gtk2_ardour/editor.cc:1904
 msgid "Select all before playhead"
-msgstr "Jouer depuis la tête de lecture"
+msgstr "Sélectionner tout avant la tête de lecture"
 
-#: editor.cc:2021
-#, fuzzy
+#: gtk2_ardour/editor.cc:1827
 msgid "Select all between cursors"
-msgstr "Démarrer depuis le curseur d'édition"
+msgstr "Sélectionner tout entre les 2 curseurs"
 
-#. standard editing stuff
-#: editor.cc:2032 editor.cc:2108 editor.cc:3483 editor_actions.cc:214
-#: redirect_box.cc:1060
+#: gtk2_ardour/editor.cc:1830 gtk2_ardour/editor.cc:1906
+msgid "Select"
+msgstr "Sélectionner"
+
+#: gtk2_ardour/editor.cc:1838 gtk2_ardour/editor.cc:1914
+#: gtk2_ardour/editor_actions.cc:217 gtk2_ardour/redirect_box.cc:1150
 msgid "Cut"
 msgstr "Couper"
 
-#: editor.cc:2033 editor.cc:2109 editor.cc:3485 editor_actions.cc:219
-#: redirect_box.cc:1062
+#: gtk2_ardour/editor.cc:1839 gtk2_ardour/editor.cc:1915
+#: gtk2_ardour/editor_actions.cc:222 gtk2_ardour/redirect_box.cc:1152
 msgid "Copy"
 msgstr "Copier"
 
-#: editor.cc:2034
+#: gtk2_ardour/editor.cc:1840
 msgid "Paste at edit cursor"
 msgstr "Coller au curseur d'édition"
 
-#: editor.cc:2035
+#: gtk2_ardour/editor.cc:1841
 msgid "Paste at mouse"
 msgstr "Coller au pointeur de la souris"
 
-#: editor.cc:2039 editor.cc:3490
+#: gtk2_ardour/editor.cc:1845
 msgid "Align"
 msgstr "Aligner"
 
-#: editor.cc:2040 editor.cc:3492
+#: gtk2_ardour/editor.cc:1846
 msgid "Align Relative"
 msgstr "Aligner relativement"
 
-#: editor.cc:2044
+#: gtk2_ardour/editor.cc:1850
 msgid "Insert chunk"
 msgstr "Insérer un fragment"
 
-#: editor.cc:2051
-#, fuzzy
+#: gtk2_ardour/editor.cc:1857
 msgid "Insert Selected Region"
-msgstr "définir les régions sélectionnées"
+msgstr "Insérer la région sélectionnée"
 
-#: editor.cc:2052
+#: gtk2_ardour/editor.cc:1858
 msgid "Insert Existing Audio"
-msgstr ""
+msgstr "Insérer des fichiers audio externes"
 
-#: editor.cc:2061 editor.cc:2117
+#: gtk2_ardour/editor.cc:1867 gtk2_ardour/editor.cc:1923
 msgid "Nudge entire track fwd"
-msgstr "Décaler la piste entière en avant"
+msgstr "Décaler toute la piste à droite"
 
-#: editor.cc:2062 editor.cc:2118
+#: gtk2_ardour/editor.cc:1868 gtk2_ardour/editor.cc:1924
 msgid "Nudge track after edit cursor fwd"
-msgstr "Décaler la piste vers l'avant après le curseur d'édition"
+msgstr "Décaler à droite les régions après le curseur"
 
-#: editor.cc:2063 editor.cc:2119
+#: gtk2_ardour/editor.cc:1869 gtk2_ardour/editor.cc:1925
 msgid "Nudge entire track bwd"
-msgstr "Décaler la piste entière vers l'arrière"
+msgstr "Décaler toute la piste à gauche"
 
-#: editor.cc:2064 editor.cc:2120
+#: gtk2_ardour/editor.cc:1870 gtk2_ardour/editor.cc:1926
 msgid "Nudge track after edit cursor bwd"
-msgstr "Décaler la piste vers l'arrière après le curseur d'édition"
+msgstr "Décaler à gauche les régions après le curseur"
 
-#: editor.cc:2110 editor.cc:3487 editor_actions.cc:221 redirect_box.cc:1064
+#: gtk2_ardour/editor.cc:1916 gtk2_ardour/editor_actions.cc:224
+#: gtk2_ardour/redirect_box.cc:1154
 msgid "Paste"
 msgstr "Coller"
 
-#: editor.cc:2630
-msgid "select/move objects"
-msgstr "sélectionner/déplacer des objets"
+#: gtk2_ardour/editor.cc:2501
+msgid "Select/Move Objects"
+msgstr "pour sélectionner ou déplacer des objets"
 
-#: editor.cc:2631
-msgid "select/move ranges"
-msgstr "sélectionner/déplacer des intervalles"
+#: gtk2_ardour/editor.cc:2502
+msgid "Select/Move Ranges"
+msgstr "pour travailler sur la zone de sélection"
 
-#: editor.cc:2632
-msgid "draw gain automation"
-msgstr "dessiner l'automatisation du gain"
+#: gtk2_ardour/editor.cc:2503
+msgid "Draw Gain Automation"
+msgstr "pour dessiner la courbe de gain"
 
-#: editor.cc:2633
-msgid "select zoom range"
-msgstr "sélectionner la plage de zoom"
+#: gtk2_ardour/editor.cc:2504
+msgid "Select Zoom Range"
+msgstr "pour sélectionner l'intervalle de zoom"
 
-#: editor.cc:2634
-msgid "stretch/shrink regions"
-msgstr "étirer/rétrécir les régions"
+#: gtk2_ardour/editor.cc:2505
+msgid "Stretch/Shrink Regions"
+msgstr "pour étirer ou contracter des régions"
 
-#: editor.cc:2635
-#, fuzzy
-msgid "listen to specific regions"
-msgstr "Écouter des régions spécifiques"
+#: gtk2_ardour/editor.cc:2506
+msgid "Listen to Specific Regions"
+msgstr "pour écouter les régions une par une"
 
-#: editor.cc:2746
-msgid "Start:"
-msgstr "Début :"
+#: gtk2_ardour/editor.cc:2536 gtk2_ardour/editor_actions.cc:143
+msgid "Zoom In"
+msgstr "zoom avant"
 
-#: editor.cc:2747
-msgid "End:"
-msgstr "Fin :"
+#: gtk2_ardour/editor.cc:2542 gtk2_ardour/editor_actions.cc:141
+msgid "Zoom Out"
+msgstr "zoom arrière"
 
-#: editor.cc:3362 editor.cc:3402
-#, fuzzy
-msgid "set selected regions"
-msgstr "définir les régions sélectionnées"
+#: gtk2_ardour/editor.cc:2548 gtk2_ardour/editor_actions.cc:145
+msgid "Zoom to Session"
+msgstr "montrer toute la session"
 
-#: editor.cc:3458 editor_actions.cc:204
+#: gtk2_ardour/editor.cc:2554
+msgid "Zoom focus"
+msgstr "zoomer vers"
+
+#: gtk2_ardour/editor.cc:2570
+msgid "Unit to snap cursors and ranges to"
+msgstr "Unité d'alignement des curseurs et zones"
+
+#: gtk2_ardour/editor.cc:2818 gtk2_ardour/editor_actions.cc:207
 msgid "Undo"
 msgstr "Annuler"
 
-#: editor.cc:3460
+#: gtk2_ardour/editor.cc:2820
 msgid "Undo (%1)"
 msgstr "Annuler (%1)"
 
-#: editor.cc:3470 editor_actions.cc:206
+#: gtk2_ardour/editor.cc:2827 gtk2_ardour/editor_actions.cc:209
 msgid "Redo"
 msgstr "Refaire"
 
-#: editor.cc:3472
+#: gtk2_ardour/editor.cc:2829
 msgid "Redo (%1)"
 msgstr "Refaire (%1)"
 
-#: editor.cc:3506
-msgid "... as new track"
-msgstr ""
-
-#: editor.cc:3507
-#, fuzzy
-msgid "... as new region"
-msgstr "aligner la région"
-
-#: editor.cc:3509
-msgid "Import audio (copy)"
-msgstr "Importer audio (copie)"
-
-#: editor.cc:3512
-msgid "Remove last capture"
-msgstr "Enlever la dernière capture"
-
-#: editor.cc:3536
+#: gtk2_ardour/editor.cc:2843
 msgid "Duplicate how many times?"
 msgstr "Dupliquer combien de fois ?"
 
-#: editor.cc:4022
+#: gtk2_ardour/editor.cc:2925
+msgid "Splice Edit"
+msgstr "adjacent"
+
+#: gtk2_ardour/editor.cc:2927
+msgid "Slide Edit"
+msgstr "superposable"
+
+#: gtk2_ardour/editor.cc:3281
 msgid ""
 "Playlist %1 is currently unused.\n"
 "If left alone, no audio files used by it will be cleaned.\n"
 "If deleted, audio files used by it alone by will cleaned."
 msgstr ""
 "La liste de lecture %1 n'est pas utilisée.\n"
-"Si vous la convervez, aucun fichier audio qu'elle utilise ne sera nettoyé.\n"
+"Si vous la conservez, aucun fichier audio qu'elle utilise ne sera nettoyé.\n"
 "Si vous l'effacez, les fichiers audio qu'elle seule utilise seront nettoyés."
 
-#: editor.cc:4030
+#: gtk2_ardour/editor.cc:3291
 msgid "Delete playlist"
-msgstr "Supprimer la playlist"
+msgstr "Supprimer la liste de lecture"
 
-#: editor.cc:4031
+#: gtk2_ardour/editor.cc:3292
 msgid "Keep playlist"
-msgstr "Garder la playlist"
+msgstr "Garder la liste de lecture"
 
-#: editor.cc:4032 editor_audio_import.cc:236 editor_ops.cc:2048
-#: editor_timefx.cc:71 export_dialog.cc:971 io_selector.cc:59
-#: io_selector.cc:793 redirect_box.cc:903 tempo_dialog.cc:20
-#: tempo_dialog.cc:37 tempo_dialog.cc:202 tempo_dialog.cc:220
+#: gtk2_ardour/editor.cc:3293 gtk2_ardour/editor_audio_import.cc:366
+#: gtk2_ardour/editor_ops.cc:1756 gtk2_ardour/editor_timefx.cc:77
+#: gtk2_ardour/export_dialog.cc:973 gtk2_ardour/io_selector.cc:60
+#: gtk2_ardour/io_selector.cc:748 gtk2_ardour/redirect_box.cc:977
+#: gtk2_ardour/tempo_dialog.cc:22 gtk2_ardour/tempo_dialog.cc:41
+#: gtk2_ardour/tempo_dialog.cc:158 gtk2_ardour/tempo_dialog.cc:176
+#: gtk2_ardour/connection_editor.cc:59
 msgid "Cancel"
 msgstr "Annuler"
 
-#: editor.cc:4199
-#, fuzzy
+#: gtk2_ardour/editor.cc:3461
+msgid "New name of snapshot"
+msgstr "Nouveau nom du cliché"
+
+#: gtk2_ardour/editor.cc:3479
+msgid ""
+"Do you really want to remove snapshot \"%1\" ?\n"
+"(cannot be undone)"
+msgstr ""
+"Voulez-vous vraiment supprimer le cliché « %1 » ?\n"
+"(cela ne pourra pas être annulé)"
+
+#: gtk2_ardour/editor.cc:3481 gtk2_ardour/editor_ops.cc:181
+#: gtk2_ardour/editor_ops.cc:3162 gtk2_ardour/route_ui.cc:783
+#: gtk2_ardour/visual_time_axis.cc:282
+msgid "No, do nothing."
+msgstr "Non, ne rien faire"
+
+#: gtk2_ardour/editor.cc:3482 gtk2_ardour/route_ui.cc:784
+#: gtk2_ardour/visual_time_axis.cc:283
+msgid "Yes, remove it."
+msgstr "Oui, supprimer"
+
+#: gtk2_ardour/editor.cc:3586
 msgid "new playlists"
-msgstr "Garder la playlist"
+msgstr "nouvelles listes de lecture"
 
-#: editor.cc:4207
-#, fuzzy
+#: gtk2_ardour/editor.cc:3594
 msgid "copy playlists"
-msgstr "Garder la playlist"
+msgstr "copier les listes de lecture"
 
-#: editor.cc:4215
-#, fuzzy
+#: gtk2_ardour/editor.cc:3602
 msgid "clear playlists"
-msgstr "effacer la liste de lecture"
+msgstr "effacer les listes de lecture"
 
-#: editor_actions.cc:28
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:29
 msgid "Select regions"
-msgstr "sélectionner les régions"
+msgstr "sélectionner"
 
-#: editor_actions.cc:29
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:30
 msgid "Select range operations"
-msgstr "sélectionner les régions"
+msgstr "zone de sélection"
 
-#: editor_actions.cc:30
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:31
 msgid "Move edit cursor"
-msgstr "Coller au curseur d'édition"
+msgstr "curseur d'édition"
 
-#: editor_actions.cc:31
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:32
 msgid "Region operations"
-msgstr "Régions/création"
+msgstr "régions"
 
-#: editor_actions.cc:32
+#: gtk2_ardour/editor_actions.cc:33
 msgid "Tools"
-msgstr ""
+msgstr "Outils"
 
-#: editor_actions.cc:33
+#: gtk2_ardour/editor_actions.cc:34
 msgid "View"
-msgstr ""
+msgstr "Affichage"
 
-#: editor_actions.cc:34
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:35
 msgid "ZoomFocus"
-msgstr "Focus du zoom"
+msgstr "zoomer vers"
 
-#: editor_actions.cc:35
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:36
 msgid "Meter hold"
-msgstr "Maintien du pic de vu-mètre"
+msgstr "Maintien de la crête de vu-mètre"
 
-#: editor_actions.cc:36
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:37
 msgid "Meter falloff"
-msgstr "Temps de chute du vu-mètre"
+msgstr "Taux de chute du vu-mètre"
 
-#: editor_actions.cc:38
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:39
 msgid "Crossfades"
-msgstr "Modèle de fondu enchaîné"
+msgstr "Fondus enchaînés"
 
-#: editor_actions.cc:39
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:40
 msgid "Monitoring"
-msgstr "Utiliser la pré-écoute matérielle"
+msgstr "Monitoring"
 
-#: editor_actions.cc:40
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:41
 msgid "Autoconnect"
-msgstr "Reconnecter"
+msgstr "Connexions automatiques"
 
-#: editor_actions.cc:41
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:42
 msgid "Layering"
-msgstr "Couche"
+msgstr "Empilement des régions"
 
-#: editor_actions.cc:42
-#, fuzzy
-msgid "Metering"
-msgstr "Vu-mètre"
+#: gtk2_ardour/editor_actions.cc:43
+msgid "Timecode fps"
+msgstr "Timecode (trames/s)"
 
-#: editor_actions.cc:43
-msgid "Fall off rate"
-msgstr ""
+#: gtk2_ardour/editor_actions.cc:44
+msgid "Pullup / Pulldown"
+msgstr "Pullup / Pulldown"
 
-#: editor_actions.cc:44
-msgid "Hold Time"
-msgstr ""
+#: gtk2_ardour/editor_actions.cc:45
+msgid "Subframes"
+msgstr "Sous-trames"
 
-#: editor_actions.cc:45
+#: gtk2_ardour/editor_actions.cc:46
 msgid "Add Existing Audio"
-msgstr ""
+msgstr "Importer"
 
-#. add named actions for the editor
-#: editor_actions.cc:50
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:51
 msgid "Show Editor Mixer"
-msgstr "Montrer toutes les tranches de mixage de piste audio"
+msgstr "Afficher la tranche de mix"
 
-#: editor_actions.cc:55
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:56
 msgid "Span Entire Overlap"
-msgstr "Mesurer le recouvrement de régions en entier"
+msgstr "Long (toute la zone de recouvrement)"
 
-#: editor_actions.cc:57 editor_actions.cc:384
-msgid "Short"
-msgstr "Court"
-
-#: editor_actions.cc:64
+#: gtk2_ardour/editor_actions.cc:65
 msgid "Created Automatically"
-msgstr ""
+msgstr "créé automatiquement"
 
-#: editor_actions.cc:67
+#: gtk2_ardour/editor_actions.cc:68
 msgid "Playhead to Next Region Start"
-msgstr ""
+msgstr "début de la région suivante"
 
-#: editor_actions.cc:69
+#: gtk2_ardour/editor_actions.cc:70
 msgid "Playhead to Next Region End"
-msgstr ""
+msgstr "fin de la région suivante"
 
-#: editor_actions.cc:71
+#: gtk2_ardour/editor_actions.cc:72
 msgid "Playhead to Next Region Sync"
-msgstr ""
+msgstr "synchro de la région suivante"
 
-#: editor_actions.cc:74
+#: gtk2_ardour/editor_actions.cc:75
 msgid "Playhead to Previous Region Start"
-msgstr ""
+msgstr "début de la région précédente"
 
-#: editor_actions.cc:76
+#: gtk2_ardour/editor_actions.cc:77
 msgid "Playhead to Previous Region End"
-msgstr ""
+msgstr "fin de la région précédente"
 
-#: editor_actions.cc:78
+#: gtk2_ardour/editor_actions.cc:79
 msgid "Playhead to Previous Region Sync"
-msgstr ""
+msgstr "synchro de la région précédente"
 
-#: editor_actions.cc:81
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:82
 msgid "Edit Cursor to Next Region Start"
-msgstr "Curseur d'édition à la fin"
+msgstr "début de la région suivante"
 
-#: editor_actions.cc:83
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:84
 msgid "Edit Cursor to Next Region End"
-msgstr "Curseur d'édition à la fin"
+msgstr "fin de la région suivante"
 
-#: editor_actions.cc:85
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:86
 msgid "Edit Cursor to Next Region Sync"
-msgstr "Curseur d'édition à la fin"
+msgstr "synchro de la région suivante"
 
-#: editor_actions.cc:88
+#: gtk2_ardour/editor_actions.cc:89
 msgid "Edit Cursor to Previous Region Start"
-msgstr ""
+msgstr "début de la région précédente"
 
-#: editor_actions.cc:90
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:91
 msgid "Edit Cursor to Previous Region End"
-msgstr "Curseur d'édition à la fin"
+msgstr "fin de la région précédente"
 
-#: editor_actions.cc:92
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:93
 msgid "Edit Cursor to Previous Region Sync"
-msgstr "Curseur d'édition à la fin"
+msgstr "synchro de la région précédente"
 
-#: editor_actions.cc:95
+#: gtk2_ardour/editor_actions.cc:96
 msgid "Playhead to Range Start"
-msgstr ""
+msgstr "début de la région"
 
-#: editor_actions.cc:97
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:98
 msgid "Playhead to Range End"
-msgstr "Jouer l'intervalle de boucle"
+msgstr "fin de la région"
 
-#: editor_actions.cc:100
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:101
 msgid "Edit Cursor to Range Start"
-msgstr "Curseur d'édition à la fin"
+msgstr "début de la région"
 
-#: editor_actions.cc:102
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:103
 msgid "Edit Cursor to Range End"
-msgstr "Curseur d'édition à la fin"
+msgstr "fin de la région"
 
-#: editor_actions.cc:105 editor_ops.cc:1363
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:106 gtk2_ardour/editor_selection.cc:726
 msgid "select all"
-msgstr "Tout sélectionner"
+msgstr "sélectionner tout"
 
-#: editor_actions.cc:107
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:108
 msgid "Select All After Edit Cursor"
-msgstr "définir la synchro. au curseur d'édition"
+msgstr "tout après le curseur d'édition"
 
-#: editor_actions.cc:109
+#: gtk2_ardour/editor_actions.cc:110
 msgid "Select All Before Edit Cursor"
-msgstr ""
+msgstr "tout avant le curseur d'édition"
 
-#: editor_actions.cc:112
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:113
 msgid "Select All After Playhead"
-msgstr "Jouer depuis la tête de lecture"
+msgstr "tout après la tête de lecture"
 
-#: editor_actions.cc:114
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:115
 msgid "Select All Before Playhead"
-msgstr "Jouer depuis la tête de lecture"
+msgstr "tout avant la tête de lecture"
 
-#: editor_actions.cc:116
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:117
 msgid "Select All Between Cursors"
-msgstr "définir la synchro. au curseur d'édition"
+msgstr "tout entre les 2 curseurs"
 
-#: editor_actions.cc:119
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:120
 msgid "Select All in Punch Range"
-msgstr "Définir l'intervalle d'insertion"
+msgstr "tout dans l'intervalle de punch in/out"
 
-#: editor_actions.cc:121
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:122
 msgid "Select All in Loop Range"
-msgstr "Sélectionner l'intervalle de boucle"
+msgstr "tout dans l'intervalle de boucle"
 
-#: editor_actions.cc:124
+#: gtk2_ardour/editor_actions.cc:125
 msgid "Jump Forward to Mark"
-msgstr ""
+msgstr "repère suivant"
 
-#: editor_actions.cc:126
+#: gtk2_ardour/editor_actions.cc:127
 msgid "Jump Backward to Mark"
-msgstr ""
+msgstr "repère précédent"
 
-#: editor_actions.cc:128
-#, fuzzy
-msgid "Add Location from Playhead"
-msgstr "Jouer depuis la tête de lecture"
+#: gtk2_ardour/editor_actions.cc:129
+msgid "Add Mark from Playhead"
+msgstr "créer un repère à la tête de lecture"
 
-#: editor_actions.cc:131
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:132
 msgid "Nudge Forward"
-msgstr "décaler vers l'avant"
+msgstr "décaler vers la droite"
 
-#: editor_actions.cc:133
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:134
 msgid "Nudge Next Forward"
-msgstr "décaler vers l'avant"
+msgstr "décaler suivant vers la droite"
 
-#: editor_actions.cc:135
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:136
 msgid "Nudge Backward"
-msgstr "Décaler vers l'arrière"
+msgstr "Décaler vers la gauche"
 
-#: editor_actions.cc:137
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:138
 msgid "Nudge Next Backward"
-msgstr "Décaler la piste entière en avant"
+msgstr "décaler suivant vers la gauche"
 
-#: editor_actions.cc:140
-#, fuzzy
-msgid "Zoom Out"
-msgstr "Zoom arrière"
-
-#: editor_actions.cc:142
-#, fuzzy
-msgid "Zoom In"
-msgstr "Zoom avant"
-
-#: editor_actions.cc:144
-#, fuzzy
-msgid "Zoom to Session"
-msgstr "Zoomer vers la session"
-
-#: editor_actions.cc:147
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:148
 msgid "Scroll Tracks Up"
-msgstr "Remplir la piste"
+msgstr "monter d'une page"
 
-#: editor_actions.cc:149
+#: gtk2_ardour/editor_actions.cc:150
 msgid "Scroll Tracks Down"
-msgstr ""
+msgstr "descendre d'une page"
 
-#: editor_actions.cc:151
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:152
 msgid "Step Tracks Up"
-msgstr "décaler la piste"
+msgstr "défiler vers le haut"
 
-#: editor_actions.cc:153
+#: gtk2_ardour/editor_actions.cc:154
 msgid "Step Tracks Down"
-msgstr ""
+msgstr "défiler vers le bas"
 
-#: editor_actions.cc:156
+#: gtk2_ardour/editor_actions.cc:157
 msgid "Scroll Backward"
-msgstr ""
+msgstr "défiler en arrière"
 
-#: editor_actions.cc:158
+#: gtk2_ardour/editor_actions.cc:159
 msgid "Scroll Forward"
-msgstr ""
+msgstr "défiler en avant"
 
-#: editor_actions.cc:160
+#: gtk2_ardour/editor_actions.cc:161
 msgid "goto"
-msgstr ""
+msgstr "aller à"
 
-#: editor_actions.cc:162
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:163
 msgid "Center Playhead"
-msgstr "Tête de lecture"
+msgstr "centrer sur la tête de lecture"
 
-#: editor_actions.cc:164
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:165
 msgid "Center Edit Cursor"
-msgstr "Curseur d'édition"
+msgstr "centrer sur le curseur d'édition"
 
-#: editor_actions.cc:166
-#, fuzzy
-msgid "Playhead Forward"
-msgstr "Tête de lecture"
+#: gtk2_ardour/editor_actions.cc:168
+msgid "Playhead forward"
+msgstr "tête de lecture en avant"
 
-#: editor_actions.cc:168
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:170
 msgid "Playhead Backward"
-msgstr "Tête de lecture"
+msgstr "tête de lecture en arrière"
 
-#: editor_actions.cc:170
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:173
 msgid "Playhead to Edit"
-msgstr "Tête de lecture"
+msgstr "sur le curseur d'édition"
 
-#: editor_actions.cc:172
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:175
 msgid "Edit to Playhead"
-msgstr "Jouer depuis la tête de lecture"
+msgstr "sur la tête de lecture"
 
-#: editor_actions.cc:175
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:178
 msgid "Align Regions Start"
-msgstr "Débuts de régions"
+msgstr "aligner le début des régions"
 
-#: editor_actions.cc:177
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:180
 msgid "Align Regions Start Relative"
-msgstr "Aligner la sélection (relativement)"
+msgstr "aligner relativement le début des régions"
 
-#: editor_actions.cc:179
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:182
 msgid "Align Regions End"
-msgstr "aligner la région"
+msgstr "aligner la fin des régions"
 
-#: editor_actions.cc:181
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:184
 msgid "Align Regions End Relative"
-msgstr "Aligner relativement"
+msgstr "aligner relativement la fin des régions"
 
-#: editor_actions.cc:184
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:187
 msgid "Align Regions Sync"
-msgstr "aligner la région"
+msgstr "aligner les synchro des régions"
 
-#: editor_actions.cc:186
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:189
 msgid "Align Regions Sync Relative"
-msgstr "Aligner relativement"
+msgstr "aligner relativement les synchro des régions"
 
-#: editor_actions.cc:189
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:192
 msgid "Audition at Mouse"
-msgstr "Audition"
+msgstr "écoute à la souris"
 
-#: editor_actions.cc:191
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:194
 msgid "Brush at Mouse"
-msgstr "Coller au pointeur de la souris"
+msgstr "brosse à la souris"
 
-#: editor_actions.cc:193
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:196
 msgid "Set Edit Cursor"
-msgstr "Curseur d'édition"
+msgstr "placer le curseur d'édition"
 
-#: editor_actions.cc:195
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:198
 msgid "Mute/Unmute Region"
-msgstr "Créer une région"
+msgstr "région muette/active"
 
-#: editor_actions.cc:197
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:200
 msgid "Set Playhead"
-msgstr "Tête de lecture"
+msgstr "placer la tête de lecture"
 
-#: editor_actions.cc:199
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:202
 msgid "Split Region"
-msgstr "Séparer la région"
+msgstr "découper la région"
 
-#: editor_actions.cc:201
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:204
 msgid "Set Region Sync Position"
-msgstr "Par position de région"
+msgstr "placer la synchro de région"
 
-#: editor_actions.cc:209
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:212
 msgid "Export Session"
-msgstr "Région"
+msgstr "exporter la session..."
 
-#: editor_actions.cc:211
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:214
 msgid "Export Range"
-msgstr "Séparer l'intervalle"
+msgstr "exporter la zone de sélection..."
 
-#. Note: for now, editor-delete does the exact same thing as editor-cut
-#: editor_actions.cc:217
+#: gtk2_ardour/editor_actions.cc:220 gtk2_ardour/connection_editor.cc:55
 msgid "Delete"
-msgstr "Supprimer"
+msgstr "Enlever"
 
-#: editor_actions.cc:223
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:226
 msgid "Duplicate Region"
 msgstr "dupliquer la région"
 
-#: editor_actions.cc:225
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:228
 msgid "Duplicate Range"
-msgstr "Dupliquer"
+msgstr "dupliquer la zone de sélection"
 
-#: editor_actions.cc:227
+#: gtk2_ardour/editor_actions.cc:230
 msgid "Insert Region"
 msgstr "Insérer une région"
 
-#: editor_actions.cc:229
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:232
 msgid "Reverse Region"
-msgstr "inverser les régions"
+msgstr "inverser la région"
 
-#: editor_actions.cc:231
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:234
 msgid "Normalize Region"
-msgstr "Normaliser"
+msgstr "normaliser la région"
 
-#: editor_actions.cc:233
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:236
 msgid "crop"
-msgstr "copier"
+msgstr "recadrer"
 
-#: editor_actions.cc:235
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:238
 msgid "Insert Chunk"
-msgstr "Insérer un fragment"
+msgstr "insérer un fragment"
 
-#: editor_actions.cc:238
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:241
 msgid "Split at edit cursor"
-msgstr "Démarrer depuis le curseur d'édition"
+msgstr "découper au curseur d'édition"
 
-#: editor_actions.cc:241
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:244
 msgid "Start Range"
-msgstr "Séparer l'intervalle"
+msgstr "zone de début"
 
-#: editor_actions.cc:243
+#: gtk2_ardour/editor_actions.cc:246
 msgid "Finish Range"
-msgstr ""
+msgstr "zone de fin"
 
-#: editor_actions.cc:245
+#: gtk2_ardour/editor_actions.cc:248
 msgid "Finish add Range"
-msgstr ""
+msgstr "Terminer l'ajout d'intervalle"
 
-#: editor_actions.cc:248
+#: gtk2_ardour/editor_actions.cc:251
 msgid "Extend Range to End of Region"
-msgstr ""
+msgstr "étendre à la fin de la région"
 
-#: editor_actions.cc:250
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:253
 msgid "Extend Range to Start of Region"
-msgstr "Aller au début de la session"
+msgstr "étendre au début de la région"
 
-#: editor_actions.cc:253
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:256
 msgid "Follow Playhead"
-msgstr "Suivre la tête de lecture"
+msgstr "suivre la tête de lecture"
 
-#: editor_actions.cc:261
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:264
 msgid "Zoom Focus Left"
-msgstr "Focus du zoom"
+msgstr "la gauche"
 
-#: editor_actions.cc:263
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:266
 msgid "Zoom Focus Right"
-msgstr "Focus du zoom"
+msgstr "la droite"
 
-#: editor_actions.cc:265
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:268
 msgid "Zoom Focus Center"
-msgstr "Focus du zoom"
+msgstr "le centre"
 
-#: editor_actions.cc:267
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:270
 msgid "Zoom Focus Playhead"
-msgstr "Focus du zoom"
+msgstr "la tête de lecture"
 
-#: editor_actions.cc:269
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:272
 msgid "Zoom Focus Edit"
-msgstr "Focus du zoom"
+msgstr "le curseur d'édition"
 
-#: editor_actions.cc:275
+#: gtk2_ardour/editor_actions.cc:278
 msgid "Object Tool"
-msgstr ""
+msgstr "outil d'objet"
 
-#: editor_actions.cc:276
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:279
 msgid "Range Tool"
-msgstr "Intervalle"
+msgstr "outil de zone de sélection"
 
-#: editor_actions.cc:277
+#: gtk2_ardour/editor_actions.cc:280
 msgid "Gain Tool"
-msgstr ""
+msgstr "outil de gain"
 
-#: editor_actions.cc:278
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:281
 msgid "Zoom Tool"
-msgstr "Zoom arrière"
+msgstr "outil de zoom"
 
-#: editor_actions.cc:279
+#: gtk2_ardour/editor_actions.cc:282
 msgid "Timefx Tool"
-msgstr ""
+msgstr "outil d'étirement/contraction"
 
-#: editor_actions.cc:286
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:284
+msgid "Snap To"
+msgstr "aligner sur"
+
+#: gtk2_ardour/editor_actions.cc:285
+msgid "Snap Mode"
+msgstr "mode d'alignement"
+
+#: gtk2_ardour/editor_actions.cc:294
 msgid "Snap to frame"
-msgstr "Snap mode"
+msgstr "aligner sur la trame"
 
-#: editor_actions.cc:287
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:295
 msgid "Snap to cd frame"
-msgstr "Snap mode"
+msgstr "aligner sur la trame de CD"
 
-#: editor_actions.cc:288
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:296
 msgid "Snap to SMPTE frame"
-msgstr "Trames SMPTE"
+msgstr "aligner sur la trame SMPTE"
 
-#: editor_actions.cc:289
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:297
 msgid "Snap to SMPTE seconds"
-msgstr "Secondes SMPTE"
+msgstr "aligner sur les secondes SMPTE"
 
-#: editor_actions.cc:290
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:298
 msgid "Snap to SMPTE minutes"
-msgstr "Minutes SMPTE"
+msgstr "aligner sur les minutes SMPTE"
 
-#: editor_actions.cc:291
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:299
 msgid "Snap to seconds"
-msgstr "3 secondes"
+msgstr "aligner sur les secondes"
 
-#: editor_actions.cc:292
+#: gtk2_ardour/editor_actions.cc:300
 msgid "Snap to minutes"
-msgstr ""
+msgstr "aligner sur les minutes"
 
-#: editor_actions.cc:293
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:301
 msgid "Snap to thirtyseconds"
-msgstr "trente-deuxième (32)"
+msgstr "aligner sur les 32ème de seconde"
 
-#: editor_actions.cc:294
+#: gtk2_ardour/editor_actions.cc:302
 msgid "Snap to asixteenthbeat"
-msgstr ""
+msgstr "aligner sur un 16ème de temps"
 
-#: editor_actions.cc:295
+#: gtk2_ardour/editor_actions.cc:303
 msgid "Snap to eighths"
-msgstr ""
+msgstr "aligner sur les 8ème de temps"
 
-#: editor_actions.cc:296
+#: gtk2_ardour/editor_actions.cc:304
 msgid "Snap to quarters"
-msgstr ""
+msgstr "aligner sur les quart de temps"
 
-#: editor_actions.cc:297
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:305
 msgid "Snap to thirds"
-msgstr "Snap mode"
+msgstr "aligner sur les triolets"
 
-#: editor_actions.cc:298
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:306
 msgid "Snap to beat"
-msgstr "Snap mode"
+msgstr "les temps"
 
-#: editor_actions.cc:299
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:307
 msgid "Snap to bar"
-msgstr "Snap to"
+msgstr "les mesures"
 
-#: editor_actions.cc:300
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:308
 msgid "Snap to mark"
-msgstr "ajouter un marqueur de tempo"
+msgstr "aligner sur le repère"
 
-#: editor_actions.cc:301
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:309
 msgid "Snap to edit cursor"
-msgstr "Démarrer depuis le curseur d'édition"
+msgstr "aligner sur le curseur d'édition"
 
-#: editor_actions.cc:302
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:310
 msgid "Snap to region start"
-msgstr "Débuts de régions"
+msgstr "aligner sur le début de région"
 
-#: editor_actions.cc:303
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:311
 msgid "Snap to region end"
-msgstr "Fins de régions"
+msgstr "aligner sur la fin de région"
 
-#: editor_actions.cc:304
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:312
 msgid "Snap to region sync"
-msgstr "Syncro. de régions"
+msgstr "aligne sur la synchro de région"
 
-#: editor_actions.cc:305
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:313
 msgid "Snap to region boundary"
-msgstr "Limites de régions"
+msgstr "aligner sur les limites de région"
 
-#. the region list popup menu
-#: editor_actions.cc:314
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:322
 msgid "Sort"
-msgstr "Court"
+msgstr "trier"
 
-#: editor_actions.cc:322
+#: gtk2_ardour/editor_actions.cc:330
 msgid "Show all"
-msgstr "Tout montrer"
+msgstr "afficher tout"
 
-#: editor_actions.cc:323
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:331
 msgid "Show automatic regions"
-msgstr "montrer toute l'automatisation"
+msgstr "afficher les régions automatiques"
 
-#: editor_actions.cc:325
+#: gtk2_ardour/editor_actions.cc:333
 msgid "Ascending"
-msgstr "Montant"
+msgstr "croissant"
 
-#: editor_actions.cc:327
+#: gtk2_ardour/editor_actions.cc:335
 msgid "Descending"
-msgstr "Descendant"
+msgstr "décroissant"
 
-#: editor_actions.cc:330
+#: gtk2_ardour/editor_actions.cc:338
 msgid "By Region Name"
-msgstr "Par nom de région"
+msgstr "par nom de région"
 
-#: editor_actions.cc:332
+#: gtk2_ardour/editor_actions.cc:340
 msgid "By Region Length"
-msgstr "Par longueur de région"
+msgstr "par longueur de région"
 
-#: editor_actions.cc:334
+#: gtk2_ardour/editor_actions.cc:342
 msgid "By Region Position"
-msgstr "Par position de région"
+msgstr "par position de région"
 
-#: editor_actions.cc:336
+#: gtk2_ardour/editor_actions.cc:344
 msgid "By Region Timestamp"
-msgstr "Par date de région"
+msgstr "par date de région"
 
-#: editor_actions.cc:338
+#: gtk2_ardour/editor_actions.cc:346
 msgid "By Region Start in File"
-msgstr "Par début de région dans le fichier"
+msgstr "par début de région (dans le fichier)"
 
-#: editor_actions.cc:340
+#: gtk2_ardour/editor_actions.cc:348
 msgid "By Region End in File"
-msgstr "Par fin de région dans le fichier"
+msgstr "par fin de région (dans le fichier)"
 
-#: editor_actions.cc:342
+#: gtk2_ardour/editor_actions.cc:350
 msgid "By Source File Name"
-msgstr "Par nom de fichier source"
+msgstr "par nom de fichier source"
 
-#: editor_actions.cc:344
+#: gtk2_ardour/editor_actions.cc:352
 msgid "By Source File Length"
-msgstr "Par longueur de fichier source"
+msgstr "par longueur de fichier source"
 
-#: editor_actions.cc:346
+#: gtk2_ardour/editor_actions.cc:354
 msgid "By Source File Creation Date"
-msgstr "Par date de création du fichier source"
+msgstr "par date de création du fichier source"
 
-#: editor_actions.cc:348
+#: gtk2_ardour/editor_actions.cc:356
 msgid "By Source Filesystem"
-msgstr "Par système de fichier source"
+msgstr "par système de fichier source"
 
-#. the next two are duplicate items with different names for use in two different contexts
-#: editor_actions.cc:354
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:362
 msgid "Add External Audio"
-msgstr "Ajouter à la liste des régions externes"
+msgstr "importer des fichiers audio"
 
-#: editor_actions.cc:356
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:364
 msgid "as Region(s)"
-msgstr "Déplacer la/les région(s)"
+msgstr "vers la liste des régions..."
 
-#: editor_actions.cc:358
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:366
 msgid "as Tracks"
-msgstr "Pistes"
+msgstr "vers nouvelles pistes..."
 
-#: editor_actions.cc:360
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:368
+msgid "as Tape Tracks"
+msgstr "vers nouvelles pistes (mode cassette)..."
+
+#: gtk2_ardour/editor_actions.cc:370
 msgid "to Tracks"
-msgstr "Pistes"
+msgstr "vers les pistes sélectionnées..."
 
-#: editor_actions.cc:363
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:373
 msgid "Show Waveforms"
-msgstr "Montrer les formes d'onde"
+msgstr "formes d'onde"
 
-#: editor_actions.cc:364
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:374
 msgid "Show Waveforms While Recording"
-msgstr "Montrer les formes d'onde pendant l'enregistrement"
+msgstr "formes d'onde pendant l'enregistr."
 
-#: editor_actions.cc:365
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:375
 msgid "Show Measures"
-msgstr "Montrer les barres de mesures"
+msgstr "montrer les barres de mesures"
 
-#: editor_actions.cc:378 editor_actions.cc:385
-msgid "Medium"
-msgstr "Moyen"
-
-#: editor_actions.cc:380
-msgid "Faster"
-msgstr "Plus rapide"
-
-#: editor_actions.cc:386
-msgid "Long"
-msgstr "Long"
-
-#: editor_actions.cc:390
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:379
 msgid "Later is Higher"
-msgstr "Les dernières régions sont placées au-dessus"
+msgstr "ultérieures au dessus"
 
-#: editor_actions.cc:391
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:380
 msgid "Most Recently Moved/Added is Higher"
-msgstr ""
-"Les régions ajoutées/déplacées/élaguées en dernier sont placées au-dessus"
+msgstr "déplacées/ajoutées au dessus"
 
-#: editor_actions.cc:392
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:381
 msgid "Most Recently Added is Higher"
-msgstr ""
-"Les régions ajoutées/déplacées/élaguées en dernier sont placées au-dessus"
+msgstr "ajoutées au dessus"
 
-#: editor_audio_import.cc:72
-#, fuzzy
+#: gtk2_ardour/editor_actions.cc:385
+msgid "23.976"
+msgstr "23.976"
+
+#: gtk2_ardour/editor_actions.cc:386
+msgid "24"
+msgstr "24"
+
+#: gtk2_ardour/editor_actions.cc:387
+msgid "24.976"
+msgstr "24.976"
+
+#: gtk2_ardour/editor_actions.cc:388
+msgid "25"
+msgstr "25"
+
+#: gtk2_ardour/editor_actions.cc:389
+msgid "29.97"
+msgstr "29.97"
+
+#: gtk2_ardour/editor_actions.cc:390
+msgid "29.97 drop"
+msgstr "29.97 drop"
+
+#: gtk2_ardour/editor_actions.cc:391
+msgid "30"
+msgstr "30"
+
+#: gtk2_ardour/editor_actions.cc:392
+msgid "30 drop"
+msgstr "30 drop"
+
+#: gtk2_ardour/editor_actions.cc:393
+msgid "59.94"
+msgstr "59.94"
+
+#: gtk2_ardour/editor_actions.cc:394
+msgid "60"
+msgstr "60"
+
+#: gtk2_ardour/editor_actions.cc:398
+msgid "+4.1667% + 0.1%"
+msgstr "+4.1667% + 0.1%"
+
+#: gtk2_ardour/editor_actions.cc:399
+msgid "+4.1667%"
+msgstr "+4.1667%"
+
+#: gtk2_ardour/editor_actions.cc:400
+msgid "+4.1667% - 0.1%"
+msgstr "+4.1667% - 0.1%"
+
+#: gtk2_ardour/editor_actions.cc:401
+msgid "+ 0.1%"
+msgstr "+ 0.1%"
+
+#: gtk2_ardour/editor_actions.cc:403
+msgid "- 0.1%"
+msgstr "- 0.1%"
+
+#: gtk2_ardour/editor_actions.cc:404
+msgid "-4.1667% + 0.1%"
+msgstr "-4.1667% + 0.1%"
+
+#: gtk2_ardour/editor_actions.cc:405
+msgid "-4.1667%"
+msgstr "-4.1667%"
+
+#: gtk2_ardour/editor_actions.cc:406
+msgid "-4.1667% - 0.1%"
+msgstr "-4.1667% - 0.1%"
+
+#: gtk2_ardour/editor_actions.cc:410
+msgid "80 per frame"
+msgstr "80 par trame"
+
+#: gtk2_ardour/editor_actions.cc:411
+msgid "100 per frame"
+msgstr "100 par trame"
+
+#: gtk2_ardour/editor_actions.cc:714 gtk2_ardour/editor_actions.cc:759
+#: gtk2_ardour/editor_actions.cc:770 gtk2_ardour/editor_actions.cc:814
+#: gtk2_ardour/editor_actions.cc:824
+msgid "programming error: %1: %2"
+msgstr "programming error: %1: %2"
+
+#: gtk2_ardour/editor_actions.cc:985
+msgid "Configuraton is using unhandled subframes per frame value: %1"
+msgstr "La configuration utilise une valeur non prise en charge de sous-trames par trame : %1"
+
+#: gtk2_ardour/editor_audio_import.cc:84
 msgid "You can't import or embed an audiofile until you have a session loaded."
 msgstr ""
-"Vous ne pouvez pas importer un fichier audio avant d'avoir chargé une "
-"session."
+"Vous ne pouvez pas importer ou lier un fichier audio avant d'avoir chargé "
+"une session."
 
-#: editor_audio_import.cc:77
-#, fuzzy
+#: gtk2_ardour/editor_audio_import.cc:89
 msgid "Add existing audio to session"
-msgstr "montrer l'automatisation existante"
+msgstr "Import de fichiers audio dans la session"
 
-#: editor_audio_import.cc:142
-msgid "ardour: importing %1"
-msgstr "ardour : importation de %1"
+#: gtk2_ardour/editor_audio_import.cc:176
+msgid "Import as a %1 region"
+msgstr "Importer comme région %1"
 
-#: editor_audio_import.cc:146
+#: gtk2_ardour/editor_audio_import.cc:177
+msgid "multichannel"
+msgstr "multivoies"
+
+#: gtk2_ardour/editor_audio_import.cc:177 gtk2_ardour/export_dialog.cc:86
+msgid "stereo"
+msgstr "stéréo"
+
+#: gtk2_ardour/editor_audio_import.cc:178
+msgid "Import as multiple regions"
+msgstr "importer vers des régions multiples"
+
+#: gtk2_ardour/editor_audio_import.cc:180
+msgid ""
+"Paired files detected (%1, %2 ...).\n"
+"Do you want to:"
+msgstr ""
+"Paire de fichiers détectée (%1, %2 ...).\n"
+"Voulez-vous :"
+
+#: gtk2_ardour/editor_audio_import.cc:226
+msgid "importing %1"
+msgstr "importation de %1"
+
+#: gtk2_ardour/editor_audio_import.cc:232
 msgid "Cancel Import"
 msgstr "Annuler l'importation"
 
-#: editor_audio_import.cc:224
-#, fuzzy
+#: gtk2_ardour/editor_audio_import.cc:332
 msgid "Editor: cannot open file \"%1\", (%2)"
-msgstr "Éditeur : impossible d'ouvrir le fichier \"%1\" (%2)"
+msgstr "Éditeur : impossible d'ouvrir le fichier « %1 » (%2)"
 
-#: editor_audio_import.cc:232
-#, fuzzy
+#: gtk2_ardour/editor_audio_import.cc:340
 msgid "Cancel entire import"
-msgstr "Annuler l'importation"
+msgstr "Annuler toute l'importation"
 
-#: editor_audio_import.cc:233
-#, fuzzy
+#: gtk2_ardour/editor_audio_import.cc:341
 msgid "Don't embed it"
-msgstr "Ne pas %1"
+msgstr "Ne pas le lier"
 
-#: editor_audio_import.cc:234
+#: gtk2_ardour/editor_audio_import.cc:342
 msgid "Embed all without questions"
-msgstr ""
+msgstr "Lier tout sans poser de question"
 
-#: editor_audio_import.cc:239
-#, fuzzy
-msgid "Embed it anyway"
-msgstr "le %1 quand même"
-
-#: editor_audio_import.cc:242
+#: gtk2_ardour/editor_audio_import.cc:345
+#: gtk2_ardour/editor_audio_import.cc:370
 msgid ""
 "%1\n"
 "This audiofile's sample rate doesn't match the session sample rate!"
 msgstr ""
 "%1\n"
-"La fréquence d'échantillonage de ce fichier audio ne correspond pas à celle "
+"La fréquence d'échantillonnage de ce fichier audio ne correspond pas à celle "
 "de la session !"
 
-#: editor_audio_import.cc:275
+#: gtk2_ardour/editor_audio_import.cc:367
+msgid "Embed it anyway"
+msgstr "Lier quand même"
+
+#: gtk2_ardour/editor_audio_import.cc:417
 msgid "could not open %1"
 msgstr "impossible d'ouvrir %1"
 
-#: editor_audio_import.cc:320
+#: gtk2_ardour/editor_audio_import.cc:464
 msgid "insert sndfile"
-msgstr "Insérer un fichier son"
+msgstr "Insérer un fichier audio"
 
-#. stuff for the verbose canvas cursor
-#: editor_canvas.cc:118
+#: gtk2_ardour/editor_canvas.cc:118
 msgid "VerboseCanvasCursor"
 msgstr "VerboseCanvasCursor"
 
-#: editor_edit_groups.cc:53 mixer_ui.cc:736
-#, fuzzy
+#: gtk2_ardour/editor_canvas.cc:267
+msgid "edit cursor color not defined, check your ardour.colors file!"
+msgstr "Pas de couleur définie pour le curseur d'édition. Vérifiez votre fichier ardour.colors !"
+
+#: gtk2_ardour/editor_canvas.cc:272
+msgid "playhead color not defined, check your ardour.colors file!"
+msgstr "Pas de couleur définie pour la tête de lecture. Vérifiez votre fichier ardour.colors !"
+
+#: gtk2_ardour/editor_edit_groups.cc:52 gtk2_ardour/mixer_ui.cc:765
 msgid "Activate All"
-msgstr "Activer"
+msgstr "Activer tout"
 
-#: editor_edit_groups.cc:54 mixer_ui.cc:737
-#, fuzzy
+#: gtk2_ardour/editor_edit_groups.cc:53 gtk2_ardour/mixer_ui.cc:766
 msgid "Disable All"
-msgstr "Déconnecter tout"
+msgstr "désactiver tout"
 
-#: editor_edit_groups.cc:56 mixer_ui.cc:739
-#, fuzzy
+#: gtk2_ardour/editor_edit_groups.cc:55 gtk2_ardour/mixer_ui.cc:768
 msgid "Add group"
-msgstr "Pas de groupe"
+msgstr "ajouter un groupe"
 
-#: editor_edit_groups.cc:229 mixer_ui.cc:970
-#, fuzzy
+#: gtk2_ardour/editor_edit_groups.cc:228 gtk2_ardour/mixer_ui.cc:1009
 msgid "unnamed"
-msgstr "Renommer"
+msgstr "(sans nom)"
 
-#: editor_edit_groups.cc:258 mixer_ui.cc:834
+#: gtk2_ardour/editor_edit_groups.cc:257 gtk2_ardour/mixer_ui.cc:863
 msgid "-all-"
-msgstr "-tout-"
+msgstr "-(tout)-"
 
-#: editor_export_audio.cc:65
+#: gtk2_ardour/editor_export_audio.cc:66
 msgid ""
 "There is no selection to export.\n"
 "\n"
 "Select a selection using the range mouse mode"
 msgstr ""
+"Il n'y a aucune sélection à exporter.\n"
+"\n"
+"Sélectionnez une zone en utilisant le mode « sélection »"
 
-#: editor_export_audio.cc:110
+#: gtk2_ardour/editor_export_audio.cc:111
 msgid ""
 "There are no ranges to export.\n"
 "\n"
 "Create 1 or more ranges by dragging the mouse in the range bar"
 msgstr ""
+"Il n'y a rien à exporter.\n"
+"\n"
+"Sélectionnez des intervalles dans la barre des intervalles"
 
-#: editor_imageframe.cc:625 editor_imageframe.cc:655
+#: gtk2_ardour/editor_imageframe.cc:622 gtk2_ardour/editor_imageframe.cc:652
 msgid "programming error: no ImageFrameView selected"
-msgstr "erreur de programmation : aucun ImageFrameView selectionné"
+msgstr "programming error: no ImageFrameView selected"
 
-#: editor_imageframe.cc:848 editor_imageframe.cc:870
+#: gtk2_ardour/editor_imageframe.cc:845 gtk2_ardour/editor_imageframe.cc:867
 msgid "programming error: no MarkerView selected"
-msgstr "erreur de programmation : aucun MarkerView sélectionné"
+msgstr "programming error: no MarkerView selected"
 
-#: editor_keyboard.cc:104
-#, fuzzy
+#: gtk2_ardour/editor_keyboard.cc:104
 msgid "mute region"
-msgstr "Assourdir cette région"
+msgstr "rendre la région muette"
 
-#: editor_keys.cc:46
-#, fuzzy
+#: gtk2_ardour/editor_keys.cc:45
 msgid "keyboard selection"
-msgstr "étendre la sélection"
+msgstr "sélection au clavier"
 
-#: editor_markers.cc:292 editor_ops.cc:1290 editor_ops.cc:1303
-#: editor_ops.cc:1321 location_ui.cc:774
+#: gtk2_ardour/editor_markers.cc:296 gtk2_ardour/editor_ops.cc:1250
+#: gtk2_ardour/editor_ops.cc:1267 gtk2_ardour/editor_ops.cc:1286
+#: gtk2_ardour/location_ui.cc:782
 msgid "add marker"
-msgstr "ajouter un marqueur"
+msgstr "ajouter un repère"
 
-#: editor_markers.cc:307 editor_markers.cc:380 editor_markers.cc:552
-#: editor_markers.cc:570 editor_markers.cc:589 editor_markers.cc:608
-#: editor_markers.cc:638 editor_markers.cc:666 editor_markers.cc:694
-#: editor_markers.cc:732 editor_markers.cc:759 editor_markers.cc:782
-#: editor_markers.cc:801 editor_mouse.cc:2015 editor_mouse.cc:4275
+#: gtk2_ardour/editor_markers.cc:312 gtk2_ardour/editor_markers.cc:376
+#: gtk2_ardour/editor_markers.cc:553 gtk2_ardour/editor_markers.cc:571
+#: gtk2_ardour/editor_markers.cc:589 gtk2_ardour/editor_markers.cc:608
+#: gtk2_ardour/editor_markers.cc:627 gtk2_ardour/editor_markers.cc:657
+#: gtk2_ardour/editor_markers.cc:685 gtk2_ardour/editor_markers.cc:713
+#: gtk2_ardour/editor_markers.cc:752 gtk2_ardour/editor_markers.cc:777
+#: gtk2_ardour/editor_markers.cc:804 gtk2_ardour/editor_markers.cc:827
+#: gtk2_ardour/editor_markers.cc:846 gtk2_ardour/editor_mouse.cc:2015
+#: gtk2_ardour/editor_mouse.cc:4351
 msgid "programming error: marker canvas item has no marker object pointer!"
-msgstr ""
-"erreur de programmation : objet canvas de marqueur sans pointeur d'objet "
-"marqueur !"
+msgstr "programming error: marker canvas item has no marker object pointer!"
 
-#: editor_markers.cc:331 location_ui.cc:656
+#: gtk2_ardour/editor_markers.cc:326 gtk2_ardour/location_ui.cc:660
 msgid "remove marker"
-msgstr "enlever le marqueur"
+msgstr "enlever le repère"
 
-#: editor_markers.cc:458
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:467
 msgid "Locate to Mark"
-msgstr "Locate to"
+msgstr "Placer la tête de lecture ici"
 
-#: editor_markers.cc:459
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:468
 msgid "Play from Mark"
-msgstr "Jouer depuis le début"
+msgstr "Lire depuis ce repère"
 
-#: editor_markers.cc:460
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:469
 msgid "Set Mark from Playhead"
-msgstr "Jouer depuis la tête de lecture"
+msgstr "nouv. repère à la tête de lect."
 
-#: editor_markers.cc:464
-#, fuzzy
-msgid "Rename Mark"
-msgstr "Renommer la piste"
-
-#: editor_markers.cc:465
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:473
 msgid "Hide Mark"
-msgstr "décaler la piste"
+msgstr "cacher le repère"
 
-#: editor_markers.cc:466
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:475 gtk2_ardour/editor_markers.cc:864
+msgid "Rename Mark"
+msgstr "renommer le repère"
+
+#: gtk2_ardour/editor_markers.cc:476
 msgid "Remove Mark"
-msgstr "Enlever les marqueurs"
+msgstr "enlever le repère"
 
-#: editor_markers.cc:479 editor_markers.cc:535
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:494
 msgid "Locate to Range Mark"
-msgstr "Marqueurs d'emplacements"
+msgstr "placer la tête de lecture ici"
 
-#: editor_markers.cc:480 editor_markers.cc:536
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:495
 msgid "Play from Range Mark"
-msgstr "Jouer l'intervalle de boucle"
+msgstr "lire depuis ce repère"
 
-#: editor_markers.cc:481
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:497
+msgid "Play Range"
+msgstr "lire l'intervalle"
+
+#: gtk2_ardour/editor_markers.cc:498
 msgid "Loop Range"
-msgstr "Boucler sur l'intervalle"
+msgstr "lire en boucle"
 
-#: editor_markers.cc:482 editor_markers.cc:537
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:500
 msgid "Set Range Mark from Playhead"
-msgstr "Jouer depuis la tête de lecture"
+msgstr "placer sur la tête de lecture"
 
-#: editor_markers.cc:483 editor_markers.cc:538
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:501
 msgid "Set Range from Range Selection"
-msgstr "sélection d'intervalle"
+msgstr "aligner sur la zone de sélection"
 
-#: editor_markers.cc:487
-#, fuzzy
-msgid "Rename Range"
-msgstr "Renommer la piste"
-
-#: editor_markers.cc:488 editor_markers.cc:540
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:505
 msgid "Hide Range"
-msgstr "Ajouter un nouvel intervalle"
+msgstr "cacher"
 
-#: editor_markers.cc:489
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:507 gtk2_ardour/editor_markers.cc:866
+msgid "Rename Range"
+msgstr "renommer"
+
+#: gtk2_ardour/editor_markers.cc:508
 msgid "Remove Range"
-msgstr "Enlever une trame"
+msgstr "enlever"
 
-#: editor_markers.cc:493 editor_markers.cc:542
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:513
 msgid "Separate Regions in Range"
-msgstr "Nouvelle région à partir de l'intervalle"
+msgstr "séparer la région"
 
-#: editor_markers.cc:494 editor_markers.cc:543
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:514
 msgid "Select All in Range"
-msgstr "Tout sélectionner dans la piste"
+msgstr "tout dans l'intervalle"
 
-#: editor_markers.cc:520
+#: gtk2_ardour/editor_markers.cc:515
+msgid "Select Range"
+msgstr "Définit la zone de sélection"
+
+#: gtk2_ardour/editor_markers.cc:541
 msgid "Set Loop Range"
-msgstr "Définir l'intervalle de boucle"
+msgstr "Boucle"
 
-#: editor_markers.cc:521
+#: gtk2_ardour/editor_markers.cc:542
 msgid "Set Punch Range"
-msgstr "Définir l'intervalle d'insertion"
+msgstr "Punch in→out"
 
-#: editor_markers.cc:815
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:860
 msgid "New Name:"
 msgstr "nouveau nom :"
 
-#: editor_markers.cc:818
-msgid "ardour: rename mark"
-msgstr "ardour : renommer le marqueur"
-
-#: editor_markers.cc:820
-msgid "ardour: rename range"
-msgstr "ardour : renommer l'intervalle"
-
-#: editor_markers.cc:840
-#, fuzzy
+#: gtk2_ardour/editor_markers.cc:888
 msgid "rename marker"
-msgstr "enlever le marqueur"
+msgstr "renommer le repère"
 
-#: editor_markers.cc:865
+#: gtk2_ardour/editor_markers.cc:914
 msgid "set loop range"
 msgstr "définir l'intervalle de boucle"
 
-#: editor_markers.cc:891
+#: gtk2_ardour/editor_markers.cc:942
 msgid "set punch range"
-msgstr "définir l'intervalle d'insertion"
+msgstr "définir l'intervalle de punch in/out"
 
-#: editor_mouse.cc:103
+#: gtk2_ardour/editor_mouse.cc:105
 msgid "Editor::event_frame() used on unhandled event type %1"
-msgstr "Editor::event_frame() utilisé sur un évènement non géré de type %1"
+msgstr "Editor::event_frame() utilisé sur un événement non géré de type %1"
 
-#: editor_mouse.cc:313
-#, fuzzy
-msgid "select on click"
-msgstr "Utiliser comme clic"
-
-#: editor_mouse.cc:1590
+#: gtk2_ardour/editor_mouse.cc:1539
 msgid "programming error: start_grab called without drag item"
-msgstr "erreur de programmation :  start_grab appelé sans objet a ramasser"
+msgstr "programming error: start_grab called without drag item"
 
-#: editor_mouse.cc:1814
+#: gtk2_ardour/editor_mouse.cc:1766
 msgid "change fade in length"
-msgstr "modifier la longueur du fondu d'ouverture"
+msgstr "modifier la durée de la montée du fondu"
 
-#: editor_mouse.cc:1832
-#, fuzzy
+#: gtk2_ardour/editor_mouse.cc:1798
 msgid "programming error: fade out canvas item has no regionview data pointer!"
-msgstr ""
-"programming error: fade out canvas item has no regionview data pointer!"
+msgstr "programming error: fade out canvas item has no regionview data pointer!"
 
-#: editor_mouse.cc:1906
+#: gtk2_ardour/editor_mouse.cc:1883
 msgid "change fade out length"
-msgstr "modifier la longueur du fondu de fermeture"
+msgstr "modifier la durée de la descente du fondu"
 
-#: editor_mouse.cc:1925
+#: gtk2_ardour/editor_mouse.cc:1915
 msgid "programming error: cursor canvas item has no cursor data pointer!"
-msgstr ""
-"erreur de programmation : objet canvas de curseur sans pointeur de données "
-"curseur"
+msgstr "programming error: cursor canvas item has no cursor data pointer!"
 
-#: editor_mouse.cc:2142
-#, fuzzy
+#: gtk2_ardour/editor_mouse.cc:2150
 msgid "move marker"
-msgstr "enlever le marqueur"
+msgstr "déplacer le repère"
 
-#: editor_mouse.cc:2165 editor_mouse.cc:2196 editor_tempodisplay.cc:459
+#: gtk2_ardour/editor_mouse.cc:2178 gtk2_ardour/editor_mouse.cc:2209
+#: gtk2_ardour/editor_tempodisplay.cc:500
 msgid ""
 "programming error: meter marker canvas item has no marker object pointer!"
 msgstr ""
-"erreur de programmation: meter marker canvas item has no marker object "
-"pointer!"
+"programming error: meter marker canvas item has no marker object pointer!"
 
-#: editor_mouse.cc:2264
-#, fuzzy
+#: gtk2_ardour/editor_mouse.cc:2277
 msgid "copy meter mark"
-msgstr "déplacer le marqueur de vu-mètre"
+msgstr "copier l'indicateur de mesure"
 
-#: editor_mouse.cc:2274
+#: gtk2_ardour/editor_mouse.cc:2288
 msgid "move meter mark"
-msgstr "déplacer le marqueur de vu-mètre"
+msgstr "déplacer l'indicateur de mesure"
 
-#: editor_mouse.cc:2289 editor_mouse.cc:2322 editor_tempodisplay.cc:331
-#: editor_tempodisplay.cc:409 editor_tempodisplay.cc:428
+#: gtk2_ardour/editor_mouse.cc:2304 gtk2_ardour/editor_mouse.cc:2337
+#: gtk2_ardour/editor_tempodisplay.cc:369
+#: gtk2_ardour/editor_tempodisplay.cc:449
+#: gtk2_ardour/editor_tempodisplay.cc:468
 msgid ""
 "programming error: tempo marker canvas item has no marker object pointer!"
 msgstr ""
-"erreur de programmation : objet canvas de marqueur de tempo sans pointeur "
-"d'objet marqueur !"
+"programming error: tempo marker canvas item has no marker object pointer!"
 
-#: editor_mouse.cc:2294 editor_mouse.cc:2327 editor_tempodisplay.cc:336
-#: editor_tempodisplay.cc:414
+#: gtk2_ardour/editor_mouse.cc:2309 gtk2_ardour/editor_mouse.cc:2342
+#: gtk2_ardour/editor_tempodisplay.cc:374
+#: gtk2_ardour/editor_tempodisplay.cc:454
 msgid "programming error: marker for tempo is not a tempo marker!"
-msgstr ""
-"erreur de programmation : le marqueur du tempo n'est pas un marqueur de "
-"tempo !"
+msgstr "programming error: marker for tempo is not a tempo marker!"
 
-#: editor_mouse.cc:2394
-#, fuzzy
+#: gtk2_ardour/editor_mouse.cc:2409
 msgid "copy tempo mark"
-msgstr "déplacer le marqueur de tempo"
+msgstr "copier le changement tempo"
 
-#: editor_mouse.cc:2404
+#: gtk2_ardour/editor_mouse.cc:2420
 msgid "move tempo mark"
-msgstr "déplacer le marqueur de tempo"
+msgstr "déplacer le changement tempo"
 
-#: editor_mouse.cc:2418 editor_mouse.cc:2437 editor_mouse.cc:2450
+#: gtk2_ardour/editor_mouse.cc:2435 gtk2_ardour/editor_mouse.cc:2454
+#: gtk2_ardour/editor_mouse.cc:2467
 msgid ""
 "programming error: control point canvas item has no control point object "
 "pointer!"
 msgstr ""
-"erreur de programmation : point de contrôle de l'objet canvas sans pointeur "
-"d'objet point de contrôle !"
+"programming error: control point canvas item has no control point object "
+"pointer!"
 
-#: editor_mouse.cc:2555
+#: gtk2_ardour/editor_mouse.cc:2573
 msgid "programming error: line canvas item has no line pointer!"
-msgstr ""
-"erreur de programmation : objet canvas de ligne sans pointeur de ligne !"
+msgstr "programming error: line canvas item has no line pointer!"
 
-#: editor_mouse.cc:2664
-#, fuzzy
+#: gtk2_ardour/editor_mouse.cc:2682
 msgid "move region(s)"
-msgstr "enlever la région"
+msgstr "déplacement de régions"
 
-#: editor_mouse.cc:2727
-#, fuzzy
+#: gtk2_ardour/editor_mouse.cc:2746
 msgid "Drag region brush"
-msgstr "Déplacer la/les région(s)"
+msgstr "brosse de glissé-déposé de région"
 
-#. don't copy again
-#. this is committed in the grab finished callback.
-#: editor_mouse.cc:2751
-msgid "Drag region copy"
-msgstr "Déplacer la copie de la région"
+#: gtk2_ardour/editor_mouse.cc:3274
+msgid "fixed time region copy"
+msgstr "Copie verticale de région"
 
-#. A selection grab currently creates two undo/redo operations, one for
-#. creating the new region and another for moving it.
-#.
-#: editor_mouse.cc:3609
-#, fuzzy
+#: gtk2_ardour/editor_mouse.cc:3276
+msgid "region copy"
+msgstr "Copie de région"
+
+#: gtk2_ardour/editor_mouse.cc:3280
+msgid "fixed time region drag"
+msgstr "Déplacement vertical de région"
+
+#: gtk2_ardour/editor_mouse.cc:3282
+msgid "region drag"
+msgstr "Déplacement de région"
+
+#: gtk2_ardour/editor_mouse.cc:3670
 msgid "selection grab"
-msgstr "attraper la sélection"
+msgstr "capture de sélection"
 
-#: editor_mouse.cc:3650
-#, fuzzy
+#: gtk2_ardour/editor_mouse.cc:3712
 msgid "cancel selection"
-msgstr "sélection d'intervalle"
+msgstr "annuler la sélection"
 
-#: editor_mouse.cc:3760
+#: gtk2_ardour/editor_mouse.cc:3822
 msgid "range selection"
-msgstr "sélection d'intervalle"
+msgstr "sélection de zone"
 
-#: editor_mouse.cc:3776
+#: gtk2_ardour/editor_mouse.cc:3838
 msgid "trim selection start"
-msgstr "élaguer le début de la sélection"
+msgstr "déplacement début de sélection"
 
-#: editor_mouse.cc:3792
+#: gtk2_ardour/editor_mouse.cc:3854
 msgid "trim selection end"
-msgstr "élaguer la fin de la sélection"
+msgstr "déplacement fin de sélection"
 
-#: editor_mouse.cc:3809
+#: gtk2_ardour/editor_mouse.cc:3871
 msgid "move selection"
-msgstr "déplacer la sélection"
+msgstr "déplacement sélection"
 
-#: editor_mouse.cc:4195
+#: gtk2_ardour/editor_mouse.cc:4260
 msgid "Start point trim"
-msgstr "Point de départ d'élaguage"
+msgstr "déplacement point de départ"
 
-#: editor_mouse.cc:4223
+#: gtk2_ardour/editor_mouse.cc:4292
 msgid "End point trim"
-msgstr "Point de fin d'élaguage"
+msgstr "déplacement point de fin"
 
-#: editor_mouse.cc:4262
+#: gtk2_ardour/editor_mouse.cc:4335
 msgid "trimmed region"
-msgstr "région élaguée"
+msgstr "région raccourcie"
 
-#: editor_mouse.cc:4400
+#: gtk2_ardour/editor_mouse.cc:4478
 msgid "new range marker"
-msgstr "nouveau marqueur d'intervalle"
+msgstr "nouvel intervalle"
 
-#: editor_mouse.cc:4642
-msgid "select regions"
-msgstr "sélectionner les régions"
+#: gtk2_ardour/editor_mouse.cc:4720
+msgid "rubberband selection"
+msgstr "sélection élastique"
 
-#: editor_mouse.cc:4671
+#: gtk2_ardour/editor_mouse.cc:4750
 msgid "Name for region:"
 msgstr "Nom de la région :"
 
-#: editor_mouse.cc:4735
+#: gtk2_ardour/editor_mouse.cc:4814
 msgid "timestretch"
 msgstr "déformation temporelle"
 
-#: editor_ops.cc:195
+#: gtk2_ardour/editor_ops.cc:116
 msgid "split"
 msgstr "séparer"
 
-#: editor_ops.cc:231
+#: gtk2_ardour/editor_ops.cc:155
 msgid "remove region"
 msgstr "enlever la région"
 
-#: editor_ops.cc:250
+#: gtk2_ardour/editor_ops.cc:175
 msgid ""
 " This is destructive, will possibly delete audio files\n"
 "It cannot be undone\n"
 "Do you really want to destroy %1 ?"
 msgstr ""
-" Ceci est destructif, et effacera peut-être des fichiers audio\n"
-"Cela ne pourra être annulé\n"
+" Cette opération est destructive et peut effacer des fichiers audio.\n"
+"Elle ne pourra pas être annulée.\n"
 "Voulez-vous vraiment détruire %1 ?"
 
-#: editor_ops.cc:254
+#: gtk2_ardour/editor_ops.cc:179
 msgid "these regions"
 msgstr "ces régions"
 
-#: editor_ops.cc:254
+#: gtk2_ardour/editor_ops.cc:179
 msgid "this region"
 msgstr "cette région"
 
-#: editor_ops.cc:256 editor_ops.cc:3318 route_ui.cc:707
-#: visual_time_axis.cc:278
-msgid "No, do nothing."
-msgstr "Non, ne rien faire."
-
-#: editor_ops.cc:259
+#: gtk2_ardour/editor_ops.cc:184
 msgid "Yes, destroy them."
 msgstr "Oui, les détruire."
 
-#: editor_ops.cc:261 editor_ops.cc:3319
+#: gtk2_ardour/editor_ops.cc:186 gtk2_ardour/editor_ops.cc:3163
 msgid "Yes, destroy it."
-msgstr "Oui, la supprimer."
+msgstr "Oui, la détruire"
 
-#: editor_ops.cc:352 editor_ops.cc:380
+#: gtk2_ardour/editor_ops.cc:272 gtk2_ardour/editor_ops.cc:300
 msgid "extend selection"
 msgstr "étendre la sélection"
 
-#: editor_ops.cc:396 editor_ops.cc:430 editor_ops.cc:474 editor_ops.cc:500
+#: gtk2_ardour/editor_ops.cc:316 gtk2_ardour/editor_ops.cc:351
+#: gtk2_ardour/editor_ops.cc:396 gtk2_ardour/editor_ops.cc:423
 msgid "nudge forward"
-msgstr "décaler vers l'avant"
+msgstr "décaler vers la droite"
 
-#: editor_ops.cc:564
+#: gtk2_ardour/editor_ops.cc:488
 msgid "build_region_boundary_cache called with snap_type = %1"
 msgstr "build_region_boundary_cache appelé avec snap_type = %1"
 
-#: editor_ops.cc:1420
-#, fuzzy
-msgid "select all within"
-msgstr "Tout sélectionner"
-
-#: editor_ops.cc:1452
-#, fuzzy
-msgid "set selection from region"
-msgstr "définir la sélection à partir de l'intervalle"
-
-#: editor_ops.cc:1485
-msgid "set selection from range"
-msgstr "définir la sélection à partir de l'intervalle"
-
-#: editor_ops.cc:1515
-#, fuzzy
-msgid "select all from range"
-msgstr "sélectionner la plage de zoom"
-
-#: editor_ops.cc:1537
-#, fuzzy
-msgid "select all from punch"
-msgstr "Tout sélectionner"
-
-#: editor_ops.cc:1559
-#, fuzzy
-msgid "select all from loop"
-msgstr "Tout sélectionner"
-
-#: editor_ops.cc:1573
-#, fuzzy
-msgid "select all after cursor"
-msgstr "Coller au curseur d'édition"
-
-#: editor_ops.cc:1578
-#, fuzzy
-msgid "select all before cursor"
-msgstr "définir la synchro. au curseur d'édition"
-
-#: editor_ops.cc:1608
-#, fuzzy
-msgid "select all between cursors"
-msgstr "définir la synchro. au curseur d'édition"
-
-#: editor_ops.cc:1739
+#: gtk2_ardour/editor_ops.cc:1407
 msgid "clear markers"
-msgstr "effacer les marqueurs"
+msgstr "effacer les repères"
 
-#: editor_ops.cc:1751
+#: gtk2_ardour/editor_ops.cc:1420
 msgid "clear ranges"
 msgstr "effacer les intervalles"
 
-#: editor_ops.cc:1770
+#: gtk2_ardour/editor_ops.cc:1440
 msgid "clear locations"
-msgstr "effacer les emplacements"
+msgstr "effacer les repères temporels"
 
-#: editor_ops.cc:1820
+#: gtk2_ardour/editor_ops.cc:1513
 msgid "insert dragged region"
-msgstr "insérer la région déplacée"
+msgstr "glissé-déposé de région"
 
-#: editor_ops.cc:1856
+#: gtk2_ardour/editor_ops.cc:1556
 msgid "insert region"
-msgstr "insérer une région"
+msgstr "insertion de région"
 
-#: editor_ops.cc:2047 io_selector.cc:58 io_selector.cc:792
+#: gtk2_ardour/editor_ops.cc:1755 gtk2_ardour/io_selector.cc:59
+#: gtk2_ardour/io_selector.cc:747 gtk2_ardour/connection_editor.cc:85
 msgid "OK"
 msgstr "OK"
 
-#: editor_ops.cc:2054
-msgid "ardour: rename region"
-msgstr "ardour : renommer la région"
+#: gtk2_ardour/editor_ops.cc:1763
+msgid "Rename Region"
+msgstr "renommer la région"
 
-#: editor_ops.cc:2277 editor_ops.cc:2326
+#: gtk2_ardour/editor_ops.cc:2005 gtk2_ardour/editor_ops.cc:2064
 msgid "separate"
 msgstr "séparer"
 
-#: editor_ops.cc:2388
+#: gtk2_ardour/editor_ops.cc:2128
 msgid "trim to selection"
-msgstr "élaguer selon la sélection"
+msgstr "raccourcir à la sélection"
 
-#: editor_ops.cc:2428
+#: gtk2_ardour/editor_ops.cc:2173
 msgid "region fill"
-msgstr "remplissage de la région"
+msgstr "remplissage"
 
-#: editor_ops.cc:2487
+#: gtk2_ardour/editor_ops.cc:2237
 msgid "fill selection"
 msgstr "remplir la sélection"
 
-#: editor_ops.cc:2508
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2258
 msgid "Programming error. that region doesn't cover that position"
-msgstr ""
-"erreur de programmation : la carte d'emplacements/marqueurs ne contient pas "
-"d'emplacements !"
+msgstr "Programming error. that region doesn't cover that position"
 
-#: editor_ops.cc:2511
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2261
 msgid "set region sync position"
-msgstr "Régions/position"
+msgstr "placer la synchro de région"
 
-#: editor_ops.cc:2526
+#: gtk2_ardour/editor_ops.cc:2277
 msgid "Place the edit cursor at the desired sync point"
-msgstr "Placer le curseur d'édition au point de synchro. désiré"
+msgstr "Placer le curseur d'édition au point de synchronisation voulu"
 
-#: editor_ops.cc:2531
+#: gtk2_ardour/editor_ops.cc:2282
 msgid "set sync from edit cursor"
-msgstr "définir la synchro. au curseur d'édition"
+msgstr "point de synchro au curseur d'édition"
 
-#: editor_ops.cc:2543
+#: gtk2_ardour/editor_ops.cc:2295
 msgid "remove sync"
-msgstr "enlever la synchro."
+msgstr "enlever le point de synchro"
 
-#: editor_ops.cc:2557
+#: gtk2_ardour/editor_ops.cc:2310
 msgid "naturalize"
-msgstr "normaliser"
+msgstr "naturaliser"
 
-#: editor_ops.cc:2621
+#: gtk2_ardour/editor_ops.cc:2375
 msgid "align selection (relative)"
-msgstr "Aligner la sélection (relativement)"
+msgstr "aligner la sélection (relatif)"
 
-#: editor_ops.cc:2649
+#: gtk2_ardour/editor_ops.cc:2404
 msgid "align selection"
 msgstr "aligner la sélection"
 
-#: editor_ops.cc:2661
+#: gtk2_ardour/editor_ops.cc:2416
 msgid "align region"
 msgstr "aligner la région"
 
-#: editor_ops.cc:2708 editor_ops.cc:2733
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2464 gtk2_ardour/editor_ops.cc:2490
 msgid "trim to edit"
-msgstr "élaguer to edit"
+msgstr "raccourcir au curseur"
 
-#: editor_ops.cc:2784
-#, fuzzy
-msgid "ardour: freeze"
-msgstr "ardour :"
-
-#: editor_ops.cc:2789
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2549
 msgid "Cancel Freeze"
-msgstr "Annuler"
+msgstr "annuler le blocage"
 
-#: editor_ops.cc:2826
-#, fuzzy
+#: gtk2_ardour/editor_ops.cc:2592
 msgid "bounce range"
-msgstr "bounce intervalle"
+msgstr "copier la sélection vers un fichier audio (bounce)"
 
-#: editor_ops.cc:2879
+#: gtk2_ardour/editor_ops.cc:2644
 msgid "cut"
 msgstr "couper"
 
-#: editor_ops.cc:2882
+#: gtk2_ardour/editor_ops.cc:2647
 msgid "copy"
 msgstr "copier"
 
-#: editor_ops.cc:2895
+#: gtk2_ardour/editor_ops.cc:2660
 msgid " objects"
 msgstr " objets"
 
-#: editor_ops.cc:2921
+#: gtk2_ardour/editor_ops.cc:2686
 msgid " range"
 msgstr " intervalle"
 
-#: editor_ops.cc:3078
+#: gtk2_ardour/editor_ops.cc:2915
 msgid "paste"
 msgstr "coller"
 
-#: editor_ops.cc:3116
+#: gtk2_ardour/editor_ops.cc:2957
 msgid "paste chunk"
 msgstr "coller le fragment"
 
-#. clear (below) will clear the argument list
-#: editor_ops.cc:3157
+#: gtk2_ardour/editor_ops.cc:3000
 msgid "duplicate region"
 msgstr "dupliquer la région"
 
-#: editor_ops.cc:3202
+#: gtk2_ardour/editor_ops.cc:3045
 msgid "duplicate selection"
 msgstr "dupliquer la sélection"
 
-#: editor_ops.cc:3259
+#: gtk2_ardour/editor_ops.cc:3101
 msgid "clear playlist"
 msgstr "effacer la liste de lecture"
 
-#: editor_ops.cc:3288
+#: gtk2_ardour/editor_ops.cc:3131
 msgid "nudge track"
 msgstr "décaler la piste"
 
-#: editor_ops.cc:3315
+#: gtk2_ardour/editor_ops.cc:3159
 msgid ""
 "Do you really want to destroy the last capture?\n"
 "(This is destructive and cannot be undone)"
 msgstr ""
-"Voulez-vous vraiment supprimer la dernière capture ?\n"
+"Voulez-vous vraiment supprimer le dernier enregistrement ?\n"
 "(cette opération est destructive et ne pourra pas être annulée)"
 
-#: editor_ops.cc:3343
+#: gtk2_ardour/editor_ops.cc:3187
 msgid "normalize"
 msgstr "normaliser"
 
-#: editor_ops.cc:3390
+#: gtk2_ardour/editor_ops.cc:3240
 msgid "reverse regions"
 msgstr "inverser les régions"
 
-#: editor_region_list.cc:98 editor_region_list.cc:103
-#: editor_region_list.cc:106 location_ui.cc:56
+#: gtk2_ardour/editor_ops.cc:3353
+msgid "reset region gain"
+msgstr "réinitialiser le gain"
+
+#: gtk2_ardour/editor_ops.cc:3442
+msgid "set fade in shape"
+msgstr "règle la forme de la montée"
+
+#: gtk2_ardour/editor_ops.cc:3466
+msgid "set fade out shape"
+msgstr "règle la forme de la descente"
+
+#: gtk2_ardour/editor_ops.cc:3490
+msgid "set fade in active"
+msgstr "active la montée"
+
+#: gtk2_ardour/editor_ops.cc:3514
+msgid "set fade out active"
+msgstr "active la descente"
+
+#: gtk2_ardour/editor_region_list.cc:108 gtk2_ardour/editor_region_list.cc:114
+#: gtk2_ardour/editor_region_list.cc:117 gtk2_ardour/location_ui.cc:57
 msgid "Hidden"
 msgstr "Caché"
 
-#. added a new fresh one at the end
-#: editor_route_list.cc:102 editor_route_list.cc:103 editor_route_list.cc:247
+#: gtk2_ardour/editor_region_list.cc:172
+msgid " (MISSING)"
+msgstr " (MANQUANT)"
+
+#: gtk2_ardour/editor_route_list.cc:101 gtk2_ardour/editor_route_list.cc:102
+#: gtk2_ardour/editor_route_list.cc:252
 msgid "editor"
 msgstr "éditeur"
 
-#: editor_route_list.cc:310 mixer_ui.cc:699
+#: gtk2_ardour/editor_route_list.cc:320 gtk2_ardour/mixer_ui.cc:728
 msgid "Show All"
 msgstr "Tout montrer"
 
-#: editor_route_list.cc:311 mixer_ui.cc:700
+#: gtk2_ardour/editor_route_list.cc:321 gtk2_ardour/mixer_ui.cc:729
 msgid "Hide All"
 msgstr "Tout cacher"
 
-#: editor_route_list.cc:312 mixer_ui.cc:701
-#, fuzzy
+#: gtk2_ardour/editor_route_list.cc:322 gtk2_ardour/mixer_ui.cc:730
 msgid "Show All Audio Tracks"
-msgstr "Montrer tous les BusAudio"
+msgstr "Afficher toutes les pistes"
 
-#: editor_route_list.cc:313 mixer_ui.cc:702
-#, fuzzy
+#: gtk2_ardour/editor_route_list.cc:323 gtk2_ardour/mixer_ui.cc:731
 msgid "Hide All Audio Tracks"
-msgstr "Cacher tous les BusAudio"
+msgstr "cacher toutes les pistes"
 
-#: editor_route_list.cc:314 mixer_ui.cc:703
-#, fuzzy
+#: gtk2_ardour/editor_route_list.cc:324 gtk2_ardour/mixer_ui.cc:732
 msgid "Show All Audio Busses"
-msgstr "Montrer tous les BusAudio"
+msgstr "afficher tous les bus"
 
-#: editor_route_list.cc:315 mixer_ui.cc:704
-#, fuzzy
+#: gtk2_ardour/editor_route_list.cc:325 gtk2_ardour/mixer_ui.cc:733
 msgid "Hide All Audio Busses"
-msgstr "Cacher tous les BusAudio"
+msgstr "cacher tous les bus"
 
-#: editor_rulers.cc:312
+#: gtk2_ardour/editor_rulers.cc:345
 msgid "New location marker"
-msgstr "Nouveau marqueur d'emplacement"
+msgstr "Nouveau repère temporel"
 
-#: editor_rulers.cc:313
+#: gtk2_ardour/editor_rulers.cc:346
 msgid "Clear all locations"
-msgstr "Effacer tous les emplacements"
+msgstr "Supprimer tous les repères temporels"
 
-#. ruler_items.push_back (MenuElem (_("New Range")));
-#: editor_rulers.cc:318
+#: gtk2_ardour/editor_rulers.cc:347
+msgid "Unhide locations"
+msgstr "Réafficher les repères temporels"
+
+#: gtk2_ardour/editor_rulers.cc:352
 msgid "Clear all ranges"
-msgstr "Effacer tous les intervalles"
+msgstr "Supprimer tous les intervalles"
 
-#: editor_rulers.cc:327
+#: gtk2_ardour/editor_rulers.cc:353
+msgid "Unhide ranges"
+msgstr "Réafficher les intervalles"
+
+#: gtk2_ardour/editor_rulers.cc:362
 msgid "New Tempo"
 msgstr "Nouveau tempo"
 
-#: editor_rulers.cc:328
+#: gtk2_ardour/editor_rulers.cc:363
 msgid "Clear tempo"
 msgstr "Effacer le tempo"
 
-#: editor_rulers.cc:333
+#: gtk2_ardour/editor_rulers.cc:368
 msgid "New Meter"
-msgstr "Nouveau vu-mètre"
+msgstr "Nouveau type de mesure"
 
-#: editor_rulers.cc:334
+#: gtk2_ardour/editor_rulers.cc:369
 msgid "Clear meter"
-msgstr "Effacer les vu-mètre"
+msgstr "Effacer les types de mesure"
 
-#: editor_rulers.cc:342
+#: gtk2_ardour/editor_rulers.cc:377
 msgid "Min:Secs"
-msgstr "Mins:Secs"
+msgstr "h:min:sec"
 
-#: editor_selection_list.cc:108
-#, fuzzy
+#: gtk2_ardour/editor_selection.cc:564 gtk2_ardour/editor_selection.cc:613
+msgid "set selected regions"
+msgstr "sélection de régions"
+
+#: gtk2_ardour/editor_selection.cc:810
+msgid "select all within"
+msgstr "sélectionner tout dedans"
+
+#: gtk2_ardour/editor_selection.cc:840
+msgid "set selection from region"
+msgstr "zone de sélection sur la région"
+
+#: gtk2_ardour/editor_selection.cc:873
+msgid "set selection from range"
+msgstr "sélection depuis l'intervalle"
+
+#: gtk2_ardour/editor_selection.cc:903
+msgid "select all from range"
+msgstr "sélectionner tout à partir de la zone"
+
+#: gtk2_ardour/editor_selection.cc:925
+msgid "select all from punch"
+msgstr "sélectionner tout depuis le point de punch in/out"
+
+#: gtk2_ardour/editor_selection.cc:947
+msgid "select all from loop"
+msgstr "sélectionner tout depuis la boucle"
+
+#: gtk2_ardour/editor_selection.cc:961
+msgid "select all after cursor"
+msgstr "sélectionner tout après le curseur"
+
+#: gtk2_ardour/editor_selection.cc:966
+msgid "select all before cursor"
+msgstr "sélectionner tout avant le curseur"
+
+#: gtk2_ardour/editor_selection.cc:996
+msgid "select all between cursors"
+msgstr "sélectionner tout entre les curseurs"
+
+#: gtk2_ardour/editor_selection_list.cc:180
 msgid "Name for Chunk:"
 msgstr "nom du fragment :"
 
-#: editor_selection_list.cc:111
-#, fuzzy
+#: gtk2_ardour/editor_selection_list.cc:183
 msgid "Create Chunk"
-msgstr "Créer un fragment"
+msgstr "créer un fragment"
 
-#: editor_selection_list.cc:111
+#: gtk2_ardour/editor_selection_list.cc:183
 msgid "Forget it"
-msgstr "Oublier"
+msgstr "Abandonner"
 
-#: editor_tempodisplay.cc:253 editor_tempodisplay.cc:293
+#: gtk2_ardour/editor_selection_list.cc:206
+msgid "No selectable material found in the currently selected time range"
+msgstr "Rien ne peut être sélectionné dans la zone choisie"
+
+#: gtk2_ardour/editor_tempodisplay.cc:290
+#: gtk2_ardour/editor_tempodisplay.cc:331
 msgid "add"
 msgstr "ajouter"
 
-#: editor_tempodisplay.cc:275
+#: gtk2_ardour/editor_tempodisplay.cc:312
 msgid "add tempo mark"
-msgstr "ajouter un marqueur de tempo"
+msgstr "ajouter un changement de tempo"
 
-#: editor_tempodisplay.cc:315
+#: gtk2_ardour/editor_tempodisplay.cc:353
 msgid "add meter mark"
-msgstr "ajouter un marqueur de vu-mètre"
+msgstr "ajouter un indicateur de type de mesure"
 
-#: editor_tempodisplay.cc:348 editor_tempodisplay.cc:376
+#: gtk2_ardour/editor_tempodisplay.cc:386
+#: gtk2_ardour/editor_tempodisplay.cc:415
 msgid "done"
 msgstr "terminé"
 
-#: editor_tempodisplay.cc:366 editor_tempodisplay.cc:394
+#: gtk2_ardour/editor_tempodisplay.cc:404
+#: gtk2_ardour/editor_tempodisplay.cc:433
 msgid "replace tempo mark"
-msgstr "remplacer le marqueur de tempo"
+msgstr "remplacer le changement de tempo"
 
-#: editor_tempodisplay.cc:433 editor_tempodisplay.cc:464
+#: gtk2_ardour/editor_tempodisplay.cc:473
+#: gtk2_ardour/editor_tempodisplay.cc:505
 msgid "programming error: marker for meter is not a meter marker!"
-msgstr "erreur de programmation : marker for meter is not a meter marker!"
+msgstr "programming error: marker for meter is not a meter marker!"
 
-#: editor_tempodisplay.cc:443 editor_tempodisplay.cc:476
+#: gtk2_ardour/editor_tempodisplay.cc:483
+#: gtk2_ardour/editor_tempodisplay.cc:517
 msgid "remove tempo mark"
-msgstr "enlever le marqueur de tempo"
+msgstr "enlever le changement de tempo"
 
-#: editor_timefx.cc:51
+#: gtk2_ardour/editor_timefx.cc:54
 msgid "Quick but Ugly"
-msgstr "Rapide mais sale"
+msgstr "rapide, basse qualité"
 
-#: editor_timefx.cc:52
+#: gtk2_ardour/editor_timefx.cc:55
 msgid "Skip Anti-aliasing"
-msgstr "Sauter l'anti-crénelage"
+msgstr "pas d'anti-crénelage"
 
-#: editor_timefx.cc:56
-msgid "ardour: timestretch"
-msgstr "ardour : déformation temporelle"
-
-#: editor_timefx.cc:57
+#: gtk2_ardour/editor_timefx.cc:59
 msgid "TimeStretchDialog"
 msgstr "TimeStretchDialog"
 
-#: editor_timefx.cc:70
-msgid "Stretch/Shrink it"
-msgstr "Étirer/Rétrécir"
+#: gtk2_ardour/editor_timefx.cc:62
+msgid "Timestretch"
+msgstr "Étirer / Contracter"
 
-#: editor_timefx.cc:73 editor_timefx.cc:74
+#: gtk2_ardour/editor_timefx.cc:76
+msgid "Stretch/Shrink it"
+msgstr "allonger ou contracter"
+
+#: gtk2_ardour/editor_timefx.cc:79 gtk2_ardour/editor_timefx.cc:80
 msgid "TimeStretchButton"
 msgstr "TimeStretchButton"
 
-#: editor_timefx.cc:75
+#: gtk2_ardour/editor_timefx.cc:81
 msgid "TimeStretchProgress"
 msgstr "TimeStretchProgress"
 
-#: editor_timefx.cc:139
+#: gtk2_ardour/editor_timefx.cc:145
 msgid "timestretch cannot be started - thread creation error"
 msgstr ""
+"déformation temporelle impossible à démarrer – erreur de création de thread"
 
-#: export_dialog.cc:59 export_dialog.cc:399 export_dialog.cc:1027
-#: export_dialog.cc:1195
+#: gtk2_ardour/export_dialog.cc:59 gtk2_ardour/export_dialog.cc:401
+#: gtk2_ardour/export_dialog.cc:1029 gtk2_ardour/export_dialog.cc:1197
 msgid "22.05kHz"
-msgstr "22.05 kHz"
+msgstr "22,05 kHz"
 
-#: export_dialog.cc:60 export_dialog.cc:402 export_dialog.cc:417
-#: export_dialog.cc:1029 export_dialog.cc:1197
+#: gtk2_ardour/export_dialog.cc:60 gtk2_ardour/export_dialog.cc:404
+#: gtk2_ardour/export_dialog.cc:419 gtk2_ardour/export_dialog.cc:1031
+#: gtk2_ardour/export_dialog.cc:1199
 msgid "44.1kHz"
-msgstr "44.1 kHz"
+msgstr "44,1 kHz"
 
-#: export_dialog.cc:61 export_dialog.cc:405 export_dialog.cc:1031
-#: export_dialog.cc:1199
+#: gtk2_ardour/export_dialog.cc:61 gtk2_ardour/export_dialog.cc:407
+#: gtk2_ardour/export_dialog.cc:1033 gtk2_ardour/export_dialog.cc:1201
 msgid "48kHz"
 msgstr "48 kHz"
 
-#: export_dialog.cc:62 export_dialog.cc:408 export_dialog.cc:1033
-#: export_dialog.cc:1201
+#: gtk2_ardour/export_dialog.cc:62 gtk2_ardour/export_dialog.cc:410
+#: gtk2_ardour/export_dialog.cc:1035 gtk2_ardour/export_dialog.cc:1203
 msgid "88.2kHz"
-msgstr "88.2 kHz"
+msgstr "88,2 kHz"
 
-#: export_dialog.cc:63 export_dialog.cc:411 export_dialog.cc:1035
-#: export_dialog.cc:1203
+#: gtk2_ardour/export_dialog.cc:63 gtk2_ardour/export_dialog.cc:413
+#: gtk2_ardour/export_dialog.cc:1037 gtk2_ardour/export_dialog.cc:1205
 msgid "96kHz"
 msgstr "96 kHz"
 
-#: export_dialog.cc:64 export_dialog.cc:414 export_dialog.cc:1037
-#: export_dialog.cc:1205
+#: gtk2_ardour/export_dialog.cc:64 gtk2_ardour/export_dialog.cc:416
+#: gtk2_ardour/export_dialog.cc:1039 gtk2_ardour/export_dialog.cc:1207
 msgid "192kHz"
 msgstr "192 kHz"
 
-#: export_dialog.cc:69
+#: gtk2_ardour/export_dialog.cc:69
 msgid "best"
 msgstr "meilleur"
 
-#: export_dialog.cc:70 export_dialog.cc:1212
+#: gtk2_ardour/export_dialog.cc:70 gtk2_ardour/export_dialog.cc:1214
 msgid "fastest"
 msgstr "rapide"
 
-#: export_dialog.cc:71 export_dialog.cc:1214
+#: gtk2_ardour/export_dialog.cc:71 gtk2_ardour/export_dialog.cc:1216
 msgid "linear"
 msgstr "linéaire"
 
-#: export_dialog.cc:72 export_dialog.cc:1216
+#: gtk2_ardour/export_dialog.cc:72 gtk2_ardour/export_dialog.cc:1218
 msgid "better"
-msgstr "meilleur"
+msgstr "mieux"
 
-#: export_dialog.cc:73 export_dialog.cc:1218
+#: gtk2_ardour/export_dialog.cc:73 gtk2_ardour/export_dialog.cc:1220
 msgid "intermediate"
 msgstr "intermédiaire"
 
-#: export_dialog.cc:79 export_dialog.cc:1227
+#: gtk2_ardour/export_dialog.cc:79 gtk2_ardour/export_dialog.cc:1229
 msgid "Rectangular"
 msgstr "Rectangulaire"
 
-#: export_dialog.cc:80
+#: gtk2_ardour/export_dialog.cc:80
 msgid "Shaped Noise"
-msgstr "Shaped noise"
+msgstr "Remodelage (shaped noise)"
 
-#: export_dialog.cc:81 export_dialog.cc:1229
+#: gtk2_ardour/export_dialog.cc:81 gtk2_ardour/export_dialog.cc:1231
 msgid "Triangular"
 msgstr "Triangulaire"
 
-#: export_dialog.cc:86
-msgid "stereo"
-msgstr "stéréo"
-
-#. default is to use all
-#: export_dialog.cc:87 export_dialog.cc:486 export_dialog.cc:1055
-#: export_dialog.cc:1177
+#: gtk2_ardour/export_dialog.cc:87 gtk2_ardour/export_dialog.cc:488
+#: gtk2_ardour/export_dialog.cc:1057 gtk2_ardour/export_dialog.cc:1179
 msgid "mono"
 msgstr "mono"
 
-#: export_dialog.cc:93
+#: gtk2_ardour/export_dialog.cc:93
 msgid "CUE"
-msgstr "CUE"
+msgstr "fichier CUE"
 
-#: export_dialog.cc:94
+#: gtk2_ardour/export_dialog.cc:94
 msgid "TOC"
-msgstr "TOC"
+msgstr "fichier TOC"
 
-#: export_dialog.cc:102
-#, fuzzy
+#: gtk2_ardour/export_dialog.cc:102
 msgid "Format"
-msgstr "Normal"
+msgstr "format"
 
-#: export_dialog.cc:103
+#: gtk2_ardour/export_dialog.cc:103
 msgid "CD Marker File Type"
-msgstr ""
+msgstr "type de fichier de marqueur de CD"
 
-#: export_dialog.cc:104
-#, fuzzy
+#: gtk2_ardour/export_dialog.cc:104
 msgid "Channels"
-msgstr "annuler"
+msgstr "voies"
 
-#: export_dialog.cc:105
-#, fuzzy
+#: gtk2_ardour/export_dialog.cc:105
 msgid "File Type"
-msgstr "Système de fichier"
+msgstr "type de fichier"
 
-#: export_dialog.cc:106
-#, fuzzy
+#: gtk2_ardour/export_dialog.cc:106
 msgid "Sample Format"
-msgstr "séparer"
+msgstr "format d'échantillon"
 
-#: export_dialog.cc:107
+#: gtk2_ardour/export_dialog.cc:107
 msgid "Sample Endianness"
-msgstr ""
+msgstr "ordre des bits des échantillons"
 
-#: export_dialog.cc:108
-#, fuzzy
+#: gtk2_ardour/export_dialog.cc:108
 msgid "Sample Rate"
-msgstr "séparer"
+msgstr "taux d'échantillonnage"
 
-#: export_dialog.cc:109
-#, fuzzy
+#: gtk2_ardour/export_dialog.cc:109
 msgid "Conversion Quality"
-msgstr "Convertir en complet"
+msgstr "qualité de conversion"
 
-#: export_dialog.cc:110
+#: gtk2_ardour/export_dialog.cc:110
 msgid "Dither Type"
-msgstr ""
+msgstr "type d'interpolation"
 
-#: export_dialog.cc:111
+#: gtk2_ardour/export_dialog.cc:111
 msgid "Export CD Marker File Only"
-msgstr ""
+msgstr "exporter simplement un fichier de marqueurs de CD"
 
-#: export_dialog.cc:112
-#, fuzzy
-msgid "Export to File"
-msgstr "Exporter sur CD"
-
-#: export_dialog.cc:113 option_editor.cc:83 option_editor.cc:84
+#: gtk2_ardour/export_dialog.cc:112 gtk2_ardour/option_editor.cc:84
+#: gtk2_ardour/option_editor.cc:85
 msgid "Browse"
 msgstr "Parcourir"
 
-#: export_dialog.cc:114
+#: gtk2_ardour/export_dialog.cc:113
 msgid "Specific tracks ..."
 msgstr "Pistes spécifiques..."
 
-#: export_dialog.cc:125
-msgid "ardour: export"
-msgstr "ardour : exporter"
-
-#: export_dialog.cc:126
-msgid "ardour_export"
-msgstr "ardour_exporter"
-
-#: export_dialog.cc:139 export_dialog.cc:155 mixer_strip.cc:124
-#: mixer_strip.cc:767
+#: gtk2_ardour/export_dialog.cc:141 gtk2_ardour/export_dialog.cc:157
+#: gtk2_ardour/mixer_strip.cc:124 gtk2_ardour/mixer_strip.cc:739
 msgid "Output"
 msgstr "Sortie"
 
-#: export_dialog.cc:633
+#: gtk2_ardour/export_dialog.cc:635
 msgid "Editor: cannot open \"%1\" as export file for CD toc file"
-msgstr ""
-"Editeur : impossible d'ouvrir \"%1\" comme fichier de table des matières de "
-"CD"
+msgstr "Editeur : impossible d'écrire l'index TOC du CD dans le fichier « %1 »"
 
-#: export_dialog.cc:759
-#, fuzzy
+#: gtk2_ardour/export_dialog.cc:761
 msgid "Editor: cannot open \"%1\" as export file for CD cue file"
 msgstr ""
-"Editeur : impossible d'ouvrir \"%1\" comme fichier d'exportation de marqueur "
-"de piste CD"
+"Editeur : impossible d'écrire le descripteur CUE du CD dans le fichier « %1 »"
 
-#: export_dialog.cc:778
+#: gtk2_ardour/export_dialog.cc:780
 msgid "WAV"
 msgstr "WAV"
 
-#: export_dialog.cc:912
+#: gtk2_ardour/export_dialog.cc:914
 msgid "Stop Export"
 msgstr "Arrêter l'exportation"
 
-#: export_dialog.cc:1131
+#: gtk2_ardour/export_dialog.cc:1133
 msgid "Please enter a valid filename."
-msgstr ""
+msgstr "veuillez entrer un nom de fichier valide"
 
-#: export_dialog.cc:1141
+#: gtk2_ardour/export_dialog.cc:1143
 msgid "Please specify a complete filename for the audio file."
-msgstr ""
+msgstr "veuiller donner un nom complet pour le fichier audio"
 
-#: export_dialog.cc:1147
+#: gtk2_ardour/export_dialog.cc:1149
 msgid "File already exists, do you want to overwrite it?"
-msgstr ""
+msgstr "Le fichier existe déjà. Voulez-vous l'écraser ?"
 
-#: export_dialog.cc:1159 export_range_markers_dialog.cc:153
+#: gtk2_ardour/export_dialog.cc:1161
+#: gtk2_ardour/export_range_markers_dialog.cc:160
 msgid "Cannot write file in: "
-msgstr ""
+msgstr "Impossible d'écrire le fichier dans :"
 
-#. warning dialog
-#: export_range_markers_dialog.cc:135
+#: gtk2_ardour/export_session_dialog.cc:29
+#: gtk2_ardour/export_region_dialog.cc:35
+msgid "Export to File"
+msgstr "exporter vers un fichier"
+
+#: gtk2_ardour/export_region_dialog.cc:34
+msgid "ardour: export region"
+msgstr "ardour : export d'une région"
+
+#: gtk2_ardour/export_range_markers_dialog.cc:41
+msgid "ardour: export ranges"
+msgstr "ardour : export de régions"
+
+#: gtk2_ardour/export_range_markers_dialog.cc:42
+msgid "Export to Directory"
+msgstr "exporter vers un dossier"
+
+#: gtk2_ardour/export_range_markers_dialog.cc:143
 msgid "Please enter a valid target directory."
-msgstr ""
+msgstr "Veuillez entrer un nom de dossier valide."
 
-#: export_range_markers_dialog.cc:143
-msgid ""
-"Please select an existing target directory. Files\n"
-"are not allowed!"
-msgstr ""
+#: gtk2_ardour/export_range_markers_dialog.cc:151
+msgid "Please select an existing target directory. Files are not allowed!"
+msgstr "Veuillez sélectionner un dossier existant (pas un fichier)"
 
-#: gain_automation_time_axis.cc:62
-#, fuzzy
+#: gtk2_ardour/gain_automation_time_axis.cc:64
 msgid "add gain automation event"
-msgstr "ajouter les évènements d'automatisation à "
+msgstr "ajout d'événement d'autom. de gain"
 
-#: gain_meter.cc:67
-msgid "cannot find images for fader slider"
-msgstr ""
-
-#: gain_meter.cc:74
-msgid "cannot find images for fader rail"
-msgstr ""
-
-#: gain_meter.cc:130 gain_meter.cc:339 gain_meter.cc:494 gain_meter.cc:539
-#, fuzzy
+#: gtk2_ardour/gain_meter.cc:112 gtk2_ardour/gain_meter.cc:330
+#: gtk2_ardour/gain_meter.cc:519 gtk2_ardour/gain_meter.cc:590
 msgid "-inf"
-msgstr "entrée"
+msgstr "-inf"
 
-#: gain_meter.cc:140
-#, fuzzy
+#: gtk2_ardour/gain_meter.cc:123
 msgid "Fader automation mode"
-msgstr "mode d'automatisation de panoramique"
+msgstr "mode d'automatisation du gain"
 
-#: gain_meter.cc:141
-#, fuzzy
+#: gtk2_ardour/gain_meter.cc:124
 msgid "Fader automation type"
-msgstr "Type d'automatisation de panoramique"
+msgstr "type d'automatisation du gain"
 
-#. XXX it might different in different languages
-#: gain_meter.cc:182 gain_meter.cc:817 panner_ui.cc:99 panner_ui.cc:807
-#, fuzzy
+#: gtk2_ardour/gain_meter.cc:169 gtk2_ardour/gain_meter.cc:884
+#: gtk2_ardour/panner_ui.cc:98 gtk2_ardour/panner_ui.cc:784
 msgid "Abs"
 msgstr "abs"
 
-#: gain_meter.cc:472
-#, fuzzy
+#: gtk2_ardour/gain_meter.cc:497
 msgid "-Inf"
-msgstr "entrée"
+msgstr "-inf"
 
-#: gain_meter.cc:781 mixer_strip.cc:770 panner_ui.cc:771
-#, fuzzy
-msgid "O"
-msgstr "OU"
+#: gtk2_ardour/gain_meter.cc:700 gtk2_ardour/gain_meter.cc:715
+msgid "meter point change"
+msgstr "changt source vu-mètre"
 
-#: gain_meter.cc:784 panner_ui.cc:774
+#: gtk2_ardour/gain_meter.cc:848 gtk2_ardour/mixer_strip.cc:449
+#: gtk2_ardour/panner_ui.cc:748
+msgid "M"
+msgstr "M"
+
+#: gtk2_ardour/gain_meter.cc:851 gtk2_ardour/panner_ui.cc:751
 msgid "P"
-msgstr ""
+msgstr "P"
 
-#: gain_meter.cc:787 panner_ui.cc:777
+#: gtk2_ardour/gain_meter.cc:854 gtk2_ardour/panner_ui.cc:754
 msgid "T"
-msgstr ""
+msgstr "T"
 
-#: gain_meter.cc:790 panner_ui.cc:780
+#: gtk2_ardour/gain_meter.cc:857 gtk2_ardour/panner_ui.cc:757
 msgid "W"
-msgstr ""
+msgstr "W"
 
-#: gtk-custom-ruler.c:126
-#, fuzzy
+#: gtk2_ardour/gtk-custom-ruler.c:126
 msgid "Lower"
-msgstr "Couche"
+msgstr "inférieur"
 
-#: gtk-custom-ruler.c:127
-#, fuzzy
+#: gtk2_ardour/gtk-custom-ruler.c:127
 msgid "Lower limit of ruler"
-msgstr "Descendre vers la couche du bas"
+msgstr "limite inférieure de la règle"
 
-#: gtk-custom-ruler.c:136
+#: gtk2_ardour/gtk-custom-ruler.c:136
 msgid "Upper"
-msgstr ""
+msgstr "supérieur"
 
-#: gtk-custom-ruler.c:137
+#: gtk2_ardour/gtk-custom-ruler.c:137
 msgid "Upper limit of ruler"
-msgstr ""
+msgstr "limite supérieure de la règle"
 
-#: gtk-custom-ruler.c:146
-#, fuzzy
+#: gtk2_ardour/gtk-custom-ruler.c:146
 msgid "Position"
-msgstr "Synchro. positionelle"
+msgstr "position"
 
-#: gtk-custom-ruler.c:147
+#: gtk2_ardour/gtk-custom-ruler.c:147
 msgid "Position of mark on the ruler"
-msgstr ""
+msgstr "position du repère sur la règle"
 
-#: gtk-custom-ruler.c:156
+#: gtk2_ardour/gtk-custom-ruler.c:156
 msgid "Max Size"
-msgstr ""
+msgstr "taille max"
 
-#: gtk-custom-ruler.c:157
+#: gtk2_ardour/gtk-custom-ruler.c:157
 msgid "Maximum size of the ruler"
-msgstr ""
+msgstr "taille max de la règle"
 
-#: gtk-custom-ruler.c:166
-#, fuzzy
+#: gtk2_ardour/gtk-custom-ruler.c:166
 msgid "Show Position"
-msgstr "Par position de région"
+msgstr "afficher la position"
 
-#: gtk-custom-ruler.c:167
+#: gtk2_ardour/gtk-custom-ruler.c:167
 msgid "Draw current ruler position"
-msgstr ""
+msgstr "dessiner la position actuelle de la règle"
 
-#. end-of-file, other end closed or shutdown?
-#: imageframe_socket_handler.cc:127
+#: gtk2_ardour/imageframe_socket_handler.cc:126
 msgid "Image Compositor Socket has been shutdown/closed"
-msgstr "La socket du compositeur d'image a été arrêtée/fermée"
+msgstr "Le socket du compositeur d'image a été arrêté ou fermé"
 
-#: imageframe_time_axis.cc:286
+#: gtk2_ardour/imageframe_time_axis.cc:285
 msgid "0.5 seconds"
-msgstr "0.5 secondes"
+msgstr "0,5 seconde"
 
-#: imageframe_time_axis.cc:287 marker_time_axis.cc:242
+#: gtk2_ardour/imageframe_time_axis.cc:286 gtk2_ardour/marker_time_axis.cc:241
 msgid "1 seconds"
 msgstr "1 seconde"
 
-#: imageframe_time_axis.cc:288 marker_time_axis.cc:243
+#: gtk2_ardour/imageframe_time_axis.cc:287 gtk2_ardour/marker_time_axis.cc:242
 msgid "1.5 seconds"
-msgstr "1.5 secondes"
+msgstr "1,5 secondes"
 
-#: imageframe_time_axis.cc:289 marker_time_axis.cc:244
+#: gtk2_ardour/imageframe_time_axis.cc:288 gtk2_ardour/marker_time_axis.cc:243
 msgid "2 seconds"
 msgstr "2 secondes"
 
-#: imageframe_time_axis.cc:290 marker_time_axis.cc:245
+#: gtk2_ardour/imageframe_time_axis.cc:289 gtk2_ardour/marker_time_axis.cc:244
 msgid "2.5 seconds"
-msgstr "2.5 secondes"
+msgstr "2,5 secondes"
 
-#: imageframe_time_axis.cc:291 marker_time_axis.cc:246
+#: gtk2_ardour/imageframe_time_axis.cc:290 gtk2_ardour/marker_time_axis.cc:245
 msgid "3 seconds"
 msgstr "3 secondes"
 
-#. duration_items.push_back(SeparatorElem()) ;
-#. duration_items.push_back(MenuElem (_("custom"), mem_fun(*this, &ImageFrameTimeAxis::set_marker_duration_custom))) ;
-#: imageframe_time_axis.cc:296 marker_time_axis.cc:251
+#: gtk2_ardour/imageframe_time_axis.cc:295 gtk2_ardour/marker_time_axis.cc:250
 msgid "Duration (sec)"
-msgstr "Durée (s)"
+msgstr "durée (s)"
 
-#: imageframe_time_axis.cc:301
+#: gtk2_ardour/imageframe_time_axis.cc:300
 msgid "Remove Frame"
 msgstr "Enlever une trame"
 
-#: imageframe_time_axis.cc:304
+#: gtk2_ardour/imageframe_time_axis.cc:303
 msgid "Image Frame"
 msgstr "Trame d'image"
 
-#: imageframe_time_axis.cc:305 marker_time_axis.cc:257
+#: gtk2_ardour/imageframe_time_axis.cc:304 gtk2_ardour/marker_time_axis.cc:256
 msgid "Rename Track"
 msgstr "Renommer la piste"
 
-#: io_selector.cc:60 io_selector.cc:794
+#: gtk2_ardour/io_selector.cc:61 gtk2_ardour/io_selector.cc:749
+#: gtk2_ardour/connection_editor.cc:60 gtk2_ardour/connection_editor.cc:109
 msgid "Rescan"
 msgstr "Rafraîchir"
 
-#: io_selector.cc:68
+#: gtk2_ardour/io_selector.cc:69
 msgid "%1 input"
 msgstr "entrée %1"
 
-#: io_selector.cc:70
+#: gtk2_ardour/io_selector.cc:71
 msgid "%1 output"
 msgstr "sortie %1"
 
-#: io_selector.cc:142 route_params_ui.cc:107
+#: gtk2_ardour/io_selector.cc:143 gtk2_ardour/route_params_ui.cc:103
 msgid "Inputs"
 msgstr "Entrées"
 
-#: io_selector.cc:142 route_params_ui.cc:108
+#: gtk2_ardour/io_selector.cc:143 gtk2_ardour/route_params_ui.cc:104
 msgid "Outputs"
 msgstr "Sorties"
 
-#: io_selector.cc:143
+#: gtk2_ardour/io_selector.cc:144
 msgid "Add Input"
 msgstr "Ajouter une entrée"
 
-#: io_selector.cc:143
+#: gtk2_ardour/io_selector.cc:144
 msgid "Add Output"
 msgstr "Ajouter une sortie"
 
-#: io_selector.cc:144
+#: gtk2_ardour/io_selector.cc:145
 msgid "Remove Input"
 msgstr "Enlever une entrée"
 
-#: io_selector.cc:144
+#: gtk2_ardour/io_selector.cc:145
 msgid "Remove Output"
 msgstr "Enlever une sortie"
 
-#: io_selector.cc:145
+#: gtk2_ardour/io_selector.cc:146
 msgid "Disconnect All"
 msgstr "Déconnecter tout"
 
-#: io_selector.cc:159
+#: gtk2_ardour/io_selector.cc:160
 msgid "Available connections"
 msgstr "Connexions disponibles"
 
-#: io_selector.cc:555 io_selector.cc:574
+#: gtk2_ardour/io_selector.cc:548 gtk2_ardour/io_selector.cc:559
 msgid "There are no more JACK ports available."
-msgstr "Il n'y a plus de ports JACK disponibles"
+msgstr "Il n'y a plus de port JACK disponible"
 
-#: io_selector.cc:649 io_selector.cc:676 io_selector.cc:729
-msgid "port"
-msgstr "port"
-
-#: io_selector.cc:798
+#: gtk2_ardour/io_selector.cc:753
 msgid "ardour: "
-msgstr "ardour :"
+msgstr "ardour : "
 
-#: keyboard.cc:299
-msgid "KeyboardTarget: keyname \"%1\" is unknown."
-msgstr "KeyboardTarget : nom de touche \"%1\" inconnue"
+#: gtk2_ardour/ladspa_pluginui.cc:77
+msgid "<span size=\"large\">Presets</span>"
+msgstr "<span size=\"large\">réglages préféfinis</span>"
 
-#: keyboard.cc:525
-msgid ""
-"Your system is completely broken - NumLock uses \"%1\"as its modifier. This "
-"is madness - see the man page for xmodmap to find out how to fix this."
+#: gtk2_ardour/ladspa_pluginui.cc:205
+msgid "Plugin Editor: could not build control element for port %1"
 msgstr ""
-"Votre système débloque complétement -- la touche de verrouillage numérique "
-"utilise \"%1\" comme modificateur. C'est n'importe quoi -- consultez la page "
-"de manuel de xmodmap pour trouver comment réparer ça."
+"Éditeur de plugin : impossible de construire l'élément de contrôle pour le "
+"port %1"
 
-#: keyboard.cc:533
-msgid ""
-"Your system generates \"%1\" when the NumLock key is pressed. This can cause "
-"problems when editing so Ardour will use %2 to mean Meta rather than %1"
-msgstr ""
-"Votre système génère \"%1\" quand la touche de verrouillage numérique est "
-"pressée. Cela peut causer des problèmes pendant l'édition, aussi Ardour "
-"utilisera %2 comme touche Meta plutôt que %1"
+#: gtk2_ardour/ladspa_pluginui.cc:295
+msgid "Automation control"
+msgstr "contrôle d'automatisation"
 
-#: keyboard.cc:594
-msgid "You have %1 keys bound to \"mod1\""
-msgstr "Vous avez %1 touches affectées à \"mod1\""
+#: gtk2_ardour/ladspa_pluginui.cc:302
+msgid "Mgnual"
+msgstr "Manuel"
 
-#: keyboard.cc:609
-msgid "You have %1 keys bound to \"mod2\""
-msgstr "Vous avez %1 touches affectées à \"mod2\""
-
-#: keyboard.cc:624
-msgid "You have %1 keys bound to \"mod3\""
-msgstr "Vous avez %1 touches affectées à \"mod3\""
-
-#: keyboard.cc:639
-msgid "You have %1 keys bound to \"mod4\""
-msgstr "Vous avez %1 touches affectées à \"mod4\""
-
-#: keyboard.cc:654
-msgid "You have %1 keys bound to \"mod5\""
-msgstr "Vous avez %1 touches affectées à \"mod5\""
-
-#: location_ui.cc:48 location_ui.cc:51
+#: gtk2_ardour/location_ui.cc:49 gtk2_ardour/location_ui.cc:52
 msgid "Set"
 msgstr "Définir"
 
-#: location_ui.cc:49 location_ui.cc:52
+#: gtk2_ardour/location_ui.cc:50 gtk2_ardour/location_ui.cc:53
 msgid "Go"
 msgstr "Aller"
 
-#: location_ui.cc:55
+#: gtk2_ardour/location_ui.cc:56
 msgid "CD"
 msgstr "CD"
 
-#: location_ui.cc:58
+#: gtk2_ardour/location_ui.cc:59
 msgid "SCMS"
 msgstr "SCMS"
 
-#: location_ui.cc:59
+#: gtk2_ardour/location_ui.cc:60
 msgid "Pre-Emphasis"
-msgstr "Pré-emphase"
+msgstr "Pré-accentuation"
 
-#: location_ui.cc:570
+#: gtk2_ardour/location_ui.cc:571
 msgid "Add New Location"
-msgstr "Ajouter un nouvel emplacement"
+msgstr "ajouter un repère temporel"
 
-#: location_ui.cc:571
+#: gtk2_ardour/location_ui.cc:572
 msgid "Add New Range"
-msgstr "Ajouter un nouvel intervalle"
+msgstr "ajouter un intervalle"
 
-#: location_ui.cc:575
-msgid "ardour: locations"
-msgstr "ardour : emplacements"
-
-#: location_ui.cc:576
-msgid "ardour_locations"
-msgstr "ardour_emplacements"
-
-#: location_ui.cc:604
-#, fuzzy
+#: gtk2_ardour/location_ui.cc:608
 msgid "Location (CD Index) Markers"
-msgstr "Marqueurs d'emplacements (Index de CD)"
+msgstr "Repères temporels (et index de CD)"
 
-#: location_ui.cc:624
-#, fuzzy
+#: gtk2_ardour/location_ui.cc:628
 msgid "Range (CD Track) Markers"
-msgstr "Marqueurs d'intervalles (Piste de CD)"
+msgstr "Intervalles (et plages de CD)"
 
-#: location_ui.cc:790
+#: gtk2_ardour/location_ui.cc:801
 msgid "add range marker"
-msgstr "ajouter marqueur d'intervalle"
+msgstr "ajouter un intervalle"
 
-#: main.cc:72
-msgid "ardour is killing itself for a clean exit\n"
-msgstr "ardour se termine lui-même pour une sortie propre\n"
-
-#: main.cc:81
-msgid "stopping user interface\n"
-msgstr "en train d'arrêter l'interface utilisateur\n"
-
-#. XXX its doubtful that snprintf() is async-safe
-#: main.cc:100
-#, c-format
-msgid "%d(%d): received signal %d\n"
-msgstr "%d(%d) : reçu le signal %d\n"
-
-#: main.cc:180
-msgid "cannot become new process group leader (%1)"
-msgstr ""
-
-#: main.cc:207
-msgid "cannot setup signal handling for %1"
-msgstr "impossible d'installer le gestionnaire de signaux pour %1"
-
-#: main.cc:218
-msgid "cannot set default signal mask (%1)"
-msgstr "impossible de définir le masque de signalisation"
-
-#: main.cc:248
-#, fuzzy
+#: gtk2_ardour/main.cc:75
 msgid ""
 "Without a UI style file, ardour will look strange.\n"
 " Please set ARDOUR2_UI_RC to point to a valid UI style file"
 msgstr ""
-"Sans un fichier de style pour son IHM, ardour aura une apparence bizarre.\n"
-"Veuillez faire pointer ARDOUR_UI_RC vers un fichier de style d'IHM valide"
+"Sans fichier de style pour son interface, Ardour aura une apparence "
+"bizarre.\n"
+"Veuillez faire pointer ARDOUR2_UI_RC vers un fichier de style valide"
 
-#: main.cc:270
-#, fuzzy
+#: gtk2_ardour/main.cc:96
 msgid "Ardour could not connect to JACK."
-msgstr "Impossible de se reconnecter à JACK"
+msgstr "Impossible de se connecter à JACK"
 
-#: main.cc:274
-#, fuzzy
+#: gtk2_ardour/main.cc:100
 msgid ""
 "There are several possible reasons:\n"
 "\n"
@@ -4846,33 +4726,19 @@ msgid ""
 "\n"
 "Please consider the possibilities, and perhaps (re)start JACK."
 msgstr ""
-"Ardour n'a pas pu se connecter à JACK.\n"
 "Il y a plusieurs raisons possibles :\n"
 "\n"
 "1) JACK n'est pas lancé.\n"
 "2) JACK tourne sous un autre utilisateur, peut-être root.\n"
-"3) Il y a un autre client appelé \"ardour\".\n"
+"3) Il y a un autre programme client appelé \"ardour\".\n"
 "\n"
-"Veuillez étudier les possibilités, et peut-être (re)lancer JACK."
+"Veuillez étudier ces possibilités, et peut-être (re)lancer JACK."
 
-#: main.cc:304
+#: gtk2_ardour/main.cc:144
 msgid "could not load command line session \"%1\""
-msgstr "impossible de charger la session indiqué en ligne de commande \"%1\""
+msgstr "impossible de charger la session indiquée en ligne de commande « %1 »"
 
-#. it wasn't new, but we require a new session
-#: main.cc:324
-msgid ""
-"\n"
-"\n"
-"A session named \"%1\" already exists.\n"
-"To avoid this message, start ardour as \"ardour %1"
-msgstr ""
-"\n"
-"\n"
-"Une session nommé \"%1\" existe déjà.\n"
-"Pour éviter ce message, lancez ardour comme cela : \"ardour %1"
-
-#: main.cc:335
+#: gtk2_ardour/main.cc:152
 msgid ""
 "\n"
 "\n"
@@ -4881,763 +4747,670 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Aucune session nommée \"%1\" n'existe.\n"
-"Pour la créer depuis la ligne de commande, lancez ardour comme cela : "
+"Il n'existe pas de session nommée « %1 ».\n"
+"Pour la créer depuis la ligne de commande, lancez ardour en tapant ceci : "
 "\"ardour --new %1"
 
-#: main.cc:399
+#: gtk2_ardour/main.cc:225
 msgid "Ardour/GTK "
 msgstr "Ardour/GTK"
 
-#: main.cc:401
+#: gtk2_ardour/main.cc:227
 msgid ""
 "\n"
 "   (built using "
 msgstr ""
 "\n"
-"   (fonctionnant avec "
+"   (construit avec "
 
-#: main.cc:405
-msgid " with libardour "
-msgstr " avec libardour "
-
-#: main.cc:410
+#: gtk2_ardour/main.cc:230
 msgid " and GCC version "
-msgstr ""
+msgstr " et GCC version "
 
-#: main.cc:420
-#, fuzzy
-msgid "Copyright (C) 1999-2006 Paul Davis"
-msgstr "Copyright (C) 1999-2005 Paul Davis"
+#: gtk2_ardour/main.cc:240
+msgid "Copyright (C) 1999-2007 Paul Davis"
+msgstr "Copyright (C) 1999-2007 Paul Davis"
 
-#: main.cc:421
+#: gtk2_ardour/main.cc:241
 msgid ""
 "Some portions Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
 "Baker"
 msgstr ""
-"Certaines parties Copyright (C) Steve Harris, Ari Johnson, Brett Viren, Joel "
-"Baker"
+"Pour certaines parties, Copyright (C) Steve Harris, Ari Johnson, Brett "
+"Viren, Joel Baker"
 
-#: main.cc:423
+#: gtk2_ardour/main.cc:243
 msgid "Ardour comes with ABSOLUTELY NO WARRANTY"
 msgstr "Ardour est distribué sans AUCUNE GARANTIE"
 
-#: main.cc:424
+#: gtk2_ardour/main.cc:244
 msgid "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-msgstr "ni même pour la COMMERCIALISATION ou pour UN BUT PARTICULIER."
+msgstr ""
+"pas même de COMMERCIALISATION\n"
+"ou d'ADÉQUATION À UN BUT PARTICULIER."
 
-#: main.cc:425
+#: gtk2_ardour/main.cc:245
 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:426
+#: gtk2_ardour/main.cc:246
 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:435
+#: gtk2_ardour/main.cc:257
 msgid "could not create ARDOUR GUI"
-msgstr "impossible de créer l'interface utilisateur d'ARDOUR"
+msgstr "impossible de créer l'interface utilisateur d'Ardour"
 
-#: main.cc:453
+#: gtk2_ardour/main.cc:282
 msgid "Could not connect to JACK server as  \"%1\""
-msgstr "Impossible de se connecter au serveur JACK en tant que \"%1\""
+msgstr "Impossible de se connecter au serveur JACK en tant que « %1 »"
 
-#: main.cc:456
+#: gtk2_ardour/main.cc:289
 msgid "could not initialize Ardour."
 msgstr "impossible d'initialiser Ardour."
 
-#: marker.cc:244
-#, fuzzy
+#: gtk2_ardour/marker.cc:243
 msgid "MarkerText"
-msgstr "Marqueur"
+msgstr "MarkerText"
 
-#: marker_time_axis.cc:254
+#: gtk2_ardour/marker_time_axis.cc:253
 msgid "Remove Marker"
-msgstr "Enlever les marqueurs"
+msgstr "Enlever le repère"
 
-#: marker_time_axis.cc:256
+#: gtk2_ardour/marker_time_axis.cc:255
 msgid "Marker"
 msgstr "Marqueur"
 
-#: meter_bridge.cc:78
-msgid "ardour: meter bridge"
-msgstr "ardour : bandeau de vu-mètre"
-
-#: meter_bridge.cc:79
-msgid "ardour_meter_bridge"
-msgstr "ardour_bandeau_vu-mètre"
-
-#: meter_bridge_strip.cc:80 meter_bridge_strip.cc:94
-#, c-format
-msgid "# of %u-sample overs"
-msgstr "# de %u-échantillons en dépassement"
-
-#: meter_bridge_strip.cc:222
-#, fuzzy
-msgid "New Name for Meter:"
-msgstr "Nouveau nom du vu-mètre :"
-
-#: mixer_strip.cc:95 mixer_strip.cc:140 mixer_strip.cc:1227
+#: gtk2_ardour/mixer_strip.cc:95 gtk2_ardour/mixer_strip.cc:140
+#: gtk2_ardour/mixer_strip.cc:1211
 msgid "pre"
-msgstr ""
+msgstr "pré"
 
-#: mixer_strip.cc:96 mixer_strip.cc:822
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:96 gtk2_ardour/mixer_strip.cc:789
 msgid "Comments"
 msgstr "commentaires"
 
-#: mixer_strip.cc:119
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:119
 msgid "Input"
-msgstr "Entrées"
+msgstr "Entrée"
 
-#: mixer_strip.cc:136 mixer_strip.cc:1223
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:136 gtk2_ardour/mixer_strip.cc:1207
 msgid "input"
-msgstr "entrée %1"
+msgstr "entrée"
 
-#: mixer_strip.cc:144 mixer_strip.cc:1231
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:144 gtk2_ardour/mixer_strip.cc:1215
 msgid "post"
-msgstr "port"
+msgstr "post"
 
-#. TRANSLATORS: this string should be longest of the strings
-#. used to describe meter points. In english, its "input".
-#.
-#: mixer_strip.cc:152
+#: gtk2_ardour/mixer_strip.cc:151
 msgid "tupni"
-msgstr ""
+msgstr "tupni"
 
-#: mixer_strip.cc:207
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:199
 msgid "Varispeed"
-msgstr "varispeed"
+msgstr "molette"
 
-#: mixer_strip.cc:233 mixer_strip.cc:836
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:225 gtk2_ardour/mixer_strip.cc:805
 msgid "Click to Add/Edit Comments"
-msgstr "cliquer pour ajouter/éditer des commentaires"
+msgstr "ajouter ou modifier des commentaires"
 
-#: mixer_strip.cc:374
+#: gtk2_ardour/mixer_strip.cc:380
 msgid "unknown strip width \"%1\" in XML GUI information"
 msgstr ""
-"largeur de tranche inconnue \"%1\" dans les données XML de l'interface "
+"largeur de tranche inconnue « %1 » dans les données XML de l'interface "
 "utilisateur"
 
-#: mixer_strip.cc:417
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:423
 msgid "record"
-msgstr "Enregistrer"
+msgstr "Enregistrement"
 
-#: mixer_strip.cc:418 region_editor.cc:47
-msgid "mute"
-msgstr "muet"
-
-#: mixer_strip.cc:419
-msgid "solo"
-msgstr "solo"
-
-#: mixer_strip.cc:422
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:430
 msgid "comments"
 msgstr "commentaires"
 
-#: mixer_strip.cc:424
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:433
 msgid "*comments*"
 msgstr "commentaires"
 
-#: mixer_strip.cc:438
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:447
 msgid "Rec"
-msgstr "Rafraîchir"
+msgstr "Enreg."
 
-#: mixer_strip.cc:439
-msgid "M"
-msgstr ""
-
-#: mixer_strip.cc:440
+#: gtk2_ardour/mixer_strip.cc:450
 msgid "S"
-msgstr ""
+msgstr "S"
 
-#: mixer_strip.cc:443 mixer_strip.cc:830
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:454 gtk2_ardour/mixer_strip.cc:799
 msgid "Cmt"
-msgstr "cmt"
+msgstr "Cmt"
 
-#: mixer_strip.cc:445 mixer_strip.cc:828
+#: gtk2_ardour/mixer_strip.cc:457 gtk2_ardour/mixer_strip.cc:796
 msgid "*Cmt*"
-msgstr ""
+msgstr "*Cmt*"
 
-#: mixer_strip.cc:483 mixer_strip.cc:549 redirect_box.cc:1006
+#: gtk2_ardour/mixer_strip.cc:496 gtk2_ardour/mixer_strip.cc:562
+#: gtk2_ardour/redirect_box.cc:1092
 msgid "Not connected to JACK - no I/O changes are possible"
-msgstr ""
+msgstr "Non connecté à JACK – aucun changement d'entrée/sortie n'est possible"
 
-#: mixer_strip.cc:560
-msgid "Track"
-msgstr "Piste"
-
-#: mixer_strip.cc:588 mixer_strip.cc:604
+#: gtk2_ardour/mixer_strip.cc:596 gtk2_ardour/mixer_strip.cc:612
 msgid "could not register new ports required for that connection"
 msgstr "impossible de définir les nouveaux ports requis pour cette connexion"
 
-#: mixer_strip.cc:747
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:719
 msgid " Input"
-msgstr "# entrées"
+msgstr " entrée"
 
-#: mixer_strip.cc:750
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:722
 msgid "I"
-msgstr "ENTRÉE"
+msgstr "I"
 
-#: mixer_strip.cc:820
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:742
+msgid "O"
+msgstr "O"
+
+#: gtk2_ardour/mixer_strip.cc:786
 msgid "*Comments*"
-msgstr "commentaires"
+msgstr "*commentaires*"
 
-#: mixer_strip.cc:859
+#: gtk2_ardour/mixer_strip.cc:841
 msgid ": comment editor"
 msgstr ": éditeur de commentaires"
 
-#: mixer_strip.cc:953
+#: gtk2_ardour/mixer_strip.cc:936
 msgid "Grp"
-msgstr ""
+msgstr "Grp"
 
-#: mixer_strip.cc:956
+#: gtk2_ardour/mixer_strip.cc:939
 msgid "~G"
 msgstr "~G"
 
-#: mixer_strip.cc:1004
-#, fuzzy
+#: gtk2_ardour/mixer_strip.cc:988
 msgid "Invert Polarity"
-msgstr "polarité"
+msgstr "inverser la polarité"
 
-#: mixer_ui.cc:85
+#: gtk2_ardour/mixer_ui.cc:82
 msgid "Strips"
 msgstr "Tranches"
 
-#: mixer_ui.cc:110
-#, fuzzy
+#: gtk2_ardour/mixer_ui.cc:107
 msgid "Group"
-msgstr "Groupes de mixage"
+msgstr "Groupe"
 
-#: mixer_ui.cc:211 mixer_ui.cc:370
-msgid "ardour: mixer"
-msgstr "ardour : console de mixage"
+#: gtk2_ardour/mixer_ui.cc:207 gtk2_ardour/mixer_ui.cc:362
+#: gtk2_ardour/mixer_ui.cc:394
+msgid "Mixer"
+msgstr "Console de mixage..."
 
-#: mixer_ui.cc:212
-msgid "ardour_mixer"
-msgstr "ardour_console_de_mixage"
-
-#: mixer_ui.cc:346
-msgid "ardour: mixer: "
-msgstr "ardour : console de mixage :"
-
-#: mixer_ui.cc:573
+#: gtk2_ardour/mixer_ui.cc:601
 msgid "signal"
 msgstr "signal"
 
-#: mixer_ui.cc:723
+#: gtk2_ardour/mixer_ui.cc:752
 msgid "track display list item for renamed strip not found!"
 msgstr ""
+"élément de liste d'affichage de piste introuvable pour la tranche renommée !"
 
-#: new_session_dialog.cc:39
-#, fuzzy
-msgid "New Session Name :"
+#: gtk2_ardour/new_session_dialog.cc:44
+msgid "Name :"
 msgstr "Nom de la session :"
 
-#: new_session_dialog.cc:41
-msgid "Create Session Directory In :"
-msgstr ""
+#: gtk2_ardour/new_session_dialog.cc:48 gtk2_ardour/new_session_dialog.cc:49
+#: gtk2_ardour/new_session_dialog.cc:50 gtk2_ardour/new_session_dialog.cc:51
+msgid "channels"
+msgstr "voies"
 
-#: new_session_dialog.cc:43
-#, fuzzy
-msgid "Use Session Template :"
-msgstr "Modèle de session"
+#: gtk2_ardour/new_session_dialog.cc:69
+msgid "<b>Busses</b>"
+msgstr "<b>Bus :</b>"
 
-#: new_session_dialog.cc:45
-#, fuzzy
-msgid "Channel Count"
-msgstr "Annuler l'importation"
+#: gtk2_ardour/new_session_dialog.cc:70
+msgid "<b>Inputs</b>"
+msgstr "<b>Entrées :</b>"
 
-#: new_session_dialog.cc:46
-#, fuzzy
+#: gtk2_ardour/new_session_dialog.cc:71
+msgid "<b>Outputs</b>"
+msgstr "<b>Sorties :</b>"
+
+#: gtk2_ardour/new_session_dialog.cc:73
+msgid "Create Folder In :"
+msgstr "Créer le dossier dans :"
+
+#: gtk2_ardour/new_session_dialog.cc:75
+msgid "Template :"
+msgstr "Modèle de session :"
+
+#: gtk2_ardour/new_session_dialog.cc:77
 msgid "Create Monitor Bus"
-msgstr "Sorties de contrôle"
+msgstr "Bus d'écoute à "
 
-#: new_session_dialog.cc:53
-#, fuzzy
+#: gtk2_ardour/new_session_dialog.cc:84
 msgid "Create Master Bus"
-msgstr "utiliser les sorties maître"
+msgstr "Bus de sortie à "
 
-#: new_session_dialog.cc:55
-#, fuzzy
-msgid "Automatically Connect Inputs"
-msgstr "connecter les entrées de piste aux ports physiques automatiquement"
+#: gtk2_ardour/new_session_dialog.cc:86
+msgid "Automatically Connect to Physical Inputs"
+msgstr "relier aux entrées matérielles"
 
-#: new_session_dialog.cc:56 new_session_dialog.cc:67
-#, fuzzy
-msgid "Port Limit"
-msgstr "Oublier"
+#: gtk2_ardour/new_session_dialog.cc:87 gtk2_ardour/new_session_dialog.cc:100
+msgid "Use only"
+msgstr "Utiliser seulement"
 
-#: new_session_dialog.cc:64
-#, fuzzy
-msgid "<b>Track/Bus Inputs</b>"
-msgstr "Inspecteur de pistes/bus"
-
-#: new_session_dialog.cc:66
-#, fuzzy
+#: gtk2_ardour/new_session_dialog.cc:99
 msgid "Automatically Connect Outputs"
-msgstr "connecter les sorties de piste manuellement"
+msgstr "relier les sorties..."
 
-#: new_session_dialog.cc:75
-msgid "Connect to Master Bus"
-msgstr ""
+#: gtk2_ardour/new_session_dialog.cc:108
+msgid "... to Master Bus"
+msgstr "...au bus général"
 
-#: new_session_dialog.cc:76
-msgid "Connect to Physical Outputs"
-msgstr ""
+#: gtk2_ardour/new_session_dialog.cc:109
+msgid "... to Physical Outputs"
+msgstr "...aux sorties matérielles"
 
-#: new_session_dialog.cc:80
-#, fuzzy
-msgid "<b>Track/Bus Outputs</b>"
-msgstr "Sortie"
-
-#: new_session_dialog.cc:83
-#, fuzzy
+#: gtk2_ardour/new_session_dialog.cc:115
 msgid "Advanced Options"
-msgstr "Éditeur d'options"
+msgstr "Options..."
 
-#: new_session_dialog.cc:91
-#, fuzzy
-msgid "Open Recent Session"
-msgstr "ouvrir session"
+#: gtk2_ardour/new_session_dialog.cc:123
+msgid "Recent:"
+msgstr "Sessions récentes :"
 
-#: new_session_dialog.cc:127
-#, fuzzy
-msgid "Open Session File :"
-msgstr "ouvrir session"
+#: gtk2_ardour/new_session_dialog.cc:160
+msgid "Browse:"
+msgstr "Autre session :"
 
-#: new_session_dialog.cc:274
-#, fuzzy
+#: gtk2_ardour/new_session_dialog.cc:338
 msgid "New Session"
-msgstr "Session"
+msgstr "Créer une session"
 
-#: new_session_dialog.cc:276
-#, fuzzy
+#: gtk2_ardour/new_session_dialog.cc:340
 msgid "Open Session"
-msgstr "ouvrir session"
+msgstr "Ouvrir une session"
 
-#: new_session_dialog.cc:281
-#, fuzzy
-msgid "ardour: session control"
-msgstr "ardour_nouvelle_session"
+#: gtk2_ardour/new_session_dialog.cc:347
+msgid "Session Control"
+msgstr "ardour : gestion des sessions"
 
-#: new_session_dialog.cc:310
-#, fuzzy
+#: gtk2_ardour/new_session_dialog.cc:390
 msgid "select template"
-msgstr "Pas de modèle"
+msgstr "choix du modèle"
 
-#: new_session_dialog.cc:316
-#, fuzzy
+#: gtk2_ardour/new_session_dialog.cc:396
 msgid "select session file"
-msgstr "sélectionner les régions"
+msgstr "sélection du fichier de session"
 
-#: new_session_dialog.cc:325
-#, fuzzy
+#: gtk2_ardour/new_session_dialog.cc:405
 msgid "select directory"
-msgstr "sélectionner les régions"
+msgstr "sélection d'un dossier"
 
-#: option_editor.cc:76
-#, fuzzy
+#: gtk2_ardour/option_editor.cc:74
 msgid "SMPTE offset is negative"
-msgstr "Décalage SMPTE"
+msgstr "décalage négatif"
 
-#: option_editor.cc:102
-msgid "ardour: options editor"
-msgstr "ardour : éditeur d'options"
-
-#: option_editor.cc:103
-msgid "ardour_option_editor"
-msgstr "ardour_éditeur_d_options"
-
-#: option_editor.cc:127
+#: gtk2_ardour/option_editor.cc:131
 msgid "Paths/Files"
 msgstr "Chemins/Fichiers"
 
-#: option_editor.cc:128
+#: gtk2_ardour/option_editor.cc:132
 msgid "Kbd/Mouse"
 msgstr "Clavier/Souris"
 
-#: option_editor.cc:131
+#: gtk2_ardour/option_editor.cc:135
 msgid "Layers & Fades"
-msgstr "Couches & fondus"
+msgstr "Calques/Fondus"
 
-#: option_editor.cc:135
+#: gtk2_ardour/option_editor.cc:139
 msgid "MIDI"
-msgstr "MIDI"
+msgstr "périph. MIDI"
 
-#: option_editor.cc:177
-msgid "24 FPS"
-msgstr "24 TPS"
-
-#: option_editor.cc:179
-#, fuzzy
-msgid "25 FPS"
-msgstr "25 TPS"
-
-#: option_editor.cc:181
-#, fuzzy
-msgid "30 FPS"
-msgstr "30 TPS drop"
-
-#: option_editor.cc:187
-#, fuzzy
-msgid "30 FPS drop"
-msgstr "30 TPS drop"
-
-#: option_editor.cc:244
+#: gtk2_ardour/option_editor.cc:227
 msgid "session RAID path"
-msgstr "chemin de session RAID"
+msgstr "chemin vers la session (RAID de préférence)"
 
-#: option_editor.cc:249
-#, fuzzy
-msgid "Soundfile Search Paths"
-msgstr "Bibliothèque audio"
-
-#: option_editor.cc:254
-#, fuzzy
-msgid "Paths"
-msgstr "Chemins/Fichiers"
-
-#: option_editor.cc:268 option_editor.cc:274 option_editor.cc:723
-#: option_editor.cc:750
+#: gtk2_ardour/option_editor.cc:243 gtk2_ardour/option_editor.cc:249
+#: gtk2_ardour/option_editor.cc:671 gtk2_ardour/option_editor.cc:691
 msgid "internal"
 msgstr "interne"
 
-#: option_editor.cc:287
+#: gtk2_ardour/option_editor.cc:262
 msgid "Short crossfade length (msecs)"
-msgstr "fondu enchaîné court (ms)"
+msgstr "durée du fondu court (ms)"
 
-#: option_editor.cc:299
-#, fuzzy
+#: gtk2_ardour/option_editor.cc:274
 msgid "Destructive crossfade length (msecs)"
-msgstr "fondu enchaîné court (ms)"
+msgstr "longueur du fondu destructif (ms)"
 
-#: option_editor.cc:367
-msgid "SMPTE Frames/second"
-msgstr "Trames SMPTE/seconde"
-
-#: option_editor.cc:368
+#: gtk2_ardour/option_editor.cc:334
 msgid "SMPTE Offset"
 msgstr "Décalage SMPTE"
 
-#: option_editor.cc:462 option_editor.cc:469 option_editor.cc:472
-#: option_editor.cc:618
-#, fuzzy
-msgid "online"
-msgstr "linéaire"
+#: gtk2_ardour/option_editor.cc:382
+msgid "Port"
+msgstr "Port"
 
-#. remember, we have to handle the i18n case where the relative
-#. lengths of the strings in language N is different than in english.
-#.
-#: option_editor.cc:469 option_editor.cc:470 option_editor.cc:615
-#, fuzzy
-msgid "offline"
-msgstr "linéaire"
+#: gtk2_ardour/option_editor.cc:383
+msgid "Offline"
+msgstr "présence"
 
-#: option_editor.cc:670
-msgid "Choose Click"
+#: gtk2_ardour/option_editor.cc:384
+msgid ""
+"Trace\n"
+"Input"
 msgstr ""
+"voir entrée\n"
+"dans la console"
 
-#: option_editor.cc:689
-#, fuzzy
+#: gtk2_ardour/option_editor.cc:385
+msgid ""
+"Trace\n"
+"Output"
+msgstr ""
+"voir sortie\n"
+"dans la console"
+
+#: gtk2_ardour/option_editor.cc:386
+msgid "MTC"
+msgstr "MTC"
+
+#: gtk2_ardour/option_editor.cc:387
+msgid "MMC"
+msgstr "MMC"
+
+#: gtk2_ardour/option_editor.cc:388
+msgid ""
+"MIDI Parameter\n"
+"Control"
+msgstr "param.\nMIDI"
+
+#: gtk2_ardour/option_editor.cc:394
+msgid "MMC Device ID"
+msgstr "identifiant\nMMC"
+
+#: gtk2_ardour/option_editor.cc:406 gtk2_ardour/option_editor.cc:413
+#: gtk2_ardour/option_editor.cc:416 gtk2_ardour/option_editor.cc:561
+msgid "online"
+msgstr "actif"
+
+#: gtk2_ardour/option_editor.cc:413 gtk2_ardour/option_editor.cc:414
+#: gtk2_ardour/option_editor.cc:558
+msgid "offline"
+msgstr "inactif"
+
+#: gtk2_ardour/option_editor.cc:624
+msgid "Choose Click"
+msgstr "choix du clic"
+
+#: gtk2_ardour/option_editor.cc:643
 msgid "Choose Click Emphasis"
-msgstr "Utiliser comme emphase de clic"
+msgstr "choix du clic accentué"
 
-#: option_editor.cc:803
+#: gtk2_ardour/option_editor.cc:743
 msgid "Click audio file"
-msgstr "Fichier audio de clic"
+msgstr "son du clic :"
 
-#: option_editor.cc:809
+#: gtk2_ardour/option_editor.cc:749
 msgid "Click emphasis audiofile"
-msgstr "Fichier audio d'emphase de clic"
+msgstr "son du clic accentué :"
 
-#: option_editor.cc:846
+#: gtk2_ardour/option_editor.cc:786
 msgid ""
 "The auditioner is a dedicated mixer strip used\n"
 "for listening to specific regions outside the context\n"
 "of the overall mix. It can be connected just like any\n"
 "other mixer strip."
 msgstr ""
-"L'auditioneur est une tranche de mixage dédiée utilisée\n"
-"pour écouter des régions spécifiques en dehors du contexte\n"
-"du mixage global. Il peut être connecté tout comme n'importe\n"
+"Une tranche de mixage dédiée est utilisée pour écouter des régions "
+"spécifiques\n"
+"en dehors du contexte du mixage global. Elle peut être connectée comme "
+"n'importe\n"
 "quelle autre tranche de mixage."
 
-#: option_editor.cc:919
+#: gtk2_ardour/option_editor.cc:859
 msgid "Edit using"
-msgstr "Édition en utilisant"
+msgstr "Raccourci pour l'édition : utiliser la touche"
 
-#: option_editor.cc:926 option_editor.cc:953
+#: gtk2_ardour/option_editor.cc:866 gtk2_ardour/option_editor.cc:893
 msgid "+ button"
-msgstr "touche +"
+msgstr "avec le bouton de la souris n°"
 
-#: option_editor.cc:946
+#: gtk2_ardour/option_editor.cc:886
 msgid "Delete using"
-msgstr "Effacer en utilisant"
+msgstr "Raccourci pour l'effacement : utiliser la touche"
 
-#: option_editor.cc:973
+#: gtk2_ardour/option_editor.cc:913
 msgid "Ignore snap using"
-msgstr "Ignorer clac en utilisant"
+msgstr "Ignorer la grille d'alignement avec la touche"
 
-#: opts.cc:46
+#: gtk2_ardour/opts.cc:46
 msgid "Usage: "
-msgstr "Usage :"
+msgstr "Utilisation :"
 
-#: opts.cc:47
+#: gtk2_ardour/opts.cc:47
 msgid "  -v, --version                    Show version information\n"
 msgstr ""
-"  -v, --version                    Montre les informations de version\n"
+"  -v, --version                    Affiche les informations de version\n"
 
-#: opts.cc:48
+#: gtk2_ardour/opts.cc:48
 msgid "  -h, --help                       Print this message\n"
 msgstr "  -h, --help                       Affiche ce message\n"
 
-#: opts.cc:49
+#: gtk2_ardour/opts.cc:49
 msgid ""
 "  -b, --bindings                   Print all possible keyboard binding "
 "names\n"
 msgstr ""
-"  -b, --bindings                   Affiche tous raccourcis clavier "
-"possibles\n"
+"  -b, --bindings                   Affiche tous les noms de raccourcis "
+"clavier possibles\n"
 
-#: opts.cc:50
+#: gtk2_ardour/opts.cc:50
 msgid "  -n, --show-splash                Show splash screen\n"
-msgstr "  -n, --show-splash                  Afficher l'écran de démarrage\n"
+msgstr "  -n, --show-splash                Afficher l'écran de démarrage\n"
 
-#: opts.cc:51
+#: gtk2_ardour/opts.cc:51
 msgid ""
 "  -c, --name  name                 Use a specific jack client name, default "
 "is ardour\n"
 msgstr ""
-"  -c, --name  nom                  Utiliser un nom de client jack "
-"spécifique, la valeur par défaut est ardour\n"
+"  -c, --name  nom                  Utiliser un nom de client jack différent. "
+"La valeur par défaut est « ardour »\n"
 
-#: opts.cc:52
+#: gtk2_ardour/opts.cc:52
 msgid ""
 "  -N, --new session-name           Create a new session from the command "
 "line\n"
-msgstr "  -N, --new nom-de-session             Nom de la session à charger\n"
-
-#: opts.cc:53
-msgid ""
-"  -o, --use-hw-optimizations        Try to use h/w specific optimizations\n"
 msgstr ""
+"  -N, --new nomsession             Créer une nouvelle session depuis la "
+"ligne de commande\n"
 
-#: opts.cc:55
+#: gtk2_ardour/opts.cc:53
+msgid "  -O, --no-hw-optimizations        Disable h/w specific optimizations\n"
+msgstr "  -O, --no-hw-optimizations        Désactiver les optimisations matérielles spécifiques\n"
+
+#: gtk2_ardour/opts.cc:54
+msgid "  -S, --sync\t                   Draw the gui synchronously \n"
+msgstr "  -S, --sync\t                   Dessiner l'interface graphique en mode synchrone\n"
+
+#: gtk2_ardour/opts.cc:56
 msgid "  -V, --novst                      Do not use VST support\n"
 msgstr ""
+"··-V,·--novst                      Désactiver la prise en charge des VST\n"
 
-#: opts.cc:57
+#: gtk2_ardour/opts.cc:58
 msgid "  [session-name]                   Name of session to load\n"
-msgstr "  [nom-de-session]                     Nom de la session à charger\n"
+msgstr "  [nomsession]                     Nom de la session à charger\n"
 
-#: opts.cc:58
+#: gtk2_ardour/opts.cc:59
 msgid "  -C, --curvetest filename         Curve algorithm debugger\n"
+msgstr "  -C, --curvetest nomfichier       Débogueur d'algorithme de courbe\n"
+
+#: gtk2_ardour/opts.cc:60
+msgid ""
+"  -k, --keybindings filename       Name of key bindings to load (default is "
+"~/.ardour2/ardour.bindings)\n"
 msgstr ""
-"  -C, --curvetest nom-de-fichier      Débogueur d'algorithme de courbe\n"
+"  -k, --keybindings nomfichier       Nom du fichier des raccourcis claviers à charger (par défaut "
+"~/.ardour2/ardour.bindings)\n"
 
-#: opts.cc:59
-#, fuzzy
-msgid "  -g, --gtktheme                   Allow GTK to load a theme\n"
-msgstr "  -h, --help                       Affiche ce message\n"
+#: gtk2_ardour/pan_automation_time_axis.cc:69
+msgid "You need to select which line to edit"
+msgstr "vous devez choisir la ligne à modifier"
 
-#: pan_automation_time_axis.cc:60
-msgid "You can't graphically edit panning of more than stream"
-msgstr ""
-
-#: pan_automation_time_axis.cc:80
-#, fuzzy
+#: gtk2_ardour/pan_automation_time_axis.cc:90
 msgid "add pan automation event"
-msgstr "ajouter les évènements d'automatisation à "
+msgstr "ajout d'événement de pan."
 
-#: panner2d.cc:589 panner_ui.cc:435 plugin_ui.cc:834
+#: gtk2_ardour/panner2d.cc:588 gtk2_ardour/panner_ui.cc:412
+#: gtk2_ardour/plugin_ui.cc:152
 msgid "Bypass"
-msgstr "Bypass"
+msgstr "Court-circuiter"
 
-#: panner_ui.cc:58 panner_ui.cc:225
-#, fuzzy
+#: gtk2_ardour/panner_ui.cc:58 gtk2_ardour/panner_ui.cc:217
 msgid "link"
-msgstr "entrée"
+msgstr "lier"
 
-#: panner_ui.cc:69
+#: gtk2_ardour/panner_ui.cc:69
 msgid "Pan automation mode"
-msgstr "Mode d'automatisation de panoramique"
+msgstr "mode d'automatisation du panoramique"
 
-#: panner_ui.cc:70
+#: gtk2_ardour/panner_ui.cc:70
 msgid "Pan automation type"
 msgstr "Type d'automatisation de panoramique"
 
-#: panner_ui.cc:81
+#: gtk2_ardour/panner_ui.cc:80
 msgid "panning link control"
-msgstr ""
+msgstr "liaison gauche–droite du panoramique"
 
-#: panner_ui.cc:83
+#: gtk2_ardour/panner_ui.cc:82
 msgid "panning link direction"
-msgstr ""
+msgstr "direction de la liaison"
 
-#: panner_ui.cc:235
+#: gtk2_ardour/panner_ui.cc:220
 msgid "L"
-msgstr ""
+msgstr "L"
 
-#: panner_ui.cc:335
+#: gtk2_ardour/panner_ui.cc:333
 #, c-format
-msgid "panner for channel %lu"
-msgstr ""
+msgid "panner for channel %zu"
+msgstr "panoramique de la voie %zu"
 
-#: panner_ui.cc:337
-#, c-format
-msgid "panner for channel %u"
-msgstr ""
-
-#: panner_ui.cc:445
-#, fuzzy
+#: gtk2_ardour/panner_ui.cc:422
 msgid "Reset all"
-msgstr "Réinitialiser"
+msgstr "Réinitialiser tout"
 
-#: playlist_selector.cc:52
-#, fuzzy
-msgid "ardour: playlists"
-msgstr "ardour : greffons"
+#: gtk2_ardour/playlist_selector.cc:58
+msgid "Playlists"
+msgstr "Listes de lecture"
 
-#: playlist_selector.cc:59
+#: gtk2_ardour/playlist_selector.cc:63
 msgid "Playlists grouped by track"
-msgstr ""
+msgstr "Listes de lecture groupées par piste"
 
-#: playlist_selector.cc:98
-#, fuzzy
-msgid "ardour: playlist for "
-msgstr "ardour : éditeur : "
+#: gtk2_ardour/playlist_selector.cc:112
+msgid "Playlist for %1"
+msgstr "Liste de lecture pour %1"
 
-#: playlist_selector.cc:114
-#, fuzzy
+#: gtk2_ardour/playlist_selector.cc:126
 msgid "Other tracks"
-msgstr "décaler la piste"
+msgstr "Autres pistes"
 
-#: playlist_selector.cc:130
+#: gtk2_ardour/playlist_selector.cc:143
 msgid "unassigned"
-msgstr ""
+msgstr "non assigné"
 
-#: plugin_selector.cc:43
+#: gtk2_ardour/plugin_selector.cc:43
 msgid "ardour: plugins"
-msgstr "ardour : greffons"
+msgstr "ardour : plugins"
 
-#: plugin_selector.cc:56
-#, fuzzy
+#: gtk2_ardour/plugin_selector.cc:56
 msgid "Available LADSPA Plugins"
-msgstr "Greffons LADSPA disponibles"
+msgstr "Plugins LADSPA disponibles"
 
-#: plugin_selector.cc:57
+#: gtk2_ardour/plugin_selector.cc:57
 msgid "Type"
 msgstr "Type"
 
-#: plugin_selector.cc:58 plugin_selector.cc:81
+#: gtk2_ardour/plugin_selector.cc:58 gtk2_ardour/plugin_selector.cc:81
+#: gtk2_ardour/plugin_selector.cc:99
 msgid "# Inputs"
-msgstr "# entrées"
+msgstr "nb d'entrées"
 
-#: plugin_selector.cc:59 plugin_selector.cc:82
+#: gtk2_ardour/plugin_selector.cc:59 gtk2_ardour/plugin_selector.cc:82
+#: gtk2_ardour/plugin_selector.cc:100
 msgid "# Outputs"
-msgstr "# sorties"
+msgstr "nb de sorties"
 
-#: plugin_selector.cc:68
+#: gtk2_ardour/plugin_selector.cc:68
 msgid "Plugins to be Connected to Insert"
-msgstr ""
+msgstr "Plugins à connecter à l'insert"
 
-#: plugin_selector.cc:80
-#, fuzzy
+#: gtk2_ardour/plugin_selector.cc:80 gtk2_ardour/plugin_selector.cc:98
 msgid "Available plugins"
-msgstr "Greffons VST disponibles"
+msgstr "Plugins VST disponibles"
 
-#: plugin_selector.cc:98
+#: gtk2_ardour/plugin_selector.cc:117
 msgid "Add a plugin to the effect list"
-msgstr "Ajouter un greffon à la liste d'effets"
+msgstr "Ajouter un plugin à la liste"
 
-#: plugin_selector.cc:102
+#: gtk2_ardour/plugin_selector.cc:121
 msgid "Remove a plugin from the effect list"
-msgstr "Retirer un greffon à la liste d'effets"
+msgstr "Retirer un plugin de la liste"
 
-#: plugin_selector.cc:104
+#: gtk2_ardour/plugin_selector.cc:123
 msgid "Update available plugins"
-msgstr "Rafraîchir les greffons disponibles"
+msgstr "Rafraîchir les plugins disponibles"
 
-#: plugin_selector.cc:126
+#: gtk2_ardour/plugin_selector.cc:146
 msgid "LADSPA"
 msgstr "LADSPA"
 
-#: plugin_selector.cc:129
+#: gtk2_ardour/plugin_selector.cc:150
 msgid "VST"
 msgstr "VST"
 
-#: plugin_ui.cc:84
+#: gtk2_ardour/plugin_selector.cc:155
+msgid "AudioUnit"
+msgstr "Unité audio"
+
+#: gtk2_ardour/plugin_ui.cc:84
 msgid ""
 "unknown type of editor-supplying plugin (note: no VST support in this "
 "version of ardour)"
 msgstr ""
-"type de greffon éditeur inconnu (note : pas de support VST dans cette "
-"version d'ardour)"
+"type de plugin à éditeur inconnu (note : VST n'est pas pris en charge dans "
+"cette version d'ardour)"
 
-#: plugin_ui.cc:139
-msgid "<span size=\"large\">Presets</span>"
-msgstr ""
-
-#: plugin_ui.cc:230
-#, fuzzy
-msgid "Controls"
-msgstr "Sorties de contrôle"
-
-#: plugin_ui.cc:267
-msgid "Plugin Editor: could not build control element for port %1"
-msgstr ""
-"Éditeur de greffon : impossible de construire l'élément de contrôle pour le "
-"port %1"
-
-#: plugin_ui.cc:358
-#, fuzzy
-msgid "Automation control"
-msgstr "contrôle d'automatisation"
-
-#: plugin_ui.cc:854
-#, fuzzy
+#: gtk2_ardour/plugin_ui.cc:172
 msgid "Plugin preset %1 not found"
-msgstr "Pré-réglage de greffon %1 non trouvé"
+msgstr "Réglage de plugin « %1 » non trouvé"
 
-#: plugin_ui.cc:864
-#, fuzzy
+#: gtk2_ardour/plugin_ui.cc:182
 msgid "Name of New Preset:"
-msgstr "Nom de la nouvelle connexion :"
+msgstr "Nom du nouveau réglage :"
 
-#: redirect_automation_line.cc:54
+#: gtk2_ardour/redirect_automation_line.cc:53
 msgid "redirect automation created for non-plugin"
-msgstr "rediriger l'automatisation créée pour le non-greffon"
+msgstr "rediriger l'automatisation créée pour le non-plugin"
 
-#: redirect_automation_time_axis.cc:94
+#: gtk2_ardour/redirect_automation_time_axis.cc:95
 msgid "add automation event to "
-msgstr "ajouter les évènements d'automatisation à "
+msgstr "ajouter un événement d'automatisation à "
 
-#: redirect_box.cc:223
+#: gtk2_ardour/redirect_box.cc:237
 msgid "New send"
-msgstr ""
+msgstr "Nouveau départ"
 
-#: redirect_box.cc:224
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:238
 msgid "Show send controls"
-msgstr "Contrôle de la vitesse avec molette"
+msgstr "Afficher les contrôles de départ"
 
-#: redirect_box.cc:383
+#: gtk2_ardour/redirect_box.cc:412 gtk2_ardour/redirect_box.cc:707
+msgid "ardour: weird plugin dialog"
+msgstr "ardour : boite de dialogue pour plugin"
+
+#: gtk2_ardour/redirect_box.cc:419
 msgid ""
 "You attempted to add a plugin (%1).\n"
 "The plugin has %2 inputs\n"
@@ -5647,8 +5420,14 @@ msgid ""
 "This makes no sense - you are throwing away\n"
 "part of the signal."
 msgstr ""
+"Vous avez essayé d'ajouter le plugin suivant :\n"
+"%1\n"
+"\n"
+"Ce plugin a %2 entrées mais au point d'insertion il y a %3 voies.\n"
+"\n"
+"C'est incohérent car vous allez jeter une partie du signal."
 
-#: redirect_box.cc:395
+#: gtk2_ardour/redirect_box.cc:431
 msgid ""
 "You attempted to add a plugin (%1).\n"
 "The plugin has %2 inputs\n"
@@ -5659,8 +5438,16 @@ msgid ""
 "side-chain inputs. A future version of Ardour will\n"
 "support this type of configuration."
 msgstr ""
+"Vous avez essayé d'ajouter le plugin suivant :\n"
+"%1\n"
+"\n"
+"Ce plugin a %2 entrées mais au point d'insertion il y a seulement %3 voies "
+"actives.\n"
+"\n"
+"C'est incohérent à moins que le plugin supporte les entrées latérales.\n"
+"Une version future d'Ardour prendra en charge ce type de configuration."
 
-#: redirect_box.cc:408
+#: gtk2_ardour/redirect_box.cc:444
 msgid ""
 "You attempted to add a plugin (%1).\n"
 "\n"
@@ -5672,1240 +5459,904 @@ msgid ""
 "\n"
 "Ardour does not understand what to do in such situations.\n"
 msgstr ""
+"Vous avez essayé d'ajouter le plugin suivant :\n"
+"%1\n"
+"\n"
+"La configuration d'entrées/sorties est incohérente :\n"
+"\n"
+"Le plugin a %2 entrées et %3 sorties.\n"
+"La piste (ou le bus) a %4 entrées et %5 sorties.\n"
+"Le point d'insertion a %6 voies actives.\n"
+"\n"
+"Ardour ne sait pas comment faire dans ce genre de situations.\n"
 
-#: redirect_box.cc:495
+#: gtk2_ardour/redirect_box.cc:541
 msgid "Pre-fader inserts, sends & plugins:"
-msgstr ""
+msgstr "Insertions, départs et plugins pré-atténuation"
 
-#: redirect_box.cc:498
+#: gtk2_ardour/redirect_box.cc:544
 msgid "Post-fader inserts, sends & plugins:"
-msgstr ""
+msgstr "Insertions, départs et plugins post-atténuation"
 
-#: redirect_box.cc:644
+#: gtk2_ardour/redirect_box.cc:710
 msgid ""
 "You cannot reorder this set of redirects\n"
 "in that way because the inputs and\n"
 "outputs do not work correctly."
 msgstr ""
+"Vous ne pouvez pas réordonner ce jeu de redirections\n"
+"de cette façon car les entrées et les sorties ne fonctionnent\n"
+"pas correctement."
 
-#: redirect_box.cc:749
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:823
 msgid "rename redirect"
-msgstr "ardour : renommer la région"
+msgstr "renommer la redirection"
 
-#: redirect_box.cc:826 redirect_box.cc:874
+#: gtk2_ardour/redirect_box.cc:899 gtk2_ardour/redirect_box.cc:948
 msgid ""
 "Copying the set of redirects on the clipboard failed,\n"
 "probably because the I/O configuration of the plugins\n"
 "could not match the configuration of this track."
 msgstr ""
+"La copie du jeu de redirections sur le presse-papier a échoué,\n"
+"probablement car la configuration d'entrées/sorties des plugins\n"
+"ne correspond pas à la configuration de cette piste."
 
-#: redirect_box.cc:896
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:970
 msgid ""
 "Do you really want to remove all redirects from this track?\n"
 "(this cannot be undone)"
 msgstr ""
-"Voulez-vous vraiment supprimer la piste \"%1\" ?\n"
+"Voulez-vous vraiment enlever toutes les redirections de cette piste ?\n"
 "(cela ne pourra pas être annulé)"
 
-#: redirect_box.cc:899
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:973
 msgid ""
 "Do you really want to remove all redirects from this bus?\n"
 "(this cannot be undone)"
 msgstr ""
-"Voulez-vous vraiment supprimer la piste \"%1\" ?\n"
+"Voulez-vous vraiment enlever toutes les redirections de ce bus ?\n"
 "(cela ne pourra pas être annulé)"
 
-#: redirect_box.cc:904
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:978
 msgid "Yes, remove them all"
-msgstr "Oui, le supprimer."
+msgstr "Oui, les enlever."
 
-#: redirect_box.cc:940
-#, fuzzy
-msgid "ardour: %1"
-msgstr "ardour :"
-
-#: redirect_box.cc:982
-#, fuzzy
-msgid "ardour: %1: %2 (by %3)"
-msgstr "ardour :"
-
-#. new stuff
-#: redirect_box.cc:1054
+#: gtk2_ardour/redirect_box.cc:1140
 msgid "New Plugin ..."
-msgstr ""
+msgstr "Nouveau plugin..."
 
-#: redirect_box.cc:1055
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:1142
 msgid "New Insert"
-msgstr "Nouvelle entrée"
+msgstr "Nouvelle insertion"
 
-#: redirect_box.cc:1056
+#: gtk2_ardour/redirect_box.cc:1144
 msgid "New Send ..."
-msgstr ""
+msgstr "Nouveau départ..."
 
-#: redirect_box.cc:1068
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:1158
 msgid "Deselect All"
-msgstr "Tout sélectionner"
+msgstr "désélectionner tout"
 
-#: redirect_box.cc:1075
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:1165
 msgid "Activate all"
-msgstr "Activer"
+msgstr "activer tout"
 
-#: redirect_box.cc:1076
-#, fuzzy
+#: gtk2_ardour/redirect_box.cc:1166
 msgid "Deactivate all"
-msgstr "Désactiver"
+msgstr "désactiver tout"
 
-#: region_editor.cc:45
+#: gtk2_ardour/redirect_box.cc:1349
+msgid "%1: %2 (by %3)"
+msgstr "%1: %2 (par %3)"
+
+#: gtk2_ardour/audio_region_editor.cc:48
 msgid "NAME:"
 msgstr "NOM :"
 
-#: region_editor.cc:46
-msgid "lock"
-msgstr "verrouiller"
-
-#: region_editor.cc:48
-msgid "opaque"
-msgstr "opaque"
-
-#: region_editor.cc:49 region_editor.cc:192 region_editor.cc:226
-msgid "active"
-msgstr "actif"
-
-#: region_editor.cc:50
-msgid "visible"
-msgstr "visible"
-
-#: region_editor.cc:53
-msgid "Layer"
-msgstr "Couche"
-
-#: region_editor.cc:54
+#: gtk2_ardour/audio_region_editor.cc:49
 msgid "play"
-msgstr "jouer"
+msgstr "lire"
 
-#: region_editor.cc:61
-msgid "ENVELOPE"
-msgstr "ENVELOPPE"
-
-#: region_editor.cc:107
-msgid "mute this region"
-msgstr "Assourdir cette région"
-
-#: region_editor.cc:108
-msgid "regions underneath this one cannot be heard"
-msgstr "les régions en dessous de celle-ci ne peuvent être entendues"
-
-#: region_editor.cc:109
-msgid "prevent any changes to this region"
-msgstr "empêche toute modification de cette région"
-
-#: region_editor.cc:110
-msgid "use the gain envelope during playback"
-msgstr "utiliser l'enveloppe de gain pendant la lecture"
-
-#: region_editor.cc:111
-msgid "show the gain envelope"
-msgstr "montrer l'enveloppe de gain"
-
-#: region_editor.cc:112
-msgid "use fade in curve during playback"
-msgstr "utiliser une courbe de fondu d'ouverture durant la lecture"
-
-#: region_editor.cc:113
-msgid "use fade out curve during playback"
-msgstr "utiliser une courbe de fondu de fermeture durant la lecture"
-
-#: region_editor.cc:114
+#: gtk2_ardour/audio_region_editor.cc:68
 msgid "audition this region"
 msgstr "écouter cette région"
 
-#: region_editor.cc:147
+#: gtk2_ardour/audio_region_editor.cc:83
 msgid "START:"
-msgstr "DÉBUT :"
+msgstr "début :"
 
-#: region_editor.cc:149
+#: gtk2_ardour/audio_region_editor.cc:85
 msgid "END:"
-msgstr "FIN :"
+msgstr "fin :"
 
-#: region_editor.cc:151
+#: gtk2_ardour/audio_region_editor.cc:87
 msgid "LENGTH:"
-msgstr "LONGUEUR :"
+msgstr "longueur :"
 
-#: region_editor.cc:191
-msgid "FADE IN"
-msgstr "FONDU D'OUVERTURE"
+#: gtk2_ardour/audio_region_editor.cc:123
+msgid "Region %1"
+msgstr "Région %1"
 
-#: region_editor.cc:193 region_editor.cc:227
-msgid "msecs"
-msgstr "ms"
+#: gtk2_ardour/audio_region_editor.cc:204
+msgid "change region start position"
+msgstr "changer le début de la région"
 
-#: region_editor.cc:225
-msgid "FADE OUT"
-msgstr "FONDU DE FERMETURE"
+#: gtk2_ardour/audio_region_editor.cc:221
+msgid "change region end position"
+msgstr "changer la fin de la région"
 
-#: region_editor.cc:265
-msgid "ardour: region "
-msgstr "ardour : région "
+#: gtk2_ardour/audio_region_editor.cc:242
+msgid "change region length"
+msgstr "changer la longueur de la région"
 
-#: region_editor.cc:402
-msgid "fade in edit"
-msgstr "édition de fondu d'ouverture"
-
-#: region_editor.cc:414
-msgid "fade out edit"
-msgstr "édition de fondu de fermeture"
-
-#: regionview.cc:1146
-#, fuzzy
+#: gtk2_ardour/audio_region_view.cc:911
 msgid "add gain control point"
-msgstr "Enlever le point de contrôle"
+msgstr "ajout d'un point de contrôle de gain"
 
-#: route_params_ui.cc:89
+#: gtk2_ardour/route_params_ui.cc:85
 msgid "Tracks/Buses"
-msgstr "Pistes/Bus"
+msgstr "Pistes et Bus"
 
-#: route_params_ui.cc:109
+#: gtk2_ardour/route_params_ui.cc:105
 msgid "Pre-fader Redirects"
-msgstr "Redirections pré-fader"
+msgstr "Redirections pré-atténuation"
 
-#: route_params_ui.cc:110
+#: gtk2_ardour/route_params_ui.cc:106
 msgid "Post-fader Redirects"
-msgstr "Redirections post-fader"
+msgstr "Redirections post-atténuation"
 
-#: route_params_ui.cc:144
-msgid "ardour: track/bus inspector"
-msgstr "ardour : inspecteur de piste/bus"
-
-#: route_params_ui.cc:145
-msgid "ardour_route_parameters"
-msgstr "ardour_paramètres_de_route"
-
-#: route_params_ui.cc:202
+#: gtk2_ardour/route_params_ui.cc:205
 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:453
+#: gtk2_ardour/route_params_ui.cc:452
 msgid "NO TRACK"
 msgstr "PAS DE PISTE"
 
-#: route_params_ui.cc:695
-msgid "ardour: track/bus inspector: "
-msgstr "ardour : inspecteur de piste/bus"
-
-#: route_params_ui.cc:699
+#: gtk2_ardour/route_params_ui.cc:682 gtk2_ardour/route_params_ui.cc:683
 msgid "No Route Selected"
 msgstr "Aucune route sélectionnée"
 
-#: route_params_ui.cc:700
-msgid "ardour: track/bus/inspector: no route selected"
-msgstr "ardour : inspecteur de piste/bus : aucune route sélectionnée"
-
-#. ctrl-shift-click applies change to all routes
-#: route_ui.cc:134
+#: gtk2_ardour/route_ui.cc:154
 msgid "mute change"
 msgstr "modification de la sourdine"
 
-#. ctrl-shift-click applies change to all routes
-#. ctrl-alt-click: exclusively solo this track, not a toggle */
-#: route_ui.cc:209 route_ui.cc:219
+#: gtk2_ardour/route_ui.cc:232 gtk2_ardour/route_ui.cc:243
 msgid "solo change"
 msgstr "modification du solo"
 
-#: route_ui.cc:282
-#, fuzzy
+#: gtk2_ardour/route_ui.cc:301
+msgid "Not connected to JACK - cannot engage record"
+msgstr "Non connecté à JACK – impossible d'enclencher l'enregistrement"
+
+#: gtk2_ardour/route_ui.cc:314
 msgid "rec-enable change"
-msgstr "modification de rec-enable"
+msgstr "(dés)activation d'enregistrement"
 
-#: route_ui.cc:479
-#, fuzzy
+#: gtk2_ardour/route_ui.cc:548
 msgid "Solo-safe"
-msgstr "Solo-safe"
+msgstr "bloquer le solo"
 
-#: route_ui.cc:487 route_ui.cc:530
-msgid "MIDI Bind"
-msgstr "Assignement MIDI"
-
-#: route_ui.cc:501
+#: gtk2_ardour/route_ui.cc:570
 msgid "Pre Fader"
-msgstr "Pré fader"
+msgstr "Pré-atténuation"
 
-#: route_ui.cc:508
+#: gtk2_ardour/route_ui.cc:577
 msgid "Post Fader"
-msgstr "Post fader"
+msgstr "Post-atténuation"
 
-#: route_ui.cc:515
+#: gtk2_ardour/route_ui.cc:584
 msgid "Control Outs"
 msgstr "Sorties de contrôle"
 
-#: route_ui.cc:522
+#: gtk2_ardour/route_ui.cc:591
 msgid "Main Outs"
 msgstr "Sorties principales"
 
-#: route_ui.cc:559
+#: gtk2_ardour/route_ui.cc:628
 msgid "mix group solo  change"
-msgstr ""
+msgstr "changt solo de groupe"
 
-#: route_ui.cc:593
+#: gtk2_ardour/route_ui.cc:667
 msgid "mix group mute change"
-msgstr ""
+msgstr "changt sourdine de groupe"
 
-#: route_ui.cc:609
+#: gtk2_ardour/route_ui.cc:684
 msgid "mix group rec-enable change"
-msgstr ""
+msgstr "changt d'activation d'enreg de groupe"
 
-#: route_ui.cc:626 visual_time_axis.cc:237
+#: gtk2_ardour/route_ui.cc:702 gtk2_ardour/visual_time_axis.cc:241
 msgid "ardour: color selection"
 msgstr "ardour : sélection de couleur"
 
-#: route_ui.cc:702
-#, fuzzy
+#: gtk2_ardour/route_ui.cc:778
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "\n"
 "You may also lose the playlist used by this track.\n"
 "(cannot be undone)"
 msgstr ""
-"Voulez-vous vraiment supprimer la piste \"%1\" ?\n"
-"Vous perdrez peut-être aussi la liste de lecture utilisée par cette piste"
+"Voulez-vous vraiment supprimer la piste « %1 » ?\n"
+"Vous pourrez aussi perdre la liste de lecture utilisée par cette piste.\n"
 "(cela ne pourra pas être annulé)"
 
-#: route_ui.cc:704
+#: gtk2_ardour/route_ui.cc:780
 msgid ""
 "Do you really want to remove bus \"%1\" ?\n"
 "(cannot be undone)"
 msgstr ""
-"Voulez-vous vraiment supprimer le bus \"%1\" ?\n"
+"Voulez-vous vraiment supprimer le bus « %1 » ?\n"
 "(cela ne pourra pas être annulé)"
 
-#: route_ui.cc:708 visual_time_axis.cc:279
-msgid "Yes, remove it."
-msgstr "Oui, le supprimer."
-
-#: route_ui.cc:737
-#, fuzzy
+#: gtk2_ardour/route_ui.cc:805
 msgid "New Name: "
 msgstr "nouveau nom :"
 
-#: sfdb_ui.cc:58
-msgid "Add Field..."
-msgstr "Ajouter un champ..."
+#: gtk2_ardour/sfdb_ui.cc:63
+msgid "Apply"
+msgstr "Appliquer"
 
-#: sfdb_ui.cc:59
-msgid "Remove Field"
-msgstr "Enlever un champ"
-
-#: sfdb_ui.cc:62
+#: gtk2_ardour/sfdb_ui.cc:69
 msgid "Soundfile Info"
-msgstr "Information du fichier son"
+msgstr "Informations sur le fichier audio"
 
-#: sfdb_ui.cc:80
-msgid "Field"
-msgstr "Champ"
+#: gtk2_ardour/sfdb_ui.cc:72
+msgid "comma seperated tags"
+msgstr "tags séparées par des virgules"
 
-#: sfdb_ui.cc:81
-msgid "Value"
-msgstr "Valeur"
+#: gtk2_ardour/sfdb_ui.cc:130
+msgid "Length: n/a"
+msgstr "Longueur : n/a"
 
-#: sfdb_ui.cc:161
-#, fuzzy
-msgid "channels"
-msgstr "annuler"
+#: gtk2_ardour/sfdb_ui.cc:131
+msgid "Format: n/a"
+msgstr "Format : n/a"
 
-#: sfdb_ui.cc:161
-#, fuzzy
-msgid "samplerate"
-msgstr "séparer"
+#: gtk2_ardour/sfdb_ui.cc:132
+msgid "Channels: n/a"
+msgstr "Voies : n/a"
 
-#: sfdb_ui.cc:162
-#, fuzzy
-msgid "resolution"
-msgstr "sélection d'intervalle"
+#: gtk2_ardour/sfdb_ui.cc:133
+msgid "Samplerate: n/a"
+msgstr "Taux d'échantillonnage : n/a"
 
-#: sfdb_ui.cc:162
-#, fuzzy
-msgid "format"
-msgstr "Normal"
+#: gtk2_ardour/sfdb_ui.cc:134
+msgid "Timecode: n/a"
+msgstr "Timecode : n/a"
 
-#: sfdb_ui.cc:183
+#: gtk2_ardour/sfdb_ui.cc:144
+msgid "Length: %1"
+msgstr "Longueur : %1"
+
+#: gtk2_ardour/sfdb_ui.cc:146
+msgid "Channels: %1"
+msgstr "Voies : %1"
+
+#: gtk2_ardour/sfdb_ui.cc:147
+msgid "Samplerate: %1"
+msgstr "Taux d'échantillonnage : %1"
+
+#: gtk2_ardour/sfdb_ui.cc:148
+msgid "Timecode: %1"
+msgstr "Timecode : %1"
+
+#: gtk2_ardour/sfdb_ui.cc:188
 msgid "Could not read file: %1 (%2)."
-msgstr "Impossible delire le fichier %1 (%2)."
+msgstr "Impossible de lire le fichier « %1 » (%2)."
 
-#: sfdb_ui.cc:199
+#: gtk2_ardour/sfdb_ui.cc:206
 msgid "Could not access soundfile: "
-msgstr "Impossible d'accéder au fichier son : "
+msgstr "Impossible d'accéder au fichier audio : "
 
-#: sfdb_ui.cc:236
-#, fuzzy
-msgid "Name for Field"
-msgstr "Nom de la région :"
+#: gtk2_ardour/sfdb_ui.cc:255
+msgid "SoundFileBox: Could not tokenize string: "
+msgstr "SoundFileBox : Could not tokenize string: "
 
-#: sfdb_ui.cc:335
+#: gtk2_ardour/sfdb_ui.cc:275
+msgid "Add to Region list"
+msgstr "ajouter à la liste des régions"
+
+#: gtk2_ardour/sfdb_ui.cc:276
+msgid "Add to selected Track(s)"
+msgstr "ajouter aux pistes sélectionnées"
+
+#: gtk2_ardour/sfdb_ui.cc:277
+msgid "Add as new Track(s)"
+msgstr "ajouter comme nouvelles pistes"
+
+#: gtk2_ardour/sfdb_ui.cc:278
+msgid "Add as new Tape Track(s)"
+msgstr "ajouter comme nouvelles pistes bandes"
+
+#: gtk2_ardour/sfdb_ui.cc:287
+msgid "Search"
+msgstr "Recherche"
+
+#: gtk2_ardour/sfdb_ui.cc:302
+msgid "Paths"
+msgstr "Chemins"
+
+#: gtk2_ardour/sfdb_ui.cc:304
+msgid "Files"
+msgstr "Fichiers"
+
+#: gtk2_ardour/sfdb_ui.cc:305
+msgid "Tags"
+msgstr "Tags"
+
+#: gtk2_ardour/sfdb_ui.cc:374
+msgid "SoundFileBrowser: Could not tokenize string: "
+msgstr "SoundFileBrowser: Could not tokenize string: "
+
+#: gtk2_ardour/sfdb_ui.cc:432
 msgid "Split Channels"
 msgstr "Séparer les voies"
 
-#: sfdb_ui.cc:342
+#: gtk2_ardour/sfdb_ui.cc:435
 msgid "Create a region for each channel"
-msgstr ""
+msgstr "créer une région pour chaque voie"
 
-#: sfdb_ui.cc:344
+#: gtk2_ardour/sfdb_ui.cc:437
 msgid "Embed"
-msgstr ""
+msgstr "Lier"
 
-#: sfdb_ui.cc:346
-#, fuzzy
+#: gtk2_ardour/sfdb_ui.cc:439
 msgid "Link to an external file"
-msgstr "Insérer un fichier son externe"
+msgstr "Lier à un fichier audio externe"
 
-#: sfdb_ui.cc:348
+#: gtk2_ardour/sfdb_ui.cc:441
 msgid "Import"
 msgstr "Importer"
 
-#: sfdb_ui.cc:350
+#: gtk2_ardour/sfdb_ui.cc:443
 msgid "Copy a file to the session folder"
-msgstr ""
+msgstr "Copier un fichier vers le dossier de session"
 
-#: sfdb_ui.cc:414
-#, fuzzy
-msgid "programming error: %1"
-msgstr "erreur de programmation : "
+#: gtk2_ardour/tempo_dialog.cc:17
+msgid "edit tempo"
+msgstr "modifier le tempo"
 
-#: tempo_dialog.cc:18 tempo_dialog.cc:35
+#: gtk2_ardour/tempo_dialog.cc:20 gtk2_ardour/tempo_dialog.cc:39
 msgid "Beats per minute"
-msgstr "Temps par minute"
+msgstr "battements par minute"
 
-#: tempo_dialog.cc:21 tempo_dialog.cc:38 tempo_dialog.cc:203
-#: tempo_dialog.cc:221
+#: gtk2_ardour/tempo_dialog.cc:23 gtk2_ardour/tempo_dialog.cc:42
+#: gtk2_ardour/tempo_dialog.cc:159 gtk2_ardour/tempo_dialog.cc:177
 msgid "Bar"
 msgstr "Mesure"
 
-#: tempo_dialog.cc:22 tempo_dialog.cc:39 tempo_dialog.cc:204
-#: tempo_dialog.cc:222
+#: gtk2_ardour/tempo_dialog.cc:24 gtk2_ardour/tempo_dialog.cc:43
+#: gtk2_ardour/tempo_dialog.cc:160 gtk2_ardour/tempo_dialog.cc:178
 msgid "Beat"
 msgstr "Temps"
 
-#: tempo_dialog.cc:24 tempo_dialog.cc:41 tempo_dialog.cc:205
-#: tempo_dialog.cc:223
+#: gtk2_ardour/tempo_dialog.cc:26 gtk2_ardour/tempo_dialog.cc:45
+#: gtk2_ardour/tempo_dialog.cc:161 gtk2_ardour/tempo_dialog.cc:179
 msgid "Location"
 msgstr "Emplacement"
 
-#: tempo_dialog.cc:199 tempo_dialog.cc:217
+#: gtk2_ardour/tempo_dialog.cc:155 gtk2_ardour/tempo_dialog.cc:173
 msgid "Meter denominator"
-msgstr "Dénominateur du vu-mètre"
+msgstr "Dénominateur de l'indicateur de mesure"
 
-#: tempo_dialog.cc:200 tempo_dialog.cc:218
+#: gtk2_ardour/tempo_dialog.cc:156 gtk2_ardour/tempo_dialog.cc:174
 msgid "Beats per bar"
 msgstr "Temps par mesure"
 
-#: tempo_dialog.cc:236 tempo_dialog.cc:247
+#: gtk2_ardour/tempo_dialog.cc:192 gtk2_ardour/tempo_dialog.cc:203
 msgid "whole (1)"
 msgstr "noire (1)"
 
-#: tempo_dialog.cc:237 tempo_dialog.cc:249
+#: gtk2_ardour/tempo_dialog.cc:193 gtk2_ardour/tempo_dialog.cc:205
 msgid "second (2)"
 msgstr "croche (2)"
 
-#: tempo_dialog.cc:238 tempo_dialog.cc:251
+#: gtk2_ardour/tempo_dialog.cc:194 gtk2_ardour/tempo_dialog.cc:207
 msgid "third (3)"
 msgstr "triolet (3)"
 
-#: tempo_dialog.cc:239 tempo_dialog.cc:253 tempo_dialog.cc:261
+#: gtk2_ardour/tempo_dialog.cc:195 gtk2_ardour/tempo_dialog.cc:209
+#: gtk2_ardour/tempo_dialog.cc:217
 msgid "quarter (4)"
 msgstr "double croche (4)"
 
-#: tempo_dialog.cc:240 tempo_dialog.cc:255
+#: gtk2_ardour/tempo_dialog.cc:196 gtk2_ardour/tempo_dialog.cc:211
 msgid "eighth (8)"
 msgstr "huitième (8)"
 
-#: tempo_dialog.cc:241 tempo_dialog.cc:257
+#: gtk2_ardour/tempo_dialog.cc:197 gtk2_ardour/tempo_dialog.cc:213
 msgid "sixteenth (16)"
 msgstr "seizième (16)"
 
-#: tempo_dialog.cc:242 tempo_dialog.cc:259
+#: gtk2_ardour/tempo_dialog.cc:198 gtk2_ardour/tempo_dialog.cc:215
 msgid "thirty-second (32)"
 msgstr "trente-deuxième (32)"
 
-#: tempo_dialog.cc:420
+#: gtk2_ardour/tempo_dialog.cc:376
 msgid "garbaged note type entry (%1)"
 msgstr "entrée type de note endommagée (%1)"
 
-#: tempo_dialog.cc:430
+#: gtk2_ardour/tempo_dialog.cc:386
 msgid "incomprehensible note type entry (%1)"
 msgstr "entrée type de note incompréhensible (%1)"
 
-#: time_axis_view.cc:112
+#: gtk2_ardour/time_axis_view.cc:111
 msgid "gTortnam"
 msgstr "gTortnam"
 
-#: time_axis_view.cc:549
+#: gtk2_ardour/time_axis_view.cc:586
 msgid "Largest"
 msgstr "Énorme"
 
-#: time_axis_view.cc:550
+#: gtk2_ardour/time_axis_view.cc:587
 msgid "Large"
+msgstr "Très grand"
+
+#: gtk2_ardour/time_axis_view.cc:588
+msgid "Larger"
 msgstr "Grand"
 
-#: time_axis_view.cc:551
-msgid "Larger"
-msgstr "Plus grand"
-
-#: time_axis_view.cc:553
+#: gtk2_ardour/time_axis_view.cc:590
 msgid "Smaller"
-msgstr "Plus petit"
-
-#: time_axis_view.cc:554
-msgid "Small"
 msgstr "Petit"
 
-#: time_axis_view.cc:870
+#: gtk2_ardour/time_axis_view.cc:591
+msgid "Small"
+msgstr "Très petit"
+
+#: gtk2_ardour/time_axis_view.cc:906
 msgid "unknown track height name \"%1\" in XML GUI information"
 msgstr "nom de hauteur de piste inconnu \"%1\" dans les données XML de l'IHM"
 
-#. first constructed item sets up font info
-#: time_axis_view_item.cc:79
+#: gtk2_ardour/time_axis_view_item.cc:78
 msgid "TimeAxisViewItemName"
-msgstr ""
+msgstr "TimeAxisViewItemName"
 
-#: time_axis_view_item.cc:298
+#: gtk2_ardour/time_axis_view_item.cc:330
 msgid "new duration %1 frames is out of bounds for %2"
-msgstr "la nouvelle durée %1 trames est hors limite pour %2"
+msgstr "la nouvelle durée %1 trames est hors limites pour %2"
 
-#: time_selection.cc:41
+#: gtk2_ardour/time_selection.cc:40
 msgid "programming error: request for non-existent audio range (%1)!"
 msgstr "programming error: request for non-existent audio range (%1)!"
 
-#: utils.cc:107 utils.cc:150
+#: gtk2_ardour/utils.cc:131 gtk2_ardour/utils.cc:174
 msgid "bad XPM header %1"
 msgstr "mauvais entête XPM %1"
 
-#: utils.cc:332
+#: gtk2_ardour/utils.cc:313
 msgid "missing RGBA style for \"%1\""
-msgstr ""
+msgstr "style RGBA manquant pour « %1 »"
 
-#: visual_time_axis.cc:276
+#: gtk2_ardour/utils.cc:495
+msgid "cannot find icon image for %1"
+msgstr "Impossible de trouver les icônes pour %1"
+
+#: gtk2_ardour/visual_time_axis.cc:280
 msgid ""
 "Do you really want to remove track \"%1\" ?\n"
 "(cannot be undone)"
 msgstr ""
-"Voulez-vous vraiment supprimer la piste \"%1\" ?\n"
+"Voulez-vous vraiment supprimer la piste « %1 » ?\n"
 "(cela ne pourra pas être annulé)"
 
-#: visual_time_axis.cc:325
+#: gtk2_ardour/visual_time_axis.cc:329
 msgid "new name: "
 msgstr "nouveau nom :"
 
-#: visual_time_axis.cc:336
-msgid "A track already exists with that name"
-msgstr "Une piste portant le même nom existe déjà"
+#: gtk2_ardour/connection_editor.cc:50
+msgid "ardour: connections"
+msgstr "ardour : connexions"
+
+#: gtk2_ardour/connection_editor.cc:51
+msgid "Input Connections"
+msgstr "Connexions en entrée"
+
+#: gtk2_ardour/connection_editor.cc:52
+msgid "Output Connections"
+msgstr "Connexions en sortie"
+
+#: gtk2_ardour/connection_editor.cc:53
+msgid "New Input"
+msgstr "Nouvelle entrée"
+
+#: gtk2_ardour/connection_editor.cc:54
+msgid "New Output"
+msgstr "Nouvelle sortie"
+
+#: gtk2_ardour/connection_editor.cc:57 gtk2_ardour/connection_editor.cc:100
+msgid "Add Port"
+msgstr "Ajouter un port"
+
+#: gtk2_ardour/connection_editor.cc:105
+msgid "Available Ports"
+msgstr "Ports disponibles"
+
+#: gtk2_ardour/connection_editor.cc:500
+msgid "Connection \""
+msgstr "Connexion \""
+
+#: gtk2_ardour/connection_editor.cc:502
+msgid "\""
+msgstr "\""
+
+#: gtk2_ardour/connection_editor.cc:531
+#, c-format
+msgid "in %d"
+msgstr "entrée %d"
+
+#: gtk2_ardour/connection_editor.cc:533
+#, c-format
+msgid "out %d"
+msgstr "sortie %d"
+
+#: gtk2_ardour/connection_editor.cc:657
+msgid "Name for new connection:"
+msgstr "Nom de la nouvelle connexion :"
+
+#: gtk2_ardour/analysis_window.cc:45
+msgid "analysis window"
+msgstr "fenêtre d'analyse"
+
+#: gtk2_ardour/analysis_window.cc:47
+msgid "Signal source"
+msgstr "source du signal"
+
+#: gtk2_ardour/analysis_window.cc:48
+msgid "Selected ranges"
+msgstr "intervalles sélectionnés"
+
+#: gtk2_ardour/analysis_window.cc:49
+msgid "Selected regions"
+msgstr "régions sélectionnées"
+
+#: gtk2_ardour/analysis_window.cc:51
+msgid "Display model"
+msgstr "Modèle d'affichage"
+
+#: gtk2_ardour/analysis_window.cc:52
+msgid "Composite graphs for each track"
+msgstr "graphique composite pour chaque piste"
+
+#: gtk2_ardour/analysis_window.cc:53
+msgid "Composite graph of all tracks"
+msgstr "graphique composite de toutes les pistes"
+
+#: gtk2_ardour/analysis_window.cc:62
+msgid "Track"
+msgstr "Piste"
+
+#: gtk2_ardour/analysis_window.cc:130
+msgid "Analyze data"
+msgstr "analyser les données"
 
 #~ msgid ""
-#~ "You cannot record-enable\n"
-#~ "track %1\n"
-#~ "because it has no input connections.\n"
-#~ "You would be wasting space recording silence."
+#~ "%1\n"
+#~ "(built with ardour/gtk %2.%3.%4 libardour: %5.%6.%7)"
 #~ msgstr ""
-#~ "Vous ne pouvez activer\n"
-#~ "l'enregistrement de la piste %1\n"
-#~ "car elle n'a pas de connections en entrée.\n"
-#~ "Vous gacheriez de l'espace en enregistrant du silence."
+#~ "%1\n"
+#~ "(ardour/gtk %2.%3.%4 libardour : %5.%6.%7)"
 
-#, fuzzy
-#~ msgid "set selected trackview"
-#~ msgstr "définir la vue de piste sélectionnée"
+#~ msgid "Autuo Play"
+#~ msgstr "lecture auto"
 
-#, fuzzy
-#~ msgid "set selected control point"
-#~ msgstr "Enlever le point de contrôle"
+#~ msgid "programming error: impossible control method"
+#~ msgstr "erreur du logiciel : méthode de contrôle impossible"
 
-#, fuzzy
-#~ msgid "set selected regionview"
-#~ msgstr "définir la vue de région sélectionnée"
+#~ msgid "Unable to create all required ports"
+#~ msgstr "Impossible de créer tous les ports"
 
-#~ msgid "Start a new session\n"
-#~ msgstr "Commencer une nouvelle session\n"
+#~ msgid "ardour_cleanup"
+#~ msgstr "ardour_cleanup"
 
-#~ msgid "via Session menu"
-#~ msgstr "via le menu Session"
+#~ msgid "MMC + Local"
+#~ msgstr "MMC + Local"
 
-#~ msgid "FirstActionMessage"
-#~ msgstr "FirstActionCursor"
+#~ msgid "Local"
+#~ msgstr "Local"
 
-#, fuzzy
-#~ msgid "<b>Advanced</b>"
-#~ msgstr "Avancé..."
+#~ msgid "Sound File Browser"
+#~ msgstr "Navigateur de fichiers audio..."
 
-#, fuzzy
-#~ msgid "Select a File"
-#~ msgstr "Tout sélectionner"
+#~ msgid "start prefix"
+#~ msgstr "préfixe de début"
 
-#, fuzzy
-#~ msgid "Track/Bus connection options"
-#~ msgstr "Inspecteur de pistes/bus"
+#~ msgid "ardour: clock"
+#~ msgstr "ardour : horloge"
 
-#~ msgid "RECORD"
-#~ msgstr "ENREGISTRER"
+#~ msgid "SMPTE"
+#~ msgstr "SMPTE"
 
-#~ msgid "INPUT"
-#~ msgstr "ENTRÉE"
+#~ msgid "a track already exists with that name"
+#~ msgstr "ce nom est déjà utilisé pour une autre piste"
 
-#~ msgid "OUTPUT"
-#~ msgstr "SORTIE"
+#~ msgid "Normal Snap"
+#~ msgstr "Aligné sur :"
 
-#~ msgid "Gain automation mode"
-#~ msgstr "Mode d'automatisation du gain"
+#~ msgid "Visible"
+#~ msgstr "visible"
 
-#~ msgid "Gain automation type"
-#~ msgstr "dessiner l'automatisation du gain"
+#~ msgid "ardour: editor"
+#~ msgstr "Ardour : éditeur"
 
-#~ msgid "trim"
-#~ msgstr "élaguer"
+#~ msgid "ardour_editor"
+#~ msgstr "ardour_editor"
 
-#~ msgid "gain automation mode"
-#~ msgstr "mode d'automatisation du gain"
+#~ msgid "ardour: editor: "
+#~ msgstr "Ardour : éditeur : "
 
-#~ msgid "gain automation state"
-#~ msgstr "état de l'automatisation du gain"
+#~ msgid "Unlock"
+#~ msgstr "Déverrouiller"
 
-#~ msgid "pan automation state"
-#~ msgstr "état de l'automatisation de panoramique"
-
-#~ msgid "REC"
-#~ msgstr "ENR."
-
-#~ msgid "OUT"
-#~ msgstr "SORTIE"
-
-#, fuzzy
-#~ msgid "aplay"
-#~ msgstr "aplay"
-
-#, fuzzy
-#~ msgid "awrite"
-#~ msgstr "awrite"
-
-#~ msgid "no group"
-#~ msgstr "aucun groupe"
-
-#, fuzzy
-#~ msgid "normal"
-#~ msgstr "Normal"
-
-#~ msgid "Disk r:%5.1f w:%5.1f MB/s"
-#~ msgstr "Disque l:%5.1f e:%5.1f Mo/s"
-
-#~ msgid "file"
-#~ msgstr "fichier"
-
-#, fuzzy
-#~ msgid "ardour cleanup"
-#~ msgstr "ardour : nettoyage"
-
-#~ msgid "close session"
-#~ msgstr "fermer la session"
-
-#, fuzzy
-#~ msgid "SetRegionLayerMode"
-#~ msgstr "Mode de superposition des régions"
-
-#, fuzzy
-#~ msgid "SetCrossfadeModel"
-#~ msgstr "Modèle de fondu enchaîné"
-
-#~ msgid "Play from"
-#~ msgstr "Jouer depuis"
-
-#~ msgid "Set from range"
-#~ msgstr "Définir à partir de l'intervalle"
-
-#~ msgid "FORMAT"
-#~ msgstr "FORMAT"
-
-#, fuzzy
-#~ msgid "CD MARKER FILE TYPE"
-#~ msgstr "TYPE DE FICHIER DU MARQUEUR DE CD"
-
-#~ msgid "CHANNELS"
-#~ msgstr "VOIES"
-
-#~ msgid "FILE TYPE"
-#~ msgstr "TYPE DE FICHIER"
-
-#~ msgid "SAMPLE FORMAT"
-#~ msgstr "FORMAT D'ÉCHANTILLON"
-
-#~ msgid "SAMPLE ENDIANNESS"
-#~ msgstr "ENDIANNESS DES ÉCHANTILLONS"
-
-#~ msgid "SAMPLE RATE"
-#~ msgstr "VITESSE D'ÉCHANTILLONAGE"
-
-#~ msgid "CONVERSION QUALITY"
-#~ msgstr "QUALITÉ DE LA CONVERSION"
-
-#~ msgid "DITHER TYPE"
-#~ msgstr "TYPE D'INTERPOLATION"
-
-#, fuzzy
-#~ msgid "EXPORT CD MARKER FILE ONLY"
-#~ msgstr "EXPORTER SEULEMENT LE FICHIER DE MARQUEUR DE CD"
-
-#~ msgid "EXPORT TO FILE"
-#~ msgstr "EXPORTER VERS FICHIER"
-
-#~ msgid "ardour: unplugged"
-#~ msgstr "ardour : déconnecté"
-
-#~ msgid "pol"
-#~ msgstr "pol"
-
-#~ msgid "To be added"
-#~ msgstr "À ajouter"
-
-#~ msgid "Update"
-#~ msgstr "Rafraîchir"
-
-#~ msgid "save"
-#~ msgstr "enregistrer"
-
-#~ msgid "bypass"
-#~ msgstr "bypass"
-
-#~ msgid "Name for plugin settings:"
-#~ msgstr "Nom pour les paramètres du greffon :"
+#~ msgid "Destroy"
+#~ msgstr "Détruire"
 
 #~ msgid ""
-#~ "\"\n"
-#~ "\t ,<.>/?:;'[{}]~`!@#$%^&*()_-+="
-#~ msgstr ""
-#~ "\"\n"
-#~ "\t ,<.>/?:;'[{}]~`!@#$%^&*()_-+="
+#~ "Current Zoom Range\n"
+#~ "(Width of visible area)"
+#~ msgstr "durée de la zone visible"
 
-#~ msgid "aeiou"
-#~ msgstr "aeiou"
+#~ msgid "... as new track"
+#~ msgstr "...comme nouvelle piste"
 
-#~ msgid "AEIOU"
-#~ msgstr "AEIOU"
+#~ msgid "... as new region"
+#~ msgstr "...comme nouvelle région"
 
-#~ msgid "bcdfghjklmnpqrtvwxyz"
-#~ msgstr "bcdfghjklmnpqrtvwxyz"
+#~ msgid "Import audio (copy)"
+#~ msgstr "Importer un fichier audio (par copie)"
 
-#~ msgid "BCDFGHJKLMNPQRTVWXYZ"
-#~ msgstr "BCDFGHJKLMNPQRTVWXYZ"
+#~ msgid "Remove last capture"
+#~ msgstr "Enlever la dernière capture"
+
+#~ msgid "Focus Left"
+#~ msgstr "à gauche"
+
+#~ msgid "Focus Right"
+#~ msgstr "à droite"
+
+#~ msgid "Focus Center"
+#~ msgstr "au centre"
+
+#~ msgid "Focus Playhead"
+#~ msgstr "suivre tête de lecture"
+
+#~ msgid "Focus Edit Cursor"
+#~ msgstr "suivre curseur d'édition"
+
+#~ msgid "SMPTE fps"
+#~ msgstr "nb trames SMPTE par seconde"
+
+#~ msgid "Add Location from Playhead"
+#~ msgstr "repère à la tête de lecture"
 
 #~ msgid ""
-#~ "Primary author:\n"
-#~ "\tPaul Davis\n"
-#~ "\n"
-#~ "Major developers:\n"
-#~ "\tJesse Chappell\n"
-#~ "\tTaybin Rutkin\n"
-#~ "Contributors:\n"
-#~ "\t"
+#~ "programming error: Unexpected SMPTE value (%1, drop = %2) in "
+#~ "update_smpte_mode.  Menu is probably wrong."
 #~ msgstr ""
-#~ "Auteur principal :\n"
-#~ "\tPaul Davis\n"
-#~ "\n"
-#~ "Développeurs principaux :\n"
-#~ "\tJesse Chappell\n"
-#~ "\tTaybin Rutkin\n"
-#~ "Contributeurs :\n"
-#~ "\t"
+#~ "erreur du logiciel: valeur SMPTE inattendue (%1, drop = %2) dans "
+#~ "update_smpte_mode.  Le menu est probablement mauvais"
 
-#~ msgid "Authors"
-#~ msgstr "Auteurs"
+#~ msgid "ardour: rename mark"
+#~ msgstr "ardour : renommer le repère"
 
-#, fuzzy
-#~ msgid "spring"
-#~ msgstr "spring"
+#~ msgid "ardour: rename range"
+#~ msgstr "ardour : renommer l'intervalle"
+
+#~ msgid "select on click"
+#~ msgstr "sélectionner au clic"
+
+#~ msgid "select regions"
+#~ msgstr "sélectionner les régions"
+
+#~ msgid "ardour: rename region"
+#~ msgstr "ardour : renommer la région"
+
+#~ msgid "ardour: freeze"
+#~ msgstr "ardour : blocage de la piste"
+
+#~ msgid "ardour: timestretch"
+#~ msgstr "ardour : déformation temporelle"
+
+#~ msgid "ardour_export"
+#~ msgstr "ardour_export"
+
+#~ msgid "cannot find images for fader slider"
+#~ msgstr "Impossible de trouver les images des atténuateurs"
+
+#~ msgid "cannot find images for fader rail"
+#~ msgstr "Impossible de trouver les images des rails d'attenuateurs"
+
+#~ msgid "port"
+#~ msgstr "port"
+
+#~ msgid "KeyboardTarget: keyname \"%1\" is unknown."
+#~ msgstr "KeyboardTarget : nom de touche inconnue : « %1 »"
 
 #~ msgid ""
-#~ "follow\n"
-#~ "PH"
+#~ "Your system is completely broken - NumLock uses \"%1\"as its modifier. "
+#~ "This is madness - see the man page for xmodmap to find out how to fix "
+#~ "this."
 #~ msgstr ""
-#~ "suivre\n"
-#~ "TL"
-
-#~ msgid "Wheel"
-#~ msgstr "Roulette"
-
-#~ msgid "rescan"
-#~ msgstr "rafraîchir"
-
-#~ msgid "Session %1 already exists at %2"
-#~ msgstr "La session %1 existe déjà en %2"
-
-#, fuzzy
-#~ msgid "UI: cannot setup meter_bridge"
-#~ msgstr "IHM : impossible d'initialiser le bandeau_vu-mètre"
-
-#~ msgid "Enable/Disable follow playhead"
-#~ msgstr "Activer/Désactiver la poursuite de la tête de lecture"
-
-#, fuzzy
-#~ msgid "Select sprung or wheel behaviour"
-#~ msgstr "Sélectionner le comportement du ressort ou de la roulette"
-
-#, fuzzy
-#~ msgid "keyboard_target: error setting binding state: invalid node"
-#~ msgstr "keyboard_target: error setting binding state: noeud invalide"
-
-#~ msgid "Image Compositor"
-#~ msgstr "Compositeur d'image"
-
-#~ msgid "Audio Library"
-#~ msgstr "Bibliothèque audio"
-
-#~ msgid "Meter Bridge"
-#~ msgstr "Bandeau de vu-mètre"
-
-#~ msgid "Input Connections"
-#~ msgstr "Connexions en entrée"
-
-#~ msgid "Output Connections"
-#~ msgstr "Connexions en sortie"
-
-#~ msgid "New Input"
-#~ msgstr "Nouvelle entrée"
-
-#~ msgid "New Output"
-#~ msgstr "Nouvelle sortie"
-
-#~ msgid "Add Port"
-#~ msgstr "Ajouter un port"
-
-#~ msgid "Available Ports"
-#~ msgstr "Ports disponibles"
-
-#~ msgid "ardour: connections"
-#~ msgstr "ardour : connexions"
-
-#~ msgid "in %d"
-#~ msgstr "en %d"
-
-#~ msgid "crossfade editor"
-#~ msgstr "éditeur de fondu enchaîné"
-
-#~ msgid "Regions/name"
-#~ msgstr "Régions/nom"
+#~ "Votre système est très mal configuré -- la touche VerrNum (Numlock)"
+#~ "utilise « %1 » comme modificateur. C'est une aberration -- consultez la "
+#~ "page de manuel de « xmodmap » pour savoir comment réparer ça."
 
 #~ msgid ""
-#~ "editor\n"
-#~ "mixer"
+#~ "Your system generates \"%1\" when the NumLock key is pressed. This can "
+#~ "cause problems when editing so Ardour will use %2 to mean Meta rather "
+#~ "than %1"
 #~ msgstr ""
-#~ "éditeur\n"
-#~ "console de mixage"
+#~ "Votre système génère le code « %1 » quand la touche VerrNum (Numlock) est "
+#~ "pressée. Cela peut causer des problèmes pendant l'édition, de sorte "
+#~ "qu'Ardour utilisera « %2 » comme touche Meta plutôt que « %1 »."
 
-#~ msgid "Invert"
-#~ msgstr "Inverser"
+#~ msgid "You have %1 keys bound to \"mod1\""
+#~ msgstr "%1 touches sont affectées à « mod1 »"
 
-#~ msgid "Edit:"
-#~ msgstr "Éditer :"
+#~ msgid "You have %1 keys bound to \"mod2\""
+#~ msgstr "%1 touches sont affectées à « mod2 »"
 
-#~ msgid "incorrectly formatted URI list, ignored"
-#~ msgstr "liste d'URI mal formattée, ignorée"
+#~ msgid "You have %1 keys bound to \"mod3\""
+#~ msgstr "%1 touches sont affectées à « mod3 »"
 
-#~ msgid "Embed audio (link)"
-#~ msgstr "Incorporer audio (lien)"
+#~ msgid "You have %1 keys bound to \"mod4\""
+#~ msgstr "%1 touches sont affectées à « mod4 »"
 
-#~ msgid "Cancel cleanup"
-#~ msgstr "Annuler le nettoyage"
+#~ msgid "You have %1 keys bound to \"mod5\""
+#~ msgstr "%1 touches sont affectées à « mod5 »"
 
-#~ msgid "programming error: line canvas item has no line object pointer!"
+#~ msgid "ardour: locations"
+#~ msgstr "ardour : repères et intervalles"
+
+#~ msgid "ardour_locations"
+#~ msgstr "ardour_locations"
+
+#~ msgid "ardour is killing itself for a clean exit\n"
+#~ msgstr "récupération du signal pour effectuer une sortie propre\n"
+
+#~ msgid "stopping user interface\n"
+#~ msgstr "arrêt de l'interface utilisateur\n"
+
+#~ msgid "%d(%d): received signal %d\n"
+#~ msgstr "%d(%d) : reçu le signal %d\n"
+
+#~ msgid "cannot become new process group leader (%1)"
+#~ msgstr "impossible de devenir le leader du nouveau groupe de processus"
+
+#~ msgid "cannot setup signal handling for %1"
+#~ msgstr "impossible d'installer le gestionnaire de signaux pour %1"
+
+#~ msgid "cannot set default signal mask (%1)"
+#~ msgstr "impossible de définir le masque de signal par défaut (%1)"
+
+#~ msgid "mute"
+#~ msgstr "muet"
+
+#~ msgid "solo"
+#~ msgstr "solo"
+
+#~ msgid "ardour: mixer"
+#~ msgstr "ardour : console de mixage"
+
+#~ msgid "ardour_mixer"
+#~ msgstr "ardour_mixer"
+
+#~ msgid "ardour: mixer: "
+#~ msgstr "ardour : console de mixage : "
+
+#~ msgid "ardour: options editor"
+#~ msgstr "ardour : éditeur d'options"
+
+#~ msgid "ardour_option_editor"
+#~ msgstr "ardour_option_editor"
+
+#~ msgid "Soundfile Search Paths"
+#~ msgstr "Chemins de recherche des fichiers audio"
+
+#~ msgid "  -g, --gtktheme                   Allow GTK to load a theme\n"
 #~ msgstr ""
-#~ "erreur de programmation : ligne de l'objet canvas sans pointeur d'objet "
-#~ "ligne !"
+#~ "  -g, --gtktheme                   Autoriser le chargement d'un thème\n"
 
-#~ msgid ""
-#~ "programming error: no \"rect\" pointer associated with selection item"
-#~ msgstr ""
-#~ "erreur de programmation : aucun pointeur \"rect\" n'est associé à "
-#~ "l'object sélection"
+#~ msgid "ardour: playlists"
+#~ msgstr "ardour : listes de lecture"
 
-#~ msgid "Name for new edit group"
-#~ msgstr "Nom du nouveau groupe d'édition"
+#~ msgid "ardour: playlist for "
+#~ msgstr "ardour : liste de lecture pour "
 
-#, fuzzy
-#~ msgid "Import selected as tracks"
-#~ msgstr "Import sélectionné"
+#~ msgid "ardour: %1"
+#~ msgstr "ardour : %1"
 
-#~ msgid "ardour: audio import in progress"
-#~ msgstr "ardour : importation audio en cours"
+#~ msgid "active"
+#~ msgstr "active"
 
-#~ msgid "You can't embed an audiofile until you have a session loaded."
-#~ msgstr ""
-#~ "Vous ne pouvez pas incorporer un fichier audio avant d'avoir chargé une "
-#~ "session."
+#~ msgid "visible"
+#~ msgstr "visible"
 
-#, fuzzy
-#~ msgid "Insert selected as new tracks"
-#~ msgstr "définir la vue de piste sélectionnée"
+#~ msgid "Layer"
+#~ msgstr "Couche n°"
 
-#~ msgid "Insert selected"
-#~ msgstr "Insertion sélectionnée"
+#~ msgid "ENVELOPE"
+#~ msgstr "enveloppe"
 
-#~ msgid "hidden"
-#~ msgstr "caché"
+#~ msgid "mute this region"
+#~ msgstr "Assourdir cette région"
 
-#~ msgid "Sorting"
-#~ msgstr "Tri"
+#~ msgid "regions underneath this one cannot be heard"
+#~ msgstr "les régions en dessous de celle-ci sont muettes"
 
-#~ msgid "Regions/length"
-#~ msgstr "Région/longueur"
+#~ msgid "prevent any changes to this region"
+#~ msgstr "empêche toute modification de cette région"
 
-#~ msgid "Regions/start"
-#~ msgstr "Régions/début"
+#~ msgid "use the gain envelope during playback"
+#~ msgstr "utiliser l'enveloppe de gain pendant la lecture"
 
-#~ msgid "Regions/end"
-#~ msgstr "Régions/fin"
+#~ msgid "show the gain envelope"
+#~ msgstr "afficher l'enveloppe de gain"
 
-#~ msgid "Regions/file name"
-#~ msgstr "Régions/nom de fichier"
+#~ msgid "use fade in curve during playback"
+#~ msgstr "utiliser un fondu ascendant pendant la lecture"
 
-#~ msgid "Regions/file size"
-#~ msgstr "Régions/taille de fichier"
+#~ msgid "use fade out curve during playback"
+#~ msgstr "utiliser un fondu descendant pendant la lecture"
 
-#~ msgid "Regions/file date"
-#~ msgstr "Région/date de fichier"
+#~ msgid "FADE IN"
+#~ msgstr "montée"
 
-#~ msgid "Regions/file system"
-#~ msgstr "Région/système de fichier"
+#~ msgid "msecs"
+#~ msgstr "ms"
 
-#~ msgid "Show All AbstractTracks"
-#~ msgstr "Montrer toutes les PistesAbstraites"
+#~ msgid "FADE OUT"
+#~ msgstr "descente"
 
-#~ msgid "Hide All AbstractTracks"
-#~ msgstr "Cacher toutes les PistesAbstraites"
+#~ msgid "ardour: region "
+#~ msgstr "ardour : région "
 
-#~ msgid "slereg"
-#~ msgstr "slereg"
+#~ msgid "ardour: track/bus inspector"
+#~ msgstr "ardour : inspecteur de pistes et de bus"
 
-#~ msgid "KeyboardTarget: no translation found for \"%1\""
-#~ msgstr "KeyboardTarget : aucune traduction trouvée pour \"%1\""
+#~ msgid "ardour_route_parameters"
+#~ msgstr "ardour_route_parameters"
 
-#~ msgid "KeyboardTarget: unknown action \"%1\""
-#~ msgstr "KeyboardTarget : action \"%1\" inconnue"
+#~ msgid "ardour: track/bus inspector: "
+#~ msgstr "ardour : inspecteur de piste et de bus :"
 
-#~ msgid "misformed binding node - ignored"
-#~ msgstr "misformed binding node -- ignored"
+#~ msgid "ardour: track/bus/inspector: no route selected"
+#~ msgstr "ardour : inspecteur de piste et de bus : aucune route sélectionnée"
 
-#~ msgid "ardour: soundfile selector"
-#~ msgstr "ardour : sélection de fichier son"
+#~ msgid "Add Field..."
+#~ msgstr "Ajouter un champ..."
 
-#~ msgid "Add to Library..."
-#~ msgstr "Ajouter à la bibliothèque..."
+#~ msgid "Remove Field"
+#~ msgstr "Enlever le champ"
 
-#~ msgid "Remove..."
-#~ msgstr "Enlever..."
+#~ msgid "Field"
+#~ msgstr "champ"
 
-#~ msgid "Find..."
-#~ msgstr "Chercher..."
+#~ msgid "Value"
+#~ msgstr "valeur"
 
-#~ msgid "Add Folder"
-#~ msgstr "Ajouter un dossier"
+#~ msgid "resolution"
+#~ msgstr "résolution"
 
-#~ msgid "Add audio file or directory"
-#~ msgstr "Ajouter un fichier ou un dossier"
+#~ msgid "format"
+#~ msgstr "format"
 
-#~ msgid "Importing"
-#~ msgstr "Importation en cours"
+#~ msgid "Name for Field"
+#~ msgstr "Nom du champ :"
 
-#~ msgid "%1 not added to database"
-#~ msgstr "%1 n'a pas été ajouté à la base de données"
+#~ msgid "32-bit floating point"
+#~ msgstr "32 bits à virgule flottante"
 
-#~ msgid "Folder name:"
-#~ msgstr "Nom du dossier :"
+#~ msgid "24-bit signed integer"
+#~ msgstr "24 bits à entiers signés"
 
-#~ msgid "Should not be reached"
-#~ msgstr "Ne devrait pas être atteint"
+#~ msgid "channel1"
+#~ msgstr "voie 1"
 
-#~ msgid "file \"%1\" could not be opened"
-#~ msgstr "le fichier \"%1\" n'a pu être ouvert"
+#~ msgid "channel2"
+#~ msgstr "voie 2"
 
-#~ msgid "file \"%1\" appears not to be an audio file"
-#~ msgstr "le fichier \"%1\" ne semble pas être un fichier audio"
-
-#~ msgid "Field name:"
-#~ msgstr "Nom de champ :"
-
-#~ msgid "Field value:"
-#~ msgstr "Valeur du champ :"
-
-#~ msgid "Find"
-#~ msgstr "Trouver"
-
-#~ msgid "AND"
-#~ msgstr "ET"
-
-#~ msgid "ardour: locate soundfiles"
-#~ msgstr "ardour : trouver fichiers audio"
-
-#~ msgid "Results"
-#~ msgstr "Résultats"
-
-#~ msgid "Uris"
-#~ msgstr "Uris"
-
-#~ msgid "Create multi-channel region"
-#~ msgstr "Créer une région multi-voie"
-
-#~ msgid "Ardour: Search Results"
-#~ msgstr "Ardour : résultat de la recherche"
-
-#~ msgid "***"
-#~ msgstr "***"
-
-#~ msgid "Hide All AudioTrack MixerStrips"
-#~ msgstr "Cacher toutes les tranches de mixage de piste audio"
-
-#~ msgid "Show All AudioBus MixerStrips"
-#~ msgstr "Montrer toutes les tranches de mixage de bus audio"
-
-#~ msgid "Hide All AudioBus MixerStrips"
-#~ msgstr "Cacher toutes les tranches de mixage de bus audio"
-
-#~ msgid "Name for new mix group"
-#~ msgstr "Nom pour le nouveau groupe de mixage"
-
-#~ msgid "Create"
-#~ msgstr "Créer"
-
-#, fuzzy
-#~ msgid "use control outs"
-#~ msgstr "utiliser les sorties de contrôle"
-
-#~ msgid "automatically connect track outputs to master outs"
-#~ msgstr "connecter les sorties de piste aux sorties maître automatiquement"
-
-#~ msgid "automatically connect track outputs to physical ports"
-#~ msgstr "connecter les sorties de piste aux ports physiques automatiquement"
-
-#~ msgid "show again"
-#~ msgstr "montrer à nouveau"
-
-#~ msgid "Hardware Inputs: use"
-#~ msgstr "Entrées matérielles : utiliser"
-
-#~ msgid "Hardware Outputs: use"
-#~ msgstr "Sorties matérielles : utiliser"
-
-#~ msgid "new session setup"
-#~ msgstr "nouveau paramétrage de session"
-
-#~ msgid "This session will playback and record at %1 Hz"
-#~ msgstr "Cette session sera lue et enregistrée à %1 Hz"
-
-#~ msgid ""
-#~ "This rate is set by JACK and cannot be changed.\n"
-#~ "If you want to use a different sample rate\n"
-#~ "please exit and restart JACK"
-#~ msgstr ""
-#~ "Cette fréquence est fixée par JACK et ne peut pas être changée.\n"
-#~ "Si vous voulez utiliser une autre fréquence d'échantillonage\n"
-#~ "veuillez arrêter puis relancer JACK"
-
-#~ msgid "blank"
-#~ msgstr "vide"
-
-#~ msgid "No template - create tracks/busses manually"
-#~ msgstr "Pas de modèle -- créez les pistes/bus manuellement"
-
-#~ msgid "Slave to MTC"
-#~ msgstr "Esclave du MTC"
-
-#~ msgid "Sync with JACK"
-#~ msgstr "Synchro. avec JACK"
-
-#~ msgid "never used but stops crashes"
-#~ msgstr "jamais utilisé mais arrête les plantages"
-
-#~ msgid "Most recently added/moved/trimmed regions are higher"
-#~ msgstr ""
-#~ "Les régions ajoutées/déplacées/élaguées en dernier sont placées au-dessus"
-
-#~ msgid "Short fades at the start of the overlap"
-#~ msgstr "Fondus courts en début de recouvrement"
-
-#~ msgid "New full-overlap crossfades are unmuted"
-#~ msgstr ""
-#~ "Les nouveaux fondus enchaînés avec recouvrement complet ne sont pas muets"
-
-#~ msgid "Narrow mixer strips"
-#~ msgstr "Rétrécir les tranches de mixage"
-
-#, fuzzy
-#~ msgid "MIDI parameter control"
-#~ msgstr "Recevoir le contrôle de paramètre MIDI"
-
-#~ msgid "Debug keyboard events"
-#~ msgstr "Déboguer les évènements clavier"
-
-#~ msgid "Misc"
-#~ msgstr "Divers"
-
-#~ msgid "Display"
-#~ msgstr "Affichage"
-
-#~ msgid "Broadcast WAVE/floating point"
-#~ msgstr "Broadcast WAVE/virgule flottante"
-
-#~ msgid "WAVE/floating point"
-#~ msgstr "WAVE/virgule flottante"
-
-#~ msgid "Native Format"
-#~ msgstr "Format natif"
-
-#~ msgid "--unknown--"
-#~ msgstr "--inconnu--"
-
-#~ msgid "in"
-#~ msgstr "entrée"
-
-#~ msgid "ins"
-#~ msgstr "entrées"
-
-#~ msgid "out"
-#~ msgstr "sortie"
-
-#~ msgid "outs"
-#~ msgstr "sorties"
-
-#, fuzzy
-#~ msgid "Select all"
-#~ msgstr "Tout sélectionner"
-
-#, fuzzy
-#~ msgid "Inserts"
-#~ msgstr "Inverser"
-
-#, fuzzy
-#~ msgid "Sends"
-#~ msgstr "Secondes"
-
-#, fuzzy
-#~ msgid "Select all ..."
-#~ msgstr "Tout sélectionner"
-
-#~ msgid "Pre Redirects"
-#~ msgstr "Pre redirections"
-
-#~ msgid "Post Redirects"
-#~ msgstr "Post redirections"
-
-#~ msgid "the exact time it was recorded"
-#~ msgstr "l'heure exacte de l'enregistrement"
-
-#~ msgid "existing material that was listened to while recording"
-#~ msgstr "son existant qui était écouté pendant l'enregistrement"
-
-#~ msgid "Seamless Looping"
-#~ msgstr "Bouclage sans a-coup"
-
-#~ msgid "Align recorded material with:"
-#~ msgstr "Aligner le son enregistré avec :"
-
-#~ msgid "No toggle button pixmaps found to match toggle-button-[0-9]*.xpm$"
-#~ msgstr ""
-#~ "Impossible de trouver une image de bouton inverseur qui corresponde à "
-#~ "toggle-button-[0-9]*.xpm$"
-
-#~ msgid ""
-#~ "No small push button pixmaps found to match small-round-button-[0-9]*.xpm$"
-#~ msgstr ""
-#~ "Impossible de trouver une image de petit bouton poussoir qui corresponde "
-#~ "à small-round-button-[0-9]*.xpm$"
-
-#~ msgid "No pixmaps found to match hslider[0-9]*.xpm$"
-#~ msgstr ""
-#~ "Impossible de trouver une image qui corresponde à hslider[0-9]*.xpm$"
-
-#~ msgid "No pixmaps found to match vslider[0-9]*.xpm$"
-#~ msgstr ""
-#~ "Impossible de trouver une image qui corresponde à vslider[0-9]*.xpm$"
-
-#~ msgid "Recieve MMC"
-#~ msgstr "Recevoir MMC"
-
-#~ msgid "Trace MIDI Input"
-#~ msgstr "Suivi des entrées MIDI"
-
-#~ msgid "Trace MIDI Output"
-#~ msgstr "Suivi des sortie MIDI"
-
-#, fuzzy
-#~ msgid "30 FPS non-drop"
-#~ msgstr "30 TPS sans-drop"
-
-#~ msgid "MTC Port"
-#~ msgstr "Port MTC"
-
-#~ msgid "MIDI Param Port"
-#~ msgstr "Port de paramètre MIDI"
-
-#~ msgid "attempt to timestretch a non-audio track!"
-#~ msgstr "tentative de déformation temporelle d'une piste non audio !"
-
-#~ msgid "cannot create timestretch thread - operation not carried out"
-#~ msgstr "cannot create timestretch thread - operation not carried out"
-
-#~ msgid "mouse brush"
-#~ msgstr "brosse de souris"
-
-#~ msgid "move region(s) between tracks"
-#~ msgstr "déplacer la/les région(s) entre les pistes"
-
-#~ msgid "copy region(s) between tracks"
-#~ msgstr "copier la/les région(s) entre les pistes"
-
-#~ msgid "ardour: tempo editor"
-#~ msgstr "ardour : éditeur de tempo"
-
-#~ msgid "ardour_add_track_bus"
-#~ msgstr "ardour_ajouter_piste_bus"
-
-#~ msgid "ok"
-#~ msgstr "OK"
-
-#, fuzzy
-#~ msgid "apply"
-#~ msgstr "aplay"
-
-#, fuzzy
-#~ msgid "fade"
-#~ msgstr "Fades"
-
-#, fuzzy
-#~ msgid "Edit left"
-#~ msgstr "Mode d'édition"
-
-#, fuzzy
-#~ msgid "Edit right"
-#~ msgstr "Édition en utilisant"
-
-#, fuzzy
-#~ msgid "Edit fade"
-#~ msgstr "Mode d'édition"
-
-#, fuzzy
-#~ msgid "Bounce region"
-#~ msgstr "Bounce selection"
-
-#~ msgid "clear connections"
-#~ msgstr "effacer les connexions"
-
-#, fuzzy
-#~ msgid "Crossfades in use"
-#~ msgstr "Crossfade"
-
-#, fuzzy
-#~ msgid "outside this computer"
-#~ msgstr "Cacher cette piste"
-
-#, fuzzy
-#~ msgid "inside this computer"
-#~ msgstr "Cacher cette piste"
+#~ msgid "Export Region"
+#~ msgstr "Exporter la région"
diff --git a/gtk2_ardour/po/sv_SE.po b/gtk2_ardour/po/sv_SE.po
index 107e3d36ad..cc567f3fb9 100644
--- a/gtk2_ardour/po/sv_SE.po
+++ b/gtk2_ardour/po/sv_SE.po
@@ -728,6 +728,14 @@ msgstr "Gå till slutet av sessionen"
 msgid "Play loop range"
 msgstr "Spela loop-omfång"
 
+#: gtk2_ardour/ardour_ui_ed.cc:243
+msgid "Transition To Roll"
+msgstr "Övergång till Rullning"
+
+#: gtk2_ardour/ardour_ui_ed.cc:247
+msgid "Transition To Reverse"
+msgstr "Övergång till Motsatt riktning"
+
 #: ../ardour_ui2.cc:296
 msgid "Return to last playback start when stopped"
 msgstr "Återvänd till senaste startmarkörpunkten vid stopp"
@@ -742,11 +750,11 @@ msgstr "Rimlig inljudsmedhörning"
 
 #: ../ardour_ui2.cc:299
 msgid "Start recording at auto-punch start"
-msgstr "Starta inspelning vid auto-punch-start"
+msgstr "Starta inspelning vid autoinslagsstart"
 
 #: ../ardour_ui2.cc:300
 msgid "Stop recording at auto-punch end"
-msgstr "Stanna inspelning vid auto-punch-slut"
+msgstr "Stanna inspelning vid autoinslagsslut"
 
 #: ../ardour_ui2.cc:301
 msgid "Enable/Disable audio click"
@@ -1025,7 +1033,7 @@ msgstr "Start/Stopp"
 
 #: ../ardour_ui_ed.cc:225
 msgid "Stop + Forget Capture"
-msgstr "Stanna + Glöm inspelning"
+msgstr "Stanna + ångra inspelning"
 
 #: ../ardour_ui_ed.cc:228
 msgid "Play Loop Range"
@@ -1053,15 +1061,15 @@ msgstr "Bakåtspolning (snabb)"
 
 #: ../ardour_ui_ed.cc:247
 msgid "Forward"
-msgstr "Framspolning"
+msgstr "Framåtspolning"
 
 #: ../ardour_ui_ed.cc:250
 msgid "Forward (Slow)"
-msgstr "Framspolning (långsam)"
+msgstr "Framåtspolning (långsam)"
 
 #: ../ardour_ui_ed.cc:253
 msgid "Forward (Fast)"
-msgstr "Framspolning (snabb)"
+msgstr "Framåtspolning (snabb)"
 
 #: ../ardour_ui_ed.cc:256
 msgid "Goto Zero"
@@ -1269,6 +1277,10 @@ msgstr "Skicka MIDI-gensvar"
 msgid "Use MIDI control"
 msgstr "Använd MIDI-kontroll"
 
+#: gtk2_ardour/ardour_ui_ed.cc:399
+msgid "Use OSC"
+msgstr "Använd OSC"
+
 #: gtk2_ardour/ardour_ui_ed.cc:437
 msgid "Auto-connect inputs to physical inputs"
 msgstr "Anslut automatiskt ingångar till fysiska ingångar"
@@ -1289,6 +1301,18 @@ msgstr "Ansluta automatiskt utgångar till master-bussen"
 msgid "Manually connect outputs"
 msgstr "Anslut utgångar manuellt"
 
+#: gtk2_ardour/ardour_ui_ed.cc:475
+msgid "Remote ID assigned by User"
+msgstr "Fjärr-ID bestäms av användaren"
+
+#: gtk2_ardour/ardour_ui_ed.cc:477
+msgid "Remote ID follows order of Mixer"
+msgstr "Fjärr-ID följer mixerordning"
+
+#: gtk2_ardour/ardour_ui_ed.cc:479
+msgid "Remote ID follows order of Editor"
+msgstr "Fjärr-ID flöjer redigerareordning"
+
 #: ../ardour_ui_ed.cc:376
 msgid "Connect new track inputs to hardware"
 msgstr "Koppla nya ingångar till hårdvara"
@@ -1342,6 +1366,10 @@ msgstr "-12dB volymreduktion för snabbspolning"
 msgid "Rec-enable stays engaged at stop"
 msgstr "Inspelningsläge ändras ej vid stopp"
 
+#: gtk2_ardour/ardour_ui_ed.cc:410
+msgid "Region equivalents overlap"
+msgstr "Likvärda regioner överlappar"
+
 #. session options
 #: ../ardour_ui_ed.cc:418
 msgid "Do not run plugins while recording"
@@ -1351,6 +1379,11 @@ msgstr "Kör ej insticksprogram vid inspelning"
 msgid "Latched solo"
 msgstr "Låst solo"
 
+#: gtk2_ardour/ardour_ui_ed.cc:409
+msgid "Show solo muting"
+msgstr "Visa solotystning"
+
+
 #: ../ardour_ui_ed.cc:426
 msgid "Solo in-place"
 msgstr "In place-solo "
@@ -1371,11 +1404,10 @@ msgstr "Nya fulla övertoningar är påslagna"
 msgid "ST"
 msgstr "HT"
 
-#: gtk2_ardour/audio_clock.cc:1796 gtk2_ardour/editor.cc:180
+#: gtk2_ardour/audio_clock.cc:1801 gtk2_ardour/editor.cc:180
 msgid "Timecode"
 msgstr "Tidskod"
 
-
 #: ../ardour_ui_options.cc:407 ../ardour_ui_options.cc:417
 #: ../ardour_ui_options.cc:484
 msgid "Internal"
@@ -2052,7 +2084,7 @@ msgstr "Omfångsmarkörer"
 
 #: ../editor.cc:193 ../editor_rulers.cc:391
 msgid "Loop/Punch Ranges"
-msgstr "Loop-/punch-markörer"
+msgstr "Loop-/inslagsmarkörer"
 
 #: ../editor.cc:215
 msgid "range"
@@ -2177,7 +2209,7 @@ msgstr ""
 #. force name
 #: ../editor.cc:1281 ../editor.cc:1290 ../editor_markers.cc:895
 msgid "Punch"
-msgstr ""
+msgstr "Inslag"
 
 #: ../editor.cc:1438 ../editor_mouse.cc:1741
 msgid "programming error: fade in canvas item has no regionview data pointer!"
@@ -2360,7 +2392,7 @@ msgstr "Redigeringsmarkör till slutet"
 #: ../editor.cc:1909 ../gain_meter.cc:180 ../gain_meter.cc:808
 #: ../panner_ui.cc:97 ../panner_ui.cc:802
 msgid "Trim"
-msgstr "Beskära"
+msgstr "Beskär"
 
 #: ../editor.cc:1912
 msgid "Split"
@@ -2378,14 +2410,14 @@ msgstr "Duplicera"
 msgid "Fill Track"
 msgstr "Fyll spåret"
 
+#: gtk2_ardour/editor.cc:1776
+msgid "Play range"
+msgstr "Spela omfång"
+
 #: ../editor.cc:1923
 msgid "Destroy"
 msgstr "Förstör"
 
-#: ../editor.cc:1953
-msgid "Play range"
-msgstr "Spela omfång"
-
 #: ../editor.cc:1954
 msgid "Loop range"
 msgstr "Loop-omfång"
@@ -2406,13 +2438,17 @@ msgstr "Separera omfång till regionlista"
 msgid "Select all in range"
 msgstr "Välj allt i omfång"
 
+#: gtk2_ardour/editor_markers.cc:515
+msgid "Select Range"
+msgstr "Välj omfång"
+
 #: ../editor.cc:1968 ../editor.cc:2013
 msgid "Set range to loop range"
 msgstr "Ställ in omfång till loop-omfånget"
 
 #: ../editor.cc:1969 ../editor.cc:2014
 msgid "Set range to punch range"
-msgstr "Ställ in omfång till punch-omfånget"
+msgstr "Ställ in omfång till inslagsomfånget"
 
 #: ../editor.cc:1971
 msgid "Crop region to range"
@@ -2609,7 +2645,7 @@ msgstr "Gör om (%1)"
 
 #: ../editor.cc:3505
 msgid "... as new track"
-msgstr "... som ny region"
+msgstr "... som nytt spår"
 
 #: ../editor.cc:3506
 msgid "... as new region"
@@ -2759,7 +2795,7 @@ msgstr "Visa redigeringsmixer"
 
 #: ../editor_actions.cc:54
 msgid "Span Entire Overlap"
-msgstr "Sträck över hela överlappnngen"
+msgstr "Sträck över hela överlappningen"
 
 #: ../editor_actions.cc:56 ../editor_actions.cc:383
 msgid "Short"
@@ -2779,7 +2815,7 @@ msgstr "Startmarkören till nästa regionslut"
 
 #: ../editor_actions.cc:70
 msgid "Playhead to Next Region Sync"
-msgstr "Startmarkören till nästa"
+msgstr "Startmarkören till nästa regionsynk.-punkt"
 
 #: ../editor_actions.cc:73
 msgid "Playhead to Previous Region Start"
@@ -2819,19 +2855,19 @@ msgstr "Redigeringsmarkören till förra regionssynk.-punkten"
 
 #: ../editor_actions.cc:94
 msgid "Playhead to Range Start"
-msgstr "Startmarkören till regionstarten"
+msgstr "Startmarkören till omfångstarten"
 
 #: ../editor_actions.cc:96
 msgid "Playhead to Range End"
-msgstr "Startmarkören till regionslutet"
+msgstr "Startmarkören till omfångslutet"
 
 #: ../editor_actions.cc:99
 msgid "Edit Cursor to Range Start"
-msgstr "Redigeringsmarkören till regionstarten"
+msgstr "Redigeringsmarkören till omfångstarten"
 
 #: ../editor_actions.cc:101
 msgid "Edit Cursor to Range End"
-msgstr "Redigeringsmarkören till regionslutet"
+msgstr "Redigeringsmarkören till omfångslutet"
 
 #: ../editor_actions.cc:104 ../editor_ops.cc:1364
 msgid "select all"
@@ -2859,7 +2895,7 @@ msgstr "Välj allt mellan markörerna"
 
 #: ../editor_actions.cc:118
 msgid "Select All in Punch Range"
-msgstr "Välj allt i punch-omfånget"
+msgstr "Välj allt i inslagsomfånget"
 
 #: ../editor_actions.cc:120
 msgid "Select All in Loop Range"
@@ -2881,6 +2917,10 @@ msgstr "Lägg till Plats från startmarkören"
 msgid "Nudge Forward"
 msgstr "Knuffa framåt"
 
+#: gtk2_ardour/editor_actions.cc:129
+msgid "Add Mark from Playhead"
+msgstr "Lägg till markör utifrån startmarkören"
+
 #: ../editor_actions.cc:132
 msgid "Nudge Next Forward"
 msgstr "Knuffa nästa framåt"
@@ -2945,6 +2985,10 @@ msgstr "Centrera redigeringsmarkören"
 msgid "Playhead Forward"
 msgstr "Startmarkören framåt"
 
+#: gtk2_ardour/editor_actions.cc:168
+msgid "Playhead forward"
+msgstr "Startmarkören framåt"
+
 #: ../editor_actions.cc:167
 msgid "Playhead Backward"
 msgstr "Startmarkören bakåt"
@@ -3221,19 +3265,19 @@ msgstr "Fallande"
 
 #: ../editor_actions.cc:329
 msgid "By Region Name"
-msgstr "utifrån Regionsnamn"
+msgstr "utifrån Regionens namn"
 
 #: ../editor_actions.cc:331
 msgid "By Region Length"
-msgstr "utifrån Regionslängd"
+msgstr "utifrån Regionens längd"
 
 #: ../editor_actions.cc:333
 msgid "By Region Position"
-msgstr "utifrån Regionsposition"
+msgstr "utifrån Regionens position"
 
 #: ../editor_actions.cc:335
 msgid "By Region Timestamp"
-msgstr "utifrån Regionstiddstämpel"
+msgstr "utifrån Regionens tidstämpel"
 
 #: ../editor_actions.cc:337
 msgid "By Region Start in File"
@@ -3245,19 +3289,19 @@ msgstr "utifrån Regionens slut i filen"
 
 #: ../editor_actions.cc:341
 msgid "By Source File Name"
-msgstr "utifrån Källfilnamn"
+msgstr "utifrån Källfilens namn"
 
 #: ../editor_actions.cc:343
 msgid "By Source File Length"
-msgstr "utifrån Källfillängd"
+msgstr "utifrån Källfilens längd"
 
 #: ../editor_actions.cc:345
 msgid "By Source File Creation Date"
-msgstr ""
+msgstr "utifrån Källfilens skapelsedatum"
 
 #: ../editor_actions.cc:347
 msgid "By Source Filesystem"
-msgstr "utifrån Källfilsskapelsedatum"
+msgstr "utifrån Källfilsystemet"
 
 #. the next two are duplicate items with different names for use in two different contexts
 #: ../editor_actions.cc:353
@@ -3480,7 +3524,7 @@ msgstr "Ta bort markör"
 
 #: ../editor_markers.cc:478 ../editor_markers.cc:534
 msgid "Locate to Range Mark"
-msgstr "Flytta starmarköer till omfångsmarkör"
+msgstr "Flytta startmarköer till omfångsmarkör"
 
 #: ../editor_markers.cc:479 ../editor_markers.cc:535
 msgid "Play from Range Mark"
@@ -3524,7 +3568,7 @@ msgstr "Sätt loop-omfång här"
 
 #: ../editor_markers.cc:520
 msgid "Set Punch Range"
-msgstr "Sätt punch-omfång här"
+msgstr "Sätt inslagsomfång här"
 
 #: ../editor_markers.cc:814
 msgid "New Name:"
@@ -3548,7 +3592,7 @@ msgstr "ställ in loop-omfång"
 
 #: ../editor_markers.cc:890
 msgid "set punch range"
-msgstr "ställ in punch-omfång"
+msgstr "ställ in inslagsomfång"
 
 #: ../editor_mouse.cc:102
 msgid "Editor::event_frame() used on unhandled event type %1"
@@ -3765,7 +3809,7 @@ msgstr "välj allt inom omfång"
 
 #: ../editor_ops.cc:1538
 msgid "select all from punch"
-msgstr "välj allt från punch"
+msgstr "välj allt från inslag"
 
 #: ../editor_ops.cc:1560
 msgid "select all from loop"
@@ -3979,11 +4023,19 @@ msgstr "Ny platsmarkör"
 msgid "Clear all locations"
 msgstr "Rensa alla platsmarkörer"
 
+#: gtk2_ardour/editor_rulers.cc:347
+msgid "Unhide locations"
+msgstr "Visa platsmarkörer"
+
 #. ruler_items.push_back (MenuElem (_("New Range")));
 #: ../editor_rulers.cc:317
 msgid "Clear all ranges"
 msgstr "Rensa alla omfång"
 
+#: gtk2_ardour/editor_rulers.cc:353
+msgid "Unhide ranges"
+msgstr "Visa omfång"
+
 #: ../editor_rulers.cc:326
 msgid "New Tempo"
 msgstr "Nytt tempo"
@@ -4908,11 +4960,11 @@ msgstr "Använd endast"
 
 #: gtk2_ardour/new_session_dialog.cc:105
 msgid "... to Master Bus"
-msgstr "...till Master-bussen"
+msgstr "... till Master-bussen"
 
 #: gtk2_ardour/new_session_dialog.cc:106
 msgid "... to Physical Outputs"
-msgstr "...till fysiska utgångar"
+msgstr "... till fysiska utgångar"
 
 
 #: ../new_session_dialog.cc:56 ../new_session_dialog.cc:67
@@ -4925,7 +4977,7 @@ msgstr "<b>Spår/bussingångar</b>"
 
 #: ../new_session_dialog.cc:66
 msgid "Automatically Connect Outputs"
-msgstr "Anslut automatiskt utgångar"
+msgstr "Anslut automatiskt utgångar..."
 
 #: ../new_session_dialog.cc:75
 msgid "Connect to Master Bus"
@@ -4976,6 +5028,10 @@ msgstr "Öppna session"
 msgid "ardour: session control"
 msgstr "ardour: session"
 
+#: gtk2_ardour/new_session_dialog.cc:347
+msgid "Session Control"
+msgstr "Session"
+
 #: ../new_session_dialog.cc:305
 msgid "select template"
 msgstr "välj mall"
@@ -5924,3 +5980,105 @@ msgstr "nytt namn: "
 #: ../visual_time_axis.cc:335
 msgid "A track already exists with that name"
 msgstr "Ett spår med det namnet existerar redan"
+
+#: gtk2_ardour/sfdb_ui.cc:273
+msgid "Add to Region list"
+msgstr "Lägg till i regionlistan"
+
+#: gtk2_ardour/sfdb_ui.cc:274
+msgid "Add to selected Track(s)"
+msgstr "Lägg till i valt spår"
+
+#: gtk2_ardour/sfdb_ui.cc:275
+msgid "Add as new Track(s)"
+msgstr "Lägg till som nytt/nya spår"
+
+#: gtk2_ardour/sfdb_ui.cc:276
+msgid "Add as new Tape Track(s)"
+msgstr "Lägg till som Band-spår"
+
+#: gtk2_ardour/sfdb_ui.cc:285
+msgid "Search"
+msgstr "Sök"
+
+#: gtk2_ardour/sfdb_ui.cc:302
+msgid "Files"
+msgstr "Filer"
+
+#: gtk2_ardour/sfdb_ui.cc:303
+msgid "Tags"
+msgstr "Taggar"
+
+#: gtk2_ardour/sfdb_ui.cc:129
+msgid "Format: n/a"
+msgstr ""
+
+#: gtk2_ardour/sfdb_ui.cc:130
+msgid "Channels: n/a"
+msgstr "Kanaler: n/a"
+
+#: gtk2_ardour/sfdb_ui.cc:131
+msgid "Samplerate: n/a"
+msgstr "Samplefrekvens: n/a"
+
+#: gtk2_ardour/sfdb_ui.cc:132
+msgid "Timecode: n/a"
+msgstr "Tidskod: n/a"
+
+#: gtk2_ardour/sfdb_ui.cc:142
+msgid "Length: %1"
+msgstr "Längd: %1"
+
+#: gtk2_ardour/sfdb_ui.cc:144
+msgid "Channels: %1"
+msgstr "Kanaler: %1"
+
+#: gtk2_ardour/sfdb_ui.cc:145
+msgid "Samplerate: %1"
+msgstr "Samplingsfrekvens: %1"
+
+#: gtk2_ardour/sfdb_ui.cc:146
+msgid "Timecode: %1"
+msgstr "Tidskod: %1"
+
+#: gtk2_ardour/sfdb_ui.cc:61
+msgid "Apply"
+msgstr "Verkställ"
+
+#: gtk2_ardour/sfdb_ui.cc:70
+msgid "comma seperated tags"
+msgstr "komma-separerade taggar"
+
+
+#: gtk2_ardour/editor.cc:127 gtk2_ardour/editor.cc:3529
+#: gtk2_ardour/editor_actions.cc:287
+msgid "Magnetic"
+msgstr "Magnetisk"
+
+#: gtk2_ardour/editor.cc:132 gtk2_ardour/editor.cc:3546
+#: gtk2_ardour/export_dialog.cc:138 gtk2_ardour/export_dialog.cc:154
+#: gtk2_ardour/export_dialog.cc:1066 gtk2_ardour/export_dialog.cc:1070
+msgid "Left"
+msgstr "Vänster"
+
+#: gtk2_ardour/editor.cc:133 gtk2_ardour/editor.cc:3548
+#: gtk2_ardour/export_dialog.cc:139 gtk2_ardour/export_dialog.cc:155
+msgid "Right"
+msgstr "Höger"
+
+#: gtk2_ardour/editor.cc:134 gtk2_ardour/editor.cc:3550
+msgid "Center"
+msgstr "Mitten"
+
+#: gtk2_ardour/editor.cc:135 gtk2_ardour/editor.cc:3552
+msgid "Playhead"
+msgstr "Startmarkören"
+
+#: gtk2_ardour/ardour_ui2.cc:835 gtk2_ardour/ardour_ui2.cc:858
+msgid "stop"
+msgstr "stopp"
+
+#: gtk2_ardour/audio_time_axis.cc:273
+msgid "Logarithmic"
+msgstr "Logaritmisk"
+
diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index 6ef254dbb5..1c881c4838 100644
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -761,15 +761,19 @@ RedirectBox::cut_redirects ()
 
 	no_redirect_redisplay = true;
 	for (vector<boost::shared_ptr<Redirect> >::iterator i = to_be_removed.begin(); i != to_be_removed.end(); ++i) {
+		// Do not cut inserts or sends
+		if (boost::dynamic_pointer_cast<PluginInsert>((*i)) != 0) {
+			void* gui = (*i)->get_gui ();
 		
-		void* gui = (*i)->get_gui ();
+			if (gui) {
+				static_cast<Gtk::Widget*>(gui)->hide ();
+			}
 		
-		if (gui) {
-			static_cast<Gtk::Widget*>(gui)->hide ();
-		}
-		
-		if (_route->remove_redirect (*i, this)) {
-			/* removal failed */
+			if (_route->remove_redirect (*i, this)) {
+				/* removal failed */
+				_rr_selection.remove (*i);
+			}
+		} else {
 			_rr_selection.remove (*i);
 		}
 
@@ -791,10 +795,40 @@ RedirectBox::copy_redirects ()
 	}
 
 	for (vector<boost::shared_ptr<Redirect> >::iterator i = to_be_copied.begin(); i != to_be_copied.end(); ++i) {
-		copies.push_back (Redirect::clone (*i));
+		// Do not copy inserts or sends
+		if (boost::dynamic_pointer_cast<PluginInsert>((*i)) != 0) {
+			copies.push_back (Redirect::clone (*i));
+		}
   	}
 
 	_rr_selection.set (copies);
+
+}
+
+void
+RedirectBox::delete_redirects ()
+{
+	vector<boost::shared_ptr<Redirect> > to_be_deleted;
+	
+	get_selected_redirects (to_be_deleted);
+
+	if (to_be_deleted.empty()) {
+		return;
+	}
+
+	for (vector<boost::shared_ptr<Redirect> >::iterator i = to_be_deleted.begin(); i != to_be_deleted.end(); ++i) {
+		
+		void* gui = (*i)->get_gui ();
+		
+		if (gui) {
+			static_cast<Gtk::Widget*>(gui)->hide ();
+		}
+
+		_route->remove_redirect( *i, this);
+	}
+
+	no_redirect_redisplay = false;
+	redisplay_redirects (this);
 }
 
 gint
@@ -958,21 +992,31 @@ could not match the configuration of this track.");
 void
 RedirectBox::all_redirects_active (bool state)
 {
-	_route->all_redirects_active (state);
+	_route->all_redirects_active (_placement, state);
 }
 
 void
-RedirectBox::clear_redirects()
+RedirectBox::clear_redirects ()
 {
 	string prompt;
 	vector<string> choices;
 
 	if (boost::dynamic_pointer_cast<AudioTrack>(_route) != 0) {
-		prompt = _("Do you really want to remove all redirects from this track?\n"
-			   "(this cannot be undone)");
+		if (_placement == PreFader) {
+			prompt = _("Do you really want to remove all pre-fader redirects from this track?\n"
+				   "(this cannot be undone)");
+		} else {
+			prompt = _("Do you really want to remove all post-fader redirects from this track?\n"
+				   "(this cannot be undone)");
+		}
 	} else {
-		prompt = _("Do you really want to remove all redirects from this bus?\n"
-			   "(this cannot be undone)");
+		if (_placement == PreFader) {
+			prompt = _("Do you really want to remove all pre-fader redirects from this bus?\n"
+				   "(this cannot be undone)");
+		} else {
+			prompt = _("Do you really want to remove all post-fader redirects from this bus?\n"
+				   "(this cannot be undone)");
+		}
 	}
 
 	choices.push_back (_("Cancel"));
@@ -981,7 +1025,7 @@ RedirectBox::clear_redirects()
 	Gtkmm2ext::Choice prompter (prompt, choices);
 
 	if (prompter.run () == 1) {
-		_route->clear_redirects (this);
+		_route->clear_redirects (_placement, this);
 	}
 }
 
@@ -1153,6 +1197,10 @@ RedirectBox::register_actions ()
 	ActionManager::plugin_selection_sensitive_actions.push_back(act);
 	act = ActionManager::register_action (popup_act_grp, X_("copy"), _("Copy"),  sigc::ptr_fun (RedirectBox::rb_copy));
 	ActionManager::plugin_selection_sensitive_actions.push_back(act);
+
+	act = ActionManager::register_action (popup_act_grp, X_("delete"), _("Delete"),  sigc::ptr_fun (RedirectBox::rb_delete));
+	ActionManager::plugin_selection_sensitive_actions.push_back(act); // ??
+
 	paste_action = ActionManager::register_action (popup_act_grp, X_("paste"), _("Paste"),  sigc::ptr_fun (RedirectBox::rb_paste));
 	act = ActionManager::register_action (popup_act_grp, X_("rename"), _("Rename"),  sigc::ptr_fun (RedirectBox::rb_rename));
 	ActionManager::plugin_selection_sensitive_actions.push_back(act);
@@ -1223,6 +1271,16 @@ RedirectBox::rb_cut ()
 	_current_redirect_box->cut_redirects ();
 }
 
+void
+RedirectBox::rb_delete ()
+{
+	if (_current_redirect_box == 0) {
+		return;
+	}
+
+	_current_redirect_box->delete_redirects ();
+}
+
 void
 RedirectBox::rb_copy ()
 {
diff --git a/gtk2_ardour/redirect_box.h b/gtk2_ardour/redirect_box.h
index 7e93efee1b..cb126dc13f 100644
--- a/gtk2_ardour/redirect_box.h
+++ b/gtk2_ardour/redirect_box.h
@@ -174,6 +174,7 @@ class RedirectBox : public Gtk::HBox
 	void cut_redirects ();
 	void copy_redirects ();
 	void paste_redirects ();
+	void delete_redirects ();
 	void clear_redirects ();
 	void clone_redirects ();
 	void rename_redirects ();
@@ -207,6 +208,7 @@ class RedirectBox : public Gtk::HBox
 	static void rb_cut ();
 	static void rb_copy ();
 	static void rb_paste ();
+	static void rb_delete ();
 	static void rb_rename ();
 	static void rb_select_all ();
 	static void rb_deselect_all ();
diff --git a/gtk2_ardour/region_selection.cc b/gtk2_ardour/region_selection.cc
index 34810691f5..8074383141 100644
--- a/gtk2_ardour/region_selection.cc
+++ b/gtk2_ardour/region_selection.cc
@@ -31,12 +31,16 @@ using namespace sigc;
 
 RegionSelection::RegionSelection ()
 {
+	RegionView::RegionViewGoingAway.connect (mem_fun(*this, &RegionSelection::remove_it));
+
 	_current_start = 0;
 	_current_end = 0;
 }
 
 RegionSelection::RegionSelection (const RegionSelection& other)
 {
+	RegionView::RegionViewGoingAway.connect (mem_fun(*this, &RegionSelection::remove_it));
+
 	for (RegionSelection::const_iterator i = other.begin(); i != other.end(); ++i) {
 		add (*i);
 	}
@@ -44,8 +48,6 @@ RegionSelection::RegionSelection (const RegionSelection& other)
 	_current_end = other._current_end;
 }
 
-
-
 RegionSelection&
 RegionSelection::operator= (const RegionSelection& other)
 {
@@ -86,8 +88,6 @@ RegionSelection::add (RegionView* rv)
 		return false;
 	}
 
-	rv->RegionViewGoingAway.connect (mem_fun(*this, &RegionSelection::remove_it));
-
 	if (rv->region()->first_frame() < _current_start || empty()) {
 		_current_start = rv->region()->first_frame();
 	}
@@ -114,31 +114,33 @@ RegionSelection::remove_it (RegionView *rv)
 bool
 RegionSelection::remove (RegionView* rv)
 {
-	RegionSelection::iterator i;
+	RegionSelection::iterator r;
 
-	if ((i = find (begin(), end(), rv)) != end()) {
-
-		erase (i);
+	if ((r = find (begin(), end(), rv)) != end()) {
 
 		// remove from layer sorted list
 		_bylayer.remove (rv);
 		
-		if (empty()) {
+		if (size() == 1) {
+
+			/* this is the last one, so when we delete it
+			   we will be empty.
+			*/
 
 			_current_start = 0;
 			_current_end = 0;
 
 		} else {
 			
-			boost::shared_ptr<Region> region ((*i)->region());
-
+			boost::shared_ptr<Region> region ((*r)->region());
+			
 			if (region->first_frame() == _current_start) {
 				
 				/* reset current start */
 				
 				nframes_t ref = max_frames;
 				
-				for (i = begin (); i != end(); ++i) {
+				for (RegionSelection::iterator i = begin (); i != end(); ++i) {
 					if (region->first_frame() < ref) {
 						ref = region->first_frame();
 					}
@@ -154,7 +156,7 @@ RegionSelection::remove (RegionView* rv)
 				
 				nframes_t ref = 0;
 				
-				for (i = begin (); i != end(); ++i) {
+				for (RegionSelection::iterator i = begin (); i != end(); ++i) {
 					if (region->first_frame() > ref) {
 						ref = region->first_frame();
 					}
@@ -164,6 +166,8 @@ RegionSelection::remove (RegionView* rv)
 			}
 		}
 
+		erase (r);
+
 		return true;
 	}
 
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index f11ec2a307..24e476704a 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -24,6 +24,7 @@
 #include <gtkmm.h>
 
 #include <gtkmm2ext/gtk_ui.h>
+#include <pbd/stacktrace.h>
 
 #include <ardour/playlist.h>
 #include <ardour/audioregion.h>
diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 74073b404e..636abc031c 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -56,41 +56,43 @@ class RegionView : public TimeAxisViewItem
 	boost::shared_ptr<ARDOUR::Region> region() const { return _region; }
 	
 	bool is_valid() const    { return valid; }
-    void set_valid (bool yn) { valid = yn; }
 
-    virtual void set_height (double);
-    virtual void set_samples_per_unit (double);
-    virtual bool set_duration (nframes_t, void*);
 
-    void move (double xdelta, double ydelta);
+	void set_valid (bool yn) { valid = yn; }
+	
+	virtual void set_height (double);
+	virtual void set_samples_per_unit (double);
+	virtual bool set_duration (nframes_t, void*);
+	
+	void move (double xdelta, double ydelta);
+	
+	void raise ();
+	void raise_to_top ();
+	void lower ();
+	void lower_to_bottom ();
 
-    void raise ();
-    void raise_to_top ();
-    void lower ();
-    void lower_to_bottom ();
-
-    bool set_position(nframes_t pos, void* src, double* delta = 0);
-    void fake_set_opaque (bool yn);
-
-    virtual void show_region_editor () = 0;
-    virtual void hide_region_editor();
-
-    virtual void region_changed (ARDOUR::Change);
-
-    virtual GhostRegion* add_ghost (AutomationTimeAxisView&) = 0;
-    void                 remove_ghost (GhostRegion*);
-
-    uint32_t get_fill_color ();
-
-    virtual void entered () {}
-    virtual void exited () {}
-    
-    static sigc::signal<void,RegionView*> RegionViewGoingAway;
-    sigc::signal<void>                    GoingAway;
+	bool set_position(nframes_t pos, void* src, double* delta = 0);
+	void fake_set_opaque (bool yn);
+	
+	virtual void show_region_editor () = 0;
+	virtual void hide_region_editor();
+	
+	virtual void region_changed (ARDOUR::Change);
+	
+	virtual GhostRegion* add_ghost (AutomationTimeAxisView&) = 0;
+	void                 remove_ghost (GhostRegion*);
+	
+	uint32_t get_fill_color ();
 
+	virtual void entered () {}
+	virtual void exited () {}
+	
+	static sigc::signal<void,RegionView*> RegionViewGoingAway;
+	sigc::signal<void>                    GoingAway;
+	
   protected:
-
-    /** Allows derived types to specify their visibility requirements
+	
+	/** Allows derived types to specify their visibility requirements
      * to the TimeAxisViewItem parent class
      */
     RegionView (ArdourCanvas::Group *, 
diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 8a9d27a4ed..1e8874444c 100644
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -20,6 +20,7 @@
 #include <algorithm>
 #include <sigc++/bind.h>
 #include <pbd/error.h>
+#include <pbd/stacktrace.h>
 
 #include <ardour/playlist.h>
 
@@ -131,6 +132,8 @@ Selection::clear_playlists ()
 	/* Selections own their playlists */
 
 	for (PlaylistSelection::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+		/* selections own their own regions, which are copies of the "originals". make them go away */
+		(*i)->drop_regions ();
 		(*i)->release ();
 	}
 
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index dbc5efc462..d46c457fea 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -515,7 +515,11 @@ TimeAxisView::popup_display_menu (guint32 when)
 	if (display_menu == 0) {
 		build_display_menu ();
 	}
-	editor.set_selected_track (*this, Selection::Add);
+
+	if (!get_selected()) {
+		editor.set_selected_track (*this, Selection::Set);
+	}
+
 	display_menu->popup (1, when);	
 }
 
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index 87eac74ccf..37daaf9ecc 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -125,17 +125,20 @@ void
 TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_color, nframes_t start, nframes_t duration, Visibility vis)
 {
 	item_name = it_name ;
+	name_text_width = ::pixel_width (it_name, NAME_FONT);
+	last_name_text_width = 0;
 	samples_per_unit = spu ;
 	should_show_selection = true;
 	frame_position = start ;
 	item_duration = duration ;
 	name_connected = false;
-	fill_opacity = 130;
+	fill_opacity = 60;
 	position_locked = false ;
 	max_item_duration = ARDOUR::max_frames;
 	min_item_duration = 0 ;
 	show_vestigial = true;
 	visibility = vis;
+	_sensitive = true;
 
 	if (duration == 0) {
 		warning << "Time Axis Item Duration == 0" << endl ;
@@ -487,6 +490,7 @@ TimeAxisViewItem::set_item_name(std::string new_name, void* src)
 	if (new_name != item_name) {
 		std::string temp_name = item_name ;
 		item_name = new_name ;
+		name_text_width = ::pixel_width (new_name, NAME_FONT);
 		NameChanged (item_name, temp_name, src) ; /* EMIT_SIGNAL */
 	}
 }
@@ -552,10 +556,12 @@ TimeAxisViewItem::get_time_axis_view()
  * @param new_name the new name text to display
  */
 void
-TimeAxisViewItem::set_name_text(std::string new_name)
+TimeAxisViewItem::set_name_text(const ustring& new_name)
 {
 	if (name_text) {
-		name_text->property_text() = new_name.c_str();
+		name_text->property_text() = new_name;
+		name_text_width = pixel_width (new_name, NAME_FONT);
+		name_text_size_cache.clear ();
 	}
 }
 
@@ -912,34 +918,88 @@ TimeAxisViewItem::reset_name_width (double pixel_width)
 	if (name_text == 0) {
 		return;
 	}
-                       
-	int width;
-	
-	ustring ustr = fit_to_pixels (item_name, (int) floor (pixel_width - NAME_X_OFFSET), NAME_FONT, width);
 
-	if (ustr.empty()) {
+	int limit = (int) floor (pixel_width - NAME_X_OFFSET);
+	bool shrinking = (last_name_text_width > pixel_width);
+	int actual_width;
+	ustring ustr;
+	ustring::size_type n;
+
+	if ((last_name_text_width &&                                       // we did this once
+	     shrinking &&                                                  // we're getting smaller
+	     (name_text_width <= limit) &&                                 // fits the new size
+	     (name_text_width <= last_name_text_width - NAME_X_OFFSET))) { // fit into the old size too
+		last_name_text_width = pixel_width;
+		return;
+	}
+
+	/* now check the cache of existing truncations */
+
+	Gtk::Label foo;
+	Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout ("");
+
+	for (n = item_name.length(); n > 0; --n) {
 		
-		name_text->hide ();
-		
-	} else {
-		
-		/* don't use name for event handling if it leaves no room
-		   for trimming to work.
-		*/
-		
-		if (pixel_width - width < (NAME_X_OFFSET * 2.0)) {
-			if (name_connected) {
-				name_connected = false;
+		map<ustring::size_type,int>::iterator i;
+
+		if ((i = name_text_size_cache.find (n)) != name_text_size_cache.end()) {
+
+			/* we know the length of this substring already */
+			
+			if ((actual_width = (*i).second) < limit) {
+
+				/* it fits, use it */
+				
+				ustr = item_name.substr (0, n);
+				break;
 			}
+						
 		} else {
-			if (!name_connected) {
-				name_connected = true;
+			
+			/* we don't know the length of this substring already, so compute
+			   it and put it into the cache.
+			 */
+
+			layout->set_text (item_name.substr (0, n));
+			
+			int width, height;
+			Gtkmm2ext::get_ink_pixel_size (layout, width, height);
+			
+			name_text_size_cache[n] = width;
+
+			if ((actual_width = width) < limit) {
+				ustr = item_name.substr (0, n);
+				break;
 			}
 		}
-		
-		name_text->property_text() = ustr;
-		name_text->show();
 	}
+
+	if (n == 0) {
+		/* nothing will fit */
+		name_text->hide ();
+		last_name_text_width = pixel_width;
+		return;
+	} 
+
+	/* don't use name for event handling if it leaves no room
+	   for trimming to work.
+	*/
+	
+	if (pixel_width - actual_width < (NAME_X_OFFSET * 2.0)) {
+		if (name_connected) {
+			name_connected = false;
+		}
+	} else {
+		if (!name_connected) {
+			name_connected = true;
+		}
+	}
+	
+	name_text->property_text() = ustr;
+	name_text_width = actual_width;
+	name_text->show();
+	last_name_text_width = pixel_width;
+
 }
 
 
diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index d41ad5a327..aeeebe1c79 100644
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -176,6 +176,9 @@ class TimeAxisViewItem : public Selectable
      * @param yn true if this item should show its selected status
      */
     virtual void set_should_show_selection (bool yn) ;
+
+    void set_sensitive (bool yn) { _sensitive = yn; }
+    bool sensitive () const { return _sensitive; }
     
     //---------------------------------------------------------------------------------------//
     // Parent Component Methods
@@ -196,7 +199,7 @@ class TimeAxisViewItem : public Selectable
      *
      * @param new_name the new name text to display
      */
-    void set_name_text(std::string new_name) ;
+    void set_name_text(const Glib::ustring& new_name) ;
     
     /**
      * Set the height of this item
@@ -412,6 +415,9 @@ class TimeAxisViewItem : public Selectable
 
     /** should the item show its selected status */
     bool should_show_selection;
+
+    /** should the item respond to events */
+    bool _sensitive;
     
     /**
      * The unique item name of this Item
@@ -455,6 +461,11 @@ class TimeAxisViewItem : public Selectable
     ArdourCanvas::SimpleRect* frame_handle_start;
     ArdourCanvas::SimpleRect* frame_handle_end;
 
+    int name_text_width;
+    double last_name_text_width;
+
+    std::map<Glib::ustring::size_type,int> name_text_size_cache;
+    
     Visibility visibility;
 
 }; /* class TimeAxisViewItem */
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index fbebf0d51a..b4d02591e9 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -44,6 +44,20 @@ using namespace sigc;
 using namespace Glib;
 using namespace PBD;
 
+int
+pixel_width (const ustring& str, Pango::FontDescription& font)
+{
+	Label foo;
+	Glib::RefPtr<Pango::Layout> layout = foo.create_pango_layout ("");
+
+	layout->set_font_description (font);
+	layout->set_text (str);
+
+	int width, height;
+	Gtkmm2ext::get_ink_pixel_size (layout, width, height);
+	return width;
+}
+
 ustring
 fit_to_pixels (const ustring& str, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses)
 {
@@ -562,55 +576,4 @@ key_is_legal_for_numeric_entry (guint keyval)
 }
 
 
-ustring
-short_path (ustring path, uint32_t target_characters)
-{
-	ustring::size_type last_sep;
-	ustring::size_type len = path.length();
-	const char separator = '/';
-
-	if (len <= target_characters) {
-		return path;
-	}
-
-	if ((last_sep = path.find_last_of (separator)) == ustring::npos) {
-
-		/* just a filename, but its too long anyway */
-
-		if (target_characters > 3) {
-			return path.substr (0, target_characters - 3) + ustring ("...");
-		} else {
-			/* stupid caller, just hand back the whole thing */
-			return path;
-		}
-	}
-
-	if (len - last_sep >= target_characters) {
-
-		/* even the filename itself is too long */
-
-		if (target_characters > 3) {
-			return path.substr (last_sep+1, target_characters - 3) + ustring ("...");
-		} else {
-			/* stupid caller, just hand back the whole thing */
-			return path;
-		}
-	}
-	
-	uint32_t so_far = (len - last_sep);
-	uint32_t space_for = target_characters - so_far;
-
-	if (space_for >= 3) {
-		ustring res = "...";
-		res += path.substr (last_sep - space_for);
-		return res;
-	} else {
-		/* remove part of the end */
-		ustring res = "...";
-		res += path.substr (last_sep - space_for, len - last_sep + space_for - 3);
-		res += "...";
-		return res;
-		
-	}
-}
 
diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index 2d2f879073..7e26ba066c 100644
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -53,6 +53,7 @@ slider_position_to_gain (double pos)
 }
 
 Glib::ustring fit_to_pixels (const Glib::ustring&, int pixel_width, Pango::FontDescription& font, int& actual_width, bool with_ellipses = false);
+int pixel_width (const Glib::ustring& str, Pango::FontDescription& font);
 
 gint   just_hide_it (GdkEventAny*, Gtk::Window*);
 void   allow_keyboard_focus (bool);
@@ -80,6 +81,5 @@ static std::map<std::string, Glib::RefPtr<Gdk::Pixbuf> > xpm_map;
 const char* const *get_xpm_data (std::string path);
 std::string longest (std::vector<std::string>&);
 bool key_is_legal_for_numeric_entry (guint keyval);
-Glib::ustring short_path (Glib::ustring, uint32_t target_characters);
 
 #endif /* __ardour_gtk_utils_h__ */
diff --git a/gtk2_ardour/waveview.cc b/gtk2_ardour/waveview.cc
index d9316c110e..fef90cde22 100644
--- a/gtk2_ardour/waveview.cc
+++ b/gtk2_ardour/waveview.cc
@@ -251,6 +251,22 @@ Glib::PropertyProxy_ReadOnly<guint> WaveView::property_wave_color() const
 {
 	return Glib::PropertyProxy_ReadOnly<guint> (this, "wave_color");
 }
+Glib::PropertyProxy<guint> WaveView::property_clip_color()
+{
+	return Glib::PropertyProxy<guint> (this, "clip_color");
+}
+Glib::PropertyProxy_ReadOnly<guint> WaveView::property_clip_color() const
+{
+	return Glib::PropertyProxy_ReadOnly<guint> (this, "clip_color");
+}
+Glib::PropertyProxy<guint> WaveView::property_zero_color()
+{
+	return Glib::PropertyProxy<guint> (this, "zero_color");
+}
+Glib::PropertyProxy_ReadOnly<guint> WaveView::property_zero_color() const
+{
+	return Glib::PropertyProxy_ReadOnly<guint> (this, "zero_color");
+}
 Glib::PropertyProxy<gint> WaveView::property_rectified()
 {
 	return Glib::PropertyProxy<gint> (this, "rectified");
diff --git a/gtk2_ardour/waveview.h b/gtk2_ardour/waveview.h
index cfa7fd416d..99028f2519 100644
--- a/gtk2_ardour/waveview.h
+++ b/gtk2_ardour/waveview.h
@@ -142,7 +142,11 @@ public:
   Glib::PropertyProxy_ReadOnly<double> property_height() const;
   Glib::PropertyProxy<guint> property_wave_color();
   Glib::PropertyProxy_ReadOnly<guint> property_wave_color() const;
+  Glib::PropertyProxy<guint> property_clip_color();
+  Glib::PropertyProxy_ReadOnly<guint> property_clip_color() const;
   Glib::PropertyProxy<gint> property_rectified();
+  Glib::PropertyProxy<guint> property_zero_color();
+  Glib::PropertyProxy_ReadOnly<guint> property_zero_color() const;
   Glib::PropertyProxy_ReadOnly<gint> property_rectified() const;
   Glib::PropertyProxy<guint> property_region_start();
   Glib::PropertyProxy_ReadOnly<guint> property_region_start() const;
diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h
index 913cd7d5ed..149ceb7dc3 100644
--- a/libs/ardour/ardour/audiofilesource.h
+++ b/libs/ardour/ardour/audiofilesource.h
@@ -81,6 +81,7 @@ class AudioFileSource : public AudioSource {
 	virtual void           mark_capture_start (nframes_t) {}
 	virtual void           mark_capture_end () {}
 	virtual void           clear_capture_marks() {}
+	virtual bool           one_of_several_channels () const { return false; }
 
 	virtual int update_header (nframes_t when, struct tm&, time_t) = 0;
 	virtual int flush_header () = 0;
@@ -161,7 +162,7 @@ class AudioFileSource : public AudioSource {
 	virtual void set_timeline_position (int64_t pos);
 	virtual void set_header_timeline_position () = 0;
 
-	bool find (Glib::ustring& path, bool must_exist, bool& is_new);
+	bool find (Glib::ustring& path, bool must_exist, bool& is_new, uint16_t& chan);
 	bool removable() const;
 	bool writable() const { return _flags & Writable; }
 };
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index 3b592a54ee..e25278cce9 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -89,6 +89,8 @@ class AudioRegion : public Region
 	int      set_state (const XMLNode&);
 
 	static void set_default_fade (float steepness, nframes_t len);
+	bool fade_in_is_default () const;
+	bool fade_out_is_default () const;
 
 	enum FadeShape {
 		Linear,
diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h
index 674a9232b5..4f0bae1208 100644
--- a/libs/ardour/ardour/configuration_vars.h
+++ b/libs/ardour/ardour/configuration_vars.h
@@ -17,7 +17,6 @@ CONFIG_VARIABLE (bool, send_mtc, "send-mtc", false)
 CONFIG_VARIABLE (bool, send_mmc, "send-mmc", false)
 CONFIG_VARIABLE (bool, mmc_control, "mmc-control", false)
 CONFIG_VARIABLE (bool, midi_feedback, "midi-feedback", false)
-CONFIG_VARIABLE (bool, midi_control, "midi-control", false)
 CONFIG_VARIABLE (uint8_t, mmc_device_id, "mmc-device-id", 0)
 
 /* control surfaces */
diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h
index 63c50d7cfb..ad21188531 100644
--- a/libs/ardour/ardour/coreaudiosource.h
+++ b/libs/ardour/ardour/coreaudiosource.h
@@ -52,7 +52,7 @@ class CoreAudioSource : public AudioFileSource {
 	mutable nframes_t tmpbufsize;
 	mutable Glib::Mutex _tmpbuf_lock;
 
-	void init (string str);
+	void init ();
 };
 
 }; /* namespace ARDOUR */
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index 10b3bbfe92..4809e17868 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -281,6 +281,7 @@ class Diskstream : public PBD::StatefulDestructible
 	nframes_t            file_frame;		
 	nframes_t            playback_sample;
 	nframes_t            playback_distance;
+	bool                 commit_should_unlock;
 
 	uint32_t                 _read_data_count;
 	uint32_t                 _write_data_count;
diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h
index 54863b6fb0..b1612f39d5 100644
--- a/libs/ardour/ardour/playlist.h
+++ b/libs/ardour/ardour/playlist.h
@@ -141,6 +141,12 @@ class Playlist : public PBD::StatefulDestructible, public boost::enable_shared_f
 	
 	virtual bool destroy_region (boost::shared_ptr<Region>) = 0;
 
+	/* special case function used by UI selection objects, which have playlists that actually own the regions
+	   within them.
+	*/
+
+	void drop_regions ();
+
   protected:
 	friend class Session;
 
@@ -180,6 +186,7 @@ class Playlist : public PBD::StatefulDestructible, public boost::enable_shared_f
 	bool             save_on_thaw;
 	string           last_save_reason;
 	uint32_t         in_set_state;
+	bool             first_set_state;
 	bool            _hidden;
 	bool            _splicing;
 	bool            _nudging;
diff --git a/libs/ardour/ardour/profile.h b/libs/ardour/ardour/profile.h
new file mode 100644
index 0000000000..2ee47d39ea
--- /dev/null
+++ b/libs/ardour/ardour/profile.h
@@ -0,0 +1,31 @@
+#ifndef __ardour_profile_h__
+#define __ardour_profile_h__
+
+#include <boost/dynamic_bitset.hpp>
+#include <stdint.h>
+
+namespace ARDOUR {
+
+class RuntimeProfile {
+  public:
+    enum Element {
+	    SmallScreen,
+	    LastElement
+    };
+    
+    RuntimeProfile() { bits.resize (LastElement); }
+    ~RuntimeProfile() {}
+
+    void set_small_screen() { bits[SmallScreen] = true; }
+    bool get_small_screen() const { return bits[SmallScreen]; }
+
+  private:
+    boost::dynamic_bitset<uint64_t> bits;
+    
+};
+
+extern RuntimeProfile* Profile;
+
+}; // namespace ARDOUR
+
+#endif /* __ardour_profile_h__ */
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 70091ef85d..6247d79a27 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -169,9 +169,9 @@ class Route : public IO
 	int copy_redirects (const Route&, Placement, uint32_t* err_streams = 0);
 	int sort_redirects (uint32_t* err_streams = 0);
 
-	void clear_redirects (void *src);
+	void clear_redirects (Placement, void *src);
 	void all_redirects_flip();
-	void all_redirects_active (bool state);
+	void all_redirects_active (Placement, bool state);
 
 	virtual nframes_t update_total_latency();
 	nframes_t signal_latency() const { return _own_latency; }
diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index d4c0572811..4e3c0fbe2d 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -38,7 +38,7 @@ class Send : public Redirect
 	Send (Session&, Placement);
 	Send (Session&, const XMLNode&);
 	Send (const Send&);
-	~Send ();
+	virtual ~Send ();
 
 	uint32_t bit_slot() const { return bitslot; }
 	
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 2022b21a05..a95b07a2e7 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -371,6 +371,7 @@ class Session : public PBD::StatefulDestructible
 	void set_session_start (nframes_t start) { start_location->set_start(start); }
 	void set_session_end (nframes_t end) { end_location->set_start(end); _end_location_is_free = false; }
 	void use_rf_shuttle_speed ();
+	void allow_auto_play (bool yn);
 	void request_transport_speed (float speed);
 	void request_overwrite_buffer (Diskstream*);
 	void request_diskstream_speed (Diskstream&, float speed);
@@ -424,6 +425,8 @@ class Session : public PBD::StatefulDestructible
 	int save_template (string template_name);
         int save_history (string snapshot_name = "");
         int restore_history (string snapshot_name);
+	void remove_state (string snapshot_name);
+	void rename_state (string old_name, string new_name);
 
 	static int rename_template (string old_name, string new_name);
 
@@ -1004,6 +1007,7 @@ class Session : public PBD::StatefulDestructible
 	volatile float          _transport_speed;
 	volatile float          _desired_transport_speed;
 	float                   _last_transport_speed;
+	bool                     auto_play_legal;
 	nframes_t          _last_slave_transport_frame;
 	nframes_t           maximum_output_latency;
 	nframes_t           last_stop_frame;
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 2fc3872887..916e9da49e 100644
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -56,6 +56,8 @@ class SndFileSource : public AudioFileSource {
 
 	bool set_destructive (bool yn);
 
+	bool one_of_several_channels () const;
+
 	static void setup_standard_crossfades (nframes_t sample_rate);
 	static const AudioFileSource::Flag default_writable_flags;
 
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index 45c91950fc..7b1179b81a 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -82,7 +82,9 @@ class Source : public PBD::StatefulDestructible
 	time_t            _timestamp;
 	jack_nframes_t    _length;
 
-	std::set<boost::shared_ptr<ARDOUR::Playlist> > _playlists;
+	Glib::Mutex playlist_lock;
+	typedef std::map<boost::shared_ptr<ARDOUR::Playlist>, uint32_t > PlaylistMap;
+	PlaylistMap _playlists;
 
   private:
 	uint32_t          _in_use;
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index eeaa095fbd..2c878fbd4d 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -526,6 +526,8 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
 		return 0;
 	}
 
+	commit_should_unlock = false;
+
 	check_record_status (transport_frame, nframes, can_record);
 
 	nominally_recording = (can_record && re);
@@ -544,7 +546,7 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
 	if (!state_lock.trylock()) {
 		return 1;
 	} 
-
+	commit_should_unlock = true;
 	adjust_capture_position = 0;
 
 	for (chan = c->begin(); chan != c->end(); ++chan) {
@@ -796,6 +798,7 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
 		   be called. unlock the state lock.
 		*/
 		
+		commit_should_unlock = false;
 		state_lock.unlock();
 	} 
 
@@ -835,7 +838,10 @@ AudioDiskstream::commit (nframes_t nframes)
 			|| c->front()->capture_buf->read_space() >= disk_io_chunk_frames;
 	}
 
-	state_lock.unlock();
+	if (commit_should_unlock) {
+		state_lock.unlock();
+	}
+
 	_processed = false;
 
 	return need_butler;
diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc
index 1d10109aa1..84ccef905c 100644
--- a/libs/ardour/audiofilesource.cc
+++ b/libs/ardour/audiofilesource.cc
@@ -29,11 +29,13 @@
 #include <pbd/pathscanner.h>
 #include <pbd/stl_delete.h>
 #include <pbd/strsplit.h>
+#include <pbd/shortpath.h>
 #include <pbd/enumwriter.h>
 
 #include <sndfile.h>
 
 #include <glibmm/miscutils.h>
+#include <glibmm/fileutils.h>
 
 #include <ardour/audiofilesource.h>
 #include <ardour/sndfile_helpers.h>
@@ -91,15 +93,17 @@ AudioFileSource::AudioFileSource (Session& s, ustring path, Flag flags, SampleFo
 
 AudioFileSource::AudioFileSource (Session& s, const XMLNode& node, bool must_exist)
 	: AudioSource (s, node), _flags (Flag (Writable|CanRename))
-          /* _channel is set in set_state() */
+          /* _channel is set in set_state() or init() */
 {
 	/* constructor used for existing internal-to-session files. file must exist */
 
 	if (set_state (node)) {
 		throw failed_constructor ();
 	}
+
+	string foo = _name;
 	
-	if (init (_name, must_exist)) {
+	if (init (foo, must_exist)) {
 		throw failed_constructor ();
 	}
 }
@@ -134,7 +138,7 @@ AudioFileSource::init (ustring pathstr, bool must_exist)
 	_peaks_built = false;
 	file_is_new = false;
 
-	if (!find (pathstr, must_exist, is_new)) {
+	if (!find (pathstr, must_exist, is_new, _channel)) {
 		throw non_existent_source ();
 	}
 
@@ -244,7 +248,10 @@ AudioFileSource::set_state (const XMLNode& node)
 void
 AudioFileSource::mark_for_remove ()
 {
-	if (!writable()) {
+	// This operation is not allowed for sources for destructive tracks or embedded files.
+	// Fortunately mark_for_remove() is never called for embedded files. This function
+	// must be fixed if that ever happens.
+	if (_flags & Destructive) {
 		return;
 	}
 
@@ -359,19 +366,13 @@ AudioFileSource::move_to_trash (const ustring& trash_dir_name)
 }
 
 bool
-AudioFileSource::find (ustring& pathstr, bool must_exist, bool& isnew)
+AudioFileSource::find (ustring& pathstr, bool must_exist, bool& isnew, uint16_t& chan)
 {
 	ustring::size_type pos;
 	bool ret = false;
 
 	isnew = false;
 
-	/* clean up PATH:CHANNEL notation so that we are looking for the correct path */
-
-	if ((pos = pathstr.find_last_of (':')) != ustring::npos) {
-		pathstr = pathstr.substr (0, pos);
-	}
-
 	if (pathstr[0] != '/') {
 
 		/* non-absolute pathname: find pathstr in search path */
@@ -396,12 +397,60 @@ AudioFileSource::find (ustring& pathstr, bool must_exist, bool& isnew)
 			if (fullpath[fullpath.length()-1] != '/') {
 				fullpath += '/';
 			}
+
 			fullpath += pathstr;
+
+			/* i (paul) made a nasty design error by using ':' as a special character in
+			   Ardour 0.99 .. this hack tries to make things sort of work.
+			*/
 			
-			if (access (fullpath.c_str(), R_OK) == 0) {
-				keeppath = fullpath;
-				++cnt;
-			} 
+			if ((pos = pathstr.find_last_of (':')) != ustring::npos) {
+				
+				if (Glib::file_test (fullpath, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
+
+					/* its a real file, no problem */
+					
+					keeppath = fullpath;
+					++cnt;
+
+				} else {
+					
+					if (must_exist) {
+						
+						/* might be an older session using file:channel syntax. see if the version
+						   without the :suffix exists
+						 */
+						
+						ustring shorter = pathstr.substr (0, pos);
+						fullpath = *i;
+
+						if (fullpath[fullpath.length()-1] != '/') {
+							fullpath += '/';
+						}
+
+						fullpath += shorter;
+
+						if (Glib::file_test (pathstr, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
+							chan = atoi (pathstr.substr (pos+1));
+							pathstr = shorter;
+							keeppath = fullpath;
+							++cnt;
+						} 
+						
+					} else {
+						
+						/* new derived file (e.g. for timefx) being created in a newer session */
+						
+					}
+				}
+
+			} else {
+
+				if (Glib::file_test (fullpath, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
+					keeppath = fullpath;
+					++cnt;
+				} 
+			}
 		}
 
 		if (cnt > 1) {
@@ -418,7 +467,7 @@ AudioFileSource::find (ustring& pathstr, bool must_exist, bool& isnew)
 				isnew = true;
 			}
 		}
-		
+
 		_name = pathstr;
 		_path = keeppath;
 		ret = true;
@@ -426,18 +475,31 @@ AudioFileSource::find (ustring& pathstr, bool must_exist, bool& isnew)
 	} else {
 		
 		/* external files and/or very very old style sessions include full paths */
+
+		/* ugh, handle ':' situation */
+
+		if ((pos = pathstr.find_last_of (':')) != ustring::npos) {
+			
+			ustring shorter = pathstr.substr (0, pos);
+
+			if (Glib::file_test (shorter, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
+				chan = atoi (pathstr.substr (pos+1));
+				pathstr = shorter;
+			}
+		}
 		
 		_path = pathstr;
+
 		if (is_embedded()) {
 			_name = pathstr;
 		} else {
 			_name = pathstr.substr (pathstr.find_last_of ('/') + 1);
 		}
-		
-		if (access (_path.c_str(), R_OK) != 0) {
+
+		if (!Glib::file_test (pathstr, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_REGULAR)) {
 
 			/* file does not exist or we cannot read it */
-
+			
 			if (must_exist) {
 				error << string_compose(_("Filesource: cannot find required file (%1): %2"), _path, strerror (errno)) << endmsg;
 				goto out;
@@ -458,6 +520,7 @@ AudioFileSource::find (ustring& pathstr, bool must_exist, bool& isnew)
 			/* already exists */
 
 			ret = true;
+
 		}
 	}
 	
@@ -575,6 +638,9 @@ AudioFileSource::safe_file_extension(ustring file)
 		file.rfind(".maud")== ustring::npos &&
 		file.rfind(".vwe") == ustring::npos &&
 		file.rfind(".paf") == ustring::npos &&
+#ifdef HAVE_FLAC
+		file.rfind(".flac")== ustring::npos &&
+#endif // HAVE_FLAC
 #ifdef HAVE_COREAUDIO
 		file.rfind(".mp3") == ustring::npos &&
 		file.rfind(".aac") == ustring::npos &&
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 8bb40e9bcb..68b77a1199 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -332,12 +332,12 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff
 	nframes_t buf_offset;
 	nframes_t to_read;
 
-	/* precondition: caller has verified that we cover the desired section */
-
-	if (chan_n >= _sources.size()) {
+	if (muted()) {
 		return 0; /* read nothing */
 	}
-	
+
+	/* precondition: caller has verified that we cover the desired section */
+
 	if (position < _position) {
 		internal_offset = 0;
 		buf_offset = _position - position;
@@ -362,18 +362,30 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff
 		mixdown_buffer += buf_offset;
 	}
 
-	if (muted()) {
-		return 0; /* read nothing */
-	}
-
 	_read_data_count = 0;
 
-	boost::shared_ptr<AudioSource> src = audio_source(chan_n);
-	if (src->read (mixdown_buffer, _start + internal_offset, to_read) != to_read) {
-		return 0; /* "read nothing" */
-	}
+	if (chan_n < n_channels()) {
+		
+		boost::shared_ptr<AudioSource> src = audio_source(chan_n);
+		if (src->read (mixdown_buffer, _start + internal_offset, to_read) != to_read) {
 
-	_read_data_count += src->read_data_count();
+			return 0; /* "read nothing" */
+		}
+
+		_read_data_count += src->read_data_count();
+
+	} else {
+		
+		/* track is N-channel, this region has less channels; silence the ones
+		   we don't have.
+		*/
+
+		memset (mixdown_buffer, 0, sizeof (Sample) * cnt);
+
+		/* no fades required */
+
+		goto merge;
+	}
 
 	/* fade in */
 
@@ -384,7 +396,7 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff
 		/* see if this read is within the fade in */
 
 		if (internal_offset < fade_in_length) {
-			
+		
 			nframes_t limit;
 
 			limit = min (to_read, fade_in_length - internal_offset);
@@ -458,13 +470,15 @@ AudioRegion::_read_at (const SourceList& srcs, Sample *buf, Sample *mixdown_buff
 		Session::apply_gain_to_buffer (mixdown_buffer, to_read, _scale_amplitude);
 	}
 
+  merge:
+
 	if (!opaque()) {
 
 		/* gack. the things we do for users.
 		 */
 
 		buf += buf_offset;
-
+		
 		for (nframes_t n = 0; n < to_read; ++n) {
 			buf[n] += mixdown_buffer[n];
 		}
@@ -827,6 +841,18 @@ AudioRegion::set_fade_out_active (bool yn)
 	send_change (FadeOutActiveChanged);
 }
 
+bool
+AudioRegion::fade_in_is_default () const
+{
+	return _fade_in_shape == Linear && _fade_in.back()->when == 64;
+}
+
+bool
+AudioRegion::fade_out_is_default () const
+{
+	return _fade_out_shape == Linear && _fade_out.back()->when == 64;
+}
+
 void
 AudioRegion::set_default_fade_in ()
 {
@@ -938,7 +964,6 @@ AudioRegion::separate_by_channel (Session& session, vector<boost::shared_ptr<Aud
 
 		boost::shared_ptr<Region> r = RegionFactory::create (srcs, _start, _length, new_name, _layer, f);
 		boost::shared_ptr<AudioRegion> ar = boost::dynamic_pointer_cast<AudioRegion> (r);
-		cerr << "new region name is " << ar->name() << endl;
 
 		v.push_back (ar);
 		
@@ -1099,7 +1124,6 @@ AudioRegion::normalize_to (float target_dB)
 	boost::shared_ptr<Playlist> pl (playlist());
 
 	if (pl) {
-		cerr << "Send modified\n";
 		pl->Modified();
 	}
 
@@ -1130,14 +1154,16 @@ void
 AudioRegion::suspend_fade_in ()
 {
 	if (++_fade_in_disabled == 1) {
-		set_fade_in_active (false);
+		if (fade_in_is_default()) {
+			set_fade_in_active (false);
+		}
 	}
 }
 
 void
 AudioRegion::resume_fade_in ()
 {
-	if (_fade_in_disabled && --_fade_in_disabled == 0) {
+	if (--_fade_in_disabled == 0 && _fade_in_disabled) {
 		set_fade_in_active (true);
 	}
 }
@@ -1146,14 +1172,16 @@ void
 AudioRegion::suspend_fade_out ()
 {
 	if (++_fade_out_disabled == 1) {
-		set_fade_out_active (false);
+		if (fade_out_is_default()) {
+			set_fade_out_active (false);
+		}
 	}
 }
 
 void
 AudioRegion::resume_fade_out ()
 {
-	if (_fade_out_disabled && --_fade_out_disabled == 0) {
+	if (--_fade_out_disabled == 0 &&_fade_out_disabled) {
 		set_fade_out_active (true);
 	}
 }
@@ -1185,7 +1213,7 @@ AudioRegion::source_offset_changed ()
 boost::shared_ptr<AudioSource>
 AudioRegion::audio_source (uint32_t n) const
 {
-	// Guaranteed to succeed (use a static cast?)
+	// Guaranteed to succeed (use a static cast for speed?)
 	return boost::dynamic_pointer_cast<AudioSource>(source(n));
 }
 
diff --git a/libs/ardour/coreaudiosource.cc b/libs/ardour/coreaudiosource.cc
index 572fd9ef81..703225e502 100644
--- a/libs/ardour/coreaudiosource.cc
+++ b/libs/ardour/coreaudiosource.cc
@@ -38,9 +38,10 @@ CoreAudioSource::CoreAudioSource (Session& s, const XMLNode& node)
 }
 
 CoreAudioSource::CoreAudioSource (Session& s, const string& path, int chn, Flag flags)
-	: AudioFileSource(s, path, flags),
+	/* files created this way are never writable or removable */
+	: AudioFileSource (s, path, Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy)))
 {
-	channel = chn;
+	_channel = chn;
 	init ();
 }
 
@@ -60,8 +61,8 @@ CoreAudioSource::init ()
 		n_channels = file_asbd.NumberChannels();
 		cerr << "number of channels: " << n_channels << endl;
 		
-		if (channel >= n_channels) {
-			error << string_compose("CoreAudioSource: file only contains %1 channels; %2 is invalid as a channel number (%3)", n_channels, channel, name()) << endmsg;
+		if (_channel >= n_channels) {
+			error << string_compose("CoreAudioSource: file only contains %1 channels; %2 is invalid as a channel number (%3)", n_channels, _channel, name()) << endmsg;
 			throw failed_constructor();
 		}
 
@@ -132,14 +133,14 @@ CoreAudioSource::read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) con
 		abl.mBuffers[0].mDataByteSize = tmpbufsize * sizeof(Sample);
 		abl.mBuffers[0].mData = tmpbuf;
 
-		cerr << "channel: " << channel << endl;
+		cerr << "channel: " << _channel << endl;
 		
 		try {
 			af.Read (real_cnt, &abl);
 		} catch (CAXException& cax) {
 			error << string_compose("CoreAudioSource: %1 (%2)", cax.mOperation, _name);
 		}
-		float *ptr = tmpbuf + channel;
+		float *ptr = tmpbuf + _channel;
 		real_cnt /= n_channels;
 		
 		/* stride through the interleaved data */
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index c8fd2e48bf..18aeb32931 100644
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -114,6 +114,7 @@ Diskstream::init (Flag f)
 	playback_distance = 0;
 	_read_data_count = 0;
 	_write_data_count = 0;
+	commit_should_unlock = false;
 
 	pending_overwrite = false;
 	overwrite_frame = 0;
@@ -212,7 +213,9 @@ Diskstream::prepare ()
 void
 Diskstream::recover ()
 {
-	state_lock.unlock();
+	if (commit_should_unlock) {
+		state_lock.unlock();
+	}
 	_processed = false;
 }
 
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index f5e841f00f..a310bd598f 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -41,6 +41,7 @@
 #include <ardour/ardour.h>
 #include <ardour/audio_library.h>
 #include <ardour/configuration.h>
+#include <ardour/profile.h>
 #include <ardour/plugin_manager.h>
 #include <ardour/audiosource.h>
 #include <ardour/utils.h>
@@ -61,6 +62,7 @@
 #include "i18n.h"
 
 ARDOUR::Configuration* ARDOUR::Config = 0;
+ARDOUR::RuntimeProfile* ARDOUR::Profile = 0;
 ARDOUR::AudioLibrary* ARDOUR::Library = 0;
 
 #ifdef HAVE_LIBLO
@@ -296,10 +298,12 @@ ARDOUR::init (ARDOUR::AudioEngine& engine, bool use_vst, bool try_optimization)
 
 	Config->set_use_vst (use_vst);
 
+	Profile = new RuntimeProfile;
+
 	if (setup_midi (engine)) {
 		return -1;
 	}
-    
+
 #ifdef HAVE_LIBLO
 	if (setup_osc ()) {
 		return -1;
diff --git a/libs/ardour/insert.cc b/libs/ardour/insert.cc
index e5d77c3951..956f693f13 100644
--- a/libs/ardour/insert.cc
+++ b/libs/ardour/insert.cc
@@ -493,9 +493,11 @@ PluginInsert::protect_automation ()
 
 		switch (al.automation_state()) {
 		case Write:
-		case Touch:
 			al.set_automation_state (Off);
 			break;
+		case Touch:
+			al.set_automation_state (Play);
+			break;
 		default:
 			break;
 		}
diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc
index ba944f3c08..082d673fbc 100644
--- a/libs/ardour/ladspa_plugin.cc
+++ b/libs/ardour/ladspa_plugin.cc
@@ -195,6 +195,7 @@ LadspaPlugin::default_value (uint32_t port)
 	float ret = 0.0f;
 	bool bounds_given = false;
 	bool sr_scaling = false;
+	bool earlier_hint = false;
 
 	/* defaults - case 1 */
 	
@@ -203,6 +204,7 @@ LadspaPlugin::default_value (uint32_t port)
 			ret = prh[port].LowerBound;
 			bounds_given = true;
 			sr_scaling = true;
+			earlier_hint = true;
 		}
 		
 		/* FIXME: add support for logarithmic defaults */
@@ -211,33 +213,41 @@ LadspaPlugin::default_value (uint32_t port)
 			ret = prh[port].LowerBound * 0.75f + prh[port].UpperBound * 0.25f;
 			bounds_given = true;
 			sr_scaling = true;
+			earlier_hint = true;
 		}
 		else if (LADSPA_IS_HINT_DEFAULT_MIDDLE(prh[port].HintDescriptor)) {
 			ret = prh[port].LowerBound * 0.50f + prh[port].UpperBound * 0.50f;
 			bounds_given = true;
 			sr_scaling = true;
+			earlier_hint = true;
 		}
 		else if (LADSPA_IS_HINT_DEFAULT_HIGH(prh[port].HintDescriptor)) {
 			ret = prh[port].LowerBound * 0.25f + prh[port].UpperBound * 0.75f;
 			bounds_given = true;
 			sr_scaling = true;
+			earlier_hint = true;
 		}
 		else if (LADSPA_IS_HINT_DEFAULT_MAXIMUM(prh[port].HintDescriptor)) {
 			ret = prh[port].UpperBound;
 			bounds_given = true;
 			sr_scaling = true;
+			earlier_hint = true;
 		}
 		else if (LADSPA_IS_HINT_DEFAULT_0(prh[port].HintDescriptor)) {
 			ret = 0.0f;
+			earlier_hint = true;
 		}
 		else if (LADSPA_IS_HINT_DEFAULT_1(prh[port].HintDescriptor)) {
 			ret = 1.0f;
+			earlier_hint = true;
 		}
 		else if (LADSPA_IS_HINT_DEFAULT_100(prh[port].HintDescriptor)) {
 			ret = 100.0f;
+			earlier_hint = true;
 		}
 		else if (LADSPA_IS_HINT_DEFAULT_440(prh[port].HintDescriptor)) {
 			ret = 440.0f;
+			earlier_hint = true;
 		}
 		else {
 			/* no hint found */
@@ -290,7 +300,7 @@ LadspaPlugin::default_value (uint32_t port)
 	
 	/* defaults - case 5 */
 		
-	if (LADSPA_IS_HINT_SAMPLE_RATE(prh[port].HintDescriptor)) {
+	if (LADSPA_IS_HINT_SAMPLE_RATE(prh[port].HintDescriptor) && !earlier_hint) {
 		if (bounds_given) {
 			if (sr_scaling) {
 				ret *= sample_rate;
diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
index d7ce12d411..8fbccf17f7 100644
--- a/libs/ardour/midi_port.cc
+++ b/libs/ardour/midi_port.cc
@@ -61,7 +61,7 @@ MidiPort::cycle_start (jack_nframes_t nframes)
 	void* jack_buffer = jack_port_get_buffer(_port, nframes);
 
 	const jack_nframes_t event_count
-		= jack_midi_get_event_count(jack_buffer, nframes);
+		= jack_midi_get_event_count(jack_buffer);
 
 	assert(event_count < _buffer.capacity());
 
@@ -71,7 +71,7 @@ MidiPort::cycle_start (jack_nframes_t nframes)
 	for (jack_nframes_t i=0; i < event_count; ++i) {
 
 		// This will fail to compile if we change MidiEvent to our own class
-		jack_midi_event_get(static_cast<jack_midi_event_t*>(&ev), jack_buffer, i, nframes);
+		jack_midi_event_get(static_cast<jack_midi_event_t*>(&ev), jack_buffer, i);
 
 		_buffer.push_back(ev);
 		// Convert note ons with velocity 0 to proper note offs
@@ -103,11 +103,11 @@ MidiPort::cycle_end()
 	//if (event_count > 0)
 	//	cerr << "MIDIPort writing " << event_count << " events." << endl;
 
-	jack_midi_clear_buffer(jack_buffer, _nframes_this_cycle);
+	jack_midi_clear_buffer(jack_buffer);
 	for (jack_nframes_t i=0; i < event_count; ++i) {
 		const jack_midi_event_t& ev = _buffer[i];
 		assert(ev.time < _nframes_this_cycle);
-		jack_midi_event_write(jack_buffer, ev.time, ev.buffer, ev.size, _nframes_this_cycle);
+		jack_midi_event_write(jack_buffer, ev.time, ev.buffer, ev.size);
 	}
 	
 	_nframes_this_cycle = 0;
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index 8e41e70687..e12857da93 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -666,10 +666,7 @@ Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co
 			}
 			
 			pan = left * gain_coeff;
-			
-			for (; n < nframes; ++n) {
-				dst[n] += src[n] * pan;
-			}
+			Session::mix_buffers_with_gain(dst+n,src+n,nframes-n,pan);
 			
 		} else {
 
@@ -679,20 +676,10 @@ Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co
 			if ((pan *= gain_coeff) != 1.0f) {
 				
 				if (pan != 0.0f) {
-					
-					for (nframes_t n = 0; n < nframes; ++n) {
-						dst[n] += src[n] * pan;
-					}      
-					
+					Session::mix_buffers_with_gain(dst,src,nframes,pan);
 				} 
-
-				
 			} else {
-				
-				for (nframes_t n = 0; n < nframes; ++n) {
-					dst[n] += src[n];
-				}      
-
+					Session::mix_buffers_no_gain(dst,src,nframes);
 			}
 #endif
 #ifdef CAN_INTERP
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 325ef27a18..0d743a5c9d 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -75,6 +75,7 @@ Playlist::Playlist (Session& sess, string nom, DataType type, bool hide)
 	, _type(type)
 {
 	init (hide);
+	first_set_state = false;
 	_name = nom;
 	
 }
@@ -113,6 +114,7 @@ Playlist::Playlist (boost::shared_ptr<const Playlist> other, string namestr, boo
 	_edit_mode = other->_edit_mode;
 
 	in_set_state = 0;
+	first_set_state = false;
 	in_flush = false;
 	in_partition = false;
 	subcnt = 0;
@@ -185,6 +187,7 @@ Playlist::Playlist (boost::shared_ptr<const Playlist> other, nframes_t start, nf
 	}
 	
 	in_set_state--;
+	first_set_state = false;
 
 	/* this constructor does NOT notify others (session) */
 }
@@ -225,6 +228,7 @@ Playlist::init (bool hide)
 	g_atomic_int_set (&ignore_state_changes, 0);
 	pending_modified = false;
 	pending_length = false;
+	first_set_state = true;
 	_refcnt = 0;
 	_hidden = hide;
 	_splicing = false;
@@ -515,10 +519,10 @@ Playlist::add_region_internal (boost::shared_ptr<Region> region, nframes_t posit
 		 old_length = _get_maximum_extent();
 	}
 
-	if (!in_set_state) {
+	if (!first_set_state) {
 		boost::shared_ptr<Playlist> foo (shared_from_this());
 		region->set_playlist (boost::weak_ptr<Playlist>(foo));
-	}
+	} 
 
 	region->set_position (position, this);
 
@@ -581,6 +585,11 @@ Playlist::remove_region_internal (boost::shared_ptr<Region>region)
 		old_length = _get_maximum_extent();
 	}
 
+	if (!in_set_state) {
+		/* unset playlist */
+		region->set_playlist (boost::weak_ptr<Playlist>());
+	}
+
 	for (i = regions.begin(); i != regions.end(); ++i) {
 		if (*i == region) {
 
@@ -1181,6 +1190,14 @@ Playlist::region_changed (Change what_changed, boost::shared_ptr<Region> region)
 	return save;
 }
 
+void
+Playlist::drop_regions ()
+{
+	RegionLock rl (this);
+	regions.clear ();
+	all_regions.clear ();
+}
+
 void
 Playlist::clear (bool with_signals)
 {
@@ -1412,7 +1429,7 @@ Playlist::set_state (const XMLNode& node)
 	}
 
 	in_set_state--;
-
+	first_set_state = false;
 	return 0;
 }
 
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index 15609706b2..b972c20589 100644
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -272,12 +272,15 @@ void
 Region::set_playlist (boost::weak_ptr<Playlist> wpl)
 {
 	boost::shared_ptr<Playlist> old_playlist = (_playlist.lock());
+
 	boost::shared_ptr<Playlist> pl (wpl.lock());
 
 	if (old_playlist == pl) {
 		return;
 	}
 
+	_playlist = pl;
+
 	if (pl) {
 		if (old_playlist) {
 			for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) {
@@ -292,7 +295,7 @@ Region::set_playlist (boost::weak_ptr<Playlist> wpl)
 	} else {
 		if (old_playlist) {
 			for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) {
-				(*i)->remove_playlist (_playlist);
+				(*i)->remove_playlist (old_playlist);
 			}
 		}
 	}
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 43c233e4d7..d37ae725af 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -113,7 +113,8 @@ Route::init ()
 
 Route::~Route ()
 {
-	clear_redirects (this);
+	clear_redirects (PreFader, this);
+	clear_redirects (PostFader, this);
 
 	for (OrderKeys::iterator i = order_keys.begin(); i != order_keys.end(); ++i) {
 		free ((void*)(i->first));
@@ -884,10 +885,13 @@ Route::add_redirects (const RedirectList& others, void *src, uint32_t* err_strea
 	return 0;
 }
 
+/** Remove redirects with a given placement.
+ * @param p Placement of redirects to remove.
+ */
 void
-Route::clear_redirects (void *src)
+Route::clear_redirects (Placement p, void *src)
 {
-	ChanCount old_rmo = redirect_max_outs;
+	const ChanCount old_rmo = redirect_max_outs;
 
 	if (!_session.engine().connected()) {
 		return;
@@ -895,13 +899,22 @@ Route::clear_redirects (void *src)
 
 	{
 		Glib::RWLock::WriterLock lm (redirect_lock);
-		RedirectList::iterator i;
-		for (i = _redirects.begin(); i != _redirects.end(); ++i) {
-			(*i)->drop_references ();
+		RedirectList new_list;
+		
+		for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
+			if ((*i)->placement() == p) {
+				/* it's the placement we want to get rid of */
+				(*i)->drop_references ();
+			} else {
+				/* it's a different placement, so keep it */
+				new_list.push_back (*i);
+			}
 		}
-		_redirects.clear ();
+		
+		_redirects = new_list;
 	}
 
+	/* FIXME: can't see how this test can ever fire */
 	if (redirect_max_outs != old_rmo) {
 		reset_panner ();
 	}
@@ -1269,8 +1282,12 @@ Route::all_redirects_flip ()
 	}
 }
 
+/** Set all redirects with a given placement to a given active state.
+ * @param p Placement of redirects to change.
+ * @param state New active state for those redirects.
+ */
 void
-Route::all_redirects_active (bool state)
+Route::all_redirects_active (Placement p, bool state)
 {
 	Glib::RWLock::ReaderLock lm (redirect_lock);
 
@@ -1279,7 +1296,9 @@ Route::all_redirects_active (bool state)
 	}
 
 	for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) {
-		(*i)->set_active (state, this);
+		if ((*i)->placement() == p) {
+			(*i)->set_active (state, this);
+		}
 	}
 }
 
@@ -2263,8 +2282,9 @@ Route::protect_automation ()
 {
 	switch (gain_automation_state()) {
 	case Write:
-	case Touch:
 		set_gain_automation_state (Off);
+	case Touch:
+		set_gain_automation_state (Play);
 		break;
 	default:
 		break;
@@ -2272,9 +2292,11 @@ Route::protect_automation ()
 
 	switch (panner().automation_state ()) {
 	case Write:
-	case Touch:
 		panner().set_automation_state (Off);
 		break;
+	case Touch:
+		panner().set_automation_state (Play);
+		break;
 	default:
 		break;
 	}
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 9d0b13fccd..d775e9c69b 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1909,7 +1909,7 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
 
 		for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
 			if (dynamic_cast<AudioTrack*>((*i).get()) == 0) {
-				if (!(*i)->hidden()) {
+				if (!(*i)->hidden() && (*i)->name() != _("master")) {
 					bus_id++;
 				}
 			}
@@ -1926,15 +1926,13 @@ Session::new_audio_route (int input_channels, int output_channels, uint32_t how_
 	while (how_many) {
 
 		do {
-			++bus_id;
-
 			snprintf (bus_name, sizeof(bus_name), "Bus %" PRIu32, bus_id);
 
 			if (route_by_name (bus_name) == 0) {
 				break;
 			}
 
-		} while (bus_id < (UINT_MAX-1));
+		} while (++bus_id < (UINT_MAX-1));
 
 		try {
 			shared_ptr<Route> bus (new Route (*this, bus_name, -1, -1, -1, -1, Route::Flag(0), DataType::AUDIO));
diff --git a/libs/ardour/session_butler.cc b/libs/ardour/session_butler.cc
index 16c8d9cffa..afb284b0f4 100644
--- a/libs/ardour/session_butler.cc
+++ b/libs/ardour/session_butler.cc
@@ -248,7 +248,7 @@ Session::butler_thread_work ()
 		gettimeofday (&begin, 0);
 
 		boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader ();
-		
+
 		for (i = dsl->begin(); !transport_work_requested() && butler_should_run && i != dsl->end(); ++i) {
 
 			boost::shared_ptr<Diskstream> ds = *i;
diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 2a078565b5..7d20a05b45 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -451,24 +451,6 @@ Session::setup_midi_control ()
 	mtc_msg[10] = 0xf1;
 	mtc_msg[12] = 0xf1;
 	mtc_msg[14] = 0xf1;
-
-	if (_mmc_port != 0) {
-
-		Config->set_send_mmc (session_send_mmc);
-
-	} else {
-
-		mmc = 0;
-		session_send_mmc = false;
-	}
-
-	if (_mtc_port != 0) {
-
-		Config->set_send_mtc (session_send_mtc);
-
-	} else {
-		session_send_mtc = false;
-	}
 }
 
 #if 0
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 9b8b7f1d24..f0c4a29aa9 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -222,6 +222,9 @@ Session::commit_diskstreams (nframes_t nframes, bool &needs_butler)
 		}
 		
 		/* force all diskstreams not handled by a Route to call do their stuff.
+		   Note: the diskstreams that were handled by a route will just return zero
+		   from this call, because they know they were processed. So in fact, this
+		   also runs commit() for every diskstream.
 		 */
 
 		if ((dret = (*i)->process (_transport_frame, nframes, 0, actively_recording(), get_rec_monitors_input())) == 0) {
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index aae5830b34..a588015eac 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -141,6 +141,7 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	insert_cnt = 0;
 	_transport_speed = 0;
 	_last_transport_speed = 0;
+	auto_play_legal = false;
 	transport_sub_state = 0;
 	_transport_frame = 0;
 	last_stop_frame = 0;
@@ -611,6 +612,48 @@ Session::remove_pending_capture_state ()
 	unlink (xml_path.c_str());
 }
 
+/** Rename a state file.
+ * @param snapshot_name Snapshot name.
+ */
+void
+Session::rename_state (string old_name, string new_name)
+{
+	if (old_name == _current_snapshot_name || old_name == _name) {
+		/* refuse to rename the current snapshot or the "main" one */
+		return;
+	}
+	
+	const string old_xml_path = _path + old_name + _statefile_suffix;
+	const string new_xml_path = _path + new_name + _statefile_suffix;
+
+	if (rename (old_xml_path.c_str(), new_xml_path.c_str()) != 0) {
+		error << string_compose(_("could not rename snapshot %1 to %2"), old_name, new_name) << endmsg;
+	}
+}
+
+/** Remove a state file.
+ * @param snapshot_name Snapshot name.
+ */
+void
+Session::remove_state (string snapshot_name)
+{
+	if (snapshot_name == _current_snapshot_name || snapshot_name == _name) {
+		/* refuse to remove the current snapshot or the "main" one */
+		return;
+	}
+	
+	const string xml_path = _path + snapshot_name + _statefile_suffix;
+
+	/* make a backup copy of the state file */
+	const string bak_path = xml_path + ".bak";
+	if (g_file_test (xml_path.c_str(), G_FILE_TEST_EXISTS)) {
+		copy_file (xml_path, bak_path);
+	}
+
+	/* and delete it */
+	unlink (xml_path.c_str());
+}
+
 int
 Session::save_state (string snapshot_name, bool pending)
 {
@@ -636,10 +679,12 @@ Session::save_state (string snapshot_name, bool pending)
 
 	if (!pending) {
 
+		/* proper save: use _statefile_suffix (.ardour in English) */
 		xml_path = _path;
 		xml_path += snapshot_name;
 		xml_path += _statefile_suffix;
 
+		/* make a backup copy of the old file */
 		bak_path = xml_path;
 		bak_path += ".bak";
 		
@@ -649,6 +694,7 @@ Session::save_state (string snapshot_name, bool pending)
 
 	} else {
 
+		/* pending save: use _pending_suffix (.pending in English) */
 		xml_path = _path;
 		xml_path += snapshot_name;
 		xml_path += _pending_suffix;
@@ -2751,6 +2797,9 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 		} 
 	}
 
+	char tmppath1[PATH_MAX+1];
+	char tmppath2[PATH_MAX+1];
+	
 	for (vector<string*>::iterator x = soundfiles->begin(); x != soundfiles->end(); ++x) {
 
 		used = false;
@@ -2758,7 +2807,10 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 
 		for (set<string>::iterator i = all_sources.begin(); i != all_sources.end(); ++i) {
 
-			if (spath == *i) {
+			realpath(spath.c_str(), tmppath1);
+			realpath((*i).c_str(),  tmppath2);
+
+			if (strcmp(tmppath1, tmppath2) == 0) {
 				used = true;
 				break;
 			}
@@ -3284,6 +3336,8 @@ Session::config_changed (const char* parameter_name)
 				/* mark us ready to send */
 				next_quarter_frame_to_send = 0;
 			}
+		} else {
+			session_send_mtc = false;
 		}
 
 	} else if (PARAM_IS ("send-mmc")) {
@@ -3294,6 +3348,9 @@ Session::config_changed (const char* parameter_name)
 		
 		if (_mmc_port != 0) {
 			session_send_mmc = Config->get_send_mmc();
+		} else {
+			mmc = 0;
+			session_send_mmc = false; 
 		}
 
 	} else if (PARAM_IS ("midi-feedback")) {
diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 836958f667..281c3a3315 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -25,6 +25,7 @@
 #include <ardour/timestamps.h>
 
 #include <pbd/error.h>
+#include <pbd/enumwriter.h>
 #include <pbd/stacktrace.h>
 
 #include <ardour/ardour.h>
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 3ee74231e0..d9150d235a 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -646,7 +646,7 @@ Session::locate (nframes_t target_frame, bool with_roll, bool with_flush, bool w
 		} 
 	}
 
-	if (transport_rolling() && !Config->get_auto_play() && !with_roll && !(synced_to_jack() && play_loop)) {
+	if (transport_rolling() && (!auto_play_legal || !Config->get_auto_play()) && !with_roll && !(synced_to_jack() && play_loop)) {
 		realtime_stop (false);
 	} 
 
@@ -936,7 +936,7 @@ Session::post_transport ()
 
 	if (post_transport_work & PostTransportLocate) {
 
-		if (((Config->get_slave_source() == None && Config->get_auto_play()) && !_exporting) || (post_transport_work & PostTransportRoll)) {
+		if (((Config->get_slave_source() == None && (auto_play_legal && Config->get_auto_play())) && !_exporting) || (post_transport_work & PostTransportRoll)) {
 			start_transport ();
 			
 		} else {
@@ -1261,3 +1261,9 @@ Session::update_latency_compensation_proxy (void* ignored)
 {
 	update_latency_compensation (false, false);
 }
+
+void
+Session::allow_auto_play (bool yn)
+{
+	auto_play_legal = yn;
+}
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc
index d11afa736b..8f795db111 100644
--- a/libs/ardour/sndfilesource.cc
+++ b/libs/ardour/sndfilesource.cc
@@ -894,3 +894,9 @@ SndFileSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binfo, bool& e
 	ret |= (uint32_t) binfo->time_reference_low;
 	return ret;
 }
+
+bool
+SndFileSource::one_of_several_channels () const
+{
+	return _info.channels > 1;
+}
diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index c4cf1156cd..86afe4cb8d 100644
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -132,7 +132,17 @@ Source::update_length (jack_nframes_t pos, jack_nframes_t cnt)
 void
 Source::add_playlist (boost::shared_ptr<Playlist> pl)
 {
-	_playlists.insert (pl);
+	std::pair<PlaylistMap::iterator,bool> res;
+	std::pair<boost::shared_ptr<Playlist>, uint32_t> newpair (pl, 1);
+	Glib::Mutex::Lock lm (playlist_lock);
+
+	res = _playlists.insert (newpair);
+
+	if (!res.second) {
+		/* it already existed, bump count */
+		res.first->second++;
+	}
+		
 	pl->GoingAway.connect (bind (mem_fun (*this, &Source::remove_playlist), boost::weak_ptr<Playlist> (pl)));
 }
 
@@ -145,10 +155,15 @@ Source::remove_playlist (boost::weak_ptr<Playlist> wpl)
 		return;
 	}
 
-	std::set<boost::shared_ptr<Playlist> >::iterator x;
+	PlaylistMap::iterator x;
+	Glib::Mutex::Lock lm (playlist_lock);
 
 	if ((x = _playlists.find (pl)) != _playlists.end()) {
-		_playlists.erase (x);
+		if (x->second > 1) {
+			x->second--;
+		} else {
+			_playlists.erase (x);
+		}
 	}
 }
 
diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index ed78b0942d..afba6b5cfb 100644
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -172,9 +172,8 @@ VSTPlugin::get_state()
 
 			} else {
 
-				error << string_compose (_("cannot check VST chunk directory: %1"),
-						  strerror (errno))
-				      << endmsg;
+				warning << string_compose (_("cannot check VST chunk directory: %1"), strerror (errno))
+					<< endmsg;
 				return *root;
 			}
 
diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript
index 579ba5dd8e..504801aa03 100644
--- a/libs/gtkmm2ext/SConscript
+++ b/libs/gtkmm2ext/SConscript
@@ -56,6 +56,7 @@ tearoff.cc
 textviewer.cc
 utils.cc
 version.cc
+window_title.cc
 """)
 
 gtkmm2ext.VersionBuild(['version.cc','gtkmm2ext/version.h'], [])
diff --git a/libs/gtkmm2ext/fastmeter.cc b/libs/gtkmm2ext/fastmeter.cc
index 253dad80a2..ab1e1472b3 100644
--- a/libs/gtkmm2ext/fastmeter.cc
+++ b/libs/gtkmm2ext/fastmeter.cc
@@ -50,7 +50,6 @@ FastMeter::FastMeter (long hold, unsigned long dimen, Orientation o)
 	hold_state = 0;
 	current_peak = 0;
 	current_level = 0;
-	current_user_level = -100.0f;
 	
 	set_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK);
 
@@ -413,10 +412,9 @@ FastMeter::horizontal_expose (GdkEventExpose* ev)
 }
 
 void
-FastMeter::set (float lvl, float usrlvl)
+FastMeter::set (float lvl)
 {
 	current_level = lvl;
-	current_user_level = usrlvl;
 	
 	if (lvl > current_peak) {
 		current_peak = lvl;
diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
index 177e4f3dbb..903f56ba6f 100644
--- a/libs/gtkmm2ext/gtk_ui.cc
+++ b/libs/gtkmm2ext/gtk_ui.cc
@@ -37,6 +37,7 @@
 #include <gtkmm2ext/textviewer.h>
 #include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/utils.h>
+#include <gtkmm2ext/window_title.h>
 
 #include "i18n.h"
 
@@ -87,10 +88,11 @@ UI::UI (string namestr, int *argc, char ***argv, string rcfile)
 	errors->text().set_editable (false); 
 	errors->text().set_name ("ErrorText");
 
-	string title;
-	title = namestr;
-	title += ": Log";
-	errors->set_title (title);
+	Glib::set_application_name(namestr);
+
+	WindowTitle title(Glib::get_application_name());
+	title += _("Log");
+	errors->set_title (title.get_string());
 
 	errors->dismiss_button().set_name ("ErrorLogCloseButton");
 	errors->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), (Window *) errors));
diff --git a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
index 775cb201cd..48bed3d150 100644
--- a/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
+++ b/libs/gtkmm2ext/gtkmm2ext/fastmeter.h
@@ -35,7 +35,7 @@ class FastMeter : public Gtk::DrawingArea {
 	FastMeter (long hold_cnt, unsigned long width, Orientation);
 	virtual ~FastMeter ();
 	
-	void set (float level, float user_level=0.0f);
+	void set (float level);
 	void clear ();
 
 	float get_level() { return current_level; }
diff --git a/libs/gtkmm2ext/gtkmm2ext/window_title.h b/libs/gtkmm2ext/gtkmm2ext/window_title.h
new file mode 100644
index 0000000000..1ce7d64b92
--- /dev/null
+++ b/libs/gtkmm2ext/gtkmm2ext/window_title.h
@@ -0,0 +1,44 @@
+#ifndef WINDOW_TITLE_INCLUDED
+#define WINDOW_TITLE_INCLUDED
+
+#include <string>
+
+namespace Gtkmm2ext {
+
+using std::string;
+
+/**
+ * \class The WindowTitle class can be used to maintain the 
+ * consistancy of window titles between windows and dialogs.
+ *
+ * Each string element that is added to the window title will
+ * be separated by a hyphen.
+ */
+class WindowTitle
+{
+public:
+
+	/**
+	 * \param title The first string/element of the window title 
+	 * which will may be the application name or the document 
+	 * name in a document based application.
+	 */
+	WindowTitle(const string& title);
+
+	/**
+	 * Add an string element to the window title.
+	 */
+	void operator+= (const string&);
+
+	/// @return The window title string.
+	const string& get_string () { return m_title;}
+
+private:
+
+	string                         m_title;
+
+};
+
+} // Gtkmm2ext
+
+#endif // WINDOW_TITLE_INCLUDED
diff --git a/libs/gtkmm2ext/window_title.cc b/libs/gtkmm2ext/window_title.cc
new file mode 100644
index 0000000000..237be1ff0f
--- /dev/null
+++ b/libs/gtkmm2ext/window_title.cc
@@ -0,0 +1,26 @@
+#include "gtkmm2ext/window_title.h"
+
+#include "i18n.h"
+
+namespace {
+	
+// I don't know if this should be translated.
+const char* const title_separator = X_(" - ");
+
+} // anonymous namespace
+
+namespace Gtkmm2ext {
+
+WindowTitle::WindowTitle(const string& title)
+	: m_title(title)
+{
+
+}
+
+void
+WindowTitle::operator+= (const string& element)
+{
+	m_title = m_title + title_separator + element;
+}
+
+}
diff --git a/libs/pbd/SConscript b/libs/pbd/SConscript
index 12664a1fca..3aaeb1bf1b 100644
--- a/libs/pbd/SConscript
+++ b/libs/pbd/SConscript
@@ -34,6 +34,7 @@ pathscanner.cc
 pool.cc
 pthread_utils.cc
 receiver.cc
+shortpath.cc
 stacktrace.cc
 stateful.cc
 strreplace.cc
diff --git a/libs/pbd/pbd/shortpath.h b/libs/pbd/pbd/shortpath.h
new file mode 100644
index 0000000000..d126472e77
--- /dev/null
+++ b/libs/pbd/pbd/shortpath.h
@@ -0,0 +1,8 @@
+#ifndef __pbd_shortpath_h__
+#define __pbd_shortpath_h__
+
+#include <glibmm/ustring.h>
+
+Glib::ustring short_path (const Glib::ustring& path, Glib::ustring::size_type target_characters);
+
+#endif /* __pbd_shortpath_h__ */
diff --git a/libs/pbd/shortpath.cc b/libs/pbd/shortpath.cc
new file mode 100644
index 0000000000..59af8e4dcb
--- /dev/null
+++ b/libs/pbd/shortpath.cc
@@ -0,0 +1,56 @@
+#include <pbd/shortpath.h>
+
+using namespace Glib;
+using namespace std;
+
+ustring
+short_path (const Glib::ustring& path, ustring::size_type target_characters)
+{
+	ustring::size_type last_sep;
+	ustring::size_type len = path.length();
+	const char separator = '/';
+
+	if (len <= target_characters) {
+		return path;
+	}
+
+	if ((last_sep = path.find_last_of (separator)) == ustring::npos) {
+
+		/* just a filename, but its too long anyway */
+
+		if (target_characters > 3) {
+			return path.substr (0, target_characters - 3) + ustring ("...");
+		} else {
+			/* stupid caller, just hand back the whole thing */
+			return path;
+		}
+	}
+
+	if (len - last_sep >= target_characters) {
+
+		/* even the filename itself is too long */
+
+		if (target_characters > 3) {
+			return path.substr (last_sep+1, target_characters - 3) + ustring ("...");
+		} else {
+			/* stupid caller, just hand back the whole thing */
+			return path;
+		}
+	}
+	
+	uint32_t so_far = (len - last_sep);
+	uint32_t space_for = target_characters - so_far;
+
+	if (space_for >= 3) {
+		ustring res = "...";
+		res += path.substr (last_sep - space_for);
+		return res;
+	} else {
+		/* remove part of the end */
+		ustring res = "...";
+		res += path.substr (last_sep - space_for, len - last_sep + space_for - 3);
+		res += "...";
+		return res;
+		
+	}
+}
diff --git a/libs/sigc++2/sigc++/adaptors/bind.h b/libs/sigc++2/sigc++/adaptors/bind.h
index 81edaf7934..180a5f26e7 100644
--- a/libs/sigc++2/sigc++/adaptors/bind.h
+++ b/libs/sigc++2/sigc++/adaptors/bind.h
@@ -131,7 +131,7 @@ struct count_void<void,void,void,void,void,void,void>
  *
  * @ingroup bind
  */
-template <int I_location, class T_functor, class T_type1=nil,class T_type2=nil,class T_type3=nil,class T_type4=nil,class T_type5=nil,class T_type6=nil,class T_type7=nil>
+template <int I_location, class T_functor, class T_type1=nil_,class T_type2=nil_,class T_type3=nil_,class T_type4=nil_,class T_type5=nil_,class T_type6=nil_,class T_type7=nil_>
 struct bind_functor;
 
 /** Adaptor that binds an argument to the wrapped functor.
diff --git a/libs/sigc++2/sigc++/adaptors/retype.h b/libs/sigc++2/sigc++/adaptors/retype.h
index 502959d3cd..01f71fcaa7 100644
--- a/libs/sigc++2/sigc++/adaptors/retype.h
+++ b/libs/sigc++2/sigc++/adaptors/retype.h
@@ -64,7 +64,7 @@ namespace sigc {
  *
  * @ingroup retype
  */
-template <class T_functor, class T_type1=nil,class T_type2=nil,class T_type3=nil,class T_type4=nil,class T_type5=nil,class T_type6=nil,class T_type7=nil>
+template <class T_functor, class T_type1=nil_,class T_type2=nil_,class T_type3=nil_,class T_type4=nil_,class T_type5=nil_,class T_type6=nil_,class T_type7=nil_>
 struct retype_functor
   : public adapts<T_functor>
 {
diff --git a/libs/sigc++2/sigc++/functors/functor_trait.h b/libs/sigc++2/sigc++/functors/functor_trait.h
index 656d010414..0b7475273f 100644
--- a/libs/sigc++2/sigc++/functors/functor_trait.h
+++ b/libs/sigc++2/sigc++/functors/functor_trait.h
@@ -27,14 +27,14 @@
 
 namespace sigc {
 
-/** nil struct type.
- * The nil struct type is used as default template argument in the
+/** nil_ struct type.
+ * The nil_ struct type is used as default template argument in the
  * unnumbered sigc::signal and sigc::slot templates.
  *
  * @ingroup signal
  * @ingroup slot
  */
-struct nil;
+struct nil_;
 
 
 /** @defgroup functors Functors
diff --git a/libs/sigc++2/sigc++/functors/slot.h b/libs/sigc++2/sigc++/functors/slot.h
index 51294fe4d8..48c192a3c3 100644
--- a/libs/sigc++2/sigc++/functors/slot.h
+++ b/libs/sigc++2/sigc++/functors/slot.h
@@ -468,7 +468,7 @@ public:
  *
  * The template arguments determine the function signature of operator()():
  * - @e T_return The return type of operator()().
- * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument.
+ * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
  *
  * To use simply assign the slot to the desired functor. If the functor
  * is not compatible with the parameter list defined with the template
@@ -540,8 +540,8 @@ public:
  *
  * The template arguments determine the function signature of operator()():
  * - @e T_return The return type of operator()().
- * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument.
+ * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
  *
  * To use simply assign the slot to the desired functor. If the functor
  * is not compatible with the parameter list defined with the template
@@ -615,9 +615,9 @@ public:
  *
  * The template arguments determine the function signature of operator()():
  * - @e T_return The return type of operator()().
- * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil means no argument.
+ * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
  *
  * To use simply assign the slot to the desired functor. If the functor
  * is not compatible with the parameter list defined with the template
@@ -693,10 +693,10 @@ public:
  *
  * The template arguments determine the function signature of operator()():
  * - @e T_return The return type of operator()().
- * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil means no argument.
+ * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
  *
  * To use simply assign the slot to the desired functor. If the functor
  * is not compatible with the parameter list defined with the template
@@ -774,11 +774,11 @@ public:
  *
  * The template arguments determine the function signature of operator()():
  * - @e T_return The return type of operator()().
- * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil means no argument.
+ * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
  *
  * To use simply assign the slot to the desired functor. If the functor
  * is not compatible with the parameter list defined with the template
@@ -858,12 +858,12 @@ public:
  *
  * The template arguments determine the function signature of operator()():
  * - @e T_return The return type of operator()().
- * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg6 Argument type used in the definition of operator()(). The default @p nil means no argument.
+ * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg6 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
  *
  * To use simply assign the slot to the desired functor. If the functor
  * is not compatible with the parameter list defined with the template
@@ -945,13 +945,13 @@ public:
  *
  * The template arguments determine the function signature of operator()():
  * - @e T_return The return type of operator()().
- * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg6 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg7 Argument type used in the definition of operator()(). The default @p nil means no argument.
+ * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg6 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg7 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
  *
  * To use simply assign the slot to the desired functor. If the functor
  * is not compatible with the parameter list defined with the template
@@ -1037,13 +1037,13 @@ public:
  *
  * The template arguments determine the function signature of operator()():
  * - @e T_return The return type of operator()().
- * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg6 Argument type used in the definition of operator()(). The default @p nil means no argument.
- * - @e T_arg7 Argument type used in the definition of operator()(). The default @p nil means no argument.
+ * - @e T_arg1 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg2 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg3 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg4 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg5 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg6 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
+ * - @e T_arg7 Argument type used in the definition of operator()(). The default @p nil_ means no argument.
  *
  * To use simply assign the slot to the desired functor. If the functor
  * is not compatible with the parameter list defined with the template
@@ -1061,7 +1061,7 @@ public:
  *
  * @ingroup slot
  */
-template <class T_return, class T_arg1 = nil,class T_arg2 = nil,class T_arg3 = nil,class T_arg4 = nil,class T_arg5 = nil,class T_arg6 = nil,class T_arg7 = nil>
+template <class T_return, class T_arg1 = nil_,class T_arg2 = nil_,class T_arg3 = nil_,class T_arg4 = nil_,class T_arg5 = nil_,class T_arg6 = nil_,class T_arg7 = nil_>
 class slot 
   : public slot7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>
 {
diff --git a/libs/sigc++2/sigc++/retype.h b/libs/sigc++2/sigc++/retype.h
index 5df6622f84..069313573b 100644
--- a/libs/sigc++2/sigc++/retype.h
+++ b/libs/sigc++2/sigc++/retype.h
@@ -9,7 +9,7 @@
 
 namespace SigC {
 
-template <class T_functor, class T_return, class T_type1=::sigc::nil,class T_type2=::sigc::nil,class T_type3=::sigc::nil,class T_type4=::sigc::nil,class T_type5=::sigc::nil,class T_type6=::sigc::nil,class T_type7=::sigc::nil>
+template <class T_functor, class T_return, class T_type1=::sigc::nil_,class T_type2=::sigc::nil_,class T_type3=::sigc::nil_,class T_type4=::sigc::nil_,class T_type5=::sigc::nil_,class T_type6=::sigc::nil_,class T_type7=::sigc::nil_>
 struct retype_slot_functor
   : public ::sigc::adapts<T_functor>
 {
diff --git a/libs/sigc++2/sigc++/signal.h b/libs/sigc++2/sigc++/signal.h
index a89112cf9e..9c4e35442a 100644
--- a/libs/sigc++2/sigc++/signal.h
+++ b/libs/sigc++2/sigc++/signal.h
@@ -407,7 +407,7 @@ private:
  * This template implements the emit() function of signal0.
  * Template specializations are available to optimize signal
  * emission when no accumulator is used, i.e. the template
- * argument @e T_accumulator is @p nil.
+ * argument @e T_accumulator is @p nil_.
  */
 template <class T_return, class T_accumulator>
 struct signal_emit0
@@ -452,9 +452,9 @@ struct signal_emit0
  * function for the case that no accumulator is used.
  */
 template <class T_return>
-struct signal_emit0<T_return, nil>
+struct signal_emit0<T_return, nil_>
 {
-  typedef signal_emit0<T_return, nil > self_type;
+  typedef signal_emit0<T_return, nil_ > self_type;
   typedef T_return result_type;
   typedef slot<T_return> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -493,9 +493,9 @@ struct signal_emit0<T_return, nil>
  * return type is @p void.
  */
 template <>
-struct signal_emit0<void, nil>
+struct signal_emit0<void, nil_>
 {
-  typedef signal_emit0<void, nil> self_type;
+  typedef signal_emit0<void, nil_> self_type;
   typedef void result_type;
   typedef slot<void> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -523,7 +523,7 @@ struct signal_emit0<void, nil>
  * This template implements the emit() function of signal1.
  * Template specializations are available to optimize signal
  * emission when no accumulator is used, i.e. the template
- * argument @e T_accumulator is @p nil.
+ * argument @e T_accumulator is @p nil_.
  */
 template <class T_return, class T_arg1, class T_accumulator>
 struct signal_emit1
@@ -577,9 +577,9 @@ struct signal_emit1
  * function for the case that no accumulator is used.
  */
 template <class T_return, class T_arg1>
-struct signal_emit1<T_return, T_arg1, nil>
+struct signal_emit1<T_return, T_arg1, nil_>
 {
-  typedef signal_emit1<T_return, T_arg1, nil > self_type;
+  typedef signal_emit1<T_return, T_arg1, nil_ > self_type;
   typedef T_return result_type;
   typedef slot<T_return, T_arg1> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -620,9 +620,9 @@ struct signal_emit1<T_return, T_arg1, nil>
  * return type is @p void.
  */
 template <class T_arg1>
-struct signal_emit1<void, T_arg1, nil>
+struct signal_emit1<void, T_arg1, nil_>
 {
-  typedef signal_emit1<void, T_arg1, nil> self_type;
+  typedef signal_emit1<void, T_arg1, nil_> self_type;
   typedef void result_type;
   typedef slot<void, T_arg1> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -652,7 +652,7 @@ struct signal_emit1<void, T_arg1, nil>
  * This template implements the emit() function of signal2.
  * Template specializations are available to optimize signal
  * emission when no accumulator is used, i.e. the template
- * argument @e T_accumulator is @p nil.
+ * argument @e T_accumulator is @p nil_.
  */
 template <class T_return, class T_arg1,class T_arg2, class T_accumulator>
 struct signal_emit2
@@ -708,9 +708,9 @@ struct signal_emit2
  * function for the case that no accumulator is used.
  */
 template <class T_return, class T_arg1,class T_arg2>
-struct signal_emit2<T_return, T_arg1,T_arg2, nil>
+struct signal_emit2<T_return, T_arg1,T_arg2, nil_>
 {
-  typedef signal_emit2<T_return, T_arg1,T_arg2, nil > self_type;
+  typedef signal_emit2<T_return, T_arg1,T_arg2, nil_ > self_type;
   typedef T_return result_type;
   typedef slot<T_return, T_arg1,T_arg2> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -752,9 +752,9 @@ struct signal_emit2<T_return, T_arg1,T_arg2, nil>
  * return type is @p void.
  */
 template <class T_arg1,class T_arg2>
-struct signal_emit2<void, T_arg1,T_arg2, nil>
+struct signal_emit2<void, T_arg1,T_arg2, nil_>
 {
-  typedef signal_emit2<void, T_arg1,T_arg2, nil> self_type;
+  typedef signal_emit2<void, T_arg1,T_arg2, nil_> self_type;
   typedef void result_type;
   typedef slot<void, T_arg1,T_arg2> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -785,7 +785,7 @@ struct signal_emit2<void, T_arg1,T_arg2, nil>
  * This template implements the emit() function of signal3.
  * Template specializations are available to optimize signal
  * emission when no accumulator is used, i.e. the template
- * argument @e T_accumulator is @p nil.
+ * argument @e T_accumulator is @p nil_.
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3, class T_accumulator>
 struct signal_emit3
@@ -843,9 +843,9 @@ struct signal_emit3
  * function for the case that no accumulator is used.
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3>
-struct signal_emit3<T_return, T_arg1,T_arg2,T_arg3, nil>
+struct signal_emit3<T_return, T_arg1,T_arg2,T_arg3, nil_>
 {
-  typedef signal_emit3<T_return, T_arg1,T_arg2,T_arg3, nil > self_type;
+  typedef signal_emit3<T_return, T_arg1,T_arg2,T_arg3, nil_ > self_type;
   typedef T_return result_type;
   typedef slot<T_return, T_arg1,T_arg2,T_arg3> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -888,9 +888,9 @@ struct signal_emit3<T_return, T_arg1,T_arg2,T_arg3, nil>
  * return type is @p void.
  */
 template <class T_arg1,class T_arg2,class T_arg3>
-struct signal_emit3<void, T_arg1,T_arg2,T_arg3, nil>
+struct signal_emit3<void, T_arg1,T_arg2,T_arg3, nil_>
 {
-  typedef signal_emit3<void, T_arg1,T_arg2,T_arg3, nil> self_type;
+  typedef signal_emit3<void, T_arg1,T_arg2,T_arg3, nil_> self_type;
   typedef void result_type;
   typedef slot<void, T_arg1,T_arg2,T_arg3> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -922,7 +922,7 @@ struct signal_emit3<void, T_arg1,T_arg2,T_arg3, nil>
  * This template implements the emit() function of signal4.
  * Template specializations are available to optimize signal
  * emission when no accumulator is used, i.e. the template
- * argument @e T_accumulator is @p nil.
+ * argument @e T_accumulator is @p nil_.
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4, class T_accumulator>
 struct signal_emit4
@@ -982,9 +982,9 @@ struct signal_emit4
  * function for the case that no accumulator is used.
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4>
-struct signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil>
+struct signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil_>
 {
-  typedef signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil > self_type;
+  typedef signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil_ > self_type;
   typedef T_return result_type;
   typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -1028,9 +1028,9 @@ struct signal_emit4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil>
  * return type is @p void.
  */
 template <class T_arg1,class T_arg2,class T_arg3,class T_arg4>
-struct signal_emit4<void, T_arg1,T_arg2,T_arg3,T_arg4, nil>
+struct signal_emit4<void, T_arg1,T_arg2,T_arg3,T_arg4, nil_>
 {
-  typedef signal_emit4<void, T_arg1,T_arg2,T_arg3,T_arg4, nil> self_type;
+  typedef signal_emit4<void, T_arg1,T_arg2,T_arg3,T_arg4, nil_> self_type;
   typedef void result_type;
   typedef slot<void, T_arg1,T_arg2,T_arg3,T_arg4> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -1063,7 +1063,7 @@ struct signal_emit4<void, T_arg1,T_arg2,T_arg3,T_arg4, nil>
  * This template implements the emit() function of signal5.
  * Template specializations are available to optimize signal
  * emission when no accumulator is used, i.e. the template
- * argument @e T_accumulator is @p nil.
+ * argument @e T_accumulator is @p nil_.
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5, class T_accumulator>
 struct signal_emit5
@@ -1125,9 +1125,9 @@ struct signal_emit5
  * function for the case that no accumulator is used.
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5>
-struct signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil>
+struct signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil_>
 {
-  typedef signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil > self_type;
+  typedef signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil_ > self_type;
   typedef T_return result_type;
   typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -1172,9 +1172,9 @@ struct signal_emit5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil>
  * return type is @p void.
  */
 template <class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5>
-struct signal_emit5<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil>
+struct signal_emit5<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil_>
 {
-  typedef signal_emit5<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil> self_type;
+  typedef signal_emit5<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil_> self_type;
   typedef void result_type;
   typedef slot<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -1208,7 +1208,7 @@ struct signal_emit5<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil>
  * This template implements the emit() function of signal6.
  * Template specializations are available to optimize signal
  * emission when no accumulator is used, i.e. the template
- * argument @e T_accumulator is @p nil.
+ * argument @e T_accumulator is @p nil_.
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6, class T_accumulator>
 struct signal_emit6
@@ -1272,9 +1272,9 @@ struct signal_emit6
  * function for the case that no accumulator is used.
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6>
-struct signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil>
+struct signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil_>
 {
-  typedef signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil > self_type;
+  typedef signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil_ > self_type;
   typedef T_return result_type;
   typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -1320,9 +1320,9 @@ struct signal_emit6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil>
  * return type is @p void.
  */
 template <class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6>
-struct signal_emit6<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil>
+struct signal_emit6<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil_>
 {
-  typedef signal_emit6<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil> self_type;
+  typedef signal_emit6<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil_> self_type;
   typedef void result_type;
   typedef slot<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -1357,7 +1357,7 @@ struct signal_emit6<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil>
  * This template implements the emit() function of signal7.
  * Template specializations are available to optimize signal
  * emission when no accumulator is used, i.e. the template
- * argument @e T_accumulator is @p nil.
+ * argument @e T_accumulator is @p nil_.
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7, class T_accumulator>
 struct signal_emit7
@@ -1423,9 +1423,9 @@ struct signal_emit7
  * function for the case that no accumulator is used.
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7>
-struct signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil>
+struct signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil_>
 {
-  typedef signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil > self_type;
+  typedef signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil_ > self_type;
   typedef T_return result_type;
   typedef slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -1472,9 +1472,9 @@ struct signal_emit7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7,
  * return type is @p void.
  */
 template <class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7>
-struct signal_emit7<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil>
+struct signal_emit7<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil_>
 {
-  typedef signal_emit7<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil> self_type;
+  typedef signal_emit7<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil_> self_type;
   typedef void result_type;
   typedef slot<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> slot_type;
   typedef signal_impl::const_iterator_type iterator_type;
@@ -1529,13 +1529,13 @@ struct signal_emit7<void, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil>
  *
  * The following template arguments are used:
  * - @e T_return The desired return type for the emit() function (may be overridden by the accumulator).
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
  *
  * You should use the more convenient unnumbered sigc::signal template.
  *
  * @ingroup signal
  */
-template <class T_return, class T_accumulator=nil>
+template <class T_return, class T_accumulator=nil_>
 class signal0
   : public signal_base
 {
@@ -1575,7 +1575,7 @@ public:
    * During signal emission all slots that have been connected
    * to the signal are invoked unless they are manually set into
    * a blocking state. The parameters are passed on to the slots.
-   * If @e T_accumulated is not @p nil, an accumulator of this type
+   * If @e T_accumulated is not @p nil_, an accumulator of this type
    * is used to process the return values of the slot invocations.
    * Otherwise, the return value of the last slot invoked is returned.
    * @return The accumulated return values of the slot invocations.
@@ -1638,13 +1638,13 @@ public:
  * The following template arguments are used:
  * - @e T_return The desired return type for the emit() function (may be overridden by the accumulator).
  * - @e T_arg1 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
  *
  * You should use the more convenient unnumbered sigc::signal template.
  *
  * @ingroup signal
  */
-template <class T_return, class T_arg1, class T_accumulator=nil>
+template <class T_return, class T_arg1, class T_accumulator=nil_>
 class signal1
   : public signal_base
 {
@@ -1684,7 +1684,7 @@ public:
    * During signal emission all slots that have been connected
    * to the signal are invoked unless they are manually set into
    * a blocking state. The parameters are passed on to the slots.
-   * If @e T_accumulated is not @p nil, an accumulator of this type
+   * If @e T_accumulated is not @p nil_, an accumulator of this type
    * is used to process the return values of the slot invocations.
    * Otherwise, the return value of the last slot invoked is returned.
    * @param _A_a1 Argument to be passed on to the slots.
@@ -1749,13 +1749,13 @@ public:
  * - @e T_return The desired return type for the emit() function (may be overridden by the accumulator).
  * - @e T_arg1 Argument type used in the definition of emit().
  * - @e T_arg2 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
  *
  * You should use the more convenient unnumbered sigc::signal template.
  *
  * @ingroup signal
  */
-template <class T_return, class T_arg1,class T_arg2, class T_accumulator=nil>
+template <class T_return, class T_arg1,class T_arg2, class T_accumulator=nil_>
 class signal2
   : public signal_base
 {
@@ -1795,7 +1795,7 @@ public:
    * During signal emission all slots that have been connected
    * to the signal are invoked unless they are manually set into
    * a blocking state. The parameters are passed on to the slots.
-   * If @e T_accumulated is not @p nil, an accumulator of this type
+   * If @e T_accumulated is not @p nil_, an accumulator of this type
    * is used to process the return values of the slot invocations.
    * Otherwise, the return value of the last slot invoked is returned.
    * @param _A_a1 Argument to be passed on to the slots.
@@ -1862,13 +1862,13 @@ public:
  * - @e T_arg1 Argument type used in the definition of emit().
  * - @e T_arg2 Argument type used in the definition of emit().
  * - @e T_arg3 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
  *
  * You should use the more convenient unnumbered sigc::signal template.
  *
  * @ingroup signal
  */
-template <class T_return, class T_arg1,class T_arg2,class T_arg3, class T_accumulator=nil>
+template <class T_return, class T_arg1,class T_arg2,class T_arg3, class T_accumulator=nil_>
 class signal3
   : public signal_base
 {
@@ -1908,7 +1908,7 @@ public:
    * During signal emission all slots that have been connected
    * to the signal are invoked unless they are manually set into
    * a blocking state. The parameters are passed on to the slots.
-   * If @e T_accumulated is not @p nil, an accumulator of this type
+   * If @e T_accumulated is not @p nil_, an accumulator of this type
    * is used to process the return values of the slot invocations.
    * Otherwise, the return value of the last slot invoked is returned.
    * @param _A_a1 Argument to be passed on to the slots.
@@ -1977,13 +1977,13 @@ public:
  * - @e T_arg2 Argument type used in the definition of emit().
  * - @e T_arg3 Argument type used in the definition of emit().
  * - @e T_arg4 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
  *
  * You should use the more convenient unnumbered sigc::signal template.
  *
  * @ingroup signal
  */
-template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4, class T_accumulator=nil>
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4, class T_accumulator=nil_>
 class signal4
   : public signal_base
 {
@@ -2023,7 +2023,7 @@ public:
    * During signal emission all slots that have been connected
    * to the signal are invoked unless they are manually set into
    * a blocking state. The parameters are passed on to the slots.
-   * If @e T_accumulated is not @p nil, an accumulator of this type
+   * If @e T_accumulated is not @p nil_, an accumulator of this type
    * is used to process the return values of the slot invocations.
    * Otherwise, the return value of the last slot invoked is returned.
    * @param _A_a1 Argument to be passed on to the slots.
@@ -2094,13 +2094,13 @@ public:
  * - @e T_arg3 Argument type used in the definition of emit().
  * - @e T_arg4 Argument type used in the definition of emit().
  * - @e T_arg5 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
  *
  * You should use the more convenient unnumbered sigc::signal template.
  *
  * @ingroup signal
  */
-template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5, class T_accumulator=nil>
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5, class T_accumulator=nil_>
 class signal5
   : public signal_base
 {
@@ -2140,7 +2140,7 @@ public:
    * During signal emission all slots that have been connected
    * to the signal are invoked unless they are manually set into
    * a blocking state. The parameters are passed on to the slots.
-   * If @e T_accumulated is not @p nil, an accumulator of this type
+   * If @e T_accumulated is not @p nil_, an accumulator of this type
    * is used to process the return values of the slot invocations.
    * Otherwise, the return value of the last slot invoked is returned.
    * @param _A_a1 Argument to be passed on to the slots.
@@ -2213,13 +2213,13 @@ public:
  * - @e T_arg4 Argument type used in the definition of emit().
  * - @e T_arg5 Argument type used in the definition of emit().
  * - @e T_arg6 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
  *
  * You should use the more convenient unnumbered sigc::signal template.
  *
  * @ingroup signal
  */
-template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6, class T_accumulator=nil>
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6, class T_accumulator=nil_>
 class signal6
   : public signal_base
 {
@@ -2259,7 +2259,7 @@ public:
    * During signal emission all slots that have been connected
    * to the signal are invoked unless they are manually set into
    * a blocking state. The parameters are passed on to the slots.
-   * If @e T_accumulated is not @p nil, an accumulator of this type
+   * If @e T_accumulated is not @p nil_, an accumulator of this type
    * is used to process the return values of the slot invocations.
    * Otherwise, the return value of the last slot invoked is returned.
    * @param _A_a1 Argument to be passed on to the slots.
@@ -2334,13 +2334,13 @@ public:
  * - @e T_arg5 Argument type used in the definition of emit().
  * - @e T_arg6 Argument type used in the definition of emit().
  * - @e T_arg7 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used, i.e. signal emission returns the return value of the last slot invoked.
  *
  * You should use the more convenient unnumbered sigc::signal template.
  *
  * @ingroup signal
  */
-template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7, class T_accumulator=nil>
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7, class T_accumulator=nil_>
 class signal7
   : public signal_base
 {
@@ -2380,7 +2380,7 @@ public:
    * During signal emission all slots that have been connected
    * to the signal are invoked unless they are manually set into
    * a blocking state. The parameters are passed on to the slots.
-   * If @e T_accumulated is not @p nil, an accumulator of this type
+   * If @e T_accumulated is not @p nil_, an accumulator of this type
    * is used to process the return values of the slot invocations.
    * Otherwise, the return value of the last slot invoked is returned.
    * @param _A_a1 Argument to be passed on to the slots.
@@ -2452,13 +2452,13 @@ public:
  * The template arguments determine the function signature of
  * the emit() function:
  * - @e T_return The desired return type of the emit() function.
- * - @e T_arg1 Argument type used in the definition of emit(). The default @p nil means no argument.
- * - @e T_arg2 Argument type used in the definition of emit(). The default @p nil means no argument.
- * - @e T_arg3 Argument type used in the definition of emit(). The default @p nil means no argument.
- * - @e T_arg4 Argument type used in the definition of emit(). The default @p nil means no argument.
- * - @e T_arg5 Argument type used in the definition of emit(). The default @p nil means no argument.
- * - @e T_arg6 Argument type used in the definition of emit(). The default @p nil means no argument.
- * - @e T_arg7 Argument type used in the definition of emit(). The default @p nil means no argument.
+ * - @e T_arg1 Argument type used in the definition of emit(). The default @p nil_ means no argument.
+ * - @e T_arg2 Argument type used in the definition of emit(). The default @p nil_ means no argument.
+ * - @e T_arg3 Argument type used in the definition of emit(). The default @p nil_ means no argument.
+ * - @e T_arg4 Argument type used in the definition of emit(). The default @p nil_ means no argument.
+ * - @e T_arg5 Argument type used in the definition of emit(). The default @p nil_ means no argument.
+ * - @e T_arg6 Argument type used in the definition of emit(). The default @p nil_ means no argument.
+ * - @e T_arg7 Argument type used in the definition of emit(). The default @p nil_ means no argument.
  *
  * To specify an accumulator type the nested class signal::accumulated can be used.
  *
@@ -2472,9 +2472,9 @@ public:
  *
  * @ingroup signal
  */
-template <class T_return, class T_arg1 = nil,class T_arg2 = nil,class T_arg3 = nil,class T_arg4 = nil,class T_arg5 = nil,class T_arg6 = nil,class T_arg7 = nil>
+template <class T_return, class T_arg1 = nil_,class T_arg2 = nil_,class T_arg3 = nil_,class T_arg4 = nil_,class T_arg5 = nil_,class T_arg6 = nil_,class T_arg7 = nil_>
 class signal 
-  : public signal7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil>
+  : public signal7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil_>
 {
 public:
   /** Convenience wrapper for the numbered sigc::signal# templates.
@@ -2536,7 +2536,7 @@ public:
 
   signal() {}
   signal(const signal& src)
-    : signal7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil>(src) {}
+    : signal7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, nil_>(src) {}
 };
 
 
@@ -2547,7 +2547,7 @@ public:
  */
 template <class T_return>
 class signal <T_return>
-  : public signal0<T_return, nil>
+  : public signal0<T_return, nil_>
 {
 public:
 
@@ -2567,7 +2567,7 @@ public:
 
   signal() {}
   signal(const signal& src)
-    : signal0<T_return, nil>(src) {}
+    : signal0<T_return, nil_>(src) {}
 };
 
 /** Convenience wrapper for the numbered sigc::signal1 template.
@@ -2577,7 +2577,7 @@ public:
  */
 template <class T_return, class T_arg1>
 class signal <T_return, T_arg1>
-  : public signal1<T_return, T_arg1, nil>
+  : public signal1<T_return, T_arg1, nil_>
 {
 public:
 
@@ -2597,7 +2597,7 @@ public:
 
   signal() {}
   signal(const signal& src)
-    : signal1<T_return, T_arg1, nil>(src) {}
+    : signal1<T_return, T_arg1, nil_>(src) {}
 };
 
 /** Convenience wrapper for the numbered sigc::signal2 template.
@@ -2607,7 +2607,7 @@ public:
  */
 template <class T_return, class T_arg1,class T_arg2>
 class signal <T_return, T_arg1,T_arg2>
-  : public signal2<T_return, T_arg1,T_arg2, nil>
+  : public signal2<T_return, T_arg1,T_arg2, nil_>
 {
 public:
 
@@ -2627,7 +2627,7 @@ public:
 
   signal() {}
   signal(const signal& src)
-    : signal2<T_return, T_arg1,T_arg2, nil>(src) {}
+    : signal2<T_return, T_arg1,T_arg2, nil_>(src) {}
 };
 
 /** Convenience wrapper for the numbered sigc::signal3 template.
@@ -2637,7 +2637,7 @@ public:
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3>
 class signal <T_return, T_arg1,T_arg2,T_arg3>
-  : public signal3<T_return, T_arg1,T_arg2,T_arg3, nil>
+  : public signal3<T_return, T_arg1,T_arg2,T_arg3, nil_>
 {
 public:
 
@@ -2657,7 +2657,7 @@ public:
 
   signal() {}
   signal(const signal& src)
-    : signal3<T_return, T_arg1,T_arg2,T_arg3, nil>(src) {}
+    : signal3<T_return, T_arg1,T_arg2,T_arg3, nil_>(src) {}
 };
 
 /** Convenience wrapper for the numbered sigc::signal4 template.
@@ -2667,7 +2667,7 @@ public:
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4>
 class signal <T_return, T_arg1,T_arg2,T_arg3,T_arg4>
-  : public signal4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil>
+  : public signal4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil_>
 {
 public:
 
@@ -2687,7 +2687,7 @@ public:
 
   signal() {}
   signal(const signal& src)
-    : signal4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil>(src) {}
+    : signal4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, nil_>(src) {}
 };
 
 /** Convenience wrapper for the numbered sigc::signal5 template.
@@ -2697,7 +2697,7 @@ public:
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5>
 class signal <T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>
-  : public signal5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil>
+  : public signal5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil_>
 {
 public:
 
@@ -2717,7 +2717,7 @@ public:
 
   signal() {}
   signal(const signal& src)
-    : signal5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil>(src) {}
+    : signal5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, nil_>(src) {}
 };
 
 /** Convenience wrapper for the numbered sigc::signal6 template.
@@ -2727,7 +2727,7 @@ public:
  */
 template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6>
 class signal <T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>
-  : public signal6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil>
+  : public signal6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil_>
 {
 public:
 
@@ -2747,7 +2747,7 @@ public:
 
   signal() {}
   signal(const signal& src)
-    : signal6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil>(src) {}
+    : signal6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, nil_>(src) {}
 };
 
 
@@ -2780,12 +2780,12 @@ namespace SigC {
  *
  * The following template arguments are used:
  * - @e T_return The desired return type for the emit() function (may be overridden by the accumulator).
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
  *
  * @deprecated Use the unnumbered template sigc::signal instead.
  * @ingroup compat
  */
-template <class T_return, class T_accumulator=::sigc::nil>
+template <class T_return, class T_accumulator=::sigc::nil_>
 class Signal0
   : public ::sigc::signal0<T_return, T_accumulator>
 {
@@ -2830,12 +2830,12 @@ public:
  * The following template arguments are used:
  * - @e T_return The desired return type for the emit() function (may be overridden by the accumulator).
  * - @e T_arg1 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
  *
  * @deprecated Use the unnumbered template sigc::signal instead.
  * @ingroup compat
  */
-template <class T_return, class T_arg1, class T_accumulator=::sigc::nil>
+template <class T_return, class T_arg1, class T_accumulator=::sigc::nil_>
 class Signal1
   : public ::sigc::signal1<T_return, T_arg1, T_accumulator>
 {
@@ -2881,12 +2881,12 @@ public:
  * - @e T_return The desired return type for the emit() function (may be overridden by the accumulator).
  * - @e T_arg1 Argument type used in the definition of emit().
  * - @e T_arg2 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
  *
  * @deprecated Use the unnumbered template sigc::signal instead.
  * @ingroup compat
  */
-template <class T_return, class T_arg1,class T_arg2, class T_accumulator=::sigc::nil>
+template <class T_return, class T_arg1,class T_arg2, class T_accumulator=::sigc::nil_>
 class Signal2
   : public ::sigc::signal2<T_return, T_arg1,T_arg2, T_accumulator>
 {
@@ -2933,12 +2933,12 @@ public:
  * - @e T_arg1 Argument type used in the definition of emit().
  * - @e T_arg2 Argument type used in the definition of emit().
  * - @e T_arg3 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
  *
  * @deprecated Use the unnumbered template sigc::signal instead.
  * @ingroup compat
  */
-template <class T_return, class T_arg1,class T_arg2,class T_arg3, class T_accumulator=::sigc::nil>
+template <class T_return, class T_arg1,class T_arg2,class T_arg3, class T_accumulator=::sigc::nil_>
 class Signal3
   : public ::sigc::signal3<T_return, T_arg1,T_arg2,T_arg3, T_accumulator>
 {
@@ -2986,12 +2986,12 @@ public:
  * - @e T_arg2 Argument type used in the definition of emit().
  * - @e T_arg3 Argument type used in the definition of emit().
  * - @e T_arg4 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
  *
  * @deprecated Use the unnumbered template sigc::signal instead.
  * @ingroup compat
  */
-template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4, class T_accumulator=::sigc::nil>
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4, class T_accumulator=::sigc::nil_>
 class Signal4
   : public ::sigc::signal4<T_return, T_arg1,T_arg2,T_arg3,T_arg4, T_accumulator>
 {
@@ -3040,12 +3040,12 @@ public:
  * - @e T_arg3 Argument type used in the definition of emit().
  * - @e T_arg4 Argument type used in the definition of emit().
  * - @e T_arg5 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
  *
  * @deprecated Use the unnumbered template sigc::signal instead.
  * @ingroup compat
  */
-template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5, class T_accumulator=::sigc::nil>
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5, class T_accumulator=::sigc::nil_>
 class Signal5
   : public ::sigc::signal5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5, T_accumulator>
 {
@@ -3095,12 +3095,12 @@ public:
  * - @e T_arg4 Argument type used in the definition of emit().
  * - @e T_arg5 Argument type used in the definition of emit().
  * - @e T_arg6 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
  *
  * @deprecated Use the unnumbered template sigc::signal instead.
  * @ingroup compat
  */
-template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6, class T_accumulator=::sigc::nil>
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6, class T_accumulator=::sigc::nil_>
 class Signal6
   : public ::sigc::signal6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6, T_accumulator>
 {
@@ -3151,12 +3151,12 @@ public:
  * - @e T_arg5 Argument type used in the definition of emit().
  * - @e T_arg6 Argument type used in the definition of emit().
  * - @e T_arg7 Argument type used in the definition of emit().
- * - @e T_accumulator The accumulator type used for emission. The default @p nil means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
+ * - @e T_accumulator The accumulator type used for emission. The default @p nil_ means that no accumulator should be used. Signal emission returns the return value of the last slot invoked.
  *
  * @deprecated Use the unnumbered template sigc::signal instead.
  * @ingroup compat
  */
-template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7, class T_accumulator=::sigc::nil>
+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7, class T_accumulator=::sigc::nil_>
 class Signal7
   : public ::sigc::signal7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7, T_accumulator>
 {
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index 1a9570c6a2..3906b53e36 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -129,6 +129,30 @@ GenericMidiControlProtocol::start_learning (Controllable* c)
 		return false;
 	}
 
+	MIDIControllables::iterator tmp;
+	for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ) {
+		tmp = i;
+		++tmp;
+		if (&(*i)->get_controllable() == c) {
+			delete (*i);
+			controllables.erase (i);
+		}
+		i = tmp;
+	}
+
+	MIDIPendingControllables::iterator ptmp;
+	for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ) {
+		ptmp = i;
+		++ptmp;
+		if (&((*i).first)->get_controllable() == c) {
+			(*i).second.disconnect();
+			delete (*i).first;
+			pending_controllables.erase (i);
+		}
+		i = ptmp;
+	}
+
+
 	MIDIControllable* mc = 0;
 
 	for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ++i) {
@@ -144,11 +168,12 @@ GenericMidiControlProtocol::start_learning (Controllable* c)
 	
 	{
 		Glib::Mutex::Lock lm (pending_lock);
-		std::pair<MIDIControllables::iterator,bool> result;
-		result = pending_controllables.insert (mc);
-		if (result.second) {
-			c->LearningFinished.connect (bind (mem_fun (*this, &GenericMidiControlProtocol::learning_stopped), mc));
-		}
+
+		std::pair<MIDIControllable *, sigc::connection> element;
+		element.first = mc;
+		element.second = c->LearningFinished.connect (bind (mem_fun (*this, &GenericMidiControlProtocol::learning_stopped), mc));
+
+		pending_controllables.push_back (element);
 	}
 
 	mc->learn_about_external_control ();
@@ -161,10 +186,18 @@ GenericMidiControlProtocol::learning_stopped (MIDIControllable* mc)
 	Glib::Mutex::Lock lm (pending_lock);
 	Glib::Mutex::Lock lm2 (controllables_lock);
 	
-	MIDIControllables::iterator i = find (pending_controllables.begin(), pending_controllables.end(), mc);
+	MIDIPendingControllables::iterator tmp;
 
-	if (i != pending_controllables.end()) {
-		pending_controllables.erase (i);
+	for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ) {
+		tmp = i;
+		++tmp;
+
+		if ( (*i).first == mc) {
+			(*i).second.disconnect();
+			pending_controllables.erase(i);
+		}
+
+		i = tmp;
 	}
 
 	controllables.insert (mc);
@@ -181,18 +214,13 @@ GenericMidiControlProtocol::stop_learning (Controllable* c)
 	   relevant MIDIControllable and remove it from the pending list.
 	*/
 
-	for (MIDIControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ++i) {
-		if (&(*i)->get_controllable() == c) {
-			(*i)->stop_learning ();
-			dptr = *i;
-			pending_controllables.erase (i);
-			break;
-		}
-	}
+	for (MIDIPendingControllables::iterator i = pending_controllables.begin(); i != pending_controllables.end(); ++i) {
+		if (&((*i).first)->get_controllable() == c) {
+			(*i).first->stop_learning ();
+			dptr = (*i).first;
+			(*i).second.disconnect();
 
-	for (MIDIControllables::iterator i = controllables.begin(); i != controllables.end(); ++i) {
-		if (&(*i)->get_controllable() == c) {
-			controllables.erase (i);
+			pending_controllables.erase (i);
 			break;
 		}
 	}
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
index 6fba16bccd..95aeb77cdb 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
@@ -49,7 +49,9 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol {
 
 	typedef std::set<MIDIControllable*> MIDIControllables;
 	MIDIControllables controllables;
-	MIDIControllables pending_controllables;
+
+	typedef std::list<std::pair<MIDIControllable*,sigc::connection> > MIDIPendingControllables;
+	MIDIPendingControllables pending_controllables;
 	Glib::Mutex controllables_lock;
 	Glib::Mutex pending_lock;
 
diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc
index 7f6f889df5..7bf730b0f5 100644
--- a/libs/surfaces/generic_midi/midicontrollable.cc
+++ b/libs/surfaces/generic_midi/midicontrollable.cc
@@ -35,7 +35,7 @@ MIDIControllable::MIDIControllable (Port& p, Controllable& c, bool is_bistate)
 	: controllable (c), _port (p), bistate (is_bistate)
 {
 	setting = false;
-	last_written = 0; // got a better idea ?
+	last_value = 0; // got a better idea ?
 	control_type = none;
 	_control_description = "MIDI Control: none";
 	control_additional = (byte) -1;
@@ -142,6 +142,8 @@ MIDIControllable::midi_sense_note (Parser &p, EventTwoBytes *msg, bool is_on)
 			controllable.set_value (is_on ? 1 : 0);
 		}
 	}
+
+	last_value = (MIDI::byte) (controllable.get_value() * 127.0); // to prevent feedback fights
 }
 
 void
@@ -157,6 +159,8 @@ MIDIControllable::midi_sense_controller (Parser &, EventTwoBytes *msg)
 				controllable.set_value (0);
 			}
 		}
+
+		last_value = (MIDI::byte) (controllable.get_value() * 127.0); // to prevent feedback fights
 	}
 }
 
@@ -167,6 +171,7 @@ MIDIControllable::midi_sense_program_change (Parser &p, byte msg)
 
 	if (!bistate) {
 		controllable.set_value (msg/127.0);
+		last_value = (MIDI::byte) (controllable.get_value() * 127.0); // to prevent feedback fights
 	} 
 }
 
@@ -178,6 +183,7 @@ MIDIControllable::midi_sense_pitchbend (Parser &p, pitchbend_t pb)
 	/* XXX gack - get rid of assumption about typeof pitchbend_t */
 
 	controllable.set_value ((pb/(float) SHRT_MAX));
+	last_value = (MIDI::byte) (controllable.get_value() * 127.0); // to prevent feedback fights
 }			
 
 void
@@ -292,7 +298,7 @@ MIDIControllable::send_feedback ()
 	if (setting || !feedback || control_type == none) {
 		return;
 	}
-	
+
 	msg[0] = (control_type & 0xF0) | (control_channel & 0xF); 
 	msg[1] = control_additional;
 	msg[2] = (byte) (controllable.get_value() * 127.0f);
@@ -307,11 +313,11 @@ MIDIControllable::write_feedback (MIDI::byte* buf, int32_t& bufsize, bool force)
 
 		MIDI::byte gm = (MIDI::byte) (controllable.get_value() * 127.0);
 		
-		if (gm != last_written) {
+		if (gm != last_value) {
 			*buf++ = (0xF0 & control_type) | (0xF & control_channel);
 			*buf++ = control_additional; /* controller number */
 			*buf++ = gm;
-			last_written = gm;
+			last_value = gm;
 			bufsize -= 3;
 		}
 	}
diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h
index 7e0243971c..4bac325feb 100644
--- a/libs/surfaces/generic_midi/midicontrollable.h
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -67,7 +67,7 @@ class MIDIControllable : public Stateful
 	PBD::Controllable& controllable;
 	MIDI::Port&     _port;
 	bool             setting;
-	MIDI::byte       last_written;
+	MIDI::byte       last_value;
 	bool             bistate;
 	int              midi_msg_id;      /* controller ID or note number */
 	sigc::connection midi_sense_connection[2];
diff --git a/libs/surfaces/mackie/bcf_surface.cc b/libs/surfaces/mackie/bcf_surface.cc
index 2aaa70fc3e..45b5ad85fa 100644
--- a/libs/surfaces/mackie/bcf_surface.cc
+++ b/libs/surfaces/mackie/bcf_surface.cc
@@ -615,19 +615,12 @@ void Mackie::BcfSurface::init_controls()
 	group->add( *control );
 
 	group = groups["modifiers"];
-	control = new Button ( 71, 1, "option", *group );
-	buttons[0x47] = control;
+	control = new Button ( 80, 1, "option", *group );
+	buttons[0x50] = control;
 	controls.push_back( control );
 	controls_by_name["option"] = control;
 	group->add( *control );
 
-	group = groups["modifiers"];
-	control = new Button ( 72, 1, "control", *group );
-	buttons[0x48] = control;
-	controls.push_back( control );
-	controls_by_name["control"] = control;
-	group->add( *control );
-
 	group = groups["modifiers"];
 	control = new Button ( 73, 1, "cmd_alt", *group );
 	buttons[0x49] = control;
@@ -663,13 +656,6 @@ void Mackie::BcfSurface::init_controls()
 	controls_by_name["snapshot"] = control;
 	group->add( *control );
 
-	group = groups["automation"];
-	control = new Button ( 78, 1, "touch", *group );
-	buttons[0x4e] = control;
-	controls.push_back( control );
-	controls_by_name["touch"] = control;
-	group->add( *control );
-
 	group = groups["functions"];
 	control = new Button ( 79, 1, "redo", *group );
 	buttons[0x4f] = control;
@@ -678,8 +664,8 @@ void Mackie::BcfSurface::init_controls()
 	group->add( *control );
 
 	group = groups["functions"];
-	control = new Button ( 80, 1, "marker", *group );
-	buttons[0x50] = control;
+	control = new Button ( 71, 1, "marker", *group );
+	buttons[0x47] = control;
 	controls.push_back( control );
 	controls_by_name["marker"] = control;
 	group->add( *control );
@@ -706,15 +692,15 @@ void Mackie::BcfSurface::init_controls()
 	group->add( *control );
 
 	group = groups["transport"];
-	control = new Button ( 84, 1, "frm_left", *group );
-	buttons[0x54] = control;
+	control = new Button ( 91, 1, "frm_left", *group );
+	buttons[0x5b] = control;
 	controls.push_back( control );
 	controls_by_name["frm_left"] = control;
 	group->add( *control );
 
 	group = groups["transport"];
-	control = new Button ( 85, 1, "frm_right", *group );
-	buttons[0x55] = control;
+	control = new Button ( 92, 1, "frm_right", *group );
+	buttons[0x5c] = control;
 	controls.push_back( control );
 	controls_by_name["frm_right"] = control;
 	group->add( *control );
@@ -727,15 +713,15 @@ void Mackie::BcfSurface::init_controls()
 	group->add( *control );
 
 	group = groups["transport"];
-	control = new Button ( 44, 1, "punch_in", *group );
-	buttons[0x2c] = control;
+	control = new Button ( 72, 1, "punch_in", *group );
+	buttons[0x48] = control;
 	controls.push_back( control );
 	controls_by_name["punch_in"] = control;
 	group->add( *control );
 
 	group = groups["transport"];
-	control = new Button ( 43, 1, "punch_out", *group );
-	buttons[0x2b] = control;
+	control = new Button ( 78, 1, "punch_out", *group );
+	buttons[0x4e] = control;
 	controls.push_back( control );
 	controls_by_name["punch_out"] = control;
 	group->add( *control );
@@ -755,15 +741,15 @@ void Mackie::BcfSurface::init_controls()
 	group->add( *control );
 
 	group = groups["transport"];
-	control = new Button ( 91, 1, "rewind", *group );
-	buttons[0x5b] = control;
+	control = new Button ( 44, 1, "rewind", *group );
+	buttons[0x2c] = control;
 	controls.push_back( control );
 	controls_by_name["rewind"] = control;
 	group->add( *control );
 
 	group = groups["transport"];
-	control = new Button ( 92, 1, "ffwd", *group );
-	buttons[0x5c] = control;
+	control = new Button ( 43, 1, "ffwd", *group );
+	buttons[0x2b] = control;
 	controls.push_back( control );
 	controls_by_name["ffwd"] = control;
 	group->add( *control );
@@ -1196,7 +1182,7 @@ void Mackie::BcfSurface::handle_button( MackieButtonHandler & mbh, ButtonState b
 			}
 			break;
 
-		case 0x47: // option
+		case 0x50: // option
 			switch ( bs ) {
 				case press: ls = mbh.option_press( button ); break;
 				case release: ls = mbh.option_release( button ); break;
@@ -1204,14 +1190,6 @@ void Mackie::BcfSurface::handle_button( MackieButtonHandler & mbh, ButtonState b
 			}
 			break;
 
-		case 0x48: // control
-			switch ( bs ) {
-				case press: ls = mbh.control_press( button ); break;
-				case release: ls = mbh.control_release( button ); break;
-				case neither: break;
-			}
-			break;
-
 		case 0x49: // cmd_alt
 			switch ( bs ) {
 				case press: ls = mbh.cmd_alt_press( button ); break;
@@ -1252,14 +1230,6 @@ void Mackie::BcfSurface::handle_button( MackieButtonHandler & mbh, ButtonState b
 			}
 			break;
 
-		case 0x4e: // touch
-			switch ( bs ) {
-				case press: ls = mbh.touch_press( button ); break;
-				case release: ls = mbh.touch_release( button ); break;
-				case neither: break;
-			}
-			break;
-
 		case 0x4f: // redo
 			switch ( bs ) {
 				case press: ls = mbh.redo_press( button ); break;
@@ -1268,7 +1238,7 @@ void Mackie::BcfSurface::handle_button( MackieButtonHandler & mbh, ButtonState b
 			}
 			break;
 
-		case 0x50: // marker
+		case 0x47: // marker
 			switch ( bs ) {
 				case press: ls = mbh.marker_press( button ); break;
 				case release: ls = mbh.marker_release( button ); break;
@@ -1300,7 +1270,7 @@ void Mackie::BcfSurface::handle_button( MackieButtonHandler & mbh, ButtonState b
 			}
 			break;
 
-		case 0x54: // frm_left
+		case 0x5b: // frm_left
 			switch ( bs ) {
 				case press: ls = mbh.frm_left_press( button ); break;
 				case release: ls = mbh.frm_left_release( button ); break;
@@ -1308,7 +1278,7 @@ void Mackie::BcfSurface::handle_button( MackieButtonHandler & mbh, ButtonState b
 			}
 			break;
 
-		case 0x55: // frm_right
+		case 0x5c: // frm_right
 			switch ( bs ) {
 				case press: ls = mbh.frm_right_press( button ); break;
 				case release: ls = mbh.frm_right_release( button ); break;
@@ -1324,7 +1294,7 @@ void Mackie::BcfSurface::handle_button( MackieButtonHandler & mbh, ButtonState b
 			}
 			break;
 
-		case 0x2c: // punch_in
+		case 0x48: // punch_in
 			switch ( bs ) {
 				case press: ls = mbh.punch_in_press( button ); break;
 				case release: ls = mbh.punch_in_release( button ); break;
@@ -1332,7 +1302,7 @@ void Mackie::BcfSurface::handle_button( MackieButtonHandler & mbh, ButtonState b
 			}
 			break;
 
-		case 0x2b: // punch_out
+		case 0x4e: // punch_out
 			switch ( bs ) {
 				case press: ls = mbh.punch_out_press( button ); break;
 				case release: ls = mbh.punch_out_release( button ); break;
@@ -1356,7 +1326,7 @@ void Mackie::BcfSurface::handle_button( MackieButtonHandler & mbh, ButtonState b
 			}
 			break;
 
-		case 0x5b: // rewind
+		case 0x2c: // rewind
 			switch ( bs ) {
 				case press: ls = mbh.rewind_press( button ); break;
 				case release: ls = mbh.rewind_release( button ); break;
@@ -1364,7 +1334,7 @@ void Mackie::BcfSurface::handle_button( MackieButtonHandler & mbh, ButtonState b
 			}
 			break;
 
-		case 0x5c: // ffwd
+		case 0x2b: // ffwd
 			switch ( bs ) {
 				case press: ls = mbh.ffwd_press( button ); break;
 				case release: ls = mbh.ffwd_release( button ); break;
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 81d249588e..b1c8ef2ff8 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -37,6 +37,7 @@
 #include <midi++/manager.h>
 #include <pbd/pthread_utils.h>
 #include <pbd/error.h>
+#include <pbd/memento_command.h>
 
 #include <ardour/route.h>
 #include <ardour/session.h>
@@ -1038,7 +1039,7 @@ void MackieControlProtocol::poll_automation()
 // Transport Buttons
 /////////////////////////////////////
 
-LedState MackieControlProtocol::rewind_press( Button & button )
+LedState MackieControlProtocol::frm_left_press( Button & button )
 {
 	// can use first_mark_before/after as well
 	Location * loc = session->locations()->first_location_before (
@@ -1048,12 +1049,12 @@ LedState MackieControlProtocol::rewind_press( Button & button )
 	return on;
 }
 
-LedState MackieControlProtocol::rewind_release( Button & button )
+LedState MackieControlProtocol::frm_left_release( Button & button )
 {
 	return off;
 }
 
-LedState MackieControlProtocol::ffwd_press( Button & button )
+LedState MackieControlProtocol::frm_right_press( Button & button )
 {
 	// can use first_mark_before/after as well
 	Location * loc = session->locations()->first_location_after (
@@ -1063,7 +1064,7 @@ LedState MackieControlProtocol::ffwd_press( Button & button )
 	return on;
 }
 
-LedState MackieControlProtocol::ffwd_release( Button & button )
+LedState MackieControlProtocol::frm_right_release( Button & button )
 {
 	return off;
 }
@@ -1112,6 +1113,36 @@ LedState MackieControlProtocol::record_release( Button & button )
 		return off;
 }
 
+LedState MackieControlProtocol::rewind_press( Button & button )
+{
+	session->request_transport_speed( -2.0 );
+	return on;
+}
+
+LedState MackieControlProtocol::rewind_release( Button & button )
+{
+	if ( _transport_previously_rolling )
+		session->request_transport_speed( 1.0 );
+	else
+		session->request_stop();
+	return off;
+}
+
+LedState MackieControlProtocol::ffwd_press( Button & button )
+{
+	session->request_transport_speed( 2.0 );
+	return on;
+}
+
+LedState MackieControlProtocol::ffwd_release( Button & button )
+{
+	if ( _transport_previously_rolling )
+		session->request_transport_speed( 1.0 );
+	else
+		session->request_stop();
+	return off;
+}
+
 ///////////////////////////////////////////
 // Session signals
 ///////////////////////////////////////////
@@ -1198,6 +1229,8 @@ void MackieControlProtocol::notify_transport_state_changed()
 	update_global_button( "stop", !session->transport_rolling() );
 	update_global_button( "loop", session->get_play_loop() );
 	
+	_transport_previously_rolling = session->transport_rolling();
+	
 	// rec is special because it's tristate
 	Button * rec = reinterpret_cast<Button*>( surface().controls_by_name["record"] );
 	mcu_port().write( builder.build_led( *rec, record_release( *rec ) ) );
@@ -1376,3 +1409,27 @@ LedState MackieControlProtocol::channel_right_release( Button & button )
 {
 	return off;
 }
+
+/////////////////////////////////////
+// Functions
+/////////////////////////////////////
+LedState MackieControlProtocol::marker_press( Button & button )
+{
+	// cut'n'paste from LocationUI::add_new_location()
+	string markername;
+	nframes_t where = session->audible_frame();
+	session->locations()->next_available_name(markername,"mcu");
+	Location *location = new Location (where, where, markername, Location::IsMark);
+	session->begin_reversible_command (_("add marker"));
+	XMLNode &before = session->locations()->get_state();
+	session->locations()->add (location, true);
+	XMLNode &after = session->locations()->get_state();
+	session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
+	session->commit_reversible_command ();
+	return on;
+}
+
+LedState MackieControlProtocol::marker_release( Button & button )
+{
+	return off;
+}
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index d71979b463..de44075262 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -124,11 +124,11 @@ class MackieControlProtocol
 	void update_global_button( const std::string & name, Mackie::LedState );
   
    // transport button handler methods from MackieButtonHandler
-	virtual Mackie::LedState rewind_press( Mackie::Button & );
-	virtual Mackie::LedState rewind_release( Mackie::Button & );
+	virtual Mackie::LedState frm_left_press( Mackie::Button & );
+	virtual Mackie::LedState frm_left_release( Mackie::Button & );
 
-	virtual Mackie::LedState ffwd_press( Mackie::Button & );
-	virtual Mackie::LedState ffwd_release( Mackie::Button & );
+	virtual Mackie::LedState frm_right_press( Mackie::Button & );
+	virtual Mackie::LedState frm_right_release( Mackie::Button & );
 
 	virtual Mackie::LedState stop_press( Mackie::Button & );
 	virtual Mackie::LedState stop_release( Mackie::Button & );
@@ -154,7 +154,13 @@ class MackieControlProtocol
 	virtual Mackie::LedState end_press( Mackie::Button & );
 	virtual Mackie::LedState end_release( Mackie::Button & );
 	
-   // bank switching button handler methods from MackieButtonHandler
+	virtual Mackie::LedState rewind_press( Mackie::Button & button );
+	virtual Mackie::LedState rewind_release( Mackie::Button & button );
+
+	virtual Mackie::LedState ffwd_press( Mackie::Button & button );
+	virtual Mackie::LedState ffwd_release( Mackie::Button & button );
+
+	// bank switching button handler methods from MackieButtonHandler
 	virtual Mackie::LedState left_press( Mackie::Button & );
 	virtual Mackie::LedState left_release( Mackie::Button & );
 
@@ -172,6 +178,10 @@ class MackieControlProtocol
 	
 	virtual Mackie::LedState global_solo_press( Mackie::Button & );
 	virtual Mackie::LedState global_solo_release( Mackie::Button & );
+	
+	// function buttons
+	virtual Mackie::LedState marker_press( Mackie::Button & );
+	virtual Mackie::LedState marker_release( Mackie::Button & );
 
   protected:
 	// create instances of MackiePort, depending on what's found in ardour.rc
@@ -302,6 +312,8 @@ class MackieControlProtocol
 	bool _polling;
 	struct pollfd * pfd;
 	int nfds;
+	
+	bool _transport_previously_rolling;
 };
 
 #endif // ardour_mackie_control_protocol_h
diff --git a/libs/surfaces/mackie/scripts/bcf-controls.csv b/libs/surfaces/mackie/scripts/bcf-controls.csv
index 6a6d66f6ac..e22965a906 100644
--- a/libs/surfaces/mackie/scripts/bcf-controls.csv
+++ b/libs/surfaces/mackie/scripts/bcf-controls.csv
@@ -49,30 +49,28 @@ button,1,,F15,1,0,0x44
 button,1,,F16,1,0,0x45
 # turn on/off all solos
 button,1,,global_solo,1,0,0x27
-button,1,modifiers,option,1,0,0x47
-button,1,modifiers,control,1,0,0x48
+button,1,modifiers,option,1,0,0x50
 button,1,modifiers,cmd_alt,1,0,0x49
 button,1,automation,on,1,1,0x4a
 button,1,automation,rec_ready,1,1,0x4b
 button,1,functions,undo,1,1,0x4c
 button,1,automation,snapshot,1,1,0x4d
-button,1,automation,touch,1,1,0x4e
 button,1,functions,redo,1,1,0x4f
-button,1,functions,marker,1,1,0x50
+button,1,functions,marker,1,1,0x47
 button,1,functions,enter,1,1,0x51
 button,1,functions,cancel,1,0,0x52
 button,1,functions,mixer,1,0,0x53
-button,1,transport,frm_left,1,1,0x54
-button,1,transport,frm_right,1,1,0x55
-button,1,transport,loop,1,1,0x46
-button,1,transport,punch_in,1,1,0x2c
-button,1,transport,punch_out,1,1,0x2b
-button,1,transport,home,1,1,0x2a
-button,1,transport,end,1,1,0x29
 
 # transport buttons
-button,1,transport,"rewind",1,1,0x5b
-button,1,transport,"ffwd",1,1,0x5c
+button,1,transport,frm_left,1,1,0x5b
+button,1,transport,frm_right,1,1,0x5c
+button,1,transport,loop,1,1,0x46
+button,1,transport,punch_in,1,1,0x48
+button,1,transport,punch_out,1,1,0x4e
+button,1,transport,home,1,1,0x2a
+button,1,transport,end,1,1,0x29
+button,1,transport,"rewind",1,1,0x2c
+button,1,transport,"ffwd",1,1,0x2b
 button,1,transport,"stop",1,1,0x5d
 button,1,transport,"play",1,1,0x5e
 button,1,transport,"record",1,1,0x1f
diff --git a/manual/xml/adding_tracks.xml b/manual/xml/adding_tracks.xml
index 999c65959a..6c89e03628 100644
--- a/manual/xml/adding_tracks.xml
+++ b/manual/xml/adding_tracks.xml
@@ -13,33 +13,52 @@
   <itemizedlist>
     <listitem>
       <para>
-        <menuchoice> <guimenu>Session</guimenu> <guisubmenu>Add
+        Choose <menuchoice> <guimenu>Session</guimenu> <guisubmenu>Add
         Track/Bus</guisubmenu> </menuchoice>
       </para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/add_track_bus.png"/>
+        </imageobject>
+      </mediaobject>
+    </listitem>
+
+    <listitem>
+      <para>
+        Choose whether you wish to add a new Track or a new Bus.
+      </para>
     </listitem>
-  </itemizedlist>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="images/add_track_bus.png"/>
-    </imageobject>
-  </mediaobject>
-  <para>
-    In the Add Tracks dialog, choose whether you wish to add a new Track or
-    a new Bus.
-  </para>
 
-  <itemizedlist>
     <listitem>
       <para>
         Enter the number of new tracks/busses you want to add.
       </para>
     </listitem>
+
+    <listitem>
+      <para>
+        Choose the channel configuration for the Tracks or Busses you are
+        adding.
+      </para>
+    </listitem>
+
+    <listitem>
+      <para>
+        If you are creating a Track choose whether to create a normal track
+        or a Tape Track.
+      </para>
+    </listitem>
   </itemizedlist>
 
-  <para>
-    Choose the I/O configuration of the tracks/busses you are adding using
-    the clickbox.
-  </para>
+  <note>
+    <para>
+      If you choose <literal>Manual Setup</literal> for the channel
+      configuration then the tracks will be created with no inputs and you
+      will have to configure the I/O configuration of the track using the
+      <link linkend="input-output-connections-editor">I/O Connections
+      Editor</link>
+    </para>
+  </note>
 <!--
 	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="Some_Subsection.xml" />
diff --git a/manual/xml/control_surfaces.xml b/manual/xml/control_surfaces.xml
index 3d9bdd2069..fea5a7a97a 100644
--- a/manual/xml/control_surfaces.xml
+++ b/manual/xml/control_surfaces.xml
@@ -22,4 +22,6 @@
 		href="generic_midi_control_surface.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="configuring_usb_device_access.xml" />
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+		href="mackie.xml" />
 </chapter>
diff --git a/manual/xml/mackie.xml b/manual/xml/mackie.xml
new file mode 100644
index 0000000000..829ccb4d5d
--- /dev/null
+++ b/manual/xml/mackie.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" standalone="no"?>
+
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+]>
+
+<section id="sn-mackie">
+  <title>Using the Mackie driver for MCU and BCF2000</title>
+  <para>
+		Note: Mackie support is available only for ardour 2.0 beta12 or newer.
+	</para>
+  <para>
+    This will walk you through the process of configuring and using Mackie
+    MCU, or a BCF2000 in
+    <ulink url="http://www.behringerdownload.de/BCF2000/BCF2000_Emulation_modes.pdf">Logic
+    Control emulation mode</ulink>.
+  </para>
+
+  <section id="mackie-connecting-device">
+    <title>Connecting Device</title>
+    <para>
+      Make sure your surface is connected and you know which
+      <filename>/dev/snd/midi</filename> entry belongs to the device. You
+      can do this by saying <command>cat /proc/asound/cards</command> which
+      should result in something like
+<screen>
+ 0 [EWS88MT        ]: ICE1712 - TerraTec EWS88MT
+                      TerraTec EWS88MT at 0x1140, irq 21
+ 1 [VirMIDI        ]: VirMIDI - VirMIDI
+                      Virtual MIDI Card 1
+ 2 [BCF2000        ]: USB-Audio - BCF2000
+                      BEHRINGER BCF2000 at usb-0000:00:1a.1-1, full speed
+</screen>
+      in this case the BCF2000 is on <filename>/dev/snd/midiC2D0</filename>.
+    </para>
+
+    <para>
+      While ardour is not running, edit your
+      <filename>.ardour2/ardour.rc</filename> and add at the top, with the
+      other ports:
+<programlisting>
+&lt;MIDI-port tag="mcu" device="/dev/snd/midiC2D0" type="alsa/raw" mode="duplex"/&gt;
+</programlisting>
+      If you have a BCF2000, and you'd like to use
+      <link linkend="mackie-bcf-mode">BCF mode</link>, you can also add
+      under the &lt;Config&gt; tag:
+<programlisting>
+&lt;Option name="mackie-emulation" value="bcf"/&gt;
+</programlisting>
+    </para>
+
+    <para>
+      It is also possible to add MCU extenders, although this is untested
+      because nobody we know has access to one right now. To do this, add
+      the following lines to <filename>~/.ardour2/ardour.rc</filename>
+<programlisting>
+&lt;MIDI-port tag="mcu_xt_1" device="/dev/snd/midiC3D0" type="alsa/raw" mode="duplex"/&gt;
+&lt;MIDI-port tag="mcu_xt_2" device="/dev/snd/midiC4D0" type="alsa/raw" mode="duplex"/&gt;
+</programlisting>
+      and so on, one for each of your extenders, up to a maximum of 9
+      extenders.
+    </para>
+  </section>
+
+  <section id="mackie-connecting-to-ardour">
+    <title>Connecting to Ardour</title>
+    <para>
+      Start up ardour. Go to Options/Control Surfaces. You should see
+      "Mackie" as one of the menu items. Turn it on. The faders on the
+      surface should jump to the correct positions. The mackie should work
+      as normal, except that any buttons not on the BCF won't work.
+    </para>
+  </section>
+
+  <section id="mackie-bcf-mode">
+    <title>BCF mode</title>
+    <para>
+      <itemizedlist>
+        <listitem>
+          <para>
+            7 of the 8 sliders are used as route sliders, the remaining
+            right-hand one is used for the master slider
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            certain buttons have been remapped from the default Behringer
+            settings, which required either both hands, or one-handed
+            contortions to do simple things like rec-enable or mute a track.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            The display shows the number of the first switched-in bank or Ar
+            if the first bank is in place.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </para>
+
+    <para>
+      BCF mode bindings
+      <table id="tbl-mackie-bcf-key-bindings">
+        <title>BCF mode bindings</title>
+        <tgroup cols = "4">
+          <colspec colnum="1" colname="Strip" colwidth="1"/>
+          <colspec colnum="2" colname="Master Strip" colwidth= "1"/>
+          <colspec colnum="3" colname="Buttons 1" colwidth="1"/>
+          <colspec colnum="4" colname="Buttons 2" colwidth= "1"/>
+          <thead>
+            <row>
+              <entry>
+                Strips 1-7
+              </entry>
+
+              <entry>
+                Master Strip
+              </entry>
+
+              <entry namest="Buttons 1" nameend="Buttons 2">
+                Buttons
+              </entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry>
+                pan / solo if pressed
+              </entry>
+
+              <entry>
+                transport <footnote>
+                <para>
+                  Making a pot pretend to be a shuttle wheel doesn't work
+                  very well.
+                </para>
+                </footnote> / global solo
+              </entry>
+
+              <entry namest="Buttons 1" nameend="Buttons 2">
+                LCD display
+              </entry>
+            </row>
+
+            <row>
+              <entry>
+                mute
+              </entry>
+
+              <entry>
+                mute
+              </entry>
+
+              <entry>
+                shift 1
+              </entry>
+
+              <entry>
+                <para>loop</para>
+								<para>shift 1: marker</para>
+								<para>shift 2: punch in</para>
+              </entry>
+            </row>
+
+            <row>
+              <entry>
+                rec
+              </entry>
+
+              <entry>
+                session rec
+              </entry>
+
+              <entry>
+                shift 2
+              </entry>
+
+              <entry>
+                <para>click</para>
+								<para>shift 2: punch out</para>
+              </entry>
+            </row>
+
+            <row>
+              <entry morerows="4" valign="middle">
+                slider
+              </entry>
+
+              <entry morerows="4" valign="middle">
+                slider
+              </entry>
+
+              <entry>
+                rewind
+              </entry>
+
+              <entry>
+                ffwd
+              </entry>
+            </row>
+
+            <row>
+              <entry>
+                home
+              </entry>
+
+              <entry>
+                end
+              </entry>
+            </row>
+
+            <row>
+              <entry>
+                <para>previous bank</para>
+								<para>shift 1: previous route</para>
+              </entry>
+
+              <entry>
+                <para>next bank</para>
+								<para>shift 1: next route</para>
+              </entry>
+            </row>
+
+            <row>
+              <entry>
+                previous marker
+              </entry>
+
+              <entry>
+                next marker
+              </entry>
+            </row>
+
+            <row>
+              <entry>
+                stop
+              </entry>
+
+              <entry>
+                play
+              </entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+    </para>
+  </section>
+<!--
+	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+		href="Some_Subsection.xml" />
+	-->
+</section>
diff --git a/manual/xml/sessions.xml b/manual/xml/sessions.xml
index a9e31f5790..3b8f0432c1 100644
--- a/manual/xml/sessions.xml
+++ b/manual/xml/sessions.xml
@@ -14,8 +14,6 @@
 		href="starting_up_your_system.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="creating_a_new_session.xml" />
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
-		href="adding_tracks.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="opening_a_session.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
diff --git a/manual/xml/tracks_and_busses.xml b/manual/xml/tracks_and_busses.xml
index d008a64864..6b528b6f51 100644
--- a/manual/xml/tracks_and_busses.xml
+++ b/manual/xml/tracks_and_busses.xml
@@ -16,42 +16,8 @@
       <imagedata fileref="images/signal_flow.png"/>
     </imageobject>
   </mediaobject>
-  <section id="creating-tracks">
-    <title>Creating Tracks</title>
-    <para>
-      Tracks may be added to the session at any time.
-    </para>
-    <orderedlist><title>Creating a new Track</title>
-      <listitem>
-        <para>
-          Choose <menuchoice> <guimenu>Session</guimenu> <guisubmenu>Add
-          Track/Bus</guisubmenu> </menuchoice>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          add_track.ps Add Track Dialog
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          In the Add Tracks dialog, choose whether you wish to add a new
-          Track or a new Bus.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Enter the number of new tracks/busses you want to add.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Choose the I/O configuration of the tracks/busses you are adding
-          using the clickbox.
-        </para>
-      </listitem>
-    </orderedlist>
-  </section>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
+		href="adding_tracks.xml" />
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" 
 		href="renaming_tracks.xml" />
   <section id="deleting-tracks">
diff --git a/svn_revision.h b/svn_revision.h
index 069c1be36a..cac9bb0c97 100644
--- a/svn_revision.h
+++ b/svn_revision.h
@@ -1,4 +1,4 @@
 #ifndef __ardour_svn_revision_h__
 #define __ardour_svn_revision_h__
-static const char* ardour_svn_revision = "1607";
+static const char* ardour_svn_revision = "1681";
 #endif
diff --git a/templates/16 Tracks.template.in b/templates/16 Tracks.template.in
index 1873f57e7f..786f41e0e2 100644
--- a/templates/16 Tracks.template.in	
+++ b/templates/16 Tracks.template.in	
@@ -80,7 +80,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=2:signal=2" diskstream-id="1088698381722129">
-      <IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -102,7 +102,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=4:signal=4" diskstream-id="1088698419943526">
-      <IO name="Audio 4" id="1088698419943460" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 4" id="1088698419943460" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -124,7 +124,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=6:signal=6" diskstream-id="1088698450754348">
-      <IO name="Audio 6" id="1088698450754242" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 6" id="1088698450754242" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -146,7 +146,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=8:signal=8" diskstream-id="1088698451167172">
-      <IO name="Audio 8" id="1088698451167106" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 8" id="1088698451167106" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -168,7 +168,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=10:signal=10" diskstream-id="1088698483801345">
-      <IO name="Audio 10" id="1088698483801234" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 10" id="1088698483801234" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -190,7 +190,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=12:signal=12" diskstream-id="1088698484325738">
-      <IO name="Audio 12" id="1088698484325672" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 12" id="1088698484325672" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -212,7 +212,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=14:signal=14" diskstream-id="1088698484839332">
-      <IO name="Audio 14" id="1088698484839137" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 14" id="1088698484839137" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -234,7 +234,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=16:signal=16" diskstream-id="1088698485412133">
-      <IO name="Audio 16" id="1088698485412068" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 16" id="1088698485412068" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
diff --git a/templates/32 Tracks.template.in b/templates/32 Tracks.template.in
index 334bd2e6d5..65f325bcc8 100644
--- a/templates/32 Tracks.template.in	
+++ b/templates/32 Tracks.template.in	
@@ -88,7 +88,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=2:signal=2" diskstream-id="1088698381722129">
-      <IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -110,7 +110,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=4:signal=4" diskstream-id="1088698419943526">
-      <IO name="Audio 4" id="1088698419943460" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 4" id="1088698419943460" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -132,7 +132,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=6:signal=6" diskstream-id="1088698450754348">
-      <IO name="Audio 6" id="1088698450754242" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 6" id="1088698450754242" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -154,7 +154,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=8:signal=8" diskstream-id="1088698451167172">
-      <IO name="Audio 8" id="1088698451167106" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 8" id="1088698451167106" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -176,7 +176,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=10:signal=10" diskstream-id="1088698483801345">
-      <IO name="Audio 10" id="1088698483801234" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 10" id="1088698483801234" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -198,7 +198,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=12:signal=12" diskstream-id="1088698484325738">
-      <IO name="Audio 12" id="1088698484325672" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 12" id="1088698484325672" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -220,7 +220,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=14:signal=14" diskstream-id="1088698484839332">
-      <IO name="Audio 14" id="1088698484839137" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 14" id="1088698484839137" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -242,7 +242,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=16:signal=16" diskstream-id="1088698485412133">
-      <IO name="Audio 16" id="1088698485412068" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 16" id="1088698485412068" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -264,7 +264,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=18:signal=18" diskstream-id="1088698520803734">
-      <IO name="Audio 18" id="1088698520803668" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 18" id="1088698520803668" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -286,7 +286,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=20:signal=20" diskstream-id="1088698521481727">
-      <IO name="Audio 20" id="1088698521481661" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 20" id="1088698521481661" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -308,7 +308,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=22:signal=22" diskstream-id="1088698522224190">
-      <IO name="Audio 22" id="1088698522224124" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 22" id="1088698522224124" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -330,7 +330,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=24:signal=24" diskstream-id="1088698523020752">
-      <IO name="Audio 24" id="1088698523020686" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 24" id="1088698523020686" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
diff --git a/templates/4 Tracks.template.in b/templates/4 Tracks.template.in
index aacb495986..d01ef1aa7d 100644
--- a/templates/4 Tracks.template.in	
+++ b/templates/4 Tracks.template.in	
@@ -68,7 +68,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=2:signal=2" diskstream-id="1088698381722129">
-      <IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -90,7 +90,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=4:signal=4" diskstream-id="1088698419943526">
-      <IO name="Audio 4" id="1088698419943460" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 4" id="1088698419943460" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
diff --git a/templates/8 Tracks.template.in b/templates/8 Tracks.template.in
index 4c9b1aa8ba..027ab59b38 100644
--- a/templates/8 Tracks.template.in	
+++ b/templates/8 Tracks.template.in	
@@ -72,7 +72,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=2:signal=2" diskstream-id="1088698381722129">
-      <IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 2" id="1088698381722065" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -94,7 +94,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=4:signal=4" diskstream-id="1088698419943526">
-      <IO name="Audio 4" id="1088698419943460" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 4" id="1088698419943460" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -116,7 +116,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=6:signal=6" diskstream-id="1088698450754348">
-      <IO name="Audio 6" id="1088698450754242" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 6" id="1088698450754242" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
@@ -138,7 +138,7 @@
       </extra>
     </Route>
     <Route muted="no" soloed="no" phase-invert="no" mute-affects-pre-fader="yes" mute-affects-post-fader="yes" mute-affects-control-outs="yes" mute-affects-main-outs="yes" order-keys="editor=8:signal=8" diskstream-id="1088698451167172">
-      <IO name="Audio 8" id="1088698451167106" inputs="{%JACK_OUTPUT%2}{%JACK_OUTPUT%1}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
+      <IO name="Audio 8" id="1088698451167106" inputs="{%JACK_OUTPUT%1}{%JACK_OUTPUT%2}" outputs="{ardour:master/in 1}{ardour:master/in 2}" gain="1" iolimits="1,-1,-1,-1" automation-state="0x0" automation-style="0x1">
         <Panner linked="no" link_direction="0">
           <StreamPanner x="0.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
           <StreamPanner x="1.000000" type="Equal Power Stereo" automation-state="0x0" automation-style="0x1" bypassed="no" muted="no"/>
diff --git a/tools/osx_packaging/ardour2_mac_ui.rc b/tools/osx_packaging/ardour2_mac_ui.rc
index e01f2eb357..6528257e74 100644
--- a/tools/osx_packaging/ardour2_mac_ui.rc
+++ b/tools/osx_packaging/ardour2_mac_ui.rc
@@ -80,7 +80,7 @@ style "marker_text"
 
 style "time_axis_view_item_name"
 {
-	font_name = "sans medium 10"
+	font_name = "sans 10"
 }
 
 style "default_base" = "medium_text"
@@ -141,11 +141,11 @@ style "transport_base" = "medium_bold_text"
   bg[SELECTED] = { 0, 0, 0 }
 }
 
-style "black_mackie_menu_bar" = "medium_bold_text"
+style "black_mackie_menu_bar"
 {
-      font_name = "sans bold 11"
-      fg[NORMAL] = { 1.0, 1.0, 1.0 }
-      bg[NORMAL] = { 0, 0, 0 }
+  font_name = "sans bold 11"
+  fg[NORMAL] = { 1.0, 1.0, 1.0 }
+  bg[NORMAL] = { 0, 0, 0 }
 }
 
 style "default_buttons_menus" 
@@ -184,24 +184,58 @@ style "small_red_active_and_selected_button" = "small_button"
 	bg[SELECTED] = { 1.0, 0, 0}
 }
 
-style "track_rec_enable_button" = "small_button"
-{
-	fg[SELECTED] = { 0.0, 0.0, 0.0 }
-	fg[ACTIVE] =   { 0.0, 0.0, 0.0 }
-	fg[PRELIGHT] = { 0.0, 0.0, 0.0 }
-
-	bg[SELECTED] =   { 1.0, 0.0, 0.0 }
-	bg[ACTIVE] =   { 0.91, 0.68, 0.68}
-	bg[PRELIGHT] =   { 1.0, 0.0, 0.0 }
-}
-
 style "gain_fader"
 {
 	bg[NORMAL] =   { 0.269, 0.269, 0.300}
 	bg[ACTIVE] =   { 0.152, 0.152, 0.168 }
 }
 
-style "mixer_rec_enable_button" = "track_rec_enable_button"
+
+style "track_rec_enable_button" = "small_button"
+{
+}
+
+style "track_rec_enable_button_active" = "small_button"
+{
+	fg[SELECTED] = { 0.0, 0.0, 0.0 }
+	fg[ACTIVE] =   { 0.0, 0.0, 0.0 }
+	fg[PRELIGHT] = { 0.0, 0.0, 0.0 }
+	fg[NORMAL] = { 0.0, 0.0, 0.0 }
+
+	bg[NORMAL] =   { 1.0, 0.0, 0.0 }
+	bg[ACTIVE] =   { 1.0, 0.0, 0.0 }
+	bg[SELECTED] =   { 1.0, 0.0, 0.0 }
+	bg[PRELIGHT] =   { 1.0, 0.0, 0.0 }
+}
+
+style "track_rec_enable_button_alternate" = "small_button"
+{
+	fg[SELECTED] = { 0.0, 0.0, 0.0 }
+	fg[ACTIVE] =   { 0.0, 0.0, 0.0 }
+	fg[PRELIGHT] = { 0.0, 0.0, 0.0 }
+	fg[NORMAL] = { 0.0, 0.0, 0.0 }
+
+	bg[NORMAL] =   { 0.91, 0.68, 0.68}
+	bg[ACTIVE] =   { 0.91, 0.68, 0.68}
+	bg[SELECTED] =   { 0.91, 0.68, 0.68}
+	bg[PRELIGHT] =   { 0.91, 0.68, 0.68}
+}
+
+style "mixer_track_rec_enable_button" = "track_rec_enable_button"
+{
+	font_name = "sans 8"
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_track_rec_enable_button_alternate" = "track_rec_enable_button_alternate"
+{
+	font_name = "sans 8"
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_track_rec_enable_button_active" = "track_rec_enable_button_active"
 {
 	font_name = "sans 8"
 	xthickness = 0
@@ -210,20 +244,33 @@ style "mixer_rec_enable_button" = "track_rec_enable_button"
 
 style "solo_button" = "small_button"
 {
-	bg[PRELIGHT] = { 0, 1.0, 0 }
-	bg[ACTIVE] = { 0.66, 0.97, 0.19 }
-
-	fg[PRELIGHT] = { 0, 0, 0 }
-	fg[ACTIVE] = { 0, 0, 0 }
 }
 
-style "safe_solo_button" = "small_button"
+style "solo_button_alternate" = "small_button"
 {
-	bg[PRELIGHT] = { 0, 1.0, 0 }
-	bg[ACTIVE] = { 0.19, 0.97, 0.69 }
+	bg[NORMAL] = { 0.19, 0.97, 0.69 } # solo-safe
+	bg[ACTIVE] = { 0.19, 0.97, 0.69 } # solo-safe
+	bg[SELECTED] = { 0.19, 0.97, 0.69 } # solo-safe
+	bg[PRELIGHT] = { 0.19, 0.97, 0.69 } # solo-safe
 
-	fg[PRELIGHT] = { 0, 0, 0 }
 	fg[ACTIVE] = { 0, 0, 0 }
+	fg[SELECTED] = { 0, 0, 0 }
+	fg[NORMAL] = { 0, 0, 0 }
+	fg[PRELIGHT] = { 0, 0, 0 }
+}
+
+
+style "solo_button_active" = "small_button"
+{
+	bg[NORMAL] = { 0.66, 0.97, 0.19 }   # solo
+	bg[ACTIVE] = { 0.66, 0.97, 0.19 }   # solo
+	bg[SELECTED] = { 0.66, 0.97, 0.19 }   # solo
+	bg[PRELIGHT] = { 0.66, 0.97, 0.19 }   # solo
+
+	fg[ACTIVE] = { 0, 0, 0 }
+	fg[SELECTED] = { 0, 0, 0 }
+	fg[NORMAL] = { 0, 0, 0 }
+	fg[PRELIGHT] = { 0, 0, 0 }
 }
 
 style "mixer_solo_button" = "solo_button"
@@ -231,27 +278,72 @@ style "mixer_solo_button" = "solo_button"
 	font_name = "sans 8"
 	xthickness = 0
 	ythickness = 0
-
 }
 
-style "mixer_safe_solo_button" = "safe_solo_button"
+style "mixer_solo_button_alternate" = "solo_button_alternate"
 {
-	font_name = "sans 7"
+	font_name = "sans 8"
+	xthickness = 0
+	ythickness = 0
+}
+style "mixer_solo_button_active" = "solo_button_active"
+{
+	font_name = "sans 8"
 	xthickness = 0
 	ythickness = 0
-
 }
 
 
 style "mute_button" = "small_button"
 {
-	bg[PRELIGHT] = { 1.0, 0.65, 0.13 }
-	bg[ACTIVE] = { 1.0, 0.98, 0.53 }
-	
-	fg[PRELIGHT] = { 0, 0, 0 }
-	fg[ACTIVE] = { 0, 0, 0 }
 }
 
+style "mute_button_alternate" = "small_button"
+{
+	bg[ACTIVE] = { 1.0, 0.98, 0.53 }
+	bg[NORMAL] = { 1.0, 0.98, 0.53 }
+	bg[SELECTED] = { 1.0, 0.98, 0.53 }
+	bg[PRELIGHT] = { 1.0, 0.98, 0.53 }
+
+	fg[SELECTED] = { 0, 0, 0 }
+	fg[ACTIVE] = { 0, 0, 0 }
+	fg[NORMAL] = { 0, 0, 0 }
+	fg[PRELIGHT] = { 0, 0, 0 }
+}
+
+style "mute_button_active" = "small_button"
+{
+	bg[NORMAL] = { 0.90, 0.89, 0.73 }
+	bg[ACTIVE] = { 0.90, 0.89, 0.73 }
+	bg[PRELIGHT] = { 0.90, 0.89, 0.73 }
+	bg[SELECTED] = { 0.90, 0.89, 0.73 }
+
+	fg[SELECTED] = { 0, 0, 0 }
+	fg[ACTIVE] = { 0, 0, 0 }
+	fg[NORMAL] = { 0, 0, 0 }
+	fg[PRELIGHT] = { 0, 0, 0 }
+}
+
+style "mixer_mute_button" = "mute_button"
+{
+	font_name = "sans 8"
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_mute_button_alternate" = "mute_button_alternate"
+{
+	font_name = "sans 8"
+	xthickness = 0
+	ythickness = 0
+}
+
+style "mixer_mute_button_active" = "mute_button_active"
+{
+	font_name = "sans 8"
+	xthickness = 0
+	ythickness = 0
+}
 
 style "multiline_combo" = "small_button"
 {
@@ -290,15 +382,39 @@ style "time_button" = "default_buttons_menus"
 
 style "transport_button"
 {
-	font_name = "sans 9"
+}
+
+style "transport_button_active"
+{
+	bg[NORMAL] = { 0.50, 1.0, 0.50 }
 	bg[ACTIVE] = { 0.50, 1.0, 0.50 }
+	bg[SELECTED] = { 0.50, 1.0, 0.50 }
+	bg[PRELIGHT] = { 0.50, 1.0, 0.50 }
+
+	fg[NORMAL] = { 0, 0, 0 }
+	fg[PRELIGHT] = { 0, 0, 0 }
+	fg[SELECTED] = { 0, 0, 0 }
 	fg[ACTIVE] = { 0, 0, 0 }
 }
 
 style "transport_rec_button"
+{
+}
+
+style "transport_rec_button_active"
 {
 	bg[ACTIVE] = { 1.0, 0, 0 }
-	bg[PRELIGHT] = { 0.91, 0.68, 0.68 }		#blinking rec button color
+	bg[NORMAL] = { 1.0, 0, 0 }
+	bg[SELECTED] = { 1.0, 0, 0 }
+	bg[PRELIGHT] = { 1.0, 0, 0 }
+}
+
+style "transport_rec_button_alternate"
+{
+	bg[PRELIGHT] = { 0.91, 0.68, 0.68 }
+	bg[NORMAL] = { 0.91, 0.68, 0.68 }
+	bg[SELECTED] = { 0.91, 0.68, 0.68 }
+	bg[ACTIVE] = { 0.91, 0.68, 0.68 }
 }
 
 style "shuttle_control" = "very_small_text"
@@ -548,7 +664,7 @@ style "transport_clock_display"
 
 style "tempo_meter_clock_display"
 {
-	font_name = "sans 9"
+	font_name = "sans 8"
 	fg[NORMAL] = { 1.0, 1.0, 1.0 }
 	fg[ACTIVE] = { 1.0, 1.0, 0.0 }
 	fg[SELECTED] = { 1.0, 0, 0 }
@@ -560,7 +676,6 @@ style "tempo_meter_clock_display"
 
 style "default_clock_display" = "medium text"
 {
- 	font_name = "sans 10"
 	fg[NORMAL] = { 0.50, 1.0, 0.50 }
 	fg[ACTIVE] = { 1.0, 0.0, 0.0 }
 	fg[SELECTED] = { 1.0, 0, 0 }
@@ -723,11 +838,11 @@ style "track_controls_inactive"
 
 style "edit_controls_base_selected"
 {
-	bg[NORMAL] = { 0.56, 0.56, 0.56 }
-	bg[ACTIVE] = { 0.56, 0.56, 0.56 }
-	bg[INSENSITIVE] = { 0.56, 0.56, 0.56 }
-	bg[SELECTED] = { 0.56, 0.56, 0.56 }
-	bg[PRELIGHT] = { 0.56, 0.56, 0.56 }
+	bg[NORMAL] = { 0.60, 0.54, 0.60 }
+	bg[ACTIVE] = { 0.60, 0.54, 0.60 }
+	bg[INSENSITIVE] = { 0.60, 0.54, 0.60 }
+	bg[SELECTED] = { 0.60, 0.54, 0.60 }
+	bg[PRELIGHT] = { 0.60, 0.54, 0.60 }
 }
 
 style "automation_track_controls_base"
@@ -1016,355 +1131,365 @@ style "ardour_button" ="default_buttons_menus"
 }
 
 #---------------------------------------------------------------
-widget "*FirstActionMessage" style "first_action_message"
-widget "*VerboseCanvasCursor" style "verbose_canvas_cursor"
-widget "*MarkerText" style "marker_text"
-widget "*TimeAxisViewItemName*" style "time_axis_view_item_name"
-#widget "*ExportProgress" style "default_buttons_menus"
-widget "*ExportFileLabel" style "small_bold_text"
-widget "*ExportFormatLabel" style "medium_bold_text"
-widget "*ExportHeader" style "small_bold_text"
-widget "*ExportFileDisplay" style "medium_entry"
-widget "*ExportFormatDisplay" style "medium_entry"
-widget "*ExportCheckbox" style "small_entry"
-widget "*ExportTrackSelector*" style "medium_entry_noselection_bg"
-widget "*EditModeSelector" style "medium_bold_entry"
-widget "*SnapTypeSelector" style "medium_bold_entry"
-widget "*SnapModeSelector" style "medium_bold_entry"
-widget "*ZoomFocusSelector" style "medium_bold_entry"
-widget "*ArdourContextMenu*" style "default_buttons_menus"
-widget "*EditGroupTitleButton*" style "default_buttons_menus"
-widget "*MixerGroupTitleButton*" style "default_buttons_menus"
-widget "*ErrorLogCloseButton" style "default_buttons_menus"
-widget "*EditorGTKButton*" style "default_buttons_menus" 
-widget "*ToolbarButton" style "default_buttons_menus"
-widget "*ToolbarButton*" style "default_buttons_menus"
-widget "*CrossfadeEditButton" style "default_buttons_menus"
-widget "*CrossfadeEditButton*" style "default_buttons_menus"
-widget "*TrackHistoryButton*" style "default_buttons_menus"
-widget "*TrackSizeButton*" style "default_buttons_menus"
-widget "*TrackPlaylistButton*" style "default_buttons_menus"
-widget "*TrackAutomationButton*" style "default_buttons_menus"
-widget "*TrackGroupButton*" style "default_buttons_menus"
-widget "*TrackMixButton*" style "default_buttons_menus"
-widget "*TrackVisualButton*" style "default_buttons_menus"
-widget "*TrackRemoveButton*" style "default_buttons_menus"
-widget "*BaseButton" style "default_buttons_menus"
-widget "*TakeButtonLabel" style "default_buttons_menus"
-widget "*MixerWidthButton" style "default_buttons_menus"
-widget "*MixerHideButton" style "default_buttons_menus"
-widget "*MixerSendButton" style "default_buttons_menus"
-widget "*MixerSendButtonLabel" style "default_buttons_menus"
-widget "*MixerSendSwitch" style "default_buttons_menus"
-widget "*MixerInsertButton" style "default_buttons_menus"
-widget "*MixerInsertButtonLabel" style "default_buttons_menus"
-widget "*MixerInsertSwitch" style "default_buttons_menus"
-widget "*MixerMonitorInputButton*" style "very_small_button"
-widget "*MixerMonitorInputButton.*" style "very_small_button"
-widget "*MixerIOButton" style "very_small_button"
-widget "*MixerIOButtonLabel" style "very_small_button"
-widget "*AddRouteDialogSpinner" style "ardour_adjusters"
-widget "*AddRouteDialogRadioButton*" style "options_window"
-widget "*OptionsNotebook" style "options_window"
-widget "*OptionEditorToggleButton*" style "options_window"
-widget "*OptionsLabel" style "options_window"
-widget "*OptionEditorAuditionerLabel" style "options_window"
-widget "*OptionsEntry" style "option_entry"
-widget "*InspectorNotebook" style "options_window"
-widget "*NewSessionDialog" style "options_window"
-widget "*NewSessionDialogButton*" style "options_window"
-widget "*MixerSendSwitch*" style "very_small_red_active_and_selected_button"
-widget "*OptionEditorToggleButton" style "small_red_active_and_selected_button"
-widget "*NewSessionDialogButton" style "small_red_active_and_selected_button"
-widget "*MixerRecordEnableButton" style "mixer_rec_enable_button"
-widget "*MixerRecordEnableButton*" style "mixer_rec_enable_button"
-widget "*TrackRecordEnableButton" style "track_rec_enable_button"
-widget "*TrackRecordEnableButton*" style "track_rec_enable_button"
-widget "*TrackMuteButton*" style "mute_button"
-widget "*TrackLoopButton*" style "track_loop_button"
-widget "*PanAutomationLineSelector*" style "multiline_combo"
-widget "*EditorTimeButton*" style "time_button"
-widget "*EditorMixerButton*" style "default_buttons_menus"
-widget "*SoloButton*" style "solo_button"
-widget "*SoloButton.*" style "solo_button"
-widget "*SafeSoloButton*" style "safe_solo_button"
-widget "*SafeSoloButton.*" style "safe_solo_button"
-widget "*MixerPhaseInvertButton*" style "very_small_button"
-widget "*MixerPhaseInvertButton.*" style "very_small_button"
-widget "*MixerAutomationRecordingButton*" style "very_small_button"
-widget "*MixerAutomationRecordingButton.*" style "very_small_button"
-widget "*MixerAutomationModeButton*" style "very_small_button"
-widget "*MixerAutomationModeButton.*" style "very_small_button"
-widget "*MixerAutomationPlaybackButton*" style "very_small_button"
-widget "*MixerAutomationPlaybackButton.*" style "very_small_button"
-widget "*MixerMuteButton*" style "mixer_mute_button"
-widget "*MixerMuteButton.*" style "mixer_mute_button"
-widget "*MixerSoloButton*" style "mixer_solo_button"
-widget "*MixerSoloButton.*" style "mixer_solo_button"
-widget "*MixerNameButton" style "very_small_button"
-widget "*MixerNameButtonLabel" style "very_small_button"
-widget "*MixerGroupButton" style "very_small_button"
-widget "*MixerGroupButtonLabel" style "very_small_button"
-widget "*MixerCommentButton" style "very_small_button"
-widget "*MixerCommentButton*" style "very_small_button"
-widget "*EditGroupButton" style "very_small_button"
-widget "*EditGroupButtonLabel" style "very_small_button"
-widget "*TransportButton" style "transport_button"
-widget "*TransportButton*" style "transport_button"
-widget "*ShuttleButton" style "transport_button"
-widget "*ShuttleButton*" style "transport_button"
-widget "*ShuttleDisplay" style "transport_button"
-widget "*ShuttleDisplay*" style "transport_button"
-widget "*ShuttleControl" style "shuttle_control"
-widget "*TransportRecButton" style "transport_rec_button"
-widget "*TransportRecButton*" style "transport_rec_button"
-widget "*RecordingXrunWarningWindow" style "xrun_warn"
-widget "*RecordingXrunWarningWindow*" style "xrun_warn"
-widget "*MainMenuBar" style "menu_bar_base"
-widget "*ErrorMessage" style "error_message"
-widget "*FatalMessage" style "fatal_message"
-widget "*InfoMessage" style "info_message"
-widget "*WarningMessage" style "warning_message"
-widget "*BigClockNonRecording" style "non_recording_big_clock_display"
-widget "*BigClockRecording" style "recording_big_clock_display"
-widget "*TransportClockDisplay" style "transport_clock_display"
-widget "*SecondaryClockDisplay" style "transport_clock_display"
-widget "*AudioClockFramesUpperInfo" style "tempo_meter_clock_display"
-widget "*AudioClockFramesLowerInfo" style "tempo_meter_clock_display"
-widget "*AudioClockSMPTEUpperInfo" style "tempo_meter_clock_display"
-widget "*AudioClockSMPTELowerInfo" style "tempo_meter_clock_display"
-widget "*AudioClockBBTUpperInfo" style "tempo_meter_clock_display"
-widget "*AudioClockBBTLowerInfo" style "tempo_meter_clock_display"
-widget "*SelectionStartClock" style "default_clock_display"
-widget "*SelectionEndClock" style "default_clock_display"
-widget "*EditCursorClock" style "default_clock_display"
-widget "*PreRollClock" style "default_clock_display"
-widget "*PostRollClock" style "default_clock_display"
-widget "*NudgeClock" style "default_clock_display"
-widget "*ZoomRangeClock" style "default_clock_display"
-widget "*SMPTEOffsetClock" style "default_clock_display"
-widget "*TransportLabel" style "small_bold_text"
-widget "*TakeLabel" style "small_bold_text"
-widget "*LocationLabel" style "small_bold_text"
-widget "*WipeLabel" style "small_bold_text"
-widget "*TakeTagLabel" style "small_bold_text"
-widget "*ToolBarLabel" style "small_bold_text"
-widget "*EditorDisplayLabel" style "small_bold_text"
-widget "*NewSessionLabel" style "large_text"
-widget "*GlobalButtonLabel" style "default_buttons_menus"
-widget "*ClickButton" style "medium_entry"
-widget "*RegionNameDisplay" style "medium_entry"
-widget "*PluginDisplay" style "medium_entry"
-widget "*SelectionDisplay" style "medium_entry"
-widget "*HistorySelector" style "medium_entry"
-widget "*LocationSelector" style "medium_entry"
-widget "*TakeSelector" style "medium_entry"
-widget "*RegionSelector" style "medium_entry"
-widget "*SMPTERuler" style "editor_time_ruler"
-widget "*BBTRuler" style "editor_time_ruler"
-widget "*FramesRuler" style "editor_time_ruler"
-widget "*MinSecRuler" style "editor_time_ruler"
-widget "*BaseFrame" style "base_frame"
-widget "*AudioTrackStripBase" style "audio_track_base"
-widget "*TimeAxisViewControlsBaseUnselected" style "audio_track_base"
-widget "*AudioTrackControlsBaseUnselected" style "audio_track_base"
-widget "*AudioTrackFader" style "gain_fader"
-widget "*AudioBusStripBase" style "audio_bus_base"
-widget "*BusControlsBaseUnselected" style "audio_bus_base"
-widget "*AudioBusFader" style "gain_fader"
-widget "*TrackSeparator" style "track_separator"
-widget "*TrackEditIndicator0*" style "edit_group_0"
-widget "*TrackEditIndicator1*" style "edit_group_1"
-widget "*TrackEditIndicator2*" style "edit_group_2"
-widget "*TrackEditIndicator3*" style "edit_group_3"
-widget "*TrackEditIndicator4*" style "edit_group_3"
-widget "*TrackEditIndicator5*" style "edit_group_3"
-widget "*TrackEditIndicator6*" style "edit_group_3"
-widget "*TrackEditIndicator7*" style "edit_group_3"
-widget "*EditorTrackNameDisplay" style "track_name_display"
-widget "*EditorTrackNameDisplay*" style "track_name_display"
-widget "*EditorActiveTrackNameDisplay" style "active_track_name_display"
-widget "*EditorActiveTrackNameDisplay*" style "active_track_name_display"
-widget "*CrossfadeEditAuditionButton" style "red_when_active"
-widget "*CrossfadeEditAuditionButton*" style "red_when_active"
-widget "*CrossfadeEditCurveButton" style "red_when_active"
-widget "*CrossfadeEditCurveButton*" style "red_when_active"
-widget "*CrossfadeEditLabel" style "medium_text"
-widget "*CrossfadeEditFrame" style "base_frame"
-widget "*MouseModeButton" style "default_buttons_menus"
-widget "*MouseModeButton*" style "default_buttons_menus"
-widget "*EditorMainCanvas" style "main_canvas_area"
-widget "*AudioTrackControlsBaseInactiveUnselected" style "track_controls_inactive"
-widget "*BusControlsBaseInactiveUnselected" style "track_controls_inactive"
-widget "*AutomationTrackControlsBaseInactiveUnselected" style "track_controls_inactive"
-widget "*AutomationTrackName" style "automation_track_name"
-widget "*AudioTrackControlsBaseInactiveSelected" style "track_controls_inactive"
-widget "*BusControlsBaseInactiveSelected" style "track_controls_inactive"
-widget "*AutomationTrackControlsBaseInactiveSelected" style "track_controls_inactive"
-widget "*AudioTrackStripBaseInactive" style "track_controls_inactive"
-widget "*AudioBusStripBaseInactive" style "track_controls_inactive"
-widget "*AudioTrackControlsBaseSelected" style "edit_controls_base_selected"
-widget "*BusControlsBaseSelected" style "edit_controls_base_selected"
-widget "*AutomationTrackControlsBase" style "automation_track_controls_base"
-widget "*AutomationTrackControlsBaseSelected" style "edit_controls_base_selected"
-widget "*EditorMenuBar*" style "black_mackie_menu_bar"
-widget "*MainMenuBar*" style "black_mackie_menu_bar"
-widget "*ZoomClickBox" style "medium_bold_entry"
-widget "*PluginParameterLabel" style "medium_text"
-widget "*PluginNameInfo" style "plugin_name_text"
-widget "*PluginMakerInfo" style "plugin_maker_text"
-widget "*PluginParameterInfo" style "medium_text"
-widget "*MotionControllerValue" style "medium_entry"
-widget "*ParameterValueDisplay" style "medium_bold_entry"
-widget "*PluginUIClickBox" style "medium_bold_entry"
-widget "*PluginUIClickBox*" style "medium_bold_entry"
-widget "*PluginSlider" style "plugin_slider"
-widget "*RedirectSelector" style "redirect_list_display"
-widget "*RedirectSelector.*" style "redirect_list_display"
-widget "*EditGroupDisplay" style "treeview_display"
-widget "*TrackListDisplay" style "treeview_display"
-widget "*RegionListDisplay" style "treeview_display"
-widget "*NamedSelectionDisplay" style "treeview_display"
-widget "*SnapshotDisplay" style "treeview_display"
-widget "*MixerTrackCommentArea" style "option_entry"
-widget "*MixerPanZone" style "pan_zone"
-widget "*MixerTrackDisplayList" style "treeview_display"
-widget "*MixerSnapshotDisplayList" style "treeview_display"
-widget "*MixerAuxDisplayList" style "treeview_display"
-widget "*MixerGroupList" style "treeview_display"
-widget "*RegionEditorLabel" style "medium_text"
-widget "*RegionEditorSmallLabel" style "small_text"
-widget "*RegionEditorEntry" style "medium_entry"
-widget "*RegionEditorClock" style "default_clock_display"
-widget "*RegionEditorToggleButton" style "paler_red_when_active"
-widget "*RegionEditorToggleButton*" style "paler_red_when_active"
-widget "*MixerStripSpeedBase" style "small_entry"
-widget "*MixerStripSpeedBase*" style "small_entry"
-widget "*MixerStripSpeedBaseNotOne" style "small_red_on_black_entry"
-widget "*MixerStripSpeedBaseNotOne*" style "small_red_on_black_entry"
-widget "*MixerStripGainDisplay" style "small_entry"
-widget "*MixerStripGainDisplay*" style "small_entry"
-widget "*MixerStripGainUnitButton" style "very_small_button"
-widget "*MixerStripGainUnitButton*" style "very_small_button"
-widget "*MixerStripMeterPreButton" style "very_small_button"
-widget "*MixerStripMeterPreButton*" style "very_small_button"
-widget "*MixerStripPeakDisplay*" style "red_active_small_entry"
-widget "*MixerStripPeakDisplayPeak*" style "peak_display_peaked_entry"
-widget "*MixerStripSelectedFrame" style "selected_strip_frame"
-widget "*MixerStripFrame" style "base_frame"
-widget "*HWMonitorButton" style "red_when_active"
-widget "*HWMonitorButton*" style "red_when_active"
-widget "*BypassButton" style "red_when_active"
-widget "*BypassButton*" style "red_when_active"
-widget "*TransportSoloAlert" style "flashing_alert"
-widget "*TransportSoloAlert.*" style "flashing_alert"
-widget "*TransportAuditioningAlert" style "flashing_alert"
-widget "*TransportAuditioningAlert.*" style "flashing_alert"
-widget "*FadeCurve" style "medium_bold_entry"
-widget "*FadeCurve*" style "medium_bold_entry"
-widget "*IOSelectorButton" style "default_buttons_menus"
-widget "*IOSelectorButton*" style "default_buttons_menus"
-widget "*IOSelectorList" style "medium_entry_noselection_fg"
-widget "*IOSelectorPortList" style "io_selector_port_list"
-widget "*IOSelectorPortList.*" style "io_selector_port_list"
-widget "*IOSelectorPortListSelected" style "selected_io_selector_port_list"
-widget "*IOSelectorPortListSelected.*" style "selected_io_selector_port_list"
-widget "*IOSelectorNotebook" style "io_selector_notebook"
-widget "*IOSelectorNotebookTab" style "io_selector_notebook"
-widget "*IOSelectorFrame" style "base_frame"
-widget "*ConnectionEditorButton" style "default_buttons_menus"
-widget "*ConnectionEditorButton*" style "default_buttons_menus"
-widget "*ConnectionEditorList" style "medium_entry_noselection_fg"
-widget "*ConnectionEditorConnectionList" style "medium_entry"
-widget "*ConnectionEditorPortList" style "io_selector_port_list"
-widget "*ConnectionEditorPortListSelected" style "selected_io_selector_port_list"
-widget "*ConnectionEditorNotebook" style "io_selector_notebook"
-widget "*ConnectionEditorNotebookTab" style "io_selector_notebook"
-widget "*ConnectionEditorFrame" style "base_frame"
-widget "*RouteParamsListDisplay" style "inspector_track_list_display"
-widget "*RouteParamsPreListDisplay" style "inspector_redirect_list_display"
-widget "*RouteParamsPostListDisplay" style "inspector_redirect_list_display"
-widget "*TearOffArrow" style "tearoff_arrow"
-widget "*RouteParamsTitleButton" style "medium_text"
-widget "*RouteParamsTitleLabel" style "medium_text"
-widget "*PluginAutomateRecordButton" style "small_red_active_and_selected_button"
-widget "*PluginAutomateRecordButton*" style "small_red_active_and_selected_button"
-widget "*PluginAutomatePlayButton" style "small_red_active_and_selected_button"
-widget "*PluginAutomatePlayButton*" style "small_red_active_and_selected_button"
-widget "*PluginAutomateButton" style "small_button"
-widget "*PluginAutomateButton*" style "small_button"
-widget "*PluginSaveButton" style "small_button"
-widget "*PluginSaveButton*" style "small_button"
-widget "*PluginLoadButton" style "small_button"
-widget "*PluginLoadButton*" style "small_button"
-widget "*FaderMetricsStrip" style "meter_metrics_strip"
-widget "*MeterMetricsStrip" style "meter_metrics_strip"
-widget "*MetricDialogFrame" style "base_frame"
-widget "*MetricEntry" style "medium_bold_entry"
-widget "*MetricButton" style "default_buttons_menus"
-widget "*MetricButton.*" style "default_buttons_menus"
-widget "*MetricLabel" style "medium_text"
-widget "*TimeStretchButton" style "default_buttons_menus"
-widget "*TimeStretchButton.*" style "default_buttons_menus"
-widget "*TimeStretchProgress" style "default_buttons_menus"
-widget "*ChoiceWindow" style "default_buttons_menus"
-widget "*ChoicePrompt" style "default_buttons_menus"
-widget "*ChoiceButton" style "default_buttons_menus"
-widget "*ChoiceButton*" style "default_buttons_menus"
-widget "*SelectionModeButton" style "default_buttons_menus"
-widget "*SelectionModeButton*" style "default_buttons_menus"
-widget "*TrackLabel" style "medium_text"
-widget "*TrackPlugName" style "medium_text"
-widget "*TrackParameterName" style "small_text"
-widget "*AddRouteDialog*" style "medium_text"
-widget "*AddRouteDialog.GtkLabel" style "medium_text"
-widget "*AddRouteDialogChannelChoice" style "medium_bold_entry"
-widget "*AddRouteDialogSpinner" style "medium_bold_entry"
-widget "*AddRouteDialogSpinner*" style "medium_bold_entry"
-widget "*AddRouteDialogRadioButton" style "red_when_active"
-widget "*AddRouteDialogButton" style "default_buttons_menus"
-widget "*AddRouteDialogNameTemplateEntry" style "medium_bold_entry"
-widget "*NewSessionIOLabel" style "larger_bold_text"
-widget "*NewSessionSR1Label" style "red_medium_text"
-widget "*NewSessionSR2Label" style "medium_text"
-widget "*NewSessionChannelChoice" style "medium_bold_entry"
-widget "*NewSessionMainButton" style "larger_bold_text"
-widget "*NewSessionMainButton*" style "larger_bold_text"
-widget "*NewSessionMainLabel" style "larger_bold_text"
-widget "*LocationEditRowClock" style "location_rows_clock"
-widget "*LocationEditNameLabel" style "medium_text"
-widget "*LocationEditSetButton" style "location_row_button"
-widget "*LocationEditSetButton*" style "location_row_button"
-widget "*LocationEditGoButton" style "location_row_button"
-widget "*LocationEditGoButton*" style "location_row_button"
-widget "*LocationEditCdButton" style "small_red_active_and_selected_button"
-widget "*LocationEditCdButton*" style "small_red_active_and_selected_button"
-widget "*LocationEditHideButton" style "small_red_active_and_selected_button"
-widget "*LocationEditHideButton*" style "small_red_active_and_selected_button"
-widget "*LocationEditNumberLabel" style "small_text"
-widget "*LocationLocEditorFrame" style "base_frame"
-widget "*LocationRangeEditorFrame" style "base_frame"
-widget "*LocationEditNameEntry" style "option_entry"
-widget "*LocationAddLocationButton" style "default_buttons_menus"
-widget "*LocationAddLocationButton*" style "default_buttons_menus"
-widget "*LocationAddRangeButton" style "default_buttons_menus"
-widget "*LocationAddRangeButton*" style "default_buttons_menus"
-widget "*LocationEditRemoveButton" style "location_row_button"
-widget "*LocationEditRemoveButton*" style "location_row_button"
-widget "*PanSlider" style "pan_slider"
-widget "*PanningLinkButton" style "mixer_red_active_button"
-widget "*PanningLinkButton.*" style "mixer_red_active_button"
-widget "*PanningLinkDirectionButton" style "very_small_button"
-widget "*PanningLinkDirectionButton.*" style "very_small_button"
-widget "*ChannelCountSelector" style "medium_bold_entry"
-widget "*ChannelCountSelector.GtkArrow" style "default_buttons_menus"
-widget "*RegionListWholeFile" style "treeview_parent_node"
-widget "*EditorHScrollbar" style "editor_hscrollbar"
 
-class "GtkWidget" style "default_base"
-class "GtkScrollbar" style "ardour_adjusters"
-class "GtkLabel" style "default_buttons_menus"
-class "GtkButton" style "ardour_button"
-class "GtkArrow" style "tearoff_arrow"
-class "GtkProgressBar" style "ardour_progressbars"
+class "GtkWidget" style:highest "default_base"
+class "GtkScrollbar" style:highest "ardour_adjusters"
+class "GtkLabel" style:highest "default_buttons_menus"
+class "GtkButton" style:highest "ardour_button"
+class "GtkArrow" style:highest "tearoff_arrow"
+class "GtkProgressBar" style:highest "ardour_progressbars"
+
+widget "*FirstActionMessage" style:highest "first_action_message"
+widget "*VerboseCanvasCursor" style:highest "verbose_canvas_cursor"
+widget "*MarkerText" style:highest "marker_text"
+widget "*TimeAxisViewItemName*" style:highest "time_axis_view_item_name"
+#widget "*ExportProgress" style:highest "default_buttons_menus"
+widget "*ExportFileLabel" style:highest "small_bold_text"
+widget "*ExportFormatLabel" style:highest "medium_bold_text"
+widget "*ExportHeader" style:highest "small_bold_text"
+widget "*ExportFileDisplay" style:highest "medium_entry"
+widget "*ExportFormatDisplay" style:highest "medium_entry"
+widget "*ExportCheckbox" style:highest "small_entry"
+widget "*ExportTrackSelector*" style:highest "medium_entry_noselection_bg"
+widget "*EditModeSelector" style:highest "medium_bold_entry"
+widget "*SnapTypeSelector" style:highest "medium_bold_entry"
+widget "*SnapModeSelector" style:highest "medium_bold_entry"
+widget "*ZoomFocusSelector" style:highest "medium_bold_entry"
+widget "*ArdourContextMenu*" style:highest "default_buttons_menus"
+widget "*EditGroupTitleButton*" style:highest "default_buttons_menus"
+widget "*MixerGroupTitleButton*" style:highest "default_buttons_menus"
+widget "*ErrorLogCloseButton" style:highest "default_buttons_menus"
+widget "*EditorGTKButton*" style:highest "default_buttons_menus" 
+widget "*ToolbarButton" style:highest "default_buttons_menus"
+widget "*ToolbarButton*" style:highest "default_buttons_menus"
+widget "*CrossfadeEditButton" style:highest "default_buttons_menus"
+widget "*CrossfadeEditButton*" style:highest "default_buttons_menus"
+widget "*TrackHistoryButton*" style:highest "default_buttons_menus"
+widget "*TrackSizeButton*" style:highest "default_buttons_menus"
+widget "*TrackPlaylistButton*" style:highest "default_buttons_menus"
+widget "*TrackAutomationButton*" style:highest "default_buttons_menus"
+widget "*TrackGroupButton*" style:highest "default_buttons_menus"
+widget "*TrackMixButton*" style:highest "default_buttons_menus"
+widget "*TrackVisualButton*" style:highest "default_buttons_menus"
+widget "*TrackRemoveButton*" style:highest "default_buttons_menus"
+widget "*BaseButton" style:highest "default_buttons_menus"
+widget "*TakeButtonLabel" style:highest "default_buttons_menus"
+widget "*MixerWidthButton" style:highest "default_buttons_menus"
+widget "*MixerHideButton" style:highest "default_buttons_menus"
+widget "*MixerSendButton" style:highest "default_buttons_menus"
+widget "*MixerSendButtonLabel" style:highest "default_buttons_menus"
+widget "*MixerSendSwitch" style:highest "default_buttons_menus"
+widget "*MixerInsertButton" style:highest "default_buttons_menus"
+widget "*MixerInsertButtonLabel" style:highest "default_buttons_menus"
+widget "*MixerInsertSwitch" style:highest "default_buttons_menus"
+widget "*MixerMonitorInputButton*" style:highest "very_small_button"
+widget "*MixerMonitorInputButton.*" style:highest "very_small_button"
+widget "*MixerIOButton" style:highest "very_small_button"
+widget "*MixerIOButtonLabel" style:highest "very_small_button"
+widget "*AddRouteDialogSpinner" style:highest "ardour_adjusters"
+widget "*AddRouteDialogRadioButton*" style:highest "options_window"
+widget "*OptionsNotebook" style:highest "options_window"
+widget "*OptionEditorToggleButton*" style:highest "options_window"
+widget "*OptionsLabel" style:highest "options_window"
+widget "*OptionEditorAuditionerLabel" style:highest "options_window"
+widget "*OptionsEntry" style:highest "option_entry"
+widget "*InspectorNotebook" style:highest "options_window"
+widget "*NewSessionDialog" style:highest "options_window"
+widget "*NewSessionDialogButton*" style:highest "options_window"
+widget "*MixerSendSwitch*" style:highest "very_small_red_active_and_selected_button"
+widget "*OptionEditorToggleButton" style:highest "small_red_active_and_selected_button"
+widget "*NewSessionDialogButton" style:highest "small_red_active_and_selected_button"
+widget "*RecordEnableButton" style:highest "track_rec_enable_button"
+widget "*RecordEnableButton-active" style:highest "track_rec_enable_button_active"
+widget "*RecordEnableButton-alternate" style:highest "track_rec_enable_button_alternate"
+widget "*MixerRecordEnableButton" style:highest "mixer_track_rec_enable_button"
+widget "*MixerRecordEnableButton-active" style:highest "mixer_track_rec_enable_button_active"
+widget "*MixerRecordEnableButton-alternate" style:highest "mixer_track_rec_enable_button_alternate"
+widget "*MuteButton" style:highest "mute_button"
+widget "*MuteButton-alternate" style:highest "mute_button_alternate"
+widget "*MuteButton-active" style:highest "mute_button_active"
+widget "*MixerMuteButton" style:highest "mixer_mute_button"
+widget "*MixerMuteButton-alternate" style:highest "mixer_mute_button_alternate"
+widget "*MixerMuteButton-active" style:highest "mixer_mute_button_active"
+widget "*SoloButton" style:highest "solo_button"
+widget "*SoloButton-alternate" style:highest "solo_button_alternate"
+widget "*SoloButton-active" style:highest "solo_button_active"
+widget "*MixerSoloButton" style:highest "mixer_solo_button"
+widget "*MixerSoloButton-alternate" style:highest "mixer_solo_button_alternate"
+widget "*MixerSoloButton-active" style:highest "mixer_solo_button_active"
+widget "*TrackLoopButton*" style:highest "track_loop_button"
+widget "*PanAutomationLineSelector*" style:highest "multiline_combo"
+widget "*EditorTimeButton*" style:highest "time_button"
+widget "*MixerPhaseInvertButton*" style:highest "very_small_button"
+widget "*MixerPhaseInvertButton.*" style:highest "very_small_button"
+widget "*MixerAutomationRecordingButton*" style:highest "very_small_button"
+widget "*MixerAutomationRecordingButton.*" style:highest "very_small_button"
+widget "*MixerAutomationModeButton*" style:highest "very_small_button"
+widget "*MixerAutomationModeButton.*" style:highest "very_small_button"
+widget "*MixerAutomationPlaybackButton*" style:highest "very_small_button"
+widget "*MixerAutomationPlaybackButton.*" style:highest "very_small_button"
+widget "*MixerNameButton" style:highest "very_small_button"
+widget "*MixerNameButtonLabel" style:highest "very_small_button"
+widget "*MixerGroupButton" style:highest "very_small_button"
+widget "*MixerGroupButtonLabel" style:highest "very_small_button"
+widget "*MixerCommentButton" style:highest "very_small_button"
+widget "*MixerCommentButton*" style:highest "very_small_button"
+widget "*EditGroupButton" style:highest "very_small_button"
+widget "*EditGroupButtonLabel" style:highest "very_small_button"
+widget "*TransportButton" style:highest "transport_rec_button"
+widget "*TransportButton-active" style:highest "transport_button_active"
+widget "*ShuttleButton" style:highest "transport_button"
+widget "*ShuttleButton*" style:highest "transport_button"
+widget "*ShuttleDisplay" style:highest "transport_button"
+widget "*ShuttleDisplay*" style:highest "transport_button"
+widget "*ShuttleControl" style:highest "shuttle_control"
+widget "*TransportRecButton" style:highest "transport_rec_button"
+widget "*TransportRecButton*" style:highest "transport_rec_button"
+widget "*TransportRecButton-active" style:highest "transport_rec_button_active"
+widget "*TransportRecButton-active*" style:highest "transport_rec_button_active"
+widget "*TransportRecButton-alternate" style:highest "transport_rec_button_alternate"
+widget "*TransportRecButton-alternate*" style:highest "transport_rec_button_alternate"
+widget "*TransportRecButton*" style:highest "transport_rec_button"
+widget "*RecordingXrunWarningWindow" style:highest "xrun_warn"
+widget "*RecordingXrunWarningWindow*" style:highest "xrun_warn"
+widget "*MainMenuBar" style:highest "menu_bar_base"
+widget "*ErrorMessage" style:highest "error_message"
+widget "*FatalMessage" style:highest "fatal_message"
+widget "*InfoMessage" style:highest "info_message"
+widget "*WarningMessage" style:highest "warning_message"
+widget "*BigClockNonRecording" style:highest "non_recording_big_clock_display"
+widget "*BigClockRecording" style:highest "recording_big_clock_display"
+widget "*TransportClockDisplay" style:highest "transport_clock_display"
+widget "*SecondaryClockDisplay" style:highest "transport_clock_display"
+widget "*AudioClockFramesUpperInfo" style:highest "tempo_meter_clock_display"
+widget "*AudioClockFramesLowerInfo" style:highest "tempo_meter_clock_display"
+widget "*AudioClockSMPTEUpperInfo" style:highest "tempo_meter_clock_display"
+widget "*AudioClockSMPTELowerInfo" style:highest "tempo_meter_clock_display"
+widget "*AudioClockBBTUpperInfo" style:highest "tempo_meter_clock_display"
+widget "*AudioClockBBTLowerInfo" style:highest "tempo_meter_clock_display"
+widget "*SelectionStartClock" style:highest "default_clock_display"
+widget "*SelectionEndClock" style:highest "default_clock_display"
+widget "*EditCursorClock" style:highest "default_clock_display"
+widget "*PreRollClock" style:highest "default_clock_display"
+widget "*PostRollClock" style:highest "default_clock_display"
+widget "*NudgeClock" style:highest "default_clock_display"
+widget "*ZoomRangeClock" style:highest "default_clock_display"
+widget "*SMPTEOffsetClock" style:highest "default_clock_display"
+widget "*TransportLabel" style:highest "small_bold_text"
+widget "*TakeLabel" style:highest "small_bold_text"
+widget "*LocationLabel" style:highest "small_bold_text"
+widget "*WipeLabel" style:highest "small_bold_text"
+widget "*TakeTagLabel" style:highest "small_bold_text"
+widget "*ToolBarLabel" style:highest "small_bold_text"
+widget "*EditorDisplayLabel" style:highest "small_bold_text"
+widget "*NewSessionLabel" style:highest "large_text"
+widget "*GlobalButtonLabel" style:highest "default_buttons_menus"
+widget "*ClickButton" style:highest "medium_entry"
+widget "*RegionNameDisplay" style:highest "medium_entry"
+widget "*PluginDisplay" style:highest "medium_entry"
+widget "*SelectionDisplay" style:highest "medium_entry"
+widget "*HistorySelector" style:highest "medium_entry"
+widget "*LocationSelector" style:highest "medium_entry"
+widget "*TakeSelector" style:highest "medium_entry"
+widget "*RegionSelector" style:highest "medium_entry"
+widget "*SMPTERuler" style:highest "editor_time_ruler"
+widget "*BBTRuler" style:highest "editor_time_ruler"
+widget "*FramesRuler" style:highest "editor_time_ruler"
+widget "*MinSecRuler" style:highest "editor_time_ruler"
+widget "*BaseFrame" style:highest "base_frame"
+widget "*AudioTrackStripBase" style:highest "audio_track_base"
+widget "*TimeAxisViewControlsBaseUnselected" style:highest "audio_track_base"
+widget "*AudioTrackControlsBaseUnselected" style:highest "audio_track_base"
+widget "*AudioTrackFader" style:highest "gain_fader"
+widget "*AudioBusStripBase" style:highest "audio_bus_base"
+widget "*BusControlsBaseUnselected" style:highest "audio_bus_base"
+widget "*AudioBusFader" style:highest "gain_fader"
+widget "*TrackSeparator" style:highest "track_separator"
+widget "*TrackEditIndicator0*" style:highest "edit_group_0"
+widget "*TrackEditIndicator1*" style:highest "edit_group_1"
+widget "*TrackEditIndicator2*" style:highest "edit_group_2"
+widget "*TrackEditIndicator3*" style:highest "edit_group_3"
+widget "*TrackEditIndicator4*" style:highest "edit_group_3"
+widget "*TrackEditIndicator5*" style:highest "edit_group_3"
+widget "*TrackEditIndicator6*" style:highest "edit_group_3"
+widget "*TrackEditIndicator7*" style:highest "edit_group_3"
+widget "*EditorTrackNameDisplay" style:highest "track_name_display"
+widget "*EditorTrackNameDisplay*" style:highest "track_name_display"
+widget "*EditorActiveTrackNameDisplay" style:highest "active_track_name_display"
+widget "*EditorActiveTrackNameDisplay*" style:highest "active_track_name_display"
+widget "*CrossfadeEditAuditionButton" style:highest "red_when_active"
+widget "*CrossfadeEditAuditionButton*" style:highest "red_when_active"
+widget "*CrossfadeEditCurveButton" style:highest "red_when_active"
+widget "*CrossfadeEditCurveButton*" style:highest "red_when_active"
+widget "*CrossfadeEditLabel" style:highest "medium_text"
+widget "*CrossfadeEditFrame" style:highest "base_frame"
+widget "*MouseModeButton" style:highest "default_buttons_menus"
+widget "*MouseModeButton*" style:highest "default_buttons_menus"
+widget "*EditorMainCanvas" style:highest "main_canvas_area"
+widget "*AudioTrackControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
+widget "*BusControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
+widget "*AutomationTrackControlsBaseInactiveUnselected" style:highest "track_controls_inactive"
+widget "*AutomationTrackName" style:highest "automation_track_name"
+widget "*AudioTrackControlsBaseInactiveSelected" style:highest "track_controls_inactive"
+widget "*BusControlsBaseInactiveSelected" style:highest "track_controls_inactive"
+widget "*AutomationTrackControlsBaseInactiveSelected" style:highest "track_controls_inactive"
+widget "*AudioTrackStripBaseInactive" style:highest "track_controls_inactive"
+widget "*AudioBusStripBaseInactive" style:highest "track_controls_inactive"
+widget "*AudioTrackControlsBaseSelected" style:highest "edit_controls_base_selected"
+widget "*BusControlsBaseSelected" style:highest "edit_controls_base_selected"
+widget "*AutomationTrackControlsBase" style:highest "automation_track_controls_base"
+widget "*AutomationTrackControlsBaseSelected" style:highest "edit_controls_base_selected"
+widget "*EditorMenuBar*" style:highest "black_mackie_menu_bar"
+widget "*MainMenuBar*" style:highest "black_mackie_menu_bar"
+widget "*ZoomClickBox" style:highest "medium_bold_entry"
+widget "*PluginParameterLabel" style:highest "medium_text"
+widget "*PluginNameInfo" style:highest "plugin_name_text"
+widget "*PluginMakerInfo" style:highest "plugin_maker_text"
+widget "*PluginParameterInfo" style:highest "medium_text"
+widget "*MotionControllerValue" style:highest "medium_entry"
+widget "*ParameterValueDisplay" style:highest "medium_bold_entry"
+widget "*PluginUIClickBox" style:highest "medium_bold_entry"
+widget "*PluginUIClickBox*" style:highest "medium_bold_entry"
+widget "*PluginSlider" style:highest "plugin_slider"
+widget "*RedirectSelector" style:highest "redirect_list_display"
+widget "*RedirectSelector.*" style:highest "redirect_list_display"
+widget "*EditGroupDisplay" style:highest "treeview_display"
+widget "*TrackListDisplay" style:highest "treeview_display"
+widget "*RegionListDisplay" style:highest "treeview_display"
+widget "*NamedSelectionDisplay" style:highest "treeview_display"
+widget "*SnapshotDisplay" style:highest "treeview_display"
+widget "*MixerTrackCommentArea" style:highest "option_entry"
+widget "*MixerPanZone" style:highest "pan_zone"
+widget "*MixerTrackDisplayList" style:highest "treeview_display"
+widget "*MixerSnapshotDisplayList" style:highest "treeview_display"
+widget "*MixerAuxDisplayList" style:highest "treeview_display"
+widget "*MixerGroupList" style:highest "treeview_display"
+widget "*RegionEditorLabel" style:highest "medium_text"
+widget "*RegionEditorSmallLabel" style:highest "small_text"
+widget "*RegionEditorEntry" style:highest "medium_entry"
+widget "*RegionEditorClock" style:highest "default_clock_display"
+widget "*RegionEditorToggleButton" style:highest "paler_red_when_active"
+widget "*RegionEditorToggleButton*" style:highest "paler_red_when_active"
+widget "*MixerStripSpeedBase" style:highest "small_entry"
+widget "*MixerStripSpeedBase*" style:highest "small_entry"
+widget "*MixerStripSpeedBaseNotOne" style:highest "small_red_on_black_entry"
+widget "*MixerStripSpeedBaseNotOne*" style:highest "small_red_on_black_entry"
+widget "*MixerStripGainDisplay" style:highest "small_entry"
+widget "*MixerStripGainDisplay*" style:highest "small_entry"
+widget "*MixerStripGainUnitButton" style:highest "very_small_button"
+widget "*MixerStripGainUnitButton*" style:highest "very_small_button"
+widget "*MixerStripMeterPreButton" style:highest "very_small_button"
+widget "*MixerStripMeterPreButton*" style:highest "very_small_button"
+widget "*MixerStripPeakDisplay*" style:highest "red_active_small_entry"
+widget "*MixerStripPeakDisplayPeak*" style:highest "peak_display_peaked_entry"
+widget "*MixerStripSelectedFrame" style:highest "selected_strip_frame"
+widget "*MixerStripFrame" style:highest "base_frame"
+widget "*HWMonitorButton" style:highest "red_when_active"
+widget "*HWMonitorButton*" style:highest "red_when_active"
+widget "*BypassButton" style:highest "red_when_active"
+widget "*BypassButton*" style:highest "red_when_active"
+widget "*TransportSoloAlert" style:highest "flashing_alert"
+widget "*TransportSoloAlert.*" style:highest "flashing_alert"
+widget "*TransportAuditioningAlert" style:highest "flashing_alert"
+widget "*TransportAuditioningAlert.*" style:highest "flashing_alert"
+widget "*FadeCurve" style:highest "medium_bold_entry"
+widget "*FadeCurve*" style:highest "medium_bold_entry"
+widget "*IOSelectorButton" style:highest "default_buttons_menus"
+widget "*IOSelectorButton*" style:highest "default_buttons_menus"
+widget "*IOSelectorList" style:highest "medium_entry_noselection_fg"
+widget "*IOSelectorPortList" style:highest "io_selector_port_list"
+widget "*IOSelectorPortList.*" style:highest "io_selector_port_list"
+widget "*IOSelectorPortListSelected" style:highest "selected_io_selector_port_list"
+widget "*IOSelectorPortListSelected.*" style:highest "selected_io_selector_port_list"
+widget "*IOSelectorNotebook" style:highest "io_selector_notebook"
+widget "*IOSelectorNotebookTab" style:highest "io_selector_notebook"
+widget "*IOSelectorFrame" style:highest "base_frame"
+widget "*ConnectionEditorButton" style:highest "default_buttons_menus"
+widget "*ConnectionEditorButton*" style:highest "default_buttons_menus"
+widget "*ConnectionEditorList" style:highest "medium_entry_noselection_fg"
+widget "*ConnectionEditorConnectionList" style:highest "medium_entry"
+widget "*ConnectionEditorPortList" style:highest "io_selector_port_list"
+widget "*ConnectionEditorPortListSelected" style:highest "selected_io_selector_port_list"
+widget "*ConnectionEditorNotebook" style:highest "io_selector_notebook"
+widget "*ConnectionEditorNotebookTab" style:highest "io_selector_notebook"
+widget "*ConnectionEditorFrame" style:highest "base_frame"
+widget "*RouteParamsListDisplay" style:highest "inspector_track_list_display"
+widget "*RouteParamsPreListDisplay" style:highest "inspector_redirect_list_display"
+widget "*RouteParamsPostListDisplay" style:highest "inspector_redirect_list_display"
+widget "*TearOffArrow" style:highest "tearoff_arrow"
+widget "*RouteParamsTitleButton" style:highest "medium_text"
+widget "*RouteParamsTitleLabel" style:highest "medium_text"
+widget "*PluginAutomateRecordButton" style:highest "small_red_active_and_selected_button"
+widget "*PluginAutomateRecordButton*" style:highest "small_red_active_and_selected_button"
+widget "*PluginAutomatePlayButton" style:highest "small_red_active_and_selected_button"
+widget "*PluginAutomatePlayButton*" style:highest "small_red_active_and_selected_button"
+widget "*PluginAutomateButton" style:highest "small_button"
+widget "*PluginAutomateButton*" style:highest "small_button"
+widget "*PluginSaveButton" style:highest "small_button"
+widget "*PluginSaveButton*" style:highest "small_button"
+widget "*PluginLoadButton" style:highest "small_button"
+widget "*PluginLoadButton*" style:highest "small_button"
+widget "*FaderMetricsStrip" style:highest "meter_metrics_strip"
+widget "*MeterMetricsStrip" style:highest "meter_metrics_strip"
+widget "*MetricDialogFrame" style:highest "base_frame"
+widget "*MetricEntry" style:highest "medium_bold_entry"
+widget "*MetricButton" style:highest "default_buttons_menus"
+widget "*MetricButton.*" style:highest "default_buttons_menus"
+widget "*MetricLabel" style:highest "medium_text"
+widget "*TimeStretchButton" style:highest "default_buttons_menus"
+widget "*TimeStretchButton.*" style:highest "default_buttons_menus"
+widget "*TimeStretchProgress" style:highest "default_buttons_menus"
+widget "*ChoiceWindow" style:highest "default_buttons_menus"
+widget "*ChoicePrompt" style:highest "default_buttons_menus"
+widget "*ChoiceButton" style:highest "default_buttons_menus"
+widget "*ChoiceButton*" style:highest "default_buttons_menus"
+widget "*SelectionModeButton" style:highest "default_buttons_menus"
+widget "*SelectionModeButton*" style:highest "default_buttons_menus"
+widget "*TrackLabel" style:highest "medium_text"
+widget "*TrackPlugName" style:highest "medium_text"
+widget "*TrackParameterName" style:highest "small_text"
+widget "*AddRouteDialog*" style:highest "medium_text"
+widget "*AddRouteDialog.GtkLabel" style:highest "medium_text"
+widget "*AddRouteDialogChannelChoice" style:highest "medium_bold_entry"
+widget "*AddRouteDialogSpinner" style:highest "medium_bold_entry"
+widget "*AddRouteDialogSpinner*" style:highest "medium_bold_entry"
+widget "*AddRouteDialogRadioButton" style:highest "red_when_active"
+widget "*AddRouteDialogButton" style:highest "default_buttons_menus"
+widget "*AddRouteDialogNameTemplateEntry" style:highest "medium_bold_entry"
+widget "*NewSessionIOLabel" style:highest "larger_bold_text"
+widget "*NewSessionSR1Label" style:highest "red_medium_text"
+widget "*NewSessionSR2Label" style:highest "medium_text"
+widget "*NewSessionChannelChoice" style:highest "medium_bold_entry"
+widget "*NewSessionMainButton" style:highest "larger_bold_text"
+widget "*NewSessionMainButton*" style:highest "larger_bold_text"
+widget "*NewSessionMainLabel" style:highest "larger_bold_text"
+widget "*LocationEditRowClock" style:highest "location_rows_clock"
+widget "*LocationEditNameLabel" style:highest "medium_text"
+widget "*LocationEditSetButton" style:highest "location_row_button"
+widget "*LocationEditSetButton*" style:highest "location_row_button"
+widget "*LocationEditGoButton" style:highest "location_row_button"
+widget "*LocationEditGoButton*" style:highest "location_row_button"
+widget "*LocationEditCdButton" style:highest "small_red_active_and_selected_button"
+widget "*LocationEditCdButton*" style:highest "small_red_active_and_selected_button"
+widget "*LocationEditHideButton" style:highest "small_red_active_and_selected_button"
+widget "*LocationEditHideButton*" style:highest "small_red_active_and_selected_button"
+widget "*LocationEditNumberLabel" style:highest "small_text"
+widget "*LocationLocEditorFrame" style:highest "base_frame"
+widget "*LocationRangeEditorFrame" style:highest "base_frame"
+widget "*LocationEditNameEntry" style:highest "option_entry"
+widget "*LocationAddLocationButton" style:highest "default_buttons_menus"
+widget "*LocationAddLocationButton*" style:highest "default_buttons_menus"
+widget "*LocationAddRangeButton" style:highest "default_buttons_menus"
+widget "*LocationAddRangeButton*" style:highest "default_buttons_menus"
+widget "*LocationEditRemoveButton" style:highest "location_row_button"
+widget "*LocationEditRemoveButton*" style:highest "location_row_button"
+widget "*PanSlider" style:highest "pan_slider"
+widget "*PanningLinkButton" style:highest "mixer_red_active_button"
+widget "*PanningLinkButton.*" style:highest "mixer_red_active_button"
+widget "*PanningLinkDirectionButton" style:highest "very_small_button"
+widget "*PanningLinkDirectionButton.*" style:highest "very_small_button"
+widget "*ChannelCountSelector" style:highest "medium_bold_entry"
+widget "*ChannelCountSelector.GtkArrow" style:highest "default_buttons_menus"
+widget "*RegionListWholeFile" style:highest "treeview_parent_node"
+widget "*EditorHScrollbar" style:highest "editor_hscrollbar"