diff --git a/ChangeLog b/ChangeLog
index d6adb22f5..ce507ca64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2008-07-18	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* include/automation_pattern.h:
+	* src/core/automation_pattern.cpp:
+	- removed obsolete variable
+	- fixed wrong behaviour of automationPattern::valueAt()
+	- in case there's only one initial value in time-map, set it for all
+	  objects when loading settings
+
+	* src/tracks/instrument_track.cpp:
+	save actual instrument-settings in separate sub-node for not mixing up
+	unknown nodes with instruments
+
+	* src/gui/widgets/group_box.cpp:
+	only toggle LED on left click
+
+	* include/detuning_helper.h:
+	* include/inline_automation.h:
+	fixed behaviour for inline-automations with only one value in time-map
+
+	* src/core/mmp.cpp:
+	- fixed and improved various tag-renaming-loops
+	- added upgrade path from LB302 to LB303
+
 	* plugins/bit_invader/bit_invader.cpp:
 	* plugins/sf2_player/sf2_player.cpp:
 	* plugins/spectrum_analyzer/spectrum_analyzer.cpp:
@@ -24,11 +46,16 @@
 	automationPattern::putValue()
 
 	* include/instrument_sound_shaping.h:
+	* src/core/effect_chain.cpp:
 	* src/core/instrument_functions.cpp:
 	* src/core/instrument_sound_shaping.cpp:
+	* src/core/meter_model.cpp:
+	* src/core/song.cpp:
+	* src/core/track.cpp:
 	* src/core/surround_area.cpp:
 	* src/gui/widgets/graph.cpp:
-	added values for displayName-property
+	* src/tracks/instrument_track.cpp:
+	added more values for displayName-property
 
 	* include/track_label_button.h:
 	* src/gui/widgets/track_label_button.cpp:
diff --git a/src/core/effect_chain.cpp b/src/core/effect_chain.cpp
index 61cbdbda0..4c95733f3 100644
--- a/src/core/effect_chain.cpp
+++ b/src/core/effect_chain.cpp
@@ -36,7 +36,7 @@
 
 effectChain::effectChain( model * _parent ) :
 	model( _parent ),
-	m_enabledModel( FALSE )
+	m_enabledModel( FALSE, this, tr( "Effects enabled" ) )
 {
 }
 
diff --git a/src/core/meter_model.cpp b/src/core/meter_model.cpp
index 7a3430eb8..ca29611e1 100644
--- a/src/core/meter_model.cpp
+++ b/src/core/meter_model.cpp
@@ -28,8 +28,8 @@
 
 meterModel::meterModel( ::model * _parent ) :
 	model( _parent ),
-	m_numeratorModel( 4, 1, 32, this ),
-	m_denominatorModel( 4, 1, 32, this )
+	m_numeratorModel( 4, 1, 32, this, tr( "Numerator" ) ),
+	m_denominatorModel( 4, 1, 32, this, tr( "Denominator" ) )
 {
 	connect( &m_numeratorModel, SIGNAL( dataChanged() ), 
 				this, SIGNAL( dataChanged() ) );
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 3dc1832f4..f98b80440 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -73,11 +73,11 @@ song::song( void ) :
 	m_globalAutomationTrack( dynamic_cast<automationTrack *>(
 				track::create( track::HiddenAutomationTrack,
 								this ) ) ),
-	m_tempoModel( DefaultTempo, MinTempo, MaxTempo, this ),
+	m_tempoModel( DefaultTempo, MinTempo, MaxTempo, this, tr( "Tempo" ) ),
 	m_timeSigModel( this ),
 	m_oldTicksPerTact( DefaultTicksPerTact ),
-	m_masterVolumeModel( 100, 0, 200, this ),
-	m_masterPitchModel( 0, -12, 12, this ),
+	m_masterVolumeModel( 100, 0, 200, this, tr( "Master volume" ) ),
+	m_masterPitchModel( 0, -12, 12, this, tr( "Master pitch" ) ),
 	m_fileName(),
 	m_oldFileName(),
 	m_modified( FALSE ),
diff --git a/src/core/track.cpp b/src/core/track.cpp
index 3f3fc5d65..14b6ba8c2 100644
--- a/src/core/track.cpp
+++ b/src/core/track.cpp
@@ -112,7 +112,7 @@ trackContentObject::trackContentObject( track * _track ) :
 	m_name( QString::null ),
 	m_startPosition(),
 	m_length(),
-	m_mutedModel( FALSE, this )
+	m_mutedModel( FALSE, this, tr( "Muted" ) )
 {
 	if( getTrack() )
 	{
@@ -1547,8 +1547,10 @@ track::track( TrackTypes _type, trackContainer * _tc ) :
 	m_type( _type ),                /*!< The track type */
 	m_name(),                       /*!< The track's name */
 	m_pixmapLoader( NULL ),         /*!< For loading the track's pixmaps */
-	m_mutedModel( FALSE, this ),    /*!< For controlling track muting */
-	m_soloModel( FALSE, this ),     /*!< For controlling track soloing */
+	m_mutedModel( FALSE, this, tr( "Muted" ) ),
+					 /*!< For controlling track muting */
+	m_soloModel( FALSE, this, tr( "Solo" ) ),
+					/*!< For controlling track soloing */
 	m_trackContentObjects()         /*!< The track content objects (segments) */
 {
 	m_trackContainer->addTrack( this );