Merged changes from trunk 1699:1751 into 2.1-staging

git-svn-id: svn://localhost/ardour2/branches/2.1-staging@1752 d708f5d6-7413-0410-9779-e7cbd77b26cf

83 files changed, 1772 insertions, 639 deletions

diff --git a/libs/ardour/ardour/configuration_variable.h b/libs/ardour/ardour/configuration_variable.h
index 81e282ff64..fa149672be 100644
--- a/libs/ardour/ardour/configuration_variable.h
+++ b/libs/ardour/ardour/configuration_variable.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_configuration_variable_h__
 #define __ardour_configuration_variable_h__
 
diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h
index 4f0bae1208..395732e727 100644
--- a/libs/ardour/ardour/configuration_vars.h
+++ b/libs/ardour/ardour/configuration_vars.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 /* IO connection */
 
 CONFIG_VARIABLE (AutoConnectOption, output_auto_connect, "output-auto-connect", AutoConnectOption (0))
@@ -118,6 +137,8 @@ CONFIG_VARIABLE (bool, use_vst, "use-vst", true)
 CONFIG_VARIABLE (uint32_t, subframes_per_frame, "subframes-per-frame", 100)
 CONFIG_VARIABLE (uint32_t, saved_history_depth, "save-history-depth", 100)
 CONFIG_VARIABLE (bool, use_overlap_equivalency, "use-overlap-equivalency", false)
+CONFIG_VARIABLE (bool, periodic_safety_backups, "periodic-safety-backups", true)
+CONFIG_VARIABLE (uint32_t, periodic_safety_backup_interval, "periodic-safety-backup-interval", 120)
 
 /* BWAV */
 
diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h
index 39e4803637..73d9b21579 100644
--- a/libs/ardour/ardour/control_protocol_manager.h
+++ b/libs/ardour/ardour/control_protocol_manager.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef ardour_control_protocol_manager_h
 #define ardour_control_protocol_manager_h
 
diff --git a/libs/ardour/ardour/export.h b/libs/ardour/ardour/export.h
index 66e5b1b7d5..bf1297d3cb 100644
--- a/libs/ardour/ardour/export.h
+++ b/libs/ardour/ardour/export.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_export_h__
 #define __ardour_export_h__
 
diff --git a/libs/ardour/ardour/noise.h b/libs/ardour/ardour/noise.h
index b06b02399b..f775fcce36 100644
--- a/libs/ardour/ardour/noise.h
+++ b/libs/ardour/ardour/noise.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef NOISE_H
 #define NOISE_H
 
diff --git a/libs/ardour/ardour/peak.h b/libs/ardour/ardour/peak.h
index 2c8abe7cf4..eaeafe0f5d 100644
--- a/libs/ardour/ardour/peak.h
+++ b/libs/ardour/ardour/peak.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_peak_h__
 #define __ardour_peak_h__
 
diff --git a/libs/ardour/ardour/playlist_factory.h b/libs/ardour/ardour/playlist_factory.h
index dcf9ab62d6..be7c290a8c 100644
--- a/libs/ardour/ardour/playlist_factory.h
+++ b/libs/ardour/ardour/playlist_factory.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_playlist_factory_h__
 #define __ardour_playlist_factory_h__
 
diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h
index b4d2e5e99d..bce723d857 100644
--- a/libs/ardour/ardour/plugin_manager.h
+++ b/libs/ardour/ardour/plugin_manager.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_plugin_manager_h__
 #define __ardour_plugin_manager_h__
 
diff --git a/libs/ardour/ardour/profile.h b/libs/ardour/ardour/profile.h
index 2ee47d39ea..3347447915 100644
--- a/libs/ardour/ardour/profile.h
+++ b/libs/ardour/ardour/profile.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_profile_h__
 #define __ardour_profile_h__
 
diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h
index f1f5d1e69f..197983a29d 100644
--- a/libs/ardour/ardour/region_factory.h
+++ b/libs/ardour/ardour/region_factory.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_region_factory_h__
 #define __ardour_region_factory_h__
 
diff --git a/libs/ardour/ardour/route_group_specialized.h b/libs/ardour/ardour/route_group_specialized.h
index 250d3744df..9e04c46d0e 100644
--- a/libs/ardour/ardour/route_group_specialized.h
+++ b/libs/ardour/ardour/route_group_specialized.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_route_group_specialized_h__
 #define __ardour_route_group_specialized_h__
 
diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index 7f88f0624f..92e4fdade2 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 a14daa4485..70a9d7c96f 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -323,6 +323,8 @@ class Session : public PBD::StatefulDestructible
 	void disable_record (bool rt_context, bool force = false);
 	void step_back_from_record ();
 	
+	void maybe_write_autosave ();
+
 	/* Proxy signal for region hidden changes */
 
 	sigc::signal<void,boost::shared_ptr<Region> > RegionHiddenChange;
@@ -1609,6 +1611,7 @@ class Session : public PBD::StatefulDestructible
 
 	void jack_timebase_callback (jack_transport_state_t, nframes_t, jack_position_t*, int);
 	int  jack_sync_callback (jack_transport_state_t, jack_position_t*);
+	void reset_jack_connection (jack_client_t* jack);
 	void record_enable_change_all (bool yn);
 
 	XMLNode& state(bool);
diff --git a/libs/ardour/ardour/session_region.h b/libs/ardour/ardour/session_region.h
index 9217d4cb41..66868f6d18 100644
--- a/libs/ardour/ardour/session_region.h
+++ b/libs/ardour/ardour/session_region.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_session_region_h__
 #define __ardour_session_region_h__
 
diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 170facb1de..73b66ca20e 100644
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -138,6 +138,7 @@ class JACK_Slave : public Slave
 	bool ok() const;
 	nframes_t resolution() const { return 1; }
 	bool requires_seekahead () const { return false; }
+	void reset_client (jack_client_t* jack);
 
   private:
 	jack_client_t* jack;
diff --git a/libs/ardour/ardour/sndfile_helpers.h b/libs/ardour/ardour/sndfile_helpers.h
index b5cdeb0a7e..26a93ad124 100644
--- a/libs/ardour/ardour/sndfile_helpers.h
+++ b/libs/ardour/ardour/sndfile_helpers.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __sndfile_helpers_h__
 #define __sndfile_helpers_h__
 
diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h
index cc3863904a..c979a575cf 100644
--- a/libs/ardour/ardour/source_factory.h
+++ b/libs/ardour/ardour/source_factory.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_source_factory_h__
 #define __ardour_source_factory_h__
 
diff --git a/libs/ardour/ardour/timestamps.h b/libs/ardour/ardour/timestamps.h
index 4ebc28b2f9..a0aeeae13d 100644
--- a/libs/ardour/ardour/timestamps.h
+++ b/libs/ardour/ardour/timestamps.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_timestamps_h__
 #define __ardour_timestamps_h__
 
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 48085d4922..b372c14b57 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -610,7 +610,16 @@ AudioDiskstream::process (nframes_t transport_frame, nframes_t nframes, nframes_
 
 	if (nominally_recording || rec_nframes) {
 
-		for (n = 0, chan = c->begin(); chan != c->end(); ++chan, ++n) {
+		uint32_t limit = _io->n_inputs ();
+
+		/* one or more ports could already have been removed from _io, but our
+		   channel setup hasn't yet been updated. prevent us from trying to
+		   use channels that correspond to missing ports. note that the
+		   process callback (from which this is called) is always atomic
+		   with respect to port removal/addition.
+		*/
+
+		for (n = 0, chan = c->begin(); chan != c->end() && n < limit; ++chan, ++n) {
 			
 			ChannelInfo* chaninfo (*chan);
 
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 501482c840..1a7405dbd3 100644
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -30,6 +30,7 @@
 #include <ardour/crossfade.h>
 #include <ardour/crossfade_compare.h>
 #include <ardour/session.h>
+#include <pbd/enumwriter.h>
 
 #include "i18n.h"
 
@@ -381,6 +382,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 		}
 
 
+
 		OverlapType c = top->coverage (bottom->position(), bottom->last_frame());
 
 		try {
@@ -411,7 +413,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 				
 				xfade = boost::shared_ptr<Crossfade> (new Crossfade (top, bottom, xfade_length, top->first_frame(), StartOfIn));
 				add_crossfade (xfade);
-				
+
 				if (top_region_at (top->last_frame() - 1) == top) {
 					/* 
 					   only add a fade out if there is no region on top of the end of 'top' (which 
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 51251e1cba..bb91625583 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -1133,6 +1133,7 @@ AudioEngine::reconnect_to_jack ()
 
 
 	if (session) {
+		session->reset_jack_connection (_jack);
 		nframes_t blocksize = jack_get_buffer_size (_jack);
 		session->set_block_size (blocksize);
 		session->set_frame_rate (jack_get_sample_rate (_jack));
diff --git a/libs/ardour/automation.cc b/libs/ardour/automation.cc
index 2e3116ba17..c6e96cfac8 100644
--- a/libs/ardour/automation.cc
+++ b/libs/ardour/automation.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <stdint.h>
 
 template<class AutomatedObject>
diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index 899790dddc..c79aa74698 100644
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <dlfcn.h>
 
 #include <pbd/compose.h>
@@ -78,6 +97,7 @@ ControlProtocolManager::drop_session ()
 		for (list<ControlProtocolInfo*>::iterator p = control_protocol_info.begin(); p != control_protocol_info.end(); ++p) {
 			// otherwise the ControlProtocol instances are not recreated in set_session
 			(*p)->requested = true;
+			(*p)->protocol = 0;
 		}
 	}
 }
diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc
index eae6c7cc52..c217b76422 100644
--- a/libs/ardour/crossfade.cc
+++ b/libs/ardour/crossfade.cc
@@ -550,7 +550,7 @@ Crossfade::compute (boost::shared_ptr<AudioRegion> a, boost::shared_ptr<AudioReg
 
 			_in = bottom;
 			_out = top;
-			_anchor_point = StartOfIn;
+			_anchor_point = EndOfOut;
 
 			if (model == FullCrossfade) {
 				_position = bottom->first_frame(); // "{"
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc
index 4220adf7eb..345fbe771d 100644
--- a/libs/ardour/enums.cc
+++ b/libs/ardour/enums.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <pbd/enumwriter.h>
 
 #include <ardour/types.h>
diff --git a/libs/ardour/jack_slave.cc b/libs/ardour/jack_slave.cc
index a06e295a09..f65be1deea 100644
--- a/libs/ardour/jack_slave.cc
+++ b/libs/ardour/jack_slave.cc
@@ -44,6 +44,12 @@ JACK_Slave::~JACK_Slave ()
 {
 }
 
+void
+JACK_Slave::reset_client (jack_client_t* j)
+{
+	jack = j;
+}
+
 bool
 JACK_Slave::locked() const
 {
diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index a86a3e9014..3b4aaae887 100644
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -137,6 +137,7 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full)
 		current.guard2++; 	 
 		
 		session.request_locate (mtc_frame, false); 	 
+		session.request_transport_speed (0);
 		update_mtc_status (MIDI::Parser::MTC_Stopped); 	 
 
  		reset ();
@@ -271,6 +272,7 @@ MTC_Slave::speed_and_position (float& speed, nframes_t& pos)
 		mtc_speed = 0;
 		pos = last.position;
 		session.request_locate (pos, false);
+		session.request_transport_speed (0);
 		update_mtc_status (MIDI::Parser::MTC_Stopped);
 		reset();
 		return false;
diff --git a/libs/ardour/po/el_GR.po b/libs/ardour/po/el_GR.po
index 5d8adef7d0..9ddd3e7188 100644
--- a/libs/ardour/po/el_GR.po
+++ b/libs/ardour/po/el_GR.po
@@ -1,79 +1,65 @@
-# Σχολιαστικός Τίτλος.
-# Πνευματικά Δικαιώματα (C) YEAR Paul Davis
-# Το πα�όν α�χείο διανέμεται υπό της ιδίας αδείας με του PACKAGE πακέτου.
-# ΠΡΩΤΟΣ ΔΗΜΙΟΥΡΓΟΣ <muadib@in.gr>, 2004.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Paul Davis
+# This file is distributed under the same license as the PACKAGE package.
+# Klearchos Gourgourinis <muadib@in.gr>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: libardour 0.664.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-29 21:03-0400\n"
-"PO-Revision-Date: 2003-05-21 12:50+0500\n"
-"Last-Translator: Muadibas\n"
+"POT-Creation-Date: 2003-06-29 21:03+0200\n"
+"PO-Revision-Date: 2007-04-16 00:38+0200\n"
+"Last-Translator: Klearchos Gourgourinis <muadib@in.gr>\n"
 "Language-Team: Hellenic(Greek)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: libs/ardour/audio_diskstream.cc:337
-#, fuzzy
 msgid "AudioDiskstream: Session doesn't know about a Playlist called \"%1\""
-msgstr ""
-"DiskStream: Η Συνεδ�ία δεν γνω�ίζει για την λίστα Αναπα�/γής με όνομα \"%1\""
+msgstr "AudioDiskStream: Η Συνεδ�ία δεν γνω�ίζει για λίστα Αναπα�/γής με όνομα \"%1\""
 
 #: libs/ardour/audio_diskstream.cc:342
-#, fuzzy
 msgid "AudioDiskstream: Playlist \"%1\" isn't an audio playlist"
-msgstr "DiskStream: Η Λίστα \"%1\" δεν είναι ηχητική λίστα αναπα�/γής"
+msgstr "AudioDiskStream: Η Λίστα \"%1\" δεν είναι ηχητική λίστα αναπα�/γής"
 
 #: libs/ardour/audio_diskstream.cc:433
-#, fuzzy
 msgid "AudioDiskstream %1: there is no existing playlist to make a copy of!"
-msgstr "DiskStream %1: δεν υπά�χει λίστα αναπα�/γής για να γίνει αντιγ�αφή!"
+msgstr "AudioDiskstream %1: δεν υπά�χει λίστα αναπα�/γής για να γίνει αντιγ�αφή!"
 
-#: libs/ardour/audio_diskstream.cc:1114 libs/ardour/audio_diskstream.cc:1125
-#, fuzzy
-msgid ""
-"AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
-msgstr ""
-"DiskStream %1: κατα την αναγόμωση, δεν μπό�εσα να διαβάσω %2 από τη λίστα "
-"αναπα�/γής στο frame %3"
+#: libs/ardour/audio_diskstream.cc:1114
+#: libs/ardour/audio_diskstream.cc:1125
+msgid "AudioDiskstream %1: when refilling, cannot read %2 from playlist at frame %3"
+msgstr "AudioDiskstream %1: κατα την αναγόμωση, δεν μπό�εσα να διαβάσω %2 από τη λίστα αναπα�/γής στο frame %3"
 
 #: libs/ardour/audio_diskstream.cc:1254
-#, fuzzy
 msgid "AudioDiskstream %1: cannot read %2 from playlist at frame %3"
-msgstr ""
-"DiskStream %1: δεν μπό�εσα να διαβάσω %2 από τη λίστα αναπα�/γής στο frame %3"
+msgstr "AudioDiskstream %1: δεν μπό�εσα να διαβάσω %2 από τη λίστα αναπα�/γής στο frame %3"
 
-#: libs/ardour/audio_diskstream.cc:1621 libs/ardour/audio_diskstream.cc:1638
-#, fuzzy
+#: libs/ardour/audio_diskstream.cc:1621
+#: libs/ardour/audio_diskstream.cc:1638
 msgid "AudioDiskstream %1: cannot write to disk"
-msgstr "DiskStream %1: δεν μπο�ώ να γ�άψω στο δίσκο"
+msgstr "AudioDiskstream %1: δεν μπο�ώ να γ�άψω στο δίσκο"
 
 #: libs/ardour/audio_diskstream.cc:1698
-#, fuzzy
 msgid "AudioDiskstream \"%1\": cannot flush captured data to disk!"
-msgstr ""
-"DiskStream \"%1\": δεν γίνεται να απο��ιφθο�ν δειγματοληψίες στο δίσκο!"
+msgstr "AudioDiskstream \"%1\": αδ�νατη η εκκαθά�ιση δειγματοληπτικών δεδομένων στο δίσκο!"
 
 #: libs/ardour/audio_diskstream.cc:1796
 msgid "%1: could not create region for complete audio file"
 msgstr "%1: δεν μπό�εσα να δημιου�γήσω πε�ιοχή για ολόκλη�ο audio file"
 
 #: libs/ardour/audio_diskstream.cc:1819
-#, fuzzy
 msgid "AudioDiskstream: could not create region for captured audio!"
-msgstr "DiskStream: δεν μπό�εσα να δημιου�γήσω πε�ιοχή για δειγματοληψίες!"
+msgstr "AudioDiskstream: δεν μπό�εσα να δημιου�γήσω πε�ιοχή για δειγματοληψίες!"
 
 #: libs/ardour/audio_diskstream.cc:1874
-#, fuzzy
 msgid "programmer error: %1"
-msgstr "σφάλμα π�ογ�αμματισμο�: %1"
+msgstr "σφάλμα π�ογ�αμματιστή: %1"
 
 #: libs/ardour/audio_diskstream.cc:2146
-#, fuzzy
 msgid "AudioDiskstream: channel %1 out of range"
-msgstr "DiskStream: κανάλι εκτός διαστήματος"
+msgstr "AudioDiskstream: κανάλι %1 εκτός διαστήματος"
 
 #: libs/ardour/audio_diskstream.cc:2171
 msgid "%1:%2 new capture file not initialized correctly"
@@ -84,68 +70,66 @@ msgid "Location \"%1\" not valid for track loop (start >= end)"
 msgstr "Η Τοποθεσία \"%1\" δεν είναι ικανή για track loop (α�χή >= τέλος)"
 
 #: libs/ardour/audio_diskstream.cc:2485
-#, fuzzy
 msgid "%1: cannot restore pending capture source file %2"
-msgstr "Εισαγωγή: δεν μπο�ώ να ανοίξω το εισαγμένο α�χείο ήχου \"%1\""
+msgstr "%1: δεν μπο�ώ να ανοίξω το α�χείο %2 από την απαιτο�μενη πηγή"
 
 #: libs/ardour/audio_diskstream.cc:2507
 msgid "%1: incorrect number of pending sources listed - ignoring them all"
-msgstr ""
+msgstr "%1: ετυπώθη λανθασμένος α�ιθμός απαιτο�μενων πηγών - αγνοήθηκαν όλες"
 
 #: libs/ardour/audio_diskstream.cc:2523
 msgid "%1: cannot create whole-file region from pending capture sources"
-msgstr ""
+msgstr "%1: αδ�νατη η δημιου�γία ακέ�αιας πε�ιοχής από τις απαιτο�μενες πηγές ηχοληψίας"
 
 #: libs/ardour/audio_diskstream.cc:2535
-#, fuzzy
 msgid "%1: cannot create region from pending capture sources"
-msgstr "%1: δεν μπό�εσα να δημιου�γήσω πε�ιοχή για ολόκλη�ο audio file"
+msgstr "%1: δεν μπό�εσα να δημιου�γήσω πε�ιοχή για τις απαιτο�μενες πηγές"
 
 #: libs/ardour/audio_library.cc:92
 msgid "channels"
-msgstr ""
+msgstr "κανάλια"
 
 #: libs/ardour/audio_library.cc:93
-#, fuzzy
 msgid "samplerate"
-msgstr "ξεχω�ιστό"
+msgstr ""
 
 #: libs/ardour/audio_library.cc:94
 msgid "resolution"
-msgstr ""
+msgstr "ανάλυση"
 
 #: libs/ardour/audio_library.cc:95
-#, fuzzy
 msgid "format"
-msgstr "float"
+msgstr ""
 
 #: libs/ardour/audio_library.cc:102
 msgid "Could not open %1.  Audio Library not saved"
 msgstr "Δεν μπό�εσα να ανοίξω το %1.  Η Audio Library δεν αποθηκε�θηκε"
 
-#: libs/ardour/audio_playlist.cc:53 libs/ardour/audio_playlist.cc:63
-#: libs/ardour/audio_playlist.cc:74 libs/ardour/audio_playlist.cc:121
-#: libs/ardour/insert.cc:76 libs/ardour/insert.cc:95 libs/ardour/insert.cc:120
-#: libs/ardour/insert.cc:838 libs/ardour/insert.cc:846 libs/ardour/send.cc:39
-#: libs/ardour/send.cc:53 libs/ardour/send.cc:62
-#: libs/ardour/session_state.cc:1621 libs/ardour/session_state.cc:1667
+#: libs/ardour/audio_playlist.cc:53
+#: libs/ardour/audio_playlist.cc:63
+#: libs/ardour/audio_playlist.cc:74
+#: libs/ardour/audio_playlist.cc:121
+#: libs/ardour/insert.cc:76
+#: libs/ardour/insert.cc:95
+#: libs/ardour/insert.cc:120
+#: libs/ardour/insert.cc:838
+#: libs/ardour/insert.cc:846
+#: libs/ardour/send.cc:39
+#: libs/ardour/send.cc:53
+#: libs/ardour/send.cc:62
+#: libs/ardour/session_state.cc:1621
+#: libs/ardour/session_state.cc:1667
 msgid "initial state"
 msgstr "π�ωτα�χική κατάσταση"
 
-#: libs/ardour/audio_playlist.cc:275 libs/ardour/audio_playlist.cc:769
-msgid ""
-"programming error: non-audio Region passed to remove_overlap in audio "
-"playlist"
-msgstr ""
-"σφάλμα π�ογ�αμματισμο�: μη-ηχητική Πε�ιοχή πέ�ασε σε remove_overlap στην "
-"audio playlist"
+#: libs/ardour/audio_playlist.cc:275
+#: libs/ardour/audio_playlist.cc:769
+msgid "programming error: non-audio Region passed to remove_overlap in audio playlist"
+msgstr "σφάλμα π�ογ�αμματισμο�: μη-ηχητική Πε�ιοχή πέ�ασε σε remove_overlap στην audio playlist"
 
 #: libs/ardour/audio_playlist.cc:402
-msgid ""
-"programming error: non-audio Region tested for overlap in audio playlist"
-msgstr ""
-"σφάλμα π�ογ�αμματισμο�: μη-ηχητική Πε�ιοχή ελέγχθη για υπε�πήδηση(overlap) "
-"στην λίστα αναπα�/γής του ήχου"
+msgid "programming error: non-audio Region tested for overlap in audio playlist"
+msgstr "σφάλμα π�ογ�αμματισμο�: μη-ηχητική Πε�ιοχή ελέγχθη για υπε�πήδηση(overlap) στην λίστα αναπα�/γής του ήχου"
 
 #: libs/ardour/audio_playlist.cc:878
 msgid "xfade change"
@@ -155,48 +139,47 @@ msgstr "αλλαγή xfade"
 msgid "region modified"
 msgstr "η πε�ιοχή μετεβλήθη"
 
-#: libs/ardour/audio_track.cc:125 libs/ardour/io.cc:1716
+#: libs/ardour/audio_track.cc:125
+#: libs/ardour/io.cc:1716
 #: libs/ardour/io.cc:1826
 msgid "Unknown connection \"%1\" listed for input of %2"
 msgstr "Άγνωστη σ�νδεση \"%1\" στη λίστα εισόδου του %2"
 
-#: libs/ardour/audio_track.cc:127 libs/ardour/io.cc:1718
+#: libs/ardour/audio_track.cc:127
+#: libs/ardour/io.cc:1718
 #: libs/ardour/io.cc:1828
-#, fuzzy
 msgid "in 1"
-msgstr "in %lu"
+msgstr ""
 
-#: libs/ardour/audio_track.cc:128 libs/ardour/io.cc:1719
+#: libs/ardour/audio_track.cc:128
+#: libs/ardour/io.cc:1719
 #: libs/ardour/io.cc:1829
 msgid "No input connections available as a replacement"
-msgstr ""
+msgstr "Καμία διαθέσιμη input σ�νδεση ως εναλλακτική"
 
-#: libs/ardour/audio_track.cc:132 libs/ardour/io.cc:1723
+#: libs/ardour/audio_track.cc:132
+#: libs/ardour/io.cc:1723
 #: libs/ardour/io.cc:1833
 msgid "Connection %1 was not available - \"in 1\" used instead"
-msgstr ""
+msgstr "Η Σ�νδεση %1 δεν ήταν διαθέσιμη - Αντ'αυτής χ�ησιμοποιήθηκε η \"in 1\"  "
 
-#: libs/ardour/audio_track.cc:141 libs/ardour/io.cc:1842
+#: libs/ardour/audio_track.cc:141
+#: libs/ardour/io.cc:1842
 msgid "improper input channel list in XML node (%1)"
 msgstr "ακατάλληλη λίστα καναλιών εισόδου στον κόμβο XML (%1)"
 
-#: libs/ardour/audio_track.cc:186 libs/ardour/audio_track.cc:199
+#: libs/ardour/audio_track.cc:186
+#: libs/ardour/audio_track.cc:199
 msgid "AudioTrack: diskstream \"%1\" not known by session"
 msgstr "AudioTrack: το diskstream \"%1\" είναι μή αναγνω�ίσιμο από τη συνεδ�ία"
 
 #: libs/ardour/audio_track.cc:297
-#, fuzzy
-msgid ""
-"MIDI rec_enable control specification for %1 is incomplete, so it has been "
-"ignored"
-msgstr ""
-"Η π�οδιαγ�αφή ελέγχου του MIDI gain για το %1 είναι ημιτελής, με αποτέλεσμα "
-"να αγνοηθεί"
+msgid "MIDI rec_enable control specification for %1 is incomplete, so it has been ignored"
+msgstr "Η π�οδιαγ�αφή ελέγχου του MIDI rec_enable για το %1 είναι ημιτελής, με αποτέλεσμα να αγνοηθεί"
 
 #: libs/ardour/audio_track.cc:309
 msgid "programming error: AudioTrack given state without diskstream!"
-msgstr ""
-"σφάλμα π�ογ�αμματισμο�: εδόθη κατάσταση στην AudioTrack δίχως diskstream!"
+msgstr "σφάλμα π�ογ�αμματισμο�: εδόθη κατάσταση στην AudioTrack δίχως diskstream!"
 
 #: libs/ardour/audioengine.cc:144
 msgid "cannot activate JACK client"
@@ -216,9 +199,10 @@ msgstr "η σ�νδεση εκλήθη π�ιν να εκκινηθεί η engin
 
 #: libs/ardour/audioengine.cc:503
 msgid "AudioEngine: cannot connect %1 (%2) to %3 (%4)"
-msgstr ""
+msgstr "AudioEngine: αδ�νατη η σ�νδεση %1 (%2) σε %3 (%4)"
 
-#: libs/ardour/audioengine.cc:516 libs/ardour/audioengine.cc:545
+#: libs/ardour/audioengine.cc:516
+#: libs/ardour/audioengine.cc:545
 msgid "disconnect called before engine was started"
 msgstr "η αποσ�νδεση εκλήθη π�ιν να εκκινηθεί η engine"
 
@@ -235,9 +219,8 @@ msgid "get_nth_physical called before engine was started"
 msgstr "η �ουτίνα get_nth_physical εκλήθη π�ιν να εκκινηθεί η engine"
 
 #: libs/ardour/audioengine.cc:739
-#, fuzzy
 msgid "get_port_total_latency() called with no JACK client connection"
-msgstr "η �ουτίνα get_port_total_latency() εκλήθη π�ιν να εκκινηθεί η engine"
+msgstr "η �ουτίνα get_port_total_latency() εκλήθη χω�ίς την εκκίνηση κάποιου JACK client"
 
 #: libs/ardour/audioengine.cc:745
 msgid "get_port_total_latency() called before engine was started"
@@ -245,43 +228,44 @@ msgstr "η �ουτίνα get_port_total_latency() εκλήθη π�ιν να ε
 
 #: libs/ardour/audioengine.cc:869
 msgid "Unable to connect to JACK server"
-msgstr ""
+msgstr "Αδ�νατη η σ�νδεση στον JACK server"
 
 #: libs/ardour/audioengine.cc:872
 msgid "Could not connect to JACK server as  \"%1\""
-msgstr ""
+msgstr "Αδ�νατη η σ�νδεση στον JACK server ως  \"%1\""
 
 #: libs/ardour/audioengine.cc:877
 msgid "JACK server started"
-msgstr ""
+msgstr "Ένα�ξη JACK server"
 
 #: libs/ardour/audioengine.cc:911
 msgid "cannot shutdown connection to JACK"
-msgstr ""
+msgstr "Αδ�νατος ο τε�ματισμός συνδέσεως με τον JACK"
 
 #: libs/ardour/audioengine.cc:936
 msgid "failed to connect to JACK"
-msgstr ""
+msgstr "Αποτυχία συνδέσεως με τον JACK"
 
 #: libs/ardour/audioengine.cc:952
-#, fuzzy
 msgid "could not reregister %1"
-msgstr "Σφάλμα: δεν μπό�εσα να γ�άψω %1"
+msgstr "αδ�νατη η επανακαταγ�αφή %1"
 
 #: libs/ardour/audioengine.cc:1009
 msgid "could not reconnect %1 and %2 (err = %3)"
-msgstr ""
+msgstr "Αδ�νατη η επανασ�νδεση %1 και %2 (err = %3)"
 
-#: libs/ardour/audiofilesource.cc:444 libs/ardour/session_state.cc:3095
-msgid ""
-"there are already 1000 files with names like %1; versioning discontinued"
+#: libs/ardour/audiofilesource.cc:444
+#: libs/ardour/session_state.cc:3095
+msgid "there are already 1000 files with names like %1; versioning discontinued"
 msgstr "Υπά�χουν ήδη 1000 α�χεία με ονόματα όπως %1; μη-συνεχές versioning"
 
-#: libs/ardour/audiofilesource.cc:458 libs/ardour/session_state.cc:3109
+#: libs/ardour/audiofilesource.cc:458
+#: libs/ardour/session_state.cc:3109
 msgid "cannot rename audio file source from %1 to %2 (%3)"
 msgstr "δεν μπο�ώ να μετονομάσω την πηγή του audio file από %1 σε %2 (%3)"
 
-#: libs/ardour/audiofilesource.cc:465 libs/ardour/session_state.cc:3124
+#: libs/ardour/audiofilesource.cc:465
+#: libs/ardour/session_state.cc:3124
 msgid "cannot remove peakfile %1 for %2 (%3)"
 msgstr "δεν μπο�ώ να απαλοίψω το peakfile %1 για %2 (%3)"
 
@@ -298,9 +282,8 @@ msgstr ""
 "\t"
 
 #: libs/ardour/audiofilesource.cc:539
-#, fuzzy
 msgid "Filesource: cannot find required file (%1): while searching %2"
-msgstr "Filesource: δεν ευ�έθη το απαιτο�μενο α�χείο (%1): %2"
+msgstr "Filesource: δεν ευ�έθη το απαιτο�μενο α�χείο (%1): κατά την αναζήτηση του %2"
 
 #: libs/ardour/audiofilesource.cc:562
 msgid "Filesource: cannot find required file (%1): %2"
@@ -310,30 +293,28 @@ msgstr "Filesource: δεν ευ�έθη το απαιτο�μενο α�χείο
 msgid "Filesource: cannot check for existing file (%1): %2"
 msgstr "Filesource: δεν μπο�ώ να ελέγξω για το υπά�χον α�χείο (%1): %2"
 
-#: libs/ardour/audiofilesource.cc:636 libs/ardour/insert.cc:525
+#: libs/ardour/audiofilesource.cc:636
+#: libs/ardour/insert.cc:525
 #: libs/ardour/sndfilesource.cc:113
 msgid "programming error: %1"
 msgstr "σφάλμα π�ογ�αμματισμο�: %1"
 
 #: libs/ardour/audiofilesource.cc:641
-#, fuzzy
 msgid "cannot rename audio file for %1 to %2"
-msgstr "δεν μπο�ώ να μετονομάσω την πηγή του audio file από %1 σε %2 (%3)"
+msgstr "δεν μπο�ώ να μετονομάσω το audio file για το %1 σε %2"
 
 #: libs/ardour/audiofilter.cc:45
 msgid "audiofilter: error creating name for new audio file based on %1"
-msgstr ""
-"audiofilter: σφάλμα στη δημιου�γία ονόματος για νέο audio file βασισμένο σε %"
-"1"
+msgstr "audiofilter: σφάλμα στη δημιου�γία ονόματος για νέο audio file βασισμένο σε %1"
 
 #: libs/ardour/audiofilter.cc:58
 msgid "audiofilter: error creating new audio file %1 (%2)"
 msgstr "audiofilter: σφάλμα στη δημιου�γία νέου audio file %1 (%2)"
 
-#: libs/ardour/audioregion.cc:857 libs/ardour/audioregion.cc:919
-#, fuzzy
+#: libs/ardour/audioregion.cc:857
+#: libs/ardour/audioregion.cc:919
 msgid "fade in change"
-msgstr "αλλαγή xfade"
+msgstr "αλλαγή fade in"
 
 #: libs/ardour/audioregion.cc:1349
 #, c-format
@@ -341,78 +322,69 @@ msgid "normalized to %.2fdB"
 msgstr "εξομαλ�νθηκε στα %.2fdB"
 
 #: libs/ardour/audioregion.cc:1367
-#, fuzzy
 msgid "envelope change"
-msgstr "αλλαγή ενε�γο�"
+msgstr "αλλαγή envelope"
 
 #: libs/ardour/audiosource.cc:143
 msgid "poll on peak request pipe failed (%1)"
 msgstr ""
 
 #: libs/ardour/audiosource.cc:150
-#, fuzzy
 msgid "Error on peak thread request pipe"
-msgstr "Σφάλμα στο transport thread request pipe"
+msgstr "Σφάλμα στο peak thread request pipe"
 
 #: libs/ardour/audiosource.cc:183
-#, fuzzy
 msgid "Error reading from peak request pipe"
-msgstr "Σφάλμα στην ανάγνωση από transport request pipe"
+msgstr "Σφάλμα στην ανάγνωση από peak request pipe"
 
-#: libs/ardour/audiosource.cc:215 libs/ardour/session_butler.cc:80
+#: libs/ardour/audiosource.cc:215
+#: libs/ardour/session_butler.cc:80
 #: libs/ardour/session_midi.cc:1183
 msgid "Cannot create transport request signal pipe (%1)"
 msgstr "Δεν μπο�ώ να δημιου�γήσω transport request signal pipe (%1)"
 
-#: libs/ardour/audiosource.cc:220 libs/ardour/audiosource.cc:225
-#, fuzzy
+#: libs/ardour/audiosource.cc:220
+#: libs/ardour/audiosource.cc:225
 msgid "UI: cannot set O_NONBLOCK on peak request pipe (%1)"
-msgstr "UI: δεν μπο�ώ να θέσω O_NONBLOCK στο signal read pipe (%1)"
+msgstr "UI: δεν μπο�ώ να θέσω O_NONBLOCK στο peak read pipe (%1)"
 
 #: libs/ardour/audiosource.cc:230
-#, fuzzy
 msgid "AudioSource: could not create peak thread"
-msgstr "Source: δεν μπό�εσα να δημιου�γήσω peak δέσμη"
+msgstr "AudioSource: δεν μπό�εσα να δημιου�γήσω peak thread"
 
 #: libs/ardour/audiosource.cc:308
-#, fuzzy
 msgid "cannot rename peakfile for %1 from %2 to %3 (%4)"
-msgstr "δεν μπο�ώ να απαλοίψω το peakfile %1 για %2 (%3)"
+msgstr "αδ�νατη η μετονομασία του peakfile για %1 από %2 σε %3 (%4)"
 
 #: libs/ardour/audiosource.cc:350
-#, fuzzy
 msgid "AudioSource: cannot stat peakfile \"%1\""
-msgstr "Source: δεν μπο�ώ να μετ�ήσω το αυτοστιγμεί peakfile \"%1\""
+msgstr ""
 
 #: libs/ardour/audiosource.cc:451
 msgid "cannot read sample data for unscaled peak computation"
-msgstr ""
-"δεν μπο�ώ να διαβάσω δεδομένα δείγματος για υπολογισμό μη-κλιμακώτου peak"
+msgstr "δεν μπο�ώ να διαβάσω δεδομένα δείγματος για υπολογισμό μη-κλιμακώτου peak"
 
-#: libs/ardour/audiosource.cc:472 libs/ardour/audiosource.cc:543
-#: libs/ardour/audiosource.cc:787 libs/ardour/audiosource.cc:878
-#, fuzzy
+#: libs/ardour/audiosource.cc:472
+#: libs/ardour/audiosource.cc:543
+#: libs/ardour/audiosource.cc:787
+#: libs/ardour/audiosource.cc:878
 msgid "AudioSource: cannot open peakpath \"%1\" (%2)"
-msgstr "Source: δεν μπο�ώ να ανοίξω το peakpath \"%1\" (%2)"
+msgstr "AudioSource: δεν μπο�ώ να ανοίξω το peakpath \"%1\" (%2)"
 
 #: libs/ardour/audiosource.cc:644
-#, fuzzy
 msgid "AudioSource[%1]: peak read - cannot read %2 samples at offset %3"
-msgstr ""
-"Source[%1]: ανάγνωση peak - δεν μπο�ώ να διαβάσω %2 δείγματα στην α�χή"
-"(offset) %3"
+msgstr "AudioSource[%1]: ανάγνωση peak - δεν μπο�ώ να διαβάσω %2 δείγματα στο (offset) %3"
 
 #: libs/ardour/audiosource.cc:798
 msgid "%1: could not write read raw data for peak computation (%2)"
-msgstr ""
-"%1: δεν μπο�εσα να γ�άψω ανεγνωσμένα raw δεδομένα για τον υπολογισμό του "
-"peak (%2)"
+msgstr "%1: δεν μπο�εσα να γ�άψω ανεγνωσμένα raw δεδομένα για τον υπολογισμό του peak (%2)"
 
 #: libs/ardour/audiosource.cc:823
 msgid "%1: could not write peak file data (%2)"
 msgstr "%1: δεν μπό�εσα να γ�άψω δεδομένα του α�χείου peak (%2)"
 
-#: libs/ardour/automation_event.cc:65 libs/ardour/location.cc:345
+#: libs/ardour/automation_event.cc:65
+#: libs/ardour/location.cc:345
 #: libs/ardour/tempo.cc:226
 msgid "initial"
 msgstr "π�ωτα�χικό"
@@ -433,7 +405,8 @@ msgstr "συμβάν απαλοίφθηκε"
 msgid "removed multiple events"
 msgstr "πολλαπλά συμβάντα απαλοίφθηκαν"
 
-#: libs/ardour/automation_event.cc:467 libs/ardour/automation_event.cc:498
+#: libs/ardour/automation_event.cc:467
+#: libs/ardour/automation_event.cc:498
 msgid "removed range"
 msgstr "διάστημα απαλοίφθηκε"
 
@@ -445,7 +418,8 @@ msgstr "διάστημα συμβάντων �υθμίστηκε"
 msgid "event adjusted"
 msgstr "συμβάν �υθμίστηκε"
 
-#: libs/ardour/automation_event.cc:665 libs/ardour/automation_event.cc:770
+#: libs/ardour/automation_event.cc:665
+#: libs/ardour/automation_event.cc:770
 #: libs/ardour/panner.cc:1041
 msgid "programming error:"
 msgstr "σφάλμα π�ογ�αμματισμο�:"
@@ -458,58 +432,46 @@ msgstr "κοπή/αντιγ�αφή/εκκαθά�ιση"
 msgid "copy"
 msgstr "αντιγ�αφή"
 
-#: libs/ardour/automation_event.cc:1180 libs/ardour/playlist.cc:939
+#: libs/ardour/automation_event.cc:1180
+#: libs/ardour/playlist.cc:939
 msgid "paste"
 msgstr "επικόλληση"
 
 #: libs/ardour/automation_event.cc:1235
-msgid ""
-"automation list: no x-coordinate stored for control point (point ignored)"
-msgstr ""
-"λίστα αυτοματισμο�: καμία x-συντεταγμένη αποθηκευμένη για σημείο ελέγχου (το "
-"σημείο αγνοήθηκε)"
+msgid "automation list: no x-coordinate stored for control point (point ignored)"
+msgstr "λίστα αυτοματισμο�: καμία x-συντεταγμένη αποθηκευμένη για σημείο ελέγχου (το σημείο αγνοήθηκε)"
 
 #: libs/ardour/automation_event.cc:1241
-msgid ""
-"automation list: no y-coordinate stored for control point (point ignored)"
-msgstr ""
-"λίστα αυτοματισμο�: καμία y-συντεταγμένη αποθηκευμένη για σημείο ελέγχου (το "
-"σημείο αγνοήθηκε)"
+msgid "automation list: no y-coordinate stored for control point (point ignored)"
+msgstr "λίστα αυτοματισμο�: καμία y-συντεταγμένη αποθηκευμένη για σημείο ελέγχου (το σημείο αγνοήθηκε)"
 
 #: libs/ardour/configuration.cc:80
-#, fuzzy
 msgid "loading system configuration file %1"
-msgstr ""
-"Ardour: δεν μπο�ώ να διαβάσω το α�χείο δια��υθμίσεως του συστήματος \"%1\""
+msgstr "Ανάκληση α�χείου �υθμίσεων συστήματος %1"
 
 #: libs/ardour/configuration.cc:83
 msgid "Ardour: cannot read system configuration file \"%1\""
-msgstr ""
-"Ardour: δεν μπο�ώ να διαβάσω το α�χείο δια��υθμίσεως του συστήματος \"%1\""
+msgstr "Ardour: δεν μπο�ώ να διαβάσω το α�χείο δια��υθμίσεως του συστήματος \"%1\""
 
 #: libs/ardour/configuration.cc:88
 msgid "Ardour: system configuration file \"%1\" not loaded successfully."
-msgstr ""
-"Ardour: το α�χείο δια��υθμίσεως του συστήματος \"%1\" δεν φο�τώθηκε επιτυχώς."
+msgstr "Ardour: το α�χείο δια��υθμίσεως του συστήματος \"%1\" δεν φο�τώθηκε επιτυχώς."
 
 #: libs/ardour/configuration.cc:105
-#, fuzzy
 msgid "loading user configuration file %1"
-msgstr "Ardour: α�χείο δια��υθμίσεως μή αναγνώσιμο \"%1\""
+msgstr "Ανάκληση α�χείου �υθμίσεων χ�ήστη %1"
 
 #: libs/ardour/configuration.cc:108
 msgid "Ardour: cannot read configuration file \"%1\""
 msgstr "Ardour: α�χείο δια��υθμίσεως μή αναγνώσιμο \"%1\""
 
 #: libs/ardour/configuration.cc:113
-#, fuzzy
 msgid "Ardour: user configuration file \"%1\" not loaded successfully."
-msgstr "Ardour: α�χείο δια��υθμίσεως \"%1\" δεν φο�τώθηκε επιτυχώς."
+msgstr "Ardour: α�χείο �υθμίσεων χ�ήστη \"%1\" δεν φο�τώθηκε επιτυχώς."
 
 #: libs/ardour/configuration.cc:137
-#, fuzzy
 msgid "Config file %1 not saved"
-msgstr "Α�χείο δια��υθμίσεως δεν αποθηκε�θηκε"
+msgstr "Α�χείο �υθμίσεων %1 δεν αποθηκε�θηκε"
 
 #: libs/ardour/configuration.cc:210
 msgid "ill-formed MIDI port specification in ardour rcfile (ignored)"
@@ -523,76 +485,72 @@ msgstr "Κόμβος π�ος Σ�νδεση δεν έχει \"όνομα\" ιδ
 msgid "Node for Connection has no \"connections\" property"
 msgstr "Κόμβος π�ος Σ�νδεση δεν έχει \"συνδέσεις\" ιδιότητα"
 
-#: libs/ardour/connection.cc:227 libs/ardour/io.cc:1902
+#: libs/ardour/connection.cc:227
+#: libs/ardour/io.cc:1902
 msgid "IO: badly formed string in XML node for inputs \"%1\""
 msgstr "IO: κακοφτιαγμένη γ�αμμή στον XML κόμβο για εισόδους \"%1\""
 
-#: libs/ardour/connection.cc:232 libs/ardour/io.cc:1907
+#: libs/ardour/connection.cc:232
+#: libs/ardour/io.cc:1907
 msgid "bad input string in XML node \"%1\""
 msgstr "κακή γ�αμμή εισόδου στον XML κόμβο \"%1\""
 
 #: libs/ardour/control_protocol_manager.cc:80
 msgid "control protocol name \"%1\" has no descriptor"
-msgstr ""
+msgstr "Το όνομα π�ωτοκόλλου ελέγχου \"%1\" δεν έχει descriptor"
 
 #: libs/ardour/control_protocol_manager.cc:85
 msgid "control protocol name \"%1\" could not be initialized"
-msgstr ""
+msgstr "Το όνομα π�ωτοκόλλου ελέγχου \"%1\" ήταν αδ�νατο να α�χίσει"
 
 #: libs/ardour/control_protocol_manager.cc:141
 msgid "Instantiating mandatory control protocol %1"
 msgstr ""
 
 #: libs/ardour/control_protocol_manager.cc:175
-#, fuzzy
 msgid "Control protocol %1 not usable"
-msgstr "Χω�ίς έλεγχο MMC (θ��α MIDI \"%1\" μη διαθέσιμη)"
+msgstr "Π�ωτόκολλο ελέγχου %1 μη χ�ησιμοποιήσιμο"
 
 #: libs/ardour/control_protocol_manager.cc:187
 msgid "Control surface protocol discovered: \"%1\""
 msgstr ""
 
 #: libs/ardour/control_protocol_manager.cc:205
-#, fuzzy
 msgid "ControlProtocolManager: cannot load module \"%1\" (%2)"
-msgstr "LADSPA: δεν μπο�ώ να φο�τώσω το module \"%1\" (%2)"
+msgstr "ControlProtocolManager: δεν μπο�ώ να φο�τώσω το module \"%1\" (%2)"
 
 #: libs/ardour/control_protocol_manager.cc:213
-#, fuzzy
 msgid "ControlProtocolManager: module \"%1\" has no descriptor function."
-msgstr "LADSPA: το module \"%1\" δεν έχει λειτου�γία πε�ιγ�αφής."
+msgstr "ControlProtocolManager: το module \"%1\" δεν έχει descriptor function."
 
 #: libs/ardour/crossfade.cc:121
-#, fuzzy
 msgid "Crossfade: no \"in\" region in state"
-msgstr "Crossfade: χω�ίς \"δεξιά\" πε�ιοχή στην κατάσταση"
+msgstr "Crossfade: χω�ίς \"in\" πε�ιοχή σε κατάσταση"
 
 #: libs/ardour/crossfade.cc:128
-#, fuzzy
 msgid "Crossfade: no \"in\" region %1 found in playlist %2"
-msgstr "Crossfade: δεξιά πε�ιοχή  %1 δεν ευ�έθη στη λίστα αναπα�/γής %2"
+msgstr "Crossfade: no \"in\" πε�ιοχή  %1 δεν ευ�έθη στη λίστα αναπα�/γής %2"
 
 #: libs/ardour/crossfade.cc:138
-#, fuzzy
 msgid "Crossfade: no \"out\" region in state"
-msgstr "Crossfade: χω�ίς \"α�ιστε�ή\" πε�ιοχή στην κατάσταση"
+msgstr "Crossfade: χω�ίς \"out\" πε�ιοχή σε κατάσταση"
 
 #: libs/ardour/crossfade.cc:145
-#, fuzzy
 msgid "Crossfade: no \"out\" region %1 found in playlist %2"
-msgstr "Crossfade: α�ιστε�ή πε�ιοχή  %1 δεν ευ�έθη στη λίστα αναπα�/γής %2"
+msgstr "Crossfade: no \"out\" πε�ιοχή  %1 δεν ευ�έθη στη λίστα αναπα�/γής %2"
 
 #: libs/ardour/crossfade.cc:492
 msgid "active changed"
 msgstr "αλλαγή ενε�γο�"
 
 #: libs/ardour/crossfade.cc:741
-#, fuzzy
 msgid "old-style crossfade information - no position information"
-msgstr "Ο κόμβος XML για την Τοποθεσία δεν έχει πλη�οφο�ίες ενά�ξεως"
+msgstr "παλαιο�-τ�που crossfade πλη�οφο�ία - καμία πλη�οφο�ία θέσεως"
 
-#: libs/ardour/curve.cc:112 libs/ardour/globals.cc:340
-#: libs/ardour/insert.cc:454 libs/ardour/session.cc:2466
+#: libs/ardour/curve.cc:112
+#: libs/ardour/globals.cc:340
+#: libs/ardour/insert.cc:454
+#: libs/ardour/session.cc:2466
 #: libs/ardour/session.cc:2518
 msgid "programming error: "
 msgstr "σφάλμα π�ογ�αμματισμο�: "
@@ -611,14 +569,13 @@ msgstr "δεν ευ�έθη το cpu MHz στο /proc/cpuinfo"
 
 #: libs/ardour/destructive_filesource.cc:188
 msgid "DestructiveFileSource: \"%1\" bad read retval: %2 of %5 (%3: %4)"
-msgstr ""
+msgstr "Καταστ�επτικήΠηγήΑ�χείου: \"%1\" κακή ανάγνωση retval: %2 of %5 (%3: %4)"
 
 #: libs/ardour/destructive_filesource.cc:201
 #: libs/ardour/destructive_filesource.cc:243
 #: libs/ardour/destructive_filesource.cc:250
-#, fuzzy
 msgid "DestructiveFileSource: \"%1\" bad write (%2)"
-msgstr "FileSource: \"%1\" κακή εγγ�αφή (%2)"
+msgstr "DestructiveFileSource: \"%1\" κακή εγγ�αφή (%2)"
 
 #: libs/ardour/globals.cc:109
 msgid "no MIDI ports specified: no MMC or MTC control possible"
@@ -628,7 +585,8 @@ msgstr "καμία MIDI θ��α δεν επελέχθη: έλεγχος MMC ή
 msgid "MIDI port specifications for \"%1\" are not understandable."
 msgstr "Οι π�οδιαγ�αφές της θ��ας MIDI για το \"%1\" δεν είναι κατανοητές."
 
-#: libs/ardour/globals.cc:137 libs/ardour/globals.cc:141
+#: libs/ardour/globals.cc:137
+#: libs/ardour/globals.cc:141
 #: libs/ardour/globals.cc:145
 msgid "default"
 msgstr "π�οκαθο�ισμένο"
@@ -642,9 +600,8 @@ msgid "No MTC support (MIDI port \"%1\" not available)"
 msgstr "Χω�ίς έλεγχο MTC (θ��α MIDI \"%1\" μη διαθέσιμη)"
 
 #: libs/ardour/globals.cc:184
-#, fuzzy
 msgid "No MIDI parameter support (MIDI port \"%1\" not available)"
-msgstr "Χω�ίς έλεγχο MTC (θ��α MIDI \"%1\" μη διαθέσιμη)"
+msgstr "Χω�ίς υποστή�ιξη MIDI πα�αμέτ�ων (θ��α MIDI \"%1\" μη διαθέσιμη)"
 
 #: libs/ardour/import.cc:75
 msgid "Import: cannot open input sound file \"%1\""
@@ -664,9 +621,7 @@ msgstr "Εισαγωγή: σφάλμα κατά την τ�οποποίηση α
 
 #: libs/ardour/import.cc:148
 msgid "Session::import_audiofile: cannot open new file source for channel %1"
-msgstr ""
-"Συνεδ�ία::εισαγωγή_α�χείου: δεν μπο�ώ να ανοίξω νέα πηγή α�χείου για το "
-"κανάλι %1"
+msgstr "Συνεδ�ία::εισαγωγή_α�χείου: δεν μπο�ώ να ανοίξω νέα πηγή α�χείου για το κανάλι %1"
 
 #: libs/ardour/import.cc:167
 msgid "converting audio"
@@ -692,7 +647,8 @@ msgstr "Εισαγωγή: src_new() απέτυχε : %1"
 msgid "Import: %1"
 msgstr "Εισαγωγή: %1"
 
-#: libs/ardour/insert.cc:644 libs/ardour/insert.cc:936
+#: libs/ardour/insert.cc:644
+#: libs/ardour/insert.cc:936
 msgid "XML node describing insert is missing the `type' field"
 msgstr "Στον κόμβο XML που πε�ιγ�άφει το insert λείπει το πεδίο `type'"
 
@@ -712,14 +668,14 @@ msgstr ""
 "Ευ�έθη μια αναφο�ά σε plugin (\"%1\") που είναι άγνωστο.\n"
 "Ίσως έχει διαγ�αφεί ή μετακινηθεί από την τελευταία του χ�ήση."
 
-#: libs/ardour/insert.cc:716 libs/ardour/insert.cc:953
+#: libs/ardour/insert.cc:716
+#: libs/ardour/insert.cc:953
 msgid "XML node describing insert is missing a Redirect node"
 msgstr "Στον κόμβο XML που πε�ιγ�άφει το insert λείπει ένας κόμβος Redirect"
 
 #: libs/ardour/insert.cc:721
 msgid "XML node describing a plugin insert is missing the `%1' information"
-msgstr ""
-"Στον κόμβο XML που πε�ιγ�άφει ένα plugin insert λείπουν οι πλη�οφο�ίες `%1' "
+msgstr "Στον κόμβο XML που πε�ιγ�άφει ένα plugin insert λείπουν οι πλη�οφο�ίες `%1' "
 
 #: libs/ardour/insert.cc:745
 msgid "PluginInsert: Auto: no ladspa port number"
@@ -731,9 +687,7 @@ msgstr "PluginInsert: Auto: το id θÏ�Ï�ας είναι εκτός πεδίοÏ
 
 #: libs/ardour/insert.cc:768
 msgid "XML node describing a port automation is missing the `%1' information"
-msgstr ""
-"Στον κόμβο XML που πε�ιγ�άφει έναν αυτοματισμό θ��ας λείπουν οι πλη�οφο�ίες `"
-"%1' "
+msgstr "Στον κόμβο XML που πε�ιγ�άφει έναν αυτοματισμό θ��ας λείπουν οι πλη�οφο�ίες `%1' "
 
 #: libs/ardour/insert.cc:854
 msgid "PortInsert: cannot add input port"
@@ -755,40 +709,51 @@ msgstr "IO: δεν μπο�ει να αποσυνδεθεί η θ��α εισό
 msgid "IO: cannot disconnect output port %1 from %2"
 msgstr "IO: δεν μπο�εί να αποσυνδεθεί η θ��α εξόδου %1 από %2"
 
-#: libs/ardour/io.cc:807 libs/ardour/io.cc:1151 libs/ardour/io.cc:1277
+#: libs/ardour/io.cc:807
+#: libs/ardour/io.cc:1151
+#: libs/ardour/io.cc:1277
 #, c-format
 msgid "%s/out"
 msgstr "%s/out"
 
-#: libs/ardour/io.cc:809 libs/ardour/io.cc:1153 libs/ardour/io.cc:1279
+#: libs/ardour/io.cc:809
+#: libs/ardour/io.cc:1153
+#: libs/ardour/io.cc:1279
 #: libs/ardour/io.cc:2849
 #, c-format
 msgid "%s/out %u"
 msgstr "%s/out %u"
 
-#: libs/ardour/io.cc:813 libs/ardour/io.cc:1158 libs/ardour/io.cc:1283
+#: libs/ardour/io.cc:813
+#: libs/ardour/io.cc:1158
+#: libs/ardour/io.cc:1283
 msgid "IO: cannot register output port %1"
 msgstr "IO: δεν μπο�ει να καταχώ�ηθεί η θ��α εξόδου %1"
 
-#: libs/ardour/io.cc:908 libs/ardour/io.cc:1011 libs/ardour/io.cc:1117
+#: libs/ardour/io.cc:908
+#: libs/ardour/io.cc:1011
+#: libs/ardour/io.cc:1117
 #, c-format
 msgid "%s/in"
 msgstr "%s/in"
 
-#: libs/ardour/io.cc:910 libs/ardour/io.cc:1014 libs/ardour/io.cc:1120
+#: libs/ardour/io.cc:910
+#: libs/ardour/io.cc:1014
+#: libs/ardour/io.cc:1120
 #: libs/ardour/io.cc:2819
 #, c-format
 msgid "%s/in %u"
 msgstr "%s/in %u"
 
-#: libs/ardour/io.cc:914 libs/ardour/io.cc:1020 libs/ardour/io.cc:1125
+#: libs/ardour/io.cc:914
+#: libs/ardour/io.cc:1020
+#: libs/ardour/io.cc:1125
 msgid "IO: cannot register input port %1"
 msgstr "IO: δεν μπο�εί να καταχώ�ηθεί η θ��α εισόδου %1"
 
 #: libs/ardour/io.cc:1541
 msgid "IO::connecting_became_legal() called without a pending state node"
-msgstr ""
-"IO::connecting_became_legal() εκλήθη χω�ίς κόμβο καταστάσεως εν αναμονή"
+msgstr "IO::connecting_became_legal() εκλήθη χω�ίς κόμβο καταστάσεως εν αναμονή"
 
 #: libs/ardour/io.cc:1564
 msgid "IO::ports_became_legal() called without a pending state node"
@@ -799,28 +764,28 @@ msgid "incorrect XML node \"%1\" passed to IO object"
 msgstr "μη-σωστός κόμβος XML \"%1\" πέ�ασε στο IO αντικείμενο"
 
 #: libs/ardour/io.cc:1649
-msgid ""
-"MIDI gain control specification for %1 is incomplete, so it has been ignored"
-msgstr ""
-"Η π�οδιαγ�αφή ελέγχου του MIDI gain για το %1 είναι ημιτελής, με αποτέλεσμα "
-"να αγνοηθεί"
+msgid "MIDI gain control specification for %1 is incomplete, so it has been ignored"
+msgstr "Η π�οδιαγ�αφή ελέγχου του MIDI gain για το %1 είναι ημιτελής, με αποτέλεσμα να αγνοηθεί"
 
-#: libs/ardour/io.cc:1739 libs/ardour/io.cc:1851
+#: libs/ardour/io.cc:1739
+#: libs/ardour/io.cc:1851
 msgid "Unknown connection \"%1\" listed for output of %2"
 msgstr "Άγνωστη σ�νδεση \"%1\" καταχω�ήθη για την έξοδο του %2"
 
-#: libs/ardour/io.cc:1741 libs/ardour/io.cc:1853
-#, fuzzy
+#: libs/ardour/io.cc:1741
+#: libs/ardour/io.cc:1853
 msgid "out 1"
-msgstr "out %lu"
+msgstr ""
 
-#: libs/ardour/io.cc:1742 libs/ardour/io.cc:1854
+#: libs/ardour/io.cc:1742
+#: libs/ardour/io.cc:1854
 msgid "No output connections available as a replacement"
-msgstr ""
+msgstr "Καμία σ�νδεση output διαθέσιμη σαν εναλλακτική"
 
-#: libs/ardour/io.cc:1746 libs/ardour/io.cc:1858
+#: libs/ardour/io.cc:1746
+#: libs/ardour/io.cc:1858
 msgid "Connection %1 was not available - \"out 1\" used instead"
-msgstr ""
+msgstr "Η σ�νδεση %1 δεν ήταν διαθέσιμη - αντ'αυτής χ�ησιμοποιήθηκε η \"out 1\" "
 
 #: libs/ardour/io.cc:1760
 msgid "%1: cannot create I/O ports"
@@ -852,9 +817,7 @@ msgstr "δÏ�σμοÏ�φος αÏ�ιθμός εκδόσεως στο αÏ�χείο Ï
 
 #: libs/ardour/io.cc:2583
 msgid "no version information in automation event file \"%1\""
-msgstr ""
-"δεν υπά�χουν πλη�οφο�ίες πε�ί εκδόσεων στο α�χείο συμβάντων αυτοματισμο� \"%1"
-"\""
+msgstr "δεν υπά�χουν πλη�οφο�ίες πε�ί εκδόσεων στο α�χείο συμβάντων αυτοματισμο� \"%1\""
 
 #: libs/ardour/io.cc:2588
 msgid "mismatched automation event file version (%1)"
@@ -862,15 +825,14 @@ msgstr "αταί�ιαστη έκδοση α�χείου συμβάντων αυ
 
 #: libs/ardour/io.cc:2596
 msgid "badly formatted automation event record at line %1 of %2 (ignored)"
-msgstr ""
-"κακώς φο�μα�ισμένη καταγ�αφή συμβάντων αυτοματισμο� στη γ�αμμή %1 of %2 "
-"(αγνοήθηκε)"
+msgstr "κακώς φο�μα�ισμένη καταγ�αφή συμβάντων αυτοματισμο� στη γ�αμμή %1 of %2 (αγνοήθηκε)"
 
 #: libs/ardour/io.cc:2616
 msgid "dubious automation event found (and ignored)"
 msgstr "αβέβαιο συμβάν αυτοματισμο� ευ�έθηκε (και αγνοήθηκε)"
 
-#: libs/ardour/io.cc:2620 libs/ardour/panner.cc:438
+#: libs/ardour/io.cc:2620
+#: libs/ardour/panner.cc:438
 #: libs/ardour/redirect.cc:148
 msgid "loaded from disk"
 msgstr "φο�τώθηκε από το δίσκο"
@@ -889,23 +851,15 @@ msgstr "LADSPA: το plugin την 'κοπάνισε' μετά την ανακά
 
 #: libs/ardour/ladspa_plugin.cc:99
 msgid "LADSPA: \"%1\" cannot be used, since it cannot do inplace processing"
-msgstr ""
-"LADSPA: \"%1\" δεν μπο�εί να χ�ησιμοποιηθεί, εφ'όσον δεν μπο�εί να κάνει επι "
-"τόπου επεξε�γασία"
+msgstr "LADSPA: \"%1\" δεν μπο�εί να χ�ησιμοποιηθεί, εφ'όσον δεν μπο�εί να κάνει επι τόπου επεξε�γασία"
 
 #: libs/ardour/ladspa_plugin.cc:329
-msgid ""
-"illegal parameter number used with plugin \"%1\". This mayindicate a change "
-"in the plugin design, and presets may beinvalid"
-msgstr ""
-"πα�άνομος α�ιθμός πα�αμέτ�ου σε χ�ήση με το plugin \"%1\". Ίσως να "
-"ενδείκνυται αλλαγή στο σχεδιασμό του plugin, και οι �υθμίσεις ίσως να είναι "
-"άκυ�ες"
+msgid "illegal parameter number used with plugin \"%1\". This mayindicate a change in the plugin design, and presets may beinvalid"
+msgstr "πα�άνομος α�ιθμός πα�αμέτ�ου σε χ�ήση με το plugin \"%1\". Ίσως να ενδείκνυται αλλαγή στο σχεδιασμό του plugin, και οι �υθμίσεις ίσως να είναι άκυ�ες"
 
 #: libs/ardour/ladspa_plugin.cc:430
-#, fuzzy
 msgid "Bad node sent to LadspaPlugin::set_state"
-msgstr "Κακή αποστολή κόμβου εστάλη στο LadspaPlugin::set_state"
+msgstr "Κακός κόμβος εστάλη στο LadspaPlugin::set_state"
 
 #: libs/ardour/ladspa_plugin.cc:443
 msgid "LADSPA: no ladspa port number"
@@ -916,12 +870,8 @@ msgid "LADSPA: no ladspa port data"
 msgstr "LADSPA: κανένα δεδομένο θ��ας ladspa"
 
 #: libs/ardour/ladspa_plugin.cc:498
-msgid ""
-"LADSPA LadspaPlugin MIDI control specification for port %1 is incomplete, so "
-"it has been ignored"
-msgstr ""
-"Ο καθο�ισμός ελέγχου LADSPA LadspaPlugin για MIDI για την θ��α %1 είναι "
-"ημιτελής, έτσι αγνοήθηκε."
+msgid "LADSPA LadspaPlugin MIDI control specification for port %1 is incomplete, so it has been ignored"
+msgstr "Ο καθο�ισμός ελέγχου LADSPA LadspaPlugin για MIDI για την θ��α %1 είναι ημιτελής, έτσι αγνοήθηκε."
 
 #: libs/ardour/location.cc:269
 msgid "incorrect XML node passed to Location::set_state"
@@ -945,11 +895,10 @@ msgstr "Ο κόμβος XML για την Τοποθεσία δεν έχει Ï€Î
 
 #: libs/ardour/location.cc:391
 msgid "Locations: attempt to use unknown location as selected location"
-msgstr ""
-"Τοποθεσίες: απόπει�α να χ�ησιμοποιηθεί άγνωστη τοποθεσία σαν επιλεγμένη "
-"τοποθεσία"
+msgstr "Τοποθεσίες: απόπει�α να χ�ησιμοποιηθεί άγνωστη τοποθεσία σαν επιλεγμένη τοποθεσία"
 
-#: libs/ardour/location.cc:418 libs/ardour/playlist.cc:1187
+#: libs/ardour/location.cc:418
+#: libs/ardour/playlist.cc:1187
 msgid "clear"
 msgstr "εκκαθά�ιση"
 
@@ -975,8 +924,7 @@ msgstr "λανθασμένο XML mode πέ�ασε στις Τοποθεσίες
 
 #: libs/ardour/mtc_slave.cc:196
 msgid "MTC Slave: atomic read of current time failed, sleeping!"
-msgstr ""
-"MTC Slave: ατομική ανάγνωση του τ�έχοντος χ�όνου απέτυχε, πίσω για �πνο!"
+msgstr "MTC Slave: ατομική ανάγνωση του τ�έχοντος χ�όνου απέτυχε, πίσω για �πνο!"
 
 #: libs/ardour/named_selection.cc:77
 msgid "Chunk %1 uses an unknown playlist \"%2\""
@@ -987,11 +935,8 @@ msgid "Chunk %1 contains misformed playlist information"
 msgstr "Το κομμάτι %1 πε�ιέχει δ�σμο�φες πλη�οφο�ίες για τη λίστα αναπα�/γής"
 
 #: libs/ardour/panner.cc:256
-#, fuzzy
 msgid "MIDI pan control specification is incomplete, so it has been ignored"
-msgstr ""
-"Η π�οδιαγ�αφή ελέγχου του MIDI gain για το %1 είναι ημιτελής, με αποτέλεσμα "
-"να αγνοηθεί"
+msgstr "Η π�οδιαγ�αφή ελέγχου του MIDI pan είναι ημιτελής, με αποτέλεσμα να αγνοηθεί"
 
 #: libs/ardour/panner.cc:361
 msgid "automation write pass"
@@ -1003,11 +948,8 @@ msgid "error writing pan automation file (%s)"
 msgstr "σφάλμα στην εγγ�αφή του pan στο α�χείο αυτοματισμο� (%s)"
 
 #: libs/ardour/panner.cc:429
-msgid ""
-"badly formatted pan automation event record at line %1 of %2 (ignored) [%3]"
-msgstr ""
-"δ�σμο�φη εγγ�αφή συμβάντος pan αυτοματισμο� στη γ�αμμή %1 of %2 (αγνοήθηκε) "
-"[%3]"
+msgid "badly formatted pan automation event record at line %1 of %2 (ignored) [%3]"
+msgstr "δ�σμο�φη εγγ�αφή συμβάντος pan αυτοματισμο� στη γ�αμμή %1 of %2 (αγνοήθηκε) [%3]"
 
 #: libs/ardour/panner.cc:944
 msgid "badly-formed positional data for Multi2dPanner - ignored"
@@ -1015,8 +957,7 @@ msgstr "δ�σμο�φα δεδομένα θέσεως για το Multi2dPanner
 
 #: libs/ardour/panner.cc:1237
 msgid "cannot open pan automation file \"%1\" for saving (%s)"
-msgstr ""
-"δεν μπο�ώ να ανοίξω α�χείο αυτοματισμο� του pan \"%1\" για αποθήκευση (%s)"
+msgstr "δεν μπο�ώ να ανοίξω α�χείο αυτοματισμο� του pan \"%1\" για αποθήκευση (%s)"
 
 #: libs/ardour/panner.cc:1273
 msgid "cannot open pan automation file %1 (%2)"
@@ -1024,15 +965,11 @@ msgstr "δεν μποÏ�ÏŽ να ανοίξω αÏ�χείο αυτοματισμοÏ
 
 #: libs/ardour/panner.cc:1286
 msgid "badly formed version number in pan automation event file \"%1\""
-msgstr ""
-"δ�σμο�φος α�ιθμός εκδόσεως στο α�χείο συμβάντων αυτοματισμο� του pan \"%1\""
+msgstr "δ�σμο�φος α�ιθμός εκδόσεως στο α�χείο συμβάντων αυτοματισμο� του pan \"%1\""
 
 #: libs/ardour/panner.cc:1290
-msgid ""
-"no version information in pan automation event file \"%1\" (first line = %2)"
-msgstr ""
-"καμία πλη�οφο�ία εκδόσεως στο α�χείο συμβάντων αυτοματισμο� του pan \"%1"
-"\" (π�ώτη γ�αμμή = %2)"
+msgid "no version information in pan automation event file \"%1\" (first line = %2)"
+msgstr "καμία πλη�οφο�ία εκδόσεως στο α�χείο συμβάντων αυτοματισμο� του pan \"%1\" (π�ώτη γ�αμμή = %2)"
 
 #: libs/ardour/panner.cc:1296
 msgid "mismatched pan automation event file version (%1)"
@@ -1040,8 +977,7 @@ msgstr "αταί�ιαστη έκδοση α�χείου συμβάντων αυ
 
 #: libs/ardour/panner.cc:1310
 msgid "too many panner states found in pan automation file %1"
-msgstr ""
-"πά�α πολλές καταστάσεις panner ευ�έθησαν στο α�χείο των αυτοματισμών pan %1"
+msgstr "πά�α πολλές καταστάσεις panner ευ�έθησαν στο α�χείο των αυτοματισμών pan %1"
 
 #: libs/ardour/panner.cc:1451
 msgid "Unknown panner plugin \"%1\" found in pan state - ignored"
@@ -1089,36 +1025,31 @@ msgstr "διαχω�ισμός"
 
 #: libs/ardour/playlist.cc:1100
 msgid "%1: bounds changed received for region (%2)not in playlist"
-msgstr ""
-"%1: τα αλλαγμένα ό�ια που ελήφθησαν για την πε�ιοχή (%2)δεν είναι στη λίστα "
-"αναπα�/γής"
+msgstr "%1: τα αλλαγμένα ό�ια που ελήφθησαν για την πε�ιοχή (%2)δεν είναι στη λίστα αναπα�/γής"
 
 #: libs/ardour/playlist.cc:1361
-#, fuzzy
 msgid "Playlist: cannot create region from state file"
-msgstr "Playlist: δεν μπο�ώ να δημιου�γήσω Πε�ιοχή από α�χείο καταστάσεως"
+msgstr "Playlist: αδ�νατη η δημιου�γία Πε�ιοχής από α�χείο καταστάσεως"
 
 #: libs/ardour/playlist.cc:1721
 msgid "nudged"
 msgstr "νυχθέν"
 
-#: libs/ardour/playlist_factory.cc:49 libs/ardour/playlist_factory.cc:64
-msgid ""
-"programming error: Playlist::createRegion called with unknown Region type"
-msgstr ""
-"σφάλμα π�ογ�αμματισμο�: Playlist::createRegion εκλήθη με άγνωστο τ�πο Πε"
+#: libs/ardour/playlist_factory.cc:49
+#: libs/ardour/playlist_factory.cc:64
+msgid "programming error: Playlist::createRegion called with unknown Region type"
+msgstr "σφάλμα π�ογ�αμματισμο�: Playlist::createRegion εκλήθη με άγνωστο τ�πο Πε"
 
 #: libs/ardour/playlist_factory.cc:86
-msgid ""
-"programming error: Playlist::copyPlaylist called with unknown Playlist type"
-msgstr ""
-"σφάλμα π�ογ�αμματισμο�: Playlist::copyPlaylist με άγνωστο τ�πο Playlist"
+msgid "programming error: Playlist::copyPlaylist called with unknown Playlist type"
+msgstr "σφάλμα π�ογ�αμματισμο�: Playlist::copyPlaylist με άγνωστο τ�πο Playlist"
 
 #: libs/ardour/plugin.cc:328
 msgid "Could not locate HOME.  Preset not saved."
 msgstr "Δεν μπό�εσα να β�ώ το HOME.  Π�ο-��θμιση δεν αποθηκε�θηκε."
 
-#: libs/ardour/plugin.cc:338 libs/ardour/plugin.cc:344
+#: libs/ardour/plugin.cc:338
+#: libs/ardour/plugin.cc:344
 msgid "Could not create %1.  Preset not saved. (%2)"
 msgstr "Δεν μπό�εσα να δημιου�γήσω το %1.  Π�ο-��θμιση δεν αποθηκε�θηκε. (%2)"
 
@@ -1144,7 +1075,7 @@ msgstr "VST: δεν μπο�ώ να φο�τώσω module από \"%1\""
 
 #: libs/ardour/plugin_manager.cc:302
 msgid "You asked ardour to not use any VST plugins"
-msgstr ""
+msgstr "Ζητήσατε απ'το Ardour να μή χ�ησιμοποιήσει VST plugins"
 
 #: libs/ardour/plugin_manager.cc:305
 msgid "This version of ardour has no support for VST plugins"
@@ -1154,17 +1085,14 @@ msgstr "Η πα�ο�σα έκδοση του ardour δεν υποστη�ίζε
 msgid "LADSPA: cannot load module from \"%1\""
 msgstr "LADSPA: δεν μπο�ώ να φο�τώσω module από \"%1\""
 
-#: libs/ardour/plugin_manager.cc:374 libs/ardour/plugin_manager.cc:386
+#: libs/ardour/plugin_manager.cc:374
+#: libs/ardour/plugin_manager.cc:386
 msgid "Unknown"
 msgstr "Άγνωστο"
 
 #: libs/ardour/plugin_manager.cc:464
-msgid ""
-"VST plugin %1 does not support processReplacing, and so cannot be used in "
-"ardour at this time"
-msgstr ""
-"Το VST plugin %1 δεν υποστη�ίζει processReplacing, και έτσι δεν μπο�εί να "
-"χ�ησιμοποιηθεί στον ardour αυτή τη φο�ά"
+msgid "VST plugin %1 does not support processReplacing, and so cannot be used in ardour at this time"
+msgstr "Το VST plugin %1 δεν υποστη�ίζει processReplacing, και έτσι δεν μπο�εί να χ�ησιμοποιηθεί στον ardour αυτή τη φο�ά"
 
 #: libs/ardour/recent_sessions.cc:44
 msgid "cannot open recent session file %1 (%2)"
@@ -1174,11 +1102,13 @@ msgstr "δεν μποÏ�ÏŽ να ανοίξω το Ï€Ï�όσφατο αÏ�χείο Ï
 msgid "programming error: unknown Redirect type in Redirect::Clone!\n"
 msgstr "σφάλμα π�ογ�αμματισμο�: άγνωστος τ�πος Redirect στο Redirect::Clone!\n"
 
-#: libs/ardour/redirect.cc:102 libs/ardour/utils.cc:203
+#: libs/ardour/redirect.cc:102
+#: libs/ardour/utils.cc:203
 msgid "pre"
 msgstr "pre"
 
-#: libs/ardour/redirect.cc:104 libs/ardour/utils.cc:206
+#: libs/ardour/redirect.cc:104
+#: libs/ardour/utils.cc:206
 msgid "post"
 msgstr "post"
 
@@ -1198,15 +1128,14 @@ msgstr "%1: δεν μποÏ�οÏ�ν να ανακληθοÏ�ν δεδομένα αÏ
 msgid "%1: cannot open %2 to store automation data (%3)"
 msgstr "%1: δεν μπο�ώ να ανοίξω %2 για αποθήκευση δεδομένων αυτοματισμο� (%3)"
 
-#: libs/ardour/redirect.cc:194 libs/ardour/redirect.cc:201
+#: libs/ardour/redirect.cc:194
+#: libs/ardour/redirect.cc:201
 msgid "%1: could not save automation state to %2"
 msgstr "%1: δεν μπό�εσα να αποθηκε�σω την κατάσταση αυτοματισμο� στο %2"
 
 #: libs/ardour/redirect.cc:246
 msgid "Could not get state from Redirect (%1).  Problem with save_automation"
-msgstr ""
-"Δεν μπό�εσα να πά�ω κατάσταση από το Redirect (%1).  Π�όβλημα με την "
-"αποθήκευση_αυτοματισμο�"
+msgstr "Δεν μπό�εσα να πά�ω κατάσταση από το Redirect (%1).  Π�όβλημα με την αποθήκευση_αυτοματισμο�"
 
 #: libs/ardour/redirect.cc:296
 msgid "incorrect XML node \"%1\" passed to Redirect object"
@@ -1222,14 +1151,11 @@ msgstr "Στον κόμβο XML που πεÏ�ιγÏ�άφει I/O λείπει έÎ
 
 #: libs/ardour/redirect.cc:348
 msgid "XML node describing a redirect is missing the `active' field"
-msgstr ""
-"Στον κόμβο XML που πε�ιγ�άφει ένα redirect λείπει το πεδίο `ενε�γό'(active)"
+msgstr "Στον κόμβο XML που πε�ιγ�άφει ένα redirect λείπει το πεδίο `ενε�γό'(active)"
 
 #: libs/ardour/redirect.cc:358
 msgid "XML node describing a redirect is missing the `placement' field"
-msgstr ""
-"Στον κόμβο XML που πε�ιγ�άφει ένα redirect λείπει το πεδίο "
-"`τοποθέτηση'(placement)"
+msgstr "Στον κόμβο XML που πε�ιγ�άφει ένα redirect λείπει το πεδίο `τοποθέτηση'(placement)"
 
 #: libs/ardour/redirect.cc:467
 msgid "active_changed"
@@ -1241,18 +1167,18 @@ msgstr "Συνεδ�ία: XMLΚόμβος που πε�ιγ�άφει Πε�ιο
 
 #: libs/ardour/region.cc:892
 msgid "Session: XMLNode describing a Region is incomplete (no name)"
-msgstr ""
-"Συνεδ�ία: XMLΚόμβος που πε�ιγ�άφει Πε�ιοχή είναι ημιτελής (χω�ίς όνομα)"
+msgstr "Συνεδ�ία: XMLΚόμβος που πε�ιγ�άφει Πε�ιοχή είναι ημιτελής (χω�ίς όνομα)"
 
-#: libs/ardour/route.cc:79 libs/ardour/session.cc:1554
-#: libs/ardour/session.cc:1560 libs/ardour/session.cc:3093
+#: libs/ardour/route.cc:79
+#: libs/ardour/session.cc:1554
+#: libs/ardour/session.cc:1560
+#: libs/ardour/session.cc:3093
 msgid "signal"
 msgstr "σήμα"
 
 #: libs/ardour/route.cc:1430
 msgid "Could not get state of route.  Problem with save_automation"
-msgstr ""
-"Δεν μπό�εσα να πά�ω κατάσταση διαδ�ομής.  Π�όβλημα με αποθήκευση_αυτοματισμο�"
+msgstr "Δεν μπό�εσα να πά�ω κατάσταση διαδ�ομής.  Π�όβλημα με αποθήκευση_αυτοματισμο�"
 
 #: libs/ardour/route.cc:1482
 msgid "Send construction failed"
@@ -1276,41 +1202,34 @@ msgstr "Κακός κόμβος εστάλη στο Route::set_state() [%1]"
 
 #: libs/ardour/route.cc:1592
 msgid "Route %1: unknown edit group \"%2 in saved state (ignored)"
-msgstr ""
-"Route %1: άγνωστη ομάδα επεξε�γασίας \"%2 στην αποθηκευμένη κατάσταση "
-"(αγνοήθηκε)"
+msgstr "Route %1: άγνωστη ομάδα επεξε�γασίας \"%2 στην αποθηκευμένη κατάσταση (αγνοήθηκε)"
 
-#: libs/ardour/route.cc:1608 libs/ardour/route.cc:1612
+#: libs/ardour/route.cc:1608
+#: libs/ardour/route.cc:1612
 msgid "badly formed order key string in state file! [%1] ... ignored."
-msgstr ""
-"δ�σμο�φη γ�αμμή κλειδιο� ταξινομήσεως στο α�χείο καταστάσεως ! [%1] ... "
-"αγνοήθηκε."
+msgstr "δ�σμο�φη γ�αμμή κλειδιο� ταξινομήσεως στο α�χείο καταστάσεως ! [%1] ... αγνοήθηκε."
 
-#: libs/ardour/route.cc:1693 libs/ardour/route.cc:1820
+#: libs/ardour/route.cc:1693
+#: libs/ardour/route.cc:1820
 msgid "[control]"
 msgstr "[έλεγχος]"
 
 #: libs/ardour/route.cc:1713
 msgid "Route %1: unknown mix group \"%2 in saved state (ignored)"
-msgstr ""
-"Route %1: άγνωστη ομάδα μίξεως \"%2 στην αποθηκευμένη κατάσταση (αγνοήθηκε)"
+msgstr "Route %1: άγνωστη ομάδα μίξεως \"%2 στην αποθηκευμένη κατάσταση (αγνοήθηκε)"
 
-#: libs/ardour/route.cc:1742 libs/ardour/route.cc:1750
-#, fuzzy
-msgid ""
-"MIDI mute control specification for %1 is incomplete, so it has been ignored"
-msgstr ""
-"Η π�οδιαγ�αφή ελέγχου του MIDI gain για το %1 είναι ημιτελής, με αποτέλεσμα "
-"να αγνοηθεί"
+#: libs/ardour/route.cc:1742
+#: libs/ardour/route.cc:1750
+msgid "MIDI mute control specification for %1 is incomplete, so it has been ignored"
+msgstr "Η π�οδιαγ�αφή ελέγχου του MIDI mute για το %1 είναι ημιτελής, με αποτέλεσμα να αγνοηθεί"
 
 #: libs/ardour/send.cc:99
 msgid "XML node describing a send is missing a Redirect node"
 msgstr "Στον κόμβο XML όπου πε�ιγ�άφεται ένα send λείπει ένας κόμβος Redirect"
 
 #: libs/ardour/session.cc:103
-#, fuzzy
 msgid "Could not resolve path: %1 (%2)"
-msgstr "Source: δεν μπο�ώ να ανοίξω το peakpath \"%1\" (%2)"
+msgstr "Αδ�νατη η ε��εση path: %1 (%2)"
 
 #: libs/ardour/session.cc:115
 msgid "cannot check session path %1 (%2)"
@@ -1353,9 +1272,9 @@ msgid "cannot create Auditioner: no auditioning of regions possible"
 msgstr "δεν μπο�ώ να δημιου�γήσω τον Ακ�οατή: καμία ακ�όαση πε�ιοχών δυνατή"
 
 #: libs/ardour/session.cc:666
-#, fuzzy, c-format
+#, c-format
 msgid "out %<PRIu32>"
-msgstr "out %lu"
+msgstr ""
 
 #: libs/ardour/session.cc:678
 #, c-format
@@ -1381,9 +1300,8 @@ msgid "cannot setup master outputs"
 msgstr "δεν μπο�ώ να διαμο�φώσω τις master εξόδους"
 
 #: libs/ardour/session.cc:758
-#, fuzzy
 msgid "Master Out"
-msgstr "master"
+msgstr ""
 
 #: libs/ardour/session.cc:830
 msgid "cannot setup control inputs"
@@ -1395,9 +1313,7 @@ msgstr "δεν μπο�ώ να διαμο�φώσω τις εξόδους ελέ
 
 #: libs/ardour/session.cc:1110
 msgid "Session: you can't use that location for auto punch (start <= end)"
-msgstr ""
-"Συνεδ�ία: δεν μπο�είτε να χ�ησιμοποιήσετε αυτήν την τοποθεσία για auto punch "
-"(α�χή <= τέλος)"
+msgstr "Συνεδ�ία: δεν μπο�είτε να χ�ησιμοποιήσετε αυτήν την τοποθεσία για auto punch (α�χή <= τέλος)"
 
 #: libs/ardour/session.cc:1189
 msgid "Session: you can't use a mark for auto loop"
@@ -1407,7 +1323,8 @@ msgstr "ΣυνεδÏ�ία: δεν μποÏ�είτε να χÏ�ησιμοποιήσÎ
 msgid "feedback loop setup between %1 and %2"
 msgstr "διαμό�φωση feedback loop ανάμεσα σε %1 και %2"
 
-#: libs/ardour/session.cc:1724 libs/ardour/session.cc:1821
+#: libs/ardour/session.cc:1724
+#: libs/ardour/session.cc:1821
 msgid "cannot configure %1 in/%2 out configuration for new audio track"
 msgstr "δεν μπο�ώ να διαμο�φώσω %1 in/%2 out διάταξη για νέο κανάλι ήχου"
 
@@ -1455,10 +1372,10 @@ msgstr "πά�α πολλές bounced εκδόσεις της Playlist \"%1\""
 msgid "cannot create new audio file \"%1\" for %2"
 msgstr "δεν μπο�ώ να δημιου�γήσω νέο α�χείο ήχου \"%1\" για %2"
 
-#: libs/ardour/session_butler.cc:85 libs/ardour/session_butler.cc:90
-#, fuzzy
+#: libs/ardour/session_butler.cc:85
+#: libs/ardour/session_butler.cc:90
 msgid "UI: cannot set O_NONBLOCK on butler request pipe (%1)"
-msgstr "UI: δεν μπο�ώ να θέσω O_NONBLOCK στο signal read pipe (%1)"
+msgstr "UI: δεν μπο�ώ να θέσω O_NONBLOCK στο butler request pipe (%1)"
 
 #: libs/ardour/session_butler.cc:95
 msgid "Session: could not create butler thread"
@@ -1469,14 +1386,12 @@ msgid "poll on butler request pipe failed (%1)"
 msgstr ""
 
 #: libs/ardour/session_butler.cc:196
-#, fuzzy
 msgid "Error on butler thread request pipe"
-msgstr "Σφάλμα στο transport thread request pipe"
+msgstr "Σφάλμα στο butler thread request pipe"
 
 #: libs/ardour/session_butler.cc:238
-#, fuzzy
 msgid "Error reading from butler request pipe"
-msgstr "Σφάλμα στην ανάγνωση από transport request pipe"
+msgstr "Σφάλμα στην ανάγνωση από butler request pipe"
 
 #: libs/ardour/session_butler.cc:275
 msgid "Butler read ahead failure on dstream %1"
@@ -1504,20 +1419,18 @@ msgstr "δεν μπο�ώ να διαβάσω δεδομένα από το sound
 
 #: libs/ardour/session_events.cc:161
 msgid "Session: cannot have two events of type %1 at the same frame (%2)."
-msgstr ""
-"Συνεδ�ία: δεν γίνεται να υπά�χουν δ�ο συμβάντα του τ�που %1 στο ίδιο frame (%"
-"2)."
+msgstr "Συνεδ�ία: δεν γίνεται να υπά�χουν δ�ο συμβάντα του τ�που %1 στο ίδιο frame (%2)."
 
 #: libs/ardour/session_events.cc:422
 msgid "Programming error: illegal event type in process_event (%1)"
-msgstr ""
-"Σφάλμα π�ογ�αμματισμο�: πα�άνομος τ�πος συμβάντος στο process_event (%1)"
+msgstr "Σφάλμα π�ογ�αμματισμο�: πα�άνομος τ�πος συμβάντος στο process_event (%1)"
 
 #: libs/ardour/session_export.cc:63
 msgid "Export: no output file specified"
 msgstr "Εξαγωγή: κανένα α�χείο εξόδου δεν π�οσδιο�ίστηκε"
 
-#: libs/ardour/session_export.cc:164 libs/ardour/session_export.cc:169
+#: libs/ardour/session_export.cc:164
+#: libs/ardour/session_export.cc:169
 msgid "illegal frame range in export specification"
 msgstr "πα�άνομο διάστημα frame στον π�οσδιο�ισμό εξαγωγής"
 
@@ -1539,9 +1452,7 @@ msgstr "πα�ουσιάστηκε σφάλμα κάτα την μετατ�οπ
 
 #: libs/ardour/session_export.cc:327
 msgid "warning, leftover frames overflowed, glitches might occur in output"
-msgstr ""
-"π�οσοχή, πα�ατημένα frames διέ��ευσαν, πιθανόν να πα�ουσιαστο�ν ατέλειες "
-"στην έξοδο"
+msgstr "π�οσοχή, πα�ατημένα frames διέ��ευσαν, πιθανόν να πα�ουσιαστο�ν ατέλειες στην έξοδο"
 
 #: libs/ardour/session_export.cc:418
 msgid "Export: could not write data to output file (%1)"
@@ -1553,11 +1464,11 @@ msgstr "%1: δεν μποÏ�ÏŽ να αναζητήσω στο %2 για εξαγÏ
 
 #: libs/ardour/session_midi.cc:200
 msgid "Ardour is slaved to MTC - port cannot be reset"
-msgstr ""
+msgstr "Το Ardour υπακο�ει το MTC - η θ��α δεν γίνεται reset"
 
 #: libs/ardour/session_midi.cc:215
 msgid "unknown port %1 requested for MTC"
-msgstr ""
+msgstr "Εζητήθη άγνωστη θ��α %1 για το MTC"
 
 #: libs/ardour/session_midi.cc:541
 msgid "Error reading from MIDI port %1"
@@ -1608,47 +1519,40 @@ msgid "Session: error in no roll for %1"
 msgstr "Συνεδ�ία: σφάλμα στο no roll για %1"
 
 #: libs/ardour/session_state.cc:101
-#, fuzzy
 msgid "Could not use path %1 (%s)"
-msgstr "Source: δεν μπο�ώ να ανοίξω το peakpath \"%1\" (%2)"
+msgstr "Αδ�νατη η χ�ήση του path %1 (%s)"
 
 #: libs/ardour/session_state.cc:129
 msgid "end"
 msgstr "τέλος"
 
 #: libs/ardour/session_state.cc:130
-#, fuzzy
 msgid "start"
-msgstr "ξεχω�ιστό"
+msgstr ""
 
 #: libs/ardour/session_state.cc:502
 msgid "Session: cannot create session dir \"%1\" (%2)"
 msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω φάκελο συνεδ�ίας \"%1\" (%2)"
 
 #: libs/ardour/session_state.cc:513
-#, fuzzy
 msgid "Session: cannot create session peakfile dir \"%1\" (%2)"
-msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω φάκελο συνεδ�ίας \"%1\" (%2)"
+msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω peakfile dir συνεδ�ίας \"%1\" (%2)"
 
 #: libs/ardour/session_state.cc:522
 msgid "Session: cannot create session sounds dir \"%1\" (%2)"
 msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω φάκελο ήχων συνεδ�ίας \"%1\" (%2)"
 
 #: libs/ardour/session_state.cc:531
-#, fuzzy
 msgid "Session: cannot create session tape dir \"%1\" (%2)"
-msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω φάκελο συνεδ�ίας \"%1\" (%2)"
+msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω tape dir συνεδ�ίας \"%1\" (%2)"
 
 #: libs/ardour/session_state.cc:540
 msgid "Session: cannot create session dead sounds dir \"%1\" (%2)"
-msgstr ""
-"Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω φάκελο 'νεκ�ών' ήχων συνεδ�ίας \"%1\" (%2)"
+msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω φάκελο 'νεκ�ών' ήχων συνεδ�ίας \"%1\" (%2)"
 
 #: libs/ardour/session_state.cc:549
 msgid "Session: cannot create session automation dir \"%1\" (%2)"
-msgstr ""
-"Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω φάκελο αυτοματισμών της συνεδ�ίας \"%1"
-"\" (%2)"
+msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω φάκελο αυτοματισμών της συνεδ�ίας \"%1\" (%2)"
 
 #: libs/ardour/session_state.cc:580
 msgid "Could not open %1 for writing mix template"
@@ -1668,23 +1572,19 @@ msgstr "ΣυνεδÏ�ία: δεν μπόÏ�εσα να φοÏ�τώσω diskstream Î
 
 #: libs/ardour/session_state.cc:685
 msgid "could not backup old state file, current state not saved."
-msgstr ""
-"δεν μπό�εσα να διασώσω το παλαιό α�χείο καταστάσεως, η τ�έχουσα κατάσταση "
-"δεν αποθηκε�τηκε."
+msgstr "δεν μπό�εσα να διασώσω το παλαιό α�χείο καταστάσεως, η τ�έχουσα κατάσταση δεν αποθηκε�τηκε."
 
 #: libs/ardour/session_state.cc:698
 msgid "state could not be saved to %1"
 msgstr "η κατάσταση δεν μπο�ο�σε να σωθεί στο %1"
 
 #: libs/ardour/session_state.cc:705
-#, fuzzy
 msgid "could not remove corrupt state file %1"
-msgstr "Δεν μπό�εσα να αναλ�σω το α�χείο rdf: %1"
+msgstr "αδ�νατη η διαγ�αφή α�χείου διεφθα�μένης state %1"
 
 #: libs/ardour/session_state.cc:709
-#, fuzzy
 msgid "could not restore state file from backup %1"
-msgstr "Σφάλμα: δεν μπό�εσα να γ�άψω %1"
+msgstr "αδ�νατη η επαναφο�ά του state file από backup %1"
 
 #: libs/ardour/session_state.cc:778
 msgid "%1: session state information file \"%2\" doesn't exist!"
@@ -1696,9 +1596,7 @@ msgstr "Δεν μπό�εσα να κατανοήσω το ardour α�χείο %
 
 #: libs/ardour/session_state.cc:1493
 msgid "programming error: Session: incorrect XML node sent to set_state()"
-msgstr ""
-"σφάλμα π�ογ�αμματισμο�: Συνεδ�ία: λανθασμένος κόμβος XML εστάλη στην "
-"set_state()"
+msgstr "σφάλμα π�ογ�αμματισμο�: Συνεδ�ία: λανθασμένος κόμβος XML εστάλη στην set_state()"
 
 #: libs/ardour/session_state.cc:1539
 msgid "Session: XML state has no options section"
@@ -1758,36 +1656,25 @@ msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω Πε�ι
 
 #: libs/ardour/session_state.cc:1764
 msgid "Session: XMLNode describing a AudioRegion is incomplete (no source)"
-msgstr ""
-"Συνεδ�ία: Ο XMLΚόμβος που πε�ιγ�άφει AudioΠε�ιοχή είναι ημιτελής (δίχως πηγή)"
+msgstr "Συνεδ�ία: Ο XMLΚόμβος που πε�ιγ�άφει AudioΠε�ιοχή είναι ημιτελής (δίχως πηγή)"
 
-#: libs/ardour/session_state.cc:1772 libs/ardour/session_state.cc:1792
-msgid ""
-"Session: XMLNode describing a AudioRegion references an unknown source id =%1"
-msgstr ""
-"Συνεδ�ία: Ο XMLΚόμβος που πε�ιγ�άφει AudioΠε�ιοχή αναφέ�ει άγνωστο id πηγής ="
-"%1"
+#: libs/ardour/session_state.cc:1772
+#: libs/ardour/session_state.cc:1792
+msgid "Session: XMLNode describing a AudioRegion references an unknown source id =%1"
+msgstr "Συνεδ�ία: Ο XMLΚόμβος που πε�ιγ�άφει AudioΠε�ιοχή αναφέ�ει άγνωστο id πηγής =%1"
 
-#: libs/ardour/session_state.cc:1778 libs/ardour/session_state.cc:1798
-#, fuzzy
-msgid ""
-"Session: XMLNode describing a AudioRegion references a non-audio source id =%"
-"1"
-msgstr ""
-"Συνεδ�ία: Ο XMLΚόμβος που πε�ιγ�άφει AudioΠε�ιοχή αναφέ�ει άγνωστο id πηγής ="
-"%1"
+#: libs/ardour/session_state.cc:1778
+#: libs/ardour/session_state.cc:1798
+msgid "Session: XMLNode describing a AudioRegion references a non-audio source id =%1"
+msgstr "Συνεδ�ία: Ο XMLNode που πε�ιγ�άφει AudioRegion αναφέ�ει μη-ηχητική πηγή με id =%1"
 
 #: libs/ardour/session_state.cc:1868
 msgid "Session: cannot create Source from XML description."
 msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω Πηγή από XML πε�ιγ�αφή."
 
 #: libs/ardour/session_state.cc:1889
-#, fuzzy
-msgid ""
-"Found a sound file that cannot be used by Ardour. Talk to the progammers."
-msgstr ""
-"Β�ήκα ένα sound file που δεν μπο�εί να χ�ησιμοποιηθεί από τον Ardour. "
-"Επικοινωνήστε με τους π�ογ�αμματιστές."
+msgid "Found a sound file that cannot be used by Ardour. Talk to the progammers."
+msgstr "Ευ�έθη sound file που δεν μπο�εί να χ�ησιμοποιηθεί από τον Ardour. Επικοινωνήστε με τους π�ογ�αμματιστές."
 
 #: libs/ardour/session_state.cc:1913
 msgid "Could not create mix templates directory \"%1\" (%2)"
@@ -1814,24 +1701,21 @@ msgid "cannot create dead sounds directory \"%1\"; ignored"
 msgstr "δεν μπο�ώ να δημιου�γήσω τον φάκελο 'dead sounds' \"%1\"; αγνοήθηκε"
 
 #: libs/ardour/session_state.cc:2029
-#, fuzzy
 msgid "cannot create peak file directory \"%1\"; ignored"
-msgstr "δεν μπο�ώ να δημιου�γήσω φάκελο συνεδ�ίας \"%1\"; αγνοήθηκε"
+msgstr "αδ�νατη η δημιου�γία φακέλου peak file  \"%1\"; αγνοήθηκε"
 
-#: libs/ardour/session_state.cc:2168 libs/ardour/session_state.cc:2189
+#: libs/ardour/session_state.cc:2168
+#: libs/ardour/session_state.cc:2189
 msgid "Session: cannot create Playlist from XML description."
 msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω την Playlist από την XML πε�ιγ�αφή."
 
 #: libs/ardour/session_state.cc:2228
 msgid "Session: cannot create Named Selection from XML description."
-msgstr ""
-"Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω την ονομασμένη επιλογή από την XML "
-"πε�ιγ�αφή."
+msgstr "Συνεδ�ία: δεν μπο�ώ να δημιου�γήσω την ονομασμένη επιλογή από την XML πε�ιγ�αφή."
 
 #: libs/ardour/session_state.cc:2360
 msgid "Unknown node \"%1\" found in Connections list from state file"
-msgstr ""
-"Άγνωστος κόμβος \"%1\" ευ�έθη στη λίστα 'Συνδέσεις' από το α�χείο καταστάσεως"
+msgstr "Άγνωστος κόμβος \"%1\" ευ�έθη στη λίστα 'Συνδέσεις' από το α�χείο καταστάσεως"
 
 #: libs/ardour/session_state.cc:3197
 msgid "cannot remove dead sound file %1 (%2)"
@@ -1843,8 +1727,7 @@ msgstr "Άγνωστη κατάσταση του JACK transport %1 στην αν
 
 #: libs/ardour/session_timefx.cc:77
 msgid "tempoize: error creating name for new audio file based on %1"
-msgstr ""
-"tempoize: σφάλμα στη δημιου�γία ονόματος για νέο α�χείο ήχου βασισμένο σε %1"
+msgstr "tempoize: σφάλμα στη δημιου�γία ονόματος για νέο α�χείο ήχου βασισμένο σε %1"
 
 #: libs/ardour/session_timefx.cc:88
 msgid "tempoize: error creating new audio file %1 (%2)"
@@ -1854,14 +1737,14 @@ msgstr "tempoize: σφάλμα στη δημιου�γία νέου α�χείο
 msgid "tempoize: error reading data from %1"
 msgstr "tempoize: σφάλμα στην ανάγνωση δεδομένων από %1"
 
-#: libs/ardour/session_timefx.cc:127 libs/ardour/session_timefx.cc:139
+#: libs/ardour/session_timefx.cc:127
+#: libs/ardour/session_timefx.cc:139
 msgid "error writing tempo-adjusted data to %1"
 msgstr "σφάλμα στην εγγ�αφή χ�ονο-�υθμισμένων δεδομένων στο %1"
 
 #: libs/ardour/session_timefx.cc:145
 msgid "timefx code failure. please notify ardour-developers."
-msgstr ""
-"αποτυχία κώδικα timefx. πα�ακαλώ ειδοποιήστε τους π�ογ�αμματιστές του ardour."
+msgstr "αποτυχία κώδικα timefx. πα�ακαλώ ειδοποιήστε τους π�ογ�αμματιστές του ardour."
 
 #: libs/ardour/session_transport.cc:117
 msgid "Cannot loop - no loop range defined"
@@ -1872,28 +1755,20 @@ msgid ""
 "Seamless looping cannot be supported while Ardour is using JACK transport.\n"
 "Recommend changing the configured options"
 msgstr ""
-"Μονοκόμματο looping δεν υποστη�ίζεται ενώ ο Ardour χ�ησιμοποιεί το JACK "
-"transport.\n"
+"Μονοκόμματο looping δεν υποστη�ίζεται ενώ ο Ardour χ�ησιμοποιεί το JACK transport.\n"
 "Συνιστο�με την αλλαγή των διαμο�φωμένων �υθμίσεων"
 
 #: libs/ardour/session_transport.cc:755
-msgid ""
-"Global varispeed cannot be supported while Ardour is connected to JACK "
-"transport control"
-msgstr ""
-"Η Global varispeed δεν μπο�εί να υποστη�ιχθεί ενώ ο Ardour είναι "
-"συνδεδεμένος με τον JACK transport control"
+msgid "Global varispeed cannot be supported while Ardour is connected to JACK transport control"
+msgstr "Η Global varispeed δεν μπο�εί να υποστη�ιχθεί ενώ ο Ardour είναι συνδεδεμένος με τον JACK transport control"
 
 #: libs/ardour/session_transport.cc:955
 msgid "please stop the transport before adjusting slave settings"
-msgstr ""
-"πα�ακαλώ σταματήστε το transport π�ιν την ��θμιση των  επιλογων εξα�τήσεως"
+msgstr "πα�ακαλώ σταματήστε το transport π�ιν την ��θμιση των  επιλογων εξα�τήσεως"
 
 #: libs/ardour/session_transport.cc:991
 msgid "No MTC port defined: MTC slaving is impossible."
-msgstr ""
-"Καμμία θ��α MTC δεν π�οσδιο�ίστηκε: η εξά�τηση του MTC (slaving) είναι "
-"αδ�νατη."
+msgstr "Καμμία θ��α MTC δεν π�οσδιο�ίστηκε: η εξά�τηση του MTC (slaving) είναι αδ�νατη."
 
 #: libs/ardour/sndfile_helpers.cc:15
 msgid "WAV"
@@ -1981,62 +1856,44 @@ msgstr "Big-endian (Mac)"
 
 #: libs/ardour/sndfilesource.cc:147
 msgid "FileSource: cannot get host information for BWF header (%1)"
-msgstr ""
-"FileSource: δεν μπο�ώ να β�ώ πλη�οφο�ίες οικοδεσπότη(host) για επικεφαλίδα "
-"BWF (%1)"
+msgstr "FileSource: δεν μπο�ώ να β�ώ πλη�οφο�ίες οικοδεσπότη(host) για επικεφαλίδα BWF (%1)"
 
 #: libs/ardour/sndfilesource.cc:169
-msgid ""
-"cannot set broadcast info for audio file %1 (%2); dropping broadcast info "
-"for this file"
-msgstr ""
+msgid "cannot set broadcast info for audio file %1 (%2); dropping broadcast info for this file"
+msgstr "Δεν ετέθησαν broadcast info για το audio file %1 (%2); από��ιψη broadcast info για αυτό το α�χείο"
 
 #: libs/ardour/sndfilesource.cc:220
-#, fuzzy
 msgid "SndFileSource: cannot open file \"%1\" for %2 (%3)"
-msgstr "SndFileSource: δεν μπο�ώ να ανοίξω το α�χείο \"%1\" (%2)"
+msgstr "SndFileSource: δεν μπο�ώ να ανοίξω το α�χείο \"%1\" για %2 (%3)"
 
 #: libs/ardour/sndfilesource.cc:226
-msgid ""
-"SndFileSource: file only contains %1 channels; %2 is invalid as a channel "
-"number"
-msgstr ""
-"SndFileSource: το α�χείο πε�ιέχει μόνο %1 κανάλια; %2 δεν έχει αξία σαν "
-"κανάλι number"
+msgid "SndFileSource: file only contains %1 channels; %2 is invalid as a channel number"
+msgstr "SndFileSource: το α�χείο πε�ιέχει μόνο %1 κανάλια; %2 δεν έχει αξία σαν κανάλι number"
 
 #: libs/ardour/sndfilesource.cc:327
 msgid "SndFileSource: could not seek to frame %1 within %2 (%3)"
 msgstr "SndFileSource: δεν μπο�ο�σα να αναζητήσω στο frame %1 μέσα στο %2 (%3)"
 
 #: libs/ardour/sndfilesource.cc:378
-#, fuzzy
 msgid "programming error: %1 %2"
-msgstr "σφάλμα π�ογ�αμματισμο�: %1"
+msgstr "σφάλμα π�ογ�αμματισμο�: %1 %2"
 
-#: libs/ardour/sndfilesource.cc:487 libs/ardour/sndfilesource.cc:533
-msgid ""
-"cannot set broadcast info for audio file %1; Dropping broadcast info for "
-"this file"
-msgstr ""
+#: libs/ardour/sndfilesource.cc:487
+#: libs/ardour/sndfilesource.cc:533
+msgid "cannot set broadcast info for audio file %1; Dropping broadcast info for this file"
+msgstr "Δεν ετέθησαν broadcast info για το audio file %1; Από��ιψη broadcast info για αυτό το α�χείο"
 
 #: libs/ardour/sndfilesource.cc:544
-#, fuzzy
 msgid "%1: cannot seek to %2"
-msgstr "%1: δεν μπο�ώ να αναζητήσω στο %2 για εξαγωγή"
+msgstr "%1: αδ�νατη η αναζήτηση στο %2"
 
 #: libs/ardour/state_manager.cc:47
-#, fuzzy
 msgid "cleared history"
-msgstr "εκκαθα�ίσθη"
+msgstr "εκκαθά�ιση ιστο�ικο�"
 
 #: libs/ardour/state_manager.cc:60
-#, fuzzy
-msgid ""
-"programming error: illegal state ID (%1) passed to StateManager::set_state() "
-"(range = 0-%2)"
-msgstr ""
-"σφάλμα π�ογ�αμματισμο�: αθέμιτη κατάσταση ID (%1) πέ�ασε στον StateManager::"
-"set_state() (range = 0-%3)"
+msgid "programming error: illegal state ID (%1) passed to StateManager::set_state() (range = 0-%2)"
+msgstr "σφάλμα π�ογ�αμματισμο�: αθέμιτη κατάσταση ID (%1) πέ�ασε στον StateManager::set_state() (range = 0-%2)"
 
 #: libs/ardour/stateful.cc:102
 msgid "Error: could not write %1"
@@ -2118,7 +1975,8 @@ msgstr "π�όσθεση μετ�ητή"
 msgid "replaced meter"
 msgstr "αντικατεστημένος μετ�ητής"
 
-#: libs/ardour/tempo.cc:483 libs/ardour/tempo.cc:499
+#: libs/ardour/tempo.cc:483
+#: libs/ardour/tempo.cc:499
 msgid "programming error: no tempo section in tempo map!"
 msgstr "σφάλμα π�ογ�αμματισμο�: κανένας τομέας �υθμο� στο χά�τη �υθμών!"
 
@@ -2126,24 +1984,22 @@ msgstr "σφάλμα π�ογ�αμματισμο�: κανένας τομέας
 msgid "programming error: unhandled MetricSection type"
 msgstr "σφάλμα π�ογ�αμματισμο�: αχεί�ιστος τ�πος MetricSection"
 
-#: libs/ardour/tempo.cc:1226 libs/ardour/tempo.cc:1238
+#: libs/ardour/tempo.cc:1226
+#: libs/ardour/tempo.cc:1238
 msgid "Tempo map: could not set new state, restoring old one."
-msgstr ""
-"Χά�της �υθμών: δεν μπό�εσα να θέσω νέα κατάσταση, επιστ�οφή π�οηγο�μενης."
+msgstr "Χά�της �υθμών: δεν μπό�εσα να θέσω νέα κατάσταση, επιστ�οφή π�οηγο�μενης."
 
 #: libs/ardour/tempo.cc:1262
 msgid "load XML data"
-msgstr ""
+msgstr "Φό�τωμα δεδομένων XML"
 
 #: libs/ardour/utils.cc:246
-#, fuzzy
 msgid "illegal or badly-formed string used for path (%1)"
-msgstr "πα�άνομη ή κακοσχηματισμένη γ�αμμή για το μονοπάτι RAID"
+msgstr "αθέμιτη ή κακοσχηματισμένη γ�αμμή για το μονοπάτι (%1)"
 
 #: libs/ardour/utils.cc:251
-#, fuzzy
 msgid "path (%1) is ambiguous"
-msgstr "Το μονοπάτι αναζήτησης του RAID είναι αμφίβολο"
+msgstr "Το μονοπάτι (%1) είναι αμφίβολο"
 
 #: libs/ardour/vst_plugin.cc:187
 msgid "cannot create VST chunk directory: %1"
@@ -2161,95 +2017,70 @@ msgstr "%1 υπά�χει αλλά δεν είναι φάκελος"
 msgid "Bad node sent to VSTPlugin::set_state"
 msgstr "Κακός κόμβος εστάλη στο VSTPlugin::set_state"
 
-#: libs/ardour/vst_plugin.cc:343 libs/ardour/vst_plugin.cc:354
+#: libs/ardour/vst_plugin.cc:343
+#: libs/ardour/vst_plugin.cc:354
 msgid "no support for presets using chunks at this time"
-msgstr ""
-"καμμία υποστή�ιξη αυτή τη στιγμή για �υθμίσεις που χ�ησιμοποιο�ν κομμάτια"
+msgstr "καμμία υποστή�ιξη αυτή τη στιγμή για �υθμίσεις που χ�ησιμοποιο�ν κομμάτια"
 
 #: libs/ardour/coreaudiosource.cc:97
-#, fuzzy
-msgid ""
-"CoreAudioSource: file only contains %1 channels; %2 is invalid as a channel "
-"number"
-msgstr ""
-"SndFileSource: το α�χείο πε�ιέχει μόνο %1 κανάλια; %2 δεν έχει αξία σαν "
-"κανάλι number"
+msgid "CoreAudioSource: file only contains %1 channels; %2 is invalid as a channel number"
+msgstr "CoreAudioSource: το α�χείο πε�ιέχει μόνο %1 κανάλια; το %2 δεν έχει αξία σαν α�ιθμός καναλιών"
 
 #: libs/ardour/coreaudiosource.cc:162
-#, fuzzy
 msgid "CoreAudioSource: could not seek to frame %1 within %2 (%3)"
-msgstr "SndFileSource: δεν μπο�ο�σα να αναζητήσω στο frame %1 μέσα στο %2 (%3)"
+msgstr "CoreAudioSource: δεν μπο�ο�σα να αναζητήσω στο frame %1 μέσα στο %2 (%3)"
 
 #~ msgid "FileSource: \"%1\" not found when searching %2 using %3"
 #~ msgstr "FileSource: \"%1\" δεν ευ�έθη όταν αναζητείτο %2 χ�ησιμοποιώντας %3"
-
 #~ msgid "FileSource: could not open \"%1\": (%2)"
 #~ msgstr "FileSource: δεν μπό�εσα να ανοίξω \"%1\": (%2)"
-
 #~ msgid "FileSource: cannot write header in %1"
 #~ msgstr "FileSource: δεν μπο�ώ να γ�άψω επικεφαλίδα στο %1"
-
 #~ msgid "FileSource: cannot locate chunks in %1"
 #~ msgstr "FileSource: δεν μπο�ώ να ανιχνε�σω κομμάτια στο %1"
-
 #~ msgid "FileSource: cannot read header in %1"
 #~ msgstr "FileSource: δεν μπο�ώ να διαβάσω επικεφαλίδα στο %1"
-
 #~ msgid "FileSource: cannot check header in %1"
 #~ msgstr "FileSource: δεν μπο�ώ να ελέγξω επικεφαλίδα στο %1"
 
 #, fuzzy
 #~ msgid "FileSource: cannot initialize peakfile for %1 as %2"
 #~ msgstr "FileSource: δεν μπο�ώ να εκκινήσω το peakfile για %1"
-
 #~ msgid "FileSource: cannot seek to end of file"
 #~ msgstr "FileSource: δεν μπο�ώ να ανιχνε�σω το τέλος του α�χείου"
-
 #~ msgid "FileSource: cannot read RIFF/WAVE chunk from file"
 #~ msgstr "FileSource: δεν μπο�ώ να διαβάσω κομμάτι RIFF/WAVE από το α�χείο"
-
 #~ msgid "FileSource %1: not a RIFF/WAVE file"
 #~ msgstr "FileSource %1: δεν είναι RIFF/WAVE α�χείο"
-
 #~ msgid "FileSource: can't read a chunk"
 #~ msgstr "FileSource: δεν μπο�ώ να διαβάσω κομμάτι"
-
 #~ msgid "FileSource: cannot get user information for BWF header (%1)"
 #~ msgstr ""
 #~ "FileSource: δεν μπο�ώ να β�ώ πλη�οφο�ίες χ�ήστη για επικεφαλίδα BWF (%1)"
-
 #~ msgid "FileSource[%1]: cannot update data size: %2"
 #~ msgstr "FileSource[%1]: δεν μπο�ώ να ανανεώσω το μέγεθος δεδομένων: %2"
-
 #~ msgid "FileSource: can't find RIFF chunk info"
 #~ msgstr "FileSource: δεν ευ�έθησαν πλη�οφο�ίες για RIFF κομμάτι"
 
 #, fuzzy
 #~ msgid "FileSource: can't find RIFX chunk info"
 #~ msgstr "FileSource: δεν ευ�έθησαν πλη�οφο�ίες για RIFF κομμάτι"
-
 #~ msgid "FileSource: can't read RIFF chunk"
 #~ msgstr "FileSource: δεν μπο�ώ να διαβάσω RIFF κομμάτι"
-
 #~ msgid "FileSource: can't find format chunk info"
 #~ msgstr "FileSource: δεν ευ�έθησαν πλη�οφο�ίες για το κομμάτι φο�μα�ίσματος"
-
 #~ msgid "FileSource: can't read format chunk"
 #~ msgstr "FileSource: δεν μπο�ώ να διαβάσω το κομμάτι φο�μα�ίσματος"
-
 #~ msgid "FileSource: can't find data chunk info"
 #~ msgstr "FileSource: δεν μπο�ώ να β�ώ πλη�οφο�ίες για το κομμάτι δεδομένων"
-
 #~ msgid "FileSource: can't read data chunk"
 #~ msgstr "FileSource: δεν μπο�ώ να διαβάσω το κομμάτι δεδομένων"
-
 #~ msgid ""
 #~ "FileSource: cannot read Broadcast Wave data from existing audio file \"%1"
 #~ "\" (%2)"
 #~ msgstr ""
 #~ "FileSource: δεν μπο�ώ να διαβάσω δεδομένα Broadcast Wave από το υπά�χον "
 #~ "α�χείο \"%1\" (%2)"
-
 #~ msgid ""
 #~ "FileSource: cannot read Broadcast Wave coding history from audio file \"%1"
 #~ "\" (%2)"
@@ -2264,29 +2095,22 @@ msgstr "SndFileSource: δεν μπο�ο�σα να αναζητήσω στο fr
 #~ msgstr ""
 #~ "FileSource \"%1\" δεν χ�ησιμοποιεί format μεταβλητής υποδιαστολής.\n"
 #~ "Αυτό πιθανόν να είναι σφάλμα π�ογ�αμματισμο�."
-
 #~ msgid "FileSource \"%1\" has no \"data\" chunk"
 #~ msgstr "FileSource \"%1\" δεν έχει \"data\" κομμάτι"
-
 #~ msgid ""
 #~ "%1: data length in header (%2) differs from implicit size in file (%3)"
 #~ msgstr ""
 #~ "%1: το μέγεθος δεδομένων της επικεφαλίδας (%2) διαφέ�ει από το δεδηλωμένο "
 #~ "μέγεθος στο α�χείο (%3)"
-
 #~ msgid "\"%1\" has a sample rate of %2 instead of %3 as used by this session"
 #~ msgstr ""
 #~ "\"%1\" έχει �υθμό δειγματοληψίας %2 αντί του %3 όπως στην πα�ο�σα συνεδ�ία"
-
 #~ msgid "FileSource: cannot write WAVE chunk: %1"
 #~ msgstr "FileSource: δεν μπο�ώ να γ�άψω WAVE κομμάτι: %1"
-
 #~ msgid "FileSource: cannot write format chunk: %1"
 #~ msgstr "FileSource: δεν μπο�ώ να γ�άψω format κομμάτι: %1"
-
 #~ msgid "FileSource: cannot data chunk: %1"
 #~ msgstr "FileSource: cδεν μπο�ώ να γ�άψω κομμάτι δεδομένων: %1"
-
 #~ msgid "FileSource: \"%1\" bad write (%2)"
 #~ msgstr "FileSource: \"%1\" κακή εγγ�αφή (%2)"
 
@@ -2309,22 +2133,17 @@ msgstr "SndFileSource: δεν μπο�ο�σα να αναζητήσω στο fr
 #, fuzzy
 #~ msgid "Error reading from feedback request pipe"
 #~ msgstr "Σφάλμα στην ανάγνωση από transport request pipe"
-
 #~ msgid "Could not find member filename"
 #~ msgstr "Δεν ευ�έθη το α�χείο μέλους"
-
 #~ msgid "could not create crossfade object in playlist %1"
 #~ msgstr "δεν έγινε δημιου�γία αντικειμένου crossfade στη λίστα αναπα�/γής%1"
-
 #~ msgid ""
 #~ "There are too many frozen versions of playlist \"%1\" to create another "
 #~ "one"
 #~ msgstr ""
 #~ "Πά�α πολλές εκδόσεις λίστας αναπα�/γής \"%1\" για τη δημιου�γία άλλης"
-
 #~ msgid "alsa_pcm:playback_1"
 #~ msgstr "alsa_pcm:playback_1"
-
 #~ msgid "alsa_pcm:playback_2"
 #~ msgstr "alsa_pcm:playback_2"
 
@@ -2335,57 +2154,42 @@ msgstr "SndFileSource: δεν μπο�ο�σα να αναζητήσω στο fr
 #, fuzzy
 #~ msgid "Source: cannot stat peakfile \"%1\" or \"%2\""
 #~ msgstr "Source: δεν μπο�ώ να μετ�ήσω το αυτοστιγμεί peakfile \"%1\""
-
 #~ msgid "Transport: error polling extra MIDI port #1 (revents =%1%2%3"
 #~ msgstr ""
 #~ "Transport: σφάλμα στην αίτηση επιπλέον θ��ας MIDI #1 (revents =%1%2%3"
-
 #~ msgid "Transport: error polling extra MIDI port #2 (revents =%1%2%3"
 #~ msgstr ""
 #~ "Transport: σφάλμα στην αίτηση επιπλέον θ��ας MIDI #2 (revents =%1%2%3"
-
 #~ msgid "Source: cannot seek to frame %1 in peakfile!"
 #~ msgstr "Source: δεν μπο�ώ να αναζητήσω το frame %1 στο peakfile!"
-
 #~ msgid "Source[%1]: cannot seek to frame %2 in peakfile!"
 #~ msgstr "Source[%1]: δεν μπο�ώ να αναζητήσω το frame %2 στο peakfile!"
-
 #~ msgid "%1: could not seek to byte %2 in peakfile (%3"
 #~ msgstr "%1: δεν μπο�ώ να αναζητήσω σε byte %2 στο peakfile (%3"
-
 #~ msgid "could not register an input port called \"%1\""
 #~ msgstr "δεν μπό�εσα να register μία θ��α εισόδου με όνομα \"%1\""
-
 #~ msgid "could not register an output port called \"%1\""
 #~ msgstr "δεν μπό�εσα να register μία θ��α εξόδου με όνομα \"%1\""
-
 #~ msgid "%1: disk stream error at frame %2 (%3)"
 #~ msgstr "%1: σφάλμα disk stream στο frame %2 (%3)"
-
 #~ msgid "IO: cannot connect input port %1 to %2"
 #~ msgstr "IO: δεν μπο�εί να συνδεθεί η θ��α εισόδου %1 στο %2"
-
 #~ msgid "IO: cannot connect output port %1 to %2"
 #~ msgstr "IO: δεν μπο�εί να συνδεθεί η θ��α εξόδου %1 στο %2"
-
 #~ msgid "Playlist: cannot create from state."
 #~ msgstr "Playlist: δεν μπο�ώ να δημιου�γήσω από κατάσταση."
-
 #~ msgid ""
 #~ "for various reasons, it is no longer valid to use one of the plugins "
 #~ "listed for this session. it will be ignored"
 #~ msgstr ""
 #~ "για διάφο�ους λόγους, δεν είναι πλέον χ�ήσιμο να χ�ησιμοποιηθεί ένα από "
 #~ "τα καταχω�ημένα pluginsγια αυτή τη συνεδ�ία. Θα αγνοηθεί."
-
 #~ msgid "cannot connect click track to %1"
 #~ msgstr "δεν μπο�ώ να διασυνδέσω το κανάλι Mετ�ονόμου(click track) στο %1"
-
 #~ msgid "out %lu+%lu"
 #~ msgstr "out %lu+%lu"
-
 #~ msgid "in %lu+%lu"
 #~ msgstr "in %lu+%lu"
-
 #~ msgid "Session: error for %1 at frame %2 (%3)"
 #~ msgstr "Συνεδ�ία: σφάλμα για %1 στο frame %2 (%3)"
+
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 8f61fc9ac1..0644a5c84b 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -2757,6 +2757,9 @@ Session::remove_last_capture ()
 	}
 
 	destroy_regions (r);
+
+	save_state (_current_snapshot_name);
+
 	return 0;
 }
 
diff --git a/libs/ardour/session_command.cc b/libs/ardour/session_command.cc
index ef2196ed13..b9a0e2cb60 100644
--- a/libs/ardour/session_command.cc
+++ b/libs/ardour/session_command.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <ardour/session.h>
 #include <ardour/route.h>
 #include <pbd/memento_command.h>
@@ -60,8 +79,9 @@ Session::memento_command_factory(XMLNode *n)
     /* create command */
     string obj_T = n->property ("type_name")->value();
     if (obj_T == typeid (AudioRegion).name() || obj_T == typeid (Region).name()) {
-	    if (audio_regions.count(id))
+	    if (audio_regions.count(id)) {
 		    return new MementoCommand<AudioRegion>(*audio_regions[id], before, after);
+	    }
     } else if (obj_T == typeid (AudioSource).name()) {
 	    if (audio_sources.count(id))
 		    return new MementoCommand<AudioSource>(*audio_sources[id], before, after);
@@ -86,6 +106,7 @@ Session::memento_command_factory(XMLNode *n)
 
     /* we failed */
     error << string_compose (_("could not reconstitute MementoCommand from XMLNode. object type = %1 id = %2"), obj_T, id.to_s()) << endmsg;
+
     return 0 ;
 }
 
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 119d2c858d..efd2d180f2 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -487,13 +487,6 @@ Session::create (bool& new_session, string* mix_template, nframes_t initial_leng
 		return -1;
 	}
 
-	dir = automation_dir ();
-
-	if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
-		error << string_compose(_("Session: cannot create session automation dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
-		return -1;
-	}
-
 	dir = export_dir ();
 
 	if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
@@ -582,6 +575,14 @@ Session::load_diskstreams (const XMLNode& node)
 }
 
 void
+Session::maybe_write_autosave()
+{
+        if (dirty() && record_status() != Recording) {
+                save_state("", true);
+        }
+}
+
+void
 Session::remove_pending_capture_state ()
 {
 	string xml_path;
@@ -688,7 +689,7 @@ Session::save_state (string snapshot_name, bool pending)
 	tmp_path += snapshot_name;
 	tmp_path += ".tmp";
 
-	cerr << "actually writing state\n";
+	cerr << "actually writing state to " << xml_path << endl;
 
 	if (!tree.write (tmp_path)) {
 		error << string_compose (_("state could not be saved to %1"), tmp_path) << endmsg;
@@ -750,7 +751,7 @@ Session::load_state (string snapshot_name)
 	xmlpath += snapshot_name;
 	xmlpath += _pending_suffix;
 
-	if (!access (xmlpath.c_str(), F_OK)) {
+	if (Glib::file_test (xmlpath, Glib::FILE_TEST_EXISTS)) {
 
 		/* there is pending state from a crashed capture attempt */
 
@@ -765,8 +766,8 @@ Session::load_state (string snapshot_name)
 		xmlpath += snapshot_name;
 		xmlpath += _statefile_suffix;
 	}
-
-	if (access (xmlpath.c_str(), F_OK)) {
+	
+	if (!Glib::file_test (xmlpath, Glib::FILE_TEST_EXISTS)) {
 		error << string_compose(_("%1: session state information file \"%2\" doesn't exist!"), _name, xmlpath) << endmsg;
 		return 1;
 	}
@@ -808,8 +809,10 @@ Session::load_state (string snapshot_name)
 	if (is_old) {
 		string backup_path;
 
-		backup_path = xmlpath;
-		backup_path += ".1";
+		backup_path = _path;
+		backup_path += snapshot_name;
+		backup_path += "-1";
+		backup_path += _statefile_suffix;
 
 		info << string_compose (_("Copying old session file %1 to %2\nUse %2 with Ardour versions before 2.0 from now on"),
 					xmlpath, backup_path) 
@@ -1504,7 +1507,7 @@ Session::path_from_region_name (string name, string identifier)
 			snprintf (buf, sizeof(buf), "%s/%s-%" PRIu32 ".wav", dir.c_str(), name.c_str(), n);
 		}
 
-		if (!g_file_test (buf, G_FILE_TEST_EXISTS)) {
+		if (!Glib::file_test (buf, Glib::FILE_TEST_EXISTS)) {
 			return buf;
 		}
 	}
diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 9ae3492ea7..486b94f27b 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -158,14 +158,6 @@ Session::sync_time_vars ()
 	}
 	_smpte_frames_per_hour = (nframes_t)rint(smpte_frames_per_second() * 3600.0);
 
-}
-
-int
-Session::set_smpte_format (SmpteFormat format)
-{
-
-	Config->set_smpte_format (format);
-
 	last_smpte_valid = false;
 	// smpte type bits are the middle two in the upper nibble
 	switch ((int) ceil (smpte_frames_per_second())) {
@@ -186,7 +178,13 @@ Session::set_smpte_format (SmpteFormat format)
 		}
 		break;
 	};
+}
 
+int
+Session::set_smpte_format (SmpteFormat format)
+{
+	/* this will trigger any other changes needed */
+	Config->set_smpte_format (format);
 	return 0;
 }
 
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index e4811ca18d..22d30fda9d 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -1255,3 +1255,13 @@ Session::allow_auto_play (bool yn)
 {
 	auto_play_legal = yn;
 }
+
+void
+Session::reset_jack_connection (jack_client_t* jack)
+{
+	JACK_Slave* js;
+
+	if (_slave && ((js = dynamic_cast<JACK_Slave*> (_slave)) != 0)) {
+		js->reset_client (jack);
+	}
+}
diff --git a/libs/ardour/sndfile_helpers.cc b/libs/ardour/sndfile_helpers.cc
index 14bf361831..9e439ba4c6 100644
--- a/libs/ardour/sndfile_helpers.cc
+++ b/libs/ardour/sndfile_helpers.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <map>
 #include <vector>
 
diff --git a/libs/gtkmm2ext/dndtreeview.cc b/libs/gtkmm2ext/dndtreeview.cc
index 7baedd4121..2c2e69f6b6 100644
--- a/libs/gtkmm2ext/dndtreeview.cc
+++ b/libs/gtkmm2ext/dndtreeview.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <cstdio>
 #include <iostream>
 
diff --git a/libs/gtkmm2ext/focus_entry.cc b/libs/gtkmm2ext/focus_entry.cc
index dbe833d06b..706fc28e2f 100644
--- a/libs/gtkmm2ext/focus_entry.cc
+++ b/libs/gtkmm2ext/focus_entry.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <gtkmm2ext/focus_entry.h>
 
 using namespace Gtkmm2ext;
diff --git a/libs/gtkmm2ext/gtkmm2ext/choice.h b/libs/gtkmm2ext/gtkmm2ext/choice.h
index 19984fb294..b6dcdc05c1 100644
--- a/libs/gtkmm2ext/gtkmm2ext/choice.h
+++ b/libs/gtkmm2ext/gtkmm2ext/choice.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_gtkmm_choice_h__
 #define __pbd_gtkmm_choice_h__
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
index f8beb75873..fbc5ea90ef 100644
--- a/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
+++ b/libs/gtkmm2ext/gtkmm2ext/dndtreeview.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __gtkmm2ext_dndtreeview_h__
 #define __gtkmm2ext_dndtreeview_h__
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/focus_entry.h b/libs/gtkmm2ext/gtkmm2ext/focus_entry.h
index 5d9d7fdac7..3fb57b433d 100644
--- a/libs/gtkmm2ext/gtkmm2ext/focus_entry.h
+++ b/libs/gtkmm2ext/gtkmm2ext/focus_entry.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __gtkmm2ext_focus_entry_h__
 #define __gtkmm2ext_focus_entry_h__
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h b/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h
index 48e1cc449c..d8bda35cb5 100644
--- a/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h
+++ b/libs/gtkmm2ext/gtkmm2ext/idle_adjustment.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __gtkmm2ext_idle_adjustment_h__
 #define __gtkmm2ext_idle_adjustment_h__
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/pixscroller.h b/libs/gtkmm2ext/gtkmm2ext/pixscroller.h
index 8739478a8f..ea33359a25 100644
--- a/libs/gtkmm2ext/gtkmm2ext/pixscroller.h
+++ b/libs/gtkmm2ext/gtkmm2ext/pixscroller.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __gtkmm2ext_pixscroller_h__ 
 #define __gtkmm2ext_pixscroller_h__
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/stop_signal.h b/libs/gtkmm2ext/gtkmm2ext/stop_signal.h
index 9c191a033e..cb8dedca12 100644
--- a/libs/gtkmm2ext/gtkmm2ext/stop_signal.h
+++ b/libs/gtkmm2ext/gtkmm2ext/stop_signal.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_gtk_stop_signal_h__
 #define __ardour_gtk_stop_signal_h__
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/window_title.h b/libs/gtkmm2ext/gtkmm2ext/window_title.h
index 1ce7d64b92..93b47d9d45 100644
--- a/libs/gtkmm2ext/gtkmm2ext/window_title.h
+++ b/libs/gtkmm2ext/gtkmm2ext/window_title.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef WINDOW_TITLE_INCLUDED
 #define WINDOW_TITLE_INCLUDED
 
diff --git a/libs/gtkmm2ext/idle_adjustment.cc b/libs/gtkmm2ext/idle_adjustment.cc
index 45118283c5..3e3a3da566 100644
--- a/libs/gtkmm2ext/idle_adjustment.cc
+++ b/libs/gtkmm2ext/idle_adjustment.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #define _BSD_SOURCE
 #include <gtkmm2ext/idle_adjustment.h>
 #include <gtkmm/main.h>
diff --git a/libs/gtkmm2ext/stateful_button.cc b/libs/gtkmm2ext/stateful_button.cc
index ffcafab123..949cae958b 100644
--- a/libs/gtkmm2ext/stateful_button.cc
+++ b/libs/gtkmm2ext/stateful_button.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <string>
 #include <iostream>
 
diff --git a/libs/gtkmm2ext/window_title.cc b/libs/gtkmm2ext/window_title.cc
index 237be1ff0f..7c942d7f20 100644
--- a/libs/gtkmm2ext/window_title.cc
+++ b/libs/gtkmm2ext/window_title.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include "gtkmm2ext/window_title.h"
 
 #include "i18n.h"
diff --git a/libs/midi++2/midi++/types.h b/libs/midi++2/midi++/types.h
index 218416d213..98855ca82d 100644
--- a/libs/midi++2/midi++/types.h
+++ b/libs/midi++2/midi++/types.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __midi_types_h__
 #define __midi_types_h__
 
diff --git a/libs/pbd/base_ui.cc b/libs/pbd/base_ui.cc
index d3c8d5e4c7..8dd056b783 100644
--- a/libs/pbd/base_ui.cc
+++ b/libs/pbd/base_ui.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/libs/pbd/basename.cc b/libs/pbd/basename.cc
index 9beed93625..0b631f4249 100644
--- a/libs/pbd/basename.cc
+++ b/libs/pbd/basename.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <pbd/basename.h>
 #include <glibmm/miscutils.h>
 
diff --git a/libs/pbd/command.cc b/libs/pbd/command.cc
index 5b41691c07..f84d99491f 100644
--- a/libs/pbd/command.cc
+++ b/libs/pbd/command.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <pbd/command.h>
 #include <pbd/xml++.h>
 
diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index 00638e6c06..039eb43e3a 100644
--- a/libs/pbd/controllable.cc
+++ b/libs/pbd/controllable.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <pbd/controllable.h>
 #include <pbd/xml++.h>
 #include <pbd/error.h>
diff --git a/libs/pbd/copyfile.cc b/libs/pbd/copyfile.cc
index d36ecef58a..2284a6b26d 100644
--- a/libs/pbd/copyfile.cc
+++ b/libs/pbd/copyfile.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <fstream>
 #include <unistd.h>
 
diff --git a/libs/pbd/error.cc b/libs/pbd/error.cc
index a6f8fb7f8f..f3568d0877 100644
--- a/libs/pbd/error.cc
+++ b/libs/pbd/error.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <pbd/error.h>
 
 Transmitter  PBD::error (Transmitter::Error);
diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc
index 353776de9f..642243a36a 100644
--- a/libs/pbd/id.cc
+++ b/libs/pbd/id.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <ostream>
 #include <iostream>
 #include <stdio.h>
diff --git a/libs/pbd/pbd/base_ui.h b/libs/pbd/pbd/base_ui.h
index b4570f8707..0928512841 100644
--- a/libs/pbd/pbd/base_ui.h
+++ b/libs/pbd/pbd/base_ui.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_base_ui_h__
 #define __pbd_base_ui_h__
 
diff --git a/libs/pbd/pbd/basename.h b/libs/pbd/pbd/basename.h
index a622643541..f13c3840dc 100644
--- a/libs/pbd/pbd/basename.h
+++ b/libs/pbd/pbd/basename.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __stupid_basename_h__
 #define __stupid_basename_h__
 
diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h
index c152013c66..ed41af1be8 100644
--- a/libs/pbd/pbd/controllable.h
+++ b/libs/pbd/pbd/controllable.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_controllable_h__
 #define __pbd_controllable_h__
 
diff --git a/libs/pbd/pbd/copyfile.h b/libs/pbd/pbd/copyfile.h
index 8a1bf242bb..1e8c5c2a42 100644
--- a/libs/pbd/pbd/copyfile.h
+++ b/libs/pbd/pbd/copyfile.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <glibmm/ustring.h>
 
 namespace PBD {
diff --git a/libs/pbd/pbd/crossthread.h b/libs/pbd/pbd/crossthread.h
index 413dea024e..b815cfd319 100644
--- a/libs/pbd/pbd/crossthread.h
+++ b/libs/pbd/pbd/crossthread.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd__crossthread_h__
 #define __pbd__crossthread_h__
 
diff --git a/libs/pbd/pbd/destructible.h b/libs/pbd/pbd/destructible.h
index 7c50806334..827feb8fe5 100644
--- a/libs/pbd/pbd/destructible.h
+++ b/libs/pbd/pbd/destructible.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_destructible_h__
 #define __pbd_destructible_h__
 
diff --git a/libs/pbd/pbd/failed_constructor.h b/libs/pbd/pbd/failed_constructor.h
index 62eb6c0d71..b13964e355 100644
--- a/libs/pbd/pbd/failed_constructor.h
+++ b/libs/pbd/pbd/failed_constructor.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_failed_constructor_h__
 #define __pbd_failed_constructor_h__
 
diff --git a/libs/pbd/pbd/forkexec.h b/libs/pbd/pbd/forkexec.h
index 2af3711390..236cffa301 100644
--- a/libs/pbd/pbd/forkexec.h
+++ b/libs/pbd/pbd/forkexec.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __forkexec_h__
 #define __forkexec_h__
 
diff --git a/libs/pbd/pbd/id.h b/libs/pbd/pbd/id.h
index eb3691d99e..3f87a65e0d 100644
--- a/libs/pbd/pbd/id.h
+++ b/libs/pbd/pbd/id.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_id_h__
 #define __pbd_id_h__
 
diff --git a/libs/pbd/pbd/pathscanner.h b/libs/pbd/pbd/pathscanner.h
index 346e7858c4..0a48d4d949 100644
--- a/libs/pbd/pbd/pathscanner.h
+++ b/libs/pbd/pbd/pathscanner.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __libmisc_pathscanner_h__
 #define __libmisc_pathscanner_h__
 
diff --git a/libs/pbd/pbd/pthread_utils.h b/libs/pbd/pbd/pthread_utils.h
index 482b5b54cf..9fa6ba4ce4 100644
--- a/libs/pbd/pbd/pthread_utils.h
+++ b/libs/pbd/pbd/pthread_utils.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_pthread_utils__
 #define __pbd_pthread_utils__
 
diff --git a/libs/pbd/pbd/rcu.h b/libs/pbd/pbd/rcu.h
index 8b0b8b3548..8b8f693e7e 100644
--- a/libs/pbd/pbd/rcu.h
+++ b/libs/pbd/pbd/rcu.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_rcu_h__
 #define __pbd_rcu_h__
 
diff --git a/libs/pbd/pbd/replace_all.h b/libs/pbd/pbd/replace_all.h
index 4434637283..3bc465d89f 100644
--- a/libs/pbd/pbd/replace_all.h
+++ b/libs/pbd/pbd/replace_all.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_replace_all_h__
 #define __pbd_replace_all_h__
 
diff --git a/libs/pbd/pbd/shiva.h b/libs/pbd/pbd/shiva.h
index 53b613ea2b..2e53ff65f5 100644
--- a/libs/pbd/pbd/shiva.h
+++ b/libs/pbd/pbd/shiva.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_shiva_h__
 #define __pbd_shiva_h__
 
diff --git a/libs/pbd/pbd/shortpath.h b/libs/pbd/pbd/shortpath.h
index d126472e77..55431bf34e 100644
--- a/libs/pbd/pbd/shortpath.h
+++ b/libs/pbd/pbd/shortpath.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_shortpath_h__
 #define __pbd_shortpath_h__
 
diff --git a/libs/pbd/pbd/stacktrace.h b/libs/pbd/pbd/stacktrace.h
index fa90a07355..c6da6ed79d 100644
--- a/libs/pbd/pbd/stacktrace.h
+++ b/libs/pbd/pbd/stacktrace.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __libpbd_stacktrace_h__
 #define __libpbd_stacktrace_h__
 
diff --git a/libs/pbd/pbd/statefuldestructible.h b/libs/pbd/pbd/statefuldestructible.h
index 708c10fc8e..83eff473d6 100644
--- a/libs/pbd/pbd/statefuldestructible.h
+++ b/libs/pbd/pbd/statefuldestructible.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_stateful_destructible_h__
 #define __pbd_stateful_destructible_h__
 
diff --git a/libs/pbd/pbd/strsplit.h b/libs/pbd/pbd/strsplit.h
index f36a3ae5f0..25c4526b6a 100644
--- a/libs/pbd/pbd/strsplit.h
+++ b/libs/pbd/pbd/strsplit.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_strplit_h__
 #define __pbd_strplit_h__
 
diff --git a/libs/pbd/pbd/tokenizer.h b/libs/pbd/pbd/tokenizer.h
index b80e3eac4a..9206d1b6fb 100644
--- a/libs/pbd/pbd/tokenizer.h
+++ b/libs/pbd/pbd/tokenizer.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef PBD_TOKENIZER
 #define PBD_TOKENIZER
 
diff --git a/libs/pbd/pbd/whitespace.h b/libs/pbd/pbd/whitespace.h
index 6adb41641c..444be112b0 100644
--- a/libs/pbd/pbd/whitespace.h
+++ b/libs/pbd/pbd/whitespace.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __pbd_whitespace_h__
 #define __pbd_whitespace_h__
 
diff --git a/libs/pbd/shortpath.cc b/libs/pbd/shortpath.cc
index 59af8e4dcb..9f9598e617 100644
--- a/libs/pbd/shortpath.cc
+++ b/libs/pbd/shortpath.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <pbd/shortpath.h>
 
 using namespace Glib;
diff --git a/libs/pbd/stacktrace.cc b/libs/pbd/stacktrace.cc
index 8a6eb606b2..375fc1eecd 100644
--- a/libs/pbd/stacktrace.cc
+++ b/libs/pbd/stacktrace.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <pbd/stacktrace.h>
 #include <iostream>
 
diff --git a/libs/pbd/strreplace.cc b/libs/pbd/strreplace.cc
index dd90baf324..7999b5c6c9 100644
--- a/libs/pbd/strreplace.cc
+++ b/libs/pbd/strreplace.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <pbd/replace_all.h>
 
 int
diff --git a/libs/pbd/strsplit.cc b/libs/pbd/strsplit.cc
index 1fb6112150..b7a7109af4 100644
--- a/libs/pbd/strsplit.cc
+++ b/libs/pbd/strsplit.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <pbd/strsplit.h>
 
 using namespace std;
diff --git a/libs/pbd/whitespace.cc b/libs/pbd/whitespace.cc
index 9568c1781c..b09d830103 100644
--- a/libs/pbd/whitespace.cc
+++ b/libs/pbd/whitespace.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2000-2007 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <pbd/whitespace.h>
 
 using namespace std;
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,20 +615,13 @@ 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;
 	controls.push_back( 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..15beb275aa 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>
@@ -256,7 +257,9 @@ void MackieControlProtocol::switch_banks( int initial )
 	int delta = sorted.size() - route_table.size();
 	if ( initial < 0 || ( delta > 0 && initial > delta ) )
 	{
+#ifdef DEBUG
 		cout << "not switching to " << initial << endl;
+#endif
 		return;
 	}
 	_current_initial_bank = initial;
@@ -416,7 +419,9 @@ int MackieControlProtocol::set_active (bool yn)
 		}
 		catch( exception & e )
 		{
+#ifdef DEBUG
 			cout << "set_active to false because exception caught: " << e.what() << endl;
+#endif
 			_active = false;
 			throw;
 		}
@@ -497,8 +502,10 @@ void MackieControlProtocol::update_global_button( const string & name, LedState
 	}
 	else
 	{
+#ifdef DEBUG
 		cout << "Button " << name << " not found" << endl;
-	}
+#endif
+		}
 }
 
 // send messages to surface to set controls to correct values
@@ -674,7 +681,9 @@ void MackieControlProtocol::close()
 		}
 		catch ( exception & e )
 		{
+#ifdef DEBUG
 			cout << "MackieControlProtocol::close caught exception: " << e.what() << endl;
+#endif
 		}
 		
 		for( MackiePorts::iterator it = _ports.begin(); it != _ports.end(); ++it )
@@ -691,7 +700,9 @@ void MackieControlProtocol::close()
 			}
 			catch ( exception & e )
 			{
+#ifdef DEBUG
 				cout << "MackieControlProtocol::close caught exception: " << e.what() << endl;
+#endif
 			}
 		}
 		
@@ -757,7 +768,9 @@ int MackieControlProtocol::set_state( const XMLNode & node )
 		}
 		catch ( exception & e )
 		{
+#ifdef DEBUG
 			cout << "exception in MackieControlProtocol::set_state: " << e.what() << endl;
+#endif
 			return -1;
 		}
 	}
@@ -1038,7 +1051,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 +1061,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 +1076,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 +1125,36 @@ LedState MackieControlProtocol::record_release( Button & button )
 		return off;
 }
 
+LedState MackieControlProtocol::rewind_press( Button & button )
+{
+	session->request_transport_speed( -4.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( 4.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
 ///////////////////////////////////////////
@@ -1133,7 +1176,9 @@ void MackieControlProtocol::notify_parameter_changed( const char * name_str )
 	}
 	else
 	{
+#ifdef DEBUG
 		cout << "parameter changed: " << name << endl;
+#endif
 	}
 }
 
@@ -1198,6 +1243,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 +1423,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
+
+# transport buttons
+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,0x2c
-button,1,transport,punch_out,1,1,0x2b
+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
-
-# transport buttons
-button,1,transport,"rewind",1,1,0x5b
-button,1,transport,"ffwd",1,1,0x5c
+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