First release candidate for 1.0.0

Bumped version number to 0.9.90 in CMakeLists.txt, README and lmms.rc.in.

.gitattributes

@@ -0,0 +1,2 @@
+.gitattributes export-ignore
+.gitignore export-ignore

.gitignore

@@ -0,0 +1,4 @@
+/build
+.*.sw?
+*~
+/CMakeLists.txt.user

.mailmap

@@ -0,0 +1,11 @@
+Tobias Doerffel <tobias.doerffel@gmail.com>
+Paul Giblock <drfaygo@gmail.com> <pgib@users.sf.net>
+Paul Giblock <drfaygo@gmail.com> <p@pgiblock.net>
+Andrew Kelley <superjoe30@gmail.com> <andrew.r.kelley@gmail.com>
+Andrew Kelley <superjoe30@gmail.com> <andy@debian.superjoesoftware>
+Janne Sinisalo <janne.m.sinisalo@gmail.com> <janne@janne-desktop.(none)>
+Raine M. Ekman <raine@iki.fi> <raine@raine.(none)>
+Raine M. Ekman <raine@iki.fi> <raine@raine.damex.fi>
+Lukas W <lukaswhl@googlemail.com> <lukaswhl@gmail.com>
+Vesa <contact.diizy@nbl.fi> <vesa@isokone.(none)>
+Jonathan Aquilina <eagles051387@gmail.com>

.travis.yml

@@ -0,0 +1,6 @@
+language: cpp
+compiler: gcc
+before_install: sudo apt-get update
+install: sudo apt-get install libqt4-dev libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev libfluidsynth-dev portaudio19-dev wine-dev g++-multilib
+before_script: mkdir build && cd build
+script: cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .. && make -j8

AUTHORS

@@ -1,35 +1,87 @@
 Tobias Doerffel
   <tobydox/at/users/dot/sourceforge/dot/net>
-  Maintainer, main-development, artwork etc.
+  Development Manager
+
+Jonathan Aquilina
+  <eagles051387/at/gmail/dot/com>
+  Project Manager
 
 Paul Giblock
   <drfaygo/at/gmail/dot/com>
-  development
+  Development
 
 Danny McRae
   <khjklujn/at/yahoo.com>
-  development
+  Development
 
 Javier Serrano Polo
   <jasp00/at/terra/dot/es>
-  development
+  Development
+  
+Lukas Wohlschläger
+  <lukaswhl/at/gmail/dot/com>
+  Development
 
 Andrew Kelley
   <superjoe30/at/gmail/dot/com>
-  development
+  Development
 
+Wong Cho Ching
+  <chwongie/hyphen/banana/at/yahoo/dot/com>
+  Development
+  
 Andreas Brandmaier
   <andy/at/brandmaier/dot/de>
   BitInvader plugin
 
 Juan Fabián Simón
   <treees@gmail.com>
-  version 4.0 plugin artwork
+  Version 0.4 plugin artwork
 
 Sebastian Tilsch
   <djcompilation/at/gmx/dot/de>
-  recording of many samples
+  Recording of many samples
 
-gabriel
+Gabriel
   <kryos1/at/shaw/dot/ca>
-  additional artwork
+  Additional artwork
+
+Vesa Kivimäki
+  <contact/dot/diizy/at/nbl/dot/fi>
+  UI Lead developer
+
+Gurjot Singh
+  <bhattigurjot/at/gmail/dot/com>
+  Developer
+
+Hannu Haahti
+  <grejppi/at/gmail/dot/com>
+  Developer
+
+Uroš Maravić
+  <uros/dot/maravic/at/gmail/dot/com>
+  UI Developer
+
+Tobiasz Karoń (unfa)
+  <unfa/at/unfamusic/dot/com>
+  UI Developer
+
+Johannes Lorenz
+  <johannes89/at/mailueberfall/dot/de>
+  Developer
+
+Rubén Ibarra Pastor
+  <pastorrub/at/msn/dot/com>
+  Developer
+
+LocoMatt
+  <samozelko123/at/gmail/dot/com>
+  3osc skin developer
+
+Chrissy McManus
+  <chrissy/dot/mc/dot/1/at/hotmail/dot/co/dot/uk>
+  UI developer
+
+Oskar Wallgren
+  <oskar/dot/wallgren13/at/gmail/dot/com>
+  Development

CMakeLists.txt

@@ -14,8 +14,8 @@ INCLUDE(CheckIncludeFiles)
 INCLUDE(FindPkgConfig)
 
 SET(VERSION_MAJOR "0")
-SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "7")
+SET(VERSION_MINOR "9")
+SET(VERSION_PATCH "90")
 #SET(VERSION_SUFFIX "")
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 IF(VERSION_SUFFIX)
@@ -30,11 +30,10 @@ OPTION(WANT_ALSA	"Include ALSA (Advanced Linux Sound Architecture) support" ON)
 OPTION(WANT_CALF	"Include CALF LADSPA plugins" ON)
 OPTION(WANT_CAPS	"Include C* Audio Plugin Suite (LADSPA plugins)" ON)
 OPTION(WANT_CMT		"Include Computer Music Toolkit LADSPA plugins" ON)
-OPTION(WANT_FFTW3F	"Include SpectrumAnalyzer and ZynAddSubFX plugin" ON)
 OPTION(WANT_JACK	"Include JACK (Jack Audio Connection Kit) support" ON)
 OPTION(WANT_OGGVORBIS	"Include OGG/Vorbis support" ON)
 OPTION(WANT_PULSEAUDIO	"Include PulseAudio support" ON)
-#OPTION(WANT_PORTAUDIO	"Include PortAudio support" ON)	# TODO: fix PortAudio support
+OPTION(WANT_PORTAUDIO	"Include PortAudio support" ON)
 OPTION(WANT_SDL		"Include SDL (Simple DirectMedia Layer) support" ON)
 OPTION(WANT_SF2		"Include SoundFont2 player plugin" ON)
 OPTION(WANT_STK		"Include Stk (Synthesis Toolkit) support" ON)
@@ -85,19 +84,16 @@ CHECK_INCLUDE_FILES(string.h LMMS_HAVE_STRING_H)
 CHECK_INCLUDE_FILES(process.h LMMS_HAVE_PROCESS_H)
 CHECK_INCLUDE_FILES(locale.h LMMS_HAVE_LOCALE_H)
 
+LIST(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX})
+
 # check for Qt4
-SET(QT_MIN_VERSION "4.3.0")
+SET(QT_MIN_VERSION "4.3.0" COMPONENTS QtCore QtGui QtXml)
 FIND_PACKAGE(Qt4 REQUIRED)
 SET(QT_USE_QTXML 1)
 EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_TRANSLATIONS" OUTPUT_VARIABLE QT_TRANSLATIONS_DIR)
-IF(LMMS_BUILD_WIN32)
-	SET(QT_TRANSLATIONS_DIR "/opt/mingw32/share/qt4/translations/")
-	# hack to allow making moc.exe a symlink to native moc-binary in compatible version
-	SET(QT_MOC_EXECUTABLE ${QT_BINARY_DIR}/moc.exe)
-ENDIF(LMMS_BUILD_WIN32)
-IF(LMMS_BUILD_WIN64)
-	SET(QT_TRANSLATIONS_DIR "/opt/mingw64/share/qt4/translations/")
-ENDIF(LMMS_BUILD_WIN64)
+IF(WIN32)
+	SET(QT_TRANSLATIONS_DIR "${MINGW_PREFIX}/share/qt4/translations/")
+ENDIF(WIN32)
 IF(EXISTS "${QT_TRANSLATIONS_DIR}")
 	MESSAGE("-- Found Qt translations in ${QT_TRANSLATIONS_DIR}")
 	ADD_DEFINITIONS(-D'QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"')
@@ -179,26 +175,22 @@ IF(WANT_STK)
 	ELSE(STK_FOUND)
 		SET(STK_INCLUDE_DIR "")
 		SET(STATUS_STK "not found, please install libstk0-dev (or similiar) "
-			"if you require the Vibed Instrument")
+			"if you require the Mallets instrument")
 	ENDIF(STK_FOUND)
 ENDIF(WANT_STK)
 
 
 # check for PortAudio
-#IF(WANT_PORTAUDIO)
-#	FIND_PACKAGE(Portaudio)
-#	IF(PORTAUDIO_FOUND)
-#		SET(LMMS_HAVE_PORTAUDIO TRUE)
-#		SET(STATUS_PORTAUDIO "OK")
-#	ELSE(PORTAUDIO_FOUND)
-#		SET(STATUS_PORTAUDIO "not found, please install libportaudio-dev (or similiar, version >= 1.8) "
-#			"if you require Portaudio support")
-#	ENDIF(PORTAUDIO_FOUND)
-#ENDIF(WANT_PORTAUDIO)
-IF(NOT LMMS_HAVE_PORTAUDIO)
-	SET(PORTAUDIO_INCLUDE_DIR "")
-	SET(PORTAUDIO_LIBRARIES "")
-ENDIF(NOT LMMS_HAVE_PORTAUDIO)
+IF(WANT_PORTAUDIO)
+	FIND_PACKAGE(Portaudio)
+	IF(PORTAUDIO_FOUND)
+		SET(LMMS_HAVE_PORTAUDIO TRUE)
+		SET(STATUS_PORTAUDIO "OK")
+	ELSE(PORTAUDIO_FOUND)
+		SET(STATUS_PORTAUDIO "not found, please install portaudio19-dev (or similiar, version >= 1.9) "
+			"if you require PortAudio support")
+	ENDIF(PORTAUDIO_FOUND)
+ENDIF(WANT_PORTAUDIO)
 
 
 # check for PulseAudio
@@ -270,16 +262,7 @@ ENDIF(WANT_JACK)
 
 
 # check for FFTW3F-library
-IF(WANT_FFTW3F)
-	PKG_CHECK_MODULES(FFTW3F fftw3f>=3.0.0)
-	IF(FFTW3F_FOUND)
-		SET(LMMS_HAVE_FFTW3F TRUE)
-		SET(STATUS_FFTW3F "OK")
-	ELSE(FFTW3F_FOUND)
-		SET(STATUS_FFTW3F "not found, libfftw3-dev (or similiar) "
-			"is highly recommended")
-	ENDIF(FFTW3F_FOUND)
-ENDIF(WANT_FFTW3F)
+PKG_CHECK_MODULES(FFTW3F REQUIRED fftw3f>=3.0.0)
 
 
 # check for Fluidsynth
@@ -294,30 +277,20 @@ IF(WANT_SF2)
 	ENDIF(FLUIDSYNTH_FOUND)
 ENDIF(WANT_SF2)
 
+# check for pthreads
+IF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
+	FIND_PACKAGE(Threads)
+ENDIF(LMMS_BUILD_LINUX OR LMMS_BUILD_APPLE)
 
 # check for WINE
 IF(WANT_VST)
-	INCLUDE(CheckLibraryExists)
-	INCLUDE(CheckIncludeFileCXX)
-	SET(CMAKE_REQUIRED_FLAGS_ORIG ${CMAKE_REQUIRED_FLAGS})
-	SET(CMAKE_REQUIRED_INCLUDES_ORIG ${CMAKE_REQUIRED_INCLUDES})
-	SET(CMAKE_CXX_COMPILER_ORIG ${CMAKE_CXX_COMPILER})
-	IF(LMMS_HOST_X86_64)
-		SET(CMAKE_REQUIRED_FLAGS -m32 ${CMAKE_REQUIRED_FLAGS})
-	ENDIF(LMMS_HOST_X86_64)
-	CHECK_LIBRARY_EXISTS(wine wine_init "" HAVE_LIBWINE)
-	SET(CMAKE_CXX_COMPILER /usr/bin/wineg++)
-	SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${CMAKE_INSTALL_PREFIX}/include/wine/windows /usr/include/wine/windows)
-	CHECK_INCLUDE_FILE_CXX(windows.h HAVE_WINDOWS_H)
-	SET(CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER_ORIG})
-	SET(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_ORIG})
-	SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_ORIG})
-	IF(HAVE_LIBWINE AND HAVE_WINDOWS_H)
+	FIND_PACKAGE(Wine)
+	IF(WINE_FOUND)
 		SET(LMMS_SUPPORT_VST TRUE)
 		SET(STATUS_VST "OK")
-	ELSE(HAVE_LIBWINE AND HAVE_WINDOWS_H)
+	ELSE(WINE_FOUND)
 		SET(STATUS_VST "not found, please install (lib)wine-dev (or similiar) - 64 bit systems additionally need gcc-multilib and g++-multilib")
-	ENDIF(HAVE_LIBWINE AND HAVE_WINDOWS_H)
+	ENDIF(WINE_FOUND)
 ENDIF(WANT_VST)
 IF(LMMS_BUILD_WIN32)
 	SET(LMMS_SUPPORT_VST TRUE)
@@ -327,12 +300,14 @@ ENDIF(LMMS_BUILD_WIN32)
 
 # check for libsamplerate
 IF(WANT_SYSTEM_SR)
-	PKG_CHECK_MODULES(SAMPLERATE samplerate>=0.1.7)
+	PKG_CHECK_MODULES(SAMPLERATE samplerate>=0.1.8)
 	IF(SAMPLERATE_FOUND)
 		SET(LMMS_HAVE_SAMPLERATE TRUE)
+		SET(STATUS_SAMPLERATE "OK")
 	ENDIF(SAMPLERATE_FOUND)
 ENDIF(WANT_SYSTEM_SR)
 IF(NOT LMMS_HAVE_SAMPLERATE)
+	SET(STATUS_SAMPLERATE "bundled")
 	INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate)
 	SET(CMAKE_CROSSCOMPILING_ORIG "${CMAKE_CROSSCOMPILING}")
 	SET(CMAKE_CROSSCOMPILING "")
@@ -359,14 +334,13 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/lmms.rc.in ${CMAKE_BINARY_DIR}/lmms.rc)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc.in ${CMAKE_BINARY_DIR}/plugins/zynaddsubfx/zynaddsubfx.rc)
 
 # set compiler flags
-#SET(CMAKE_BUILD_TYPE relwithdebug)
-SET(CMAKE_C_FLAGS "-O2 -g -Wall ${CMAKE_C_FLAGS}")
-SET(CMAKE_CXX_FLAGS "-O2 -g -fno-exceptions -Wall ${CMAKE_CXX_FLAGS}")
-#SET(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS}")
-#SET(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_CXX_FLAGS}")
+SET(WERROR_FLAGS "-Wall -Werror -Werror=unused-function -Wno-sign-compare -Wno-strict-overflow")
+SET(CMAKE_C_FLAGS "-O2 -g ${WERROR_FLAGS} ${CMAKE_C_FLAGS}")
+SET(CMAKE_CXX_FLAGS "-O2 -g -fno-exceptions ${WERROR_FLAGS} ${CMAKE_CXX_FLAGS}")
+set(CMAKE_C_FLAGS_DEBUG "-DLMMS_DEBUG")
 
 
-# people simply updating SVN will still have this and mess up build with it
+# people simply updating git will still have this and mess up build with it
 FILE(REMOVE include/lmmsconfig.h)
 
 FILE(GLOB lmms_INCLUDES ${CMAKE_SOURCE_DIR}/include/*.h)
@@ -375,7 +349,19 @@ FILE(GLOB_RECURSE lmms_SOURCES ${CMAKE_SOURCE_DIR}/src/*.cpp)
 
 SET(lmms_MOC ${lmms_INCLUDES})
 
-SET(lmms_EMBEDDED_RESOURCES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/COPYING)
+# Get list of all committers from git history, ordered by number of commits
+FIND_PACKAGE(Git)
+IF(GIT_FOUND)
+	SET(CONTRIBUTORS ${CMAKE_BINARY_DIR}/CONTRIBUTORS)
+	EXECUTE_PROCESS(
+		COMMAND ${GIT_EXECUTABLE} shortlog -sne
+		COMMAND cut -c8-
+		OUTPUT_FILE ${CONTRIBUTORS}
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		TIMEOUT 1)
+ENDIF(GIT_FOUND)
+
+SET(lmms_EMBEDDED_RESOURCES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/COPYING ${CONTRIBUTORS})
 
 QT4_WRAP_CPP(lmms_MOC_out ${lmms_MOC} OPTIONS -nw)
 QT4_WRAP_UI(lmms_UI_out ${lmms_UI})
@@ -422,22 +408,29 @@ ADD_SUBDIRECTORY(data)
 #
 # build LMMS-binary
 #
-ADD_DEFINITIONS(-D'LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/"' -D'PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/lmms/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
+IF(LMMS_BUILD_WIN32)
+	SET(EXTRA_LIBRARIES "-lwinmm")
+ENDIF()
+
+# Paths relative to lmms executable
+FILE(RELATIVE_PATH LIB_DIR_RELATIVE /${BIN_DIR} /${LIB_DIR})
+FILE(RELATIVE_PATH PLUGIN_DIR_RELATIVE /${BIN_DIR} /${PLUGIN_DIR})
+ADD_DEFINITIONS(-D'LIB_DIR="${LIB_DIR_RELATIVE}/"' -D'PLUGIN_DIR="${PLUGIN_DIR_RELATIVE}/"' ${PULSEAUDIO_DEFINITIONS} ${PORTAUDIO_DEFINITIONS})
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/include ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${SDL_INCLUDE_DIR} ${PORTAUDIO_INCLUDE_DIR} ${PULSEAUDIO_INCLUDE_DIR} ${JACK_INCLUDE_DIRS} ${OGGVORBIS_INCLUDE_DIR} ${SAMPLERATE_INCLUDE_DIRS} ${SNDFILE_INCLUDE_DIRS})
-LINK_DIRECTORIES(${CMAKE_INSTALL_PREFIX}/lib ${ASOUND_LIBRARY_DIR} ${JACK_LIBRARY_DIRS} ${SAMPLERATE_LIBRARY_DIRS} ${SNDFILE_LIBRARY_DIRS})
-LINK_LIBRARIES(${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PORTAUDIO_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES})
 
 ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/lmms.1.gz COMMAND gzip -c ${CMAKE_SOURCE_DIR}/lmms.1 > ${CMAKE_BINARY_DIR}/lmms.1.gz DEPENDS ${CMAKE_SOURCE_DIR}/lmms.1 COMMENT "Generating lmms.1.gz")
 
 ADD_EXECUTABLE(lmms ${lmms_SOURCES} ${lmms_INCLUDES} ${LIBSAMPLERATE_SOURCES} ${LMMS_ER_H} ${lmms_UI_out} lmmsconfig.h lmmsversion.h ${WINRC} ${CMAKE_BINARY_DIR}/lmms.1.gz)
 
+TARGET_LINK_LIBRARIES(lmms ${CMAKE_THREAD_LIBS_INIT} ${QT_LIBRARIES} ${ASOUND_LIBRARY} ${SDL_LIBRARY} ${PORTAUDIO_LIBRARIES} ${PULSEAUDIO_LIBRARIES} ${JACK_LIBRARIES} ${OGGVORBIS_LIBRARIES} ${SAMPLERATE_LIBRARIES} ${SNDFILE_LIBRARIES} ${EXTRA_LIBRARIES})
+
 IF(LMMS_BUILD_WIN32)
 
 	SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -mwindows")
 	ADD_CUSTOM_COMMAND(TARGET lmms POST_BUILD COMMAND ${STRIP} ${CMAKE_BINARY_DIR}/lmms.exe)
 
-	INSTALL(TARGETS lmms RUNTIME DESTINATION .)
+	INSTALL(TARGETS lmms RUNTIME DESTINATION ${BIN_DIR})
 	INSTALL(FILES
 					${MINGW_PREFIX}/bin/QtCore4.dll
 					${MINGW_PREFIX}/bin/QtGui4.dll
@@ -447,9 +440,11 @@ IF(LMMS_BUILD_WIN32)
 					${MINGW_PREFIX}/bin/libvorbisenc-2.dll
 					${MINGW_PREFIX}/bin/libvorbisfile-3.dll
 					${MINGW_PREFIX}/bin/libogg-0.dll
-					${MINGW_PREFIX}/bin/libfluidsynth-1.dll
+					${MINGW_PREFIX}/bin/libfluidsynth.dll
 					${MINGW_PREFIX}/bin/libfftw3f-3.dll
 					${MINGW_PREFIX}/bin/libFLAC-8.dll
+					${MINGW_PREFIX}/bin/libportaudio-2.dll
+					${MINGW_PREFIX}/bin/libpng15-15.dll
 					${MINGW_PREFIX}/bin/SDL.dll
 					${MINGW_PREFIX}/bin/libglib-2.0-0.dll
 					${MINGW_PREFIX}/bin/libgthread-2.0-0.dll
@@ -461,7 +456,7 @@ ELSE(LMMS_BUILD_WIN32)
 		SET_TARGET_PROPERTIES(lmms PROPERTIES LINK_FLAGS "${LINK_FLAGS} -Wl,-E")
 	ENDIF(NOT LMMS_BUILD_APPLE)
 
-	INSTALL(TARGETS lmms RUNTIME DESTINATION bin)
+	INSTALL(TARGETS lmms RUNTIME DESTINATION ${BIN_DIR})
 	INSTALL(FILES ${CMAKE_BINARY_DIR}/lmms.1.gz DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1/ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
 
 ENDIF(LMMS_BUILD_WIN32)
@@ -528,43 +523,10 @@ ADD_CUSTOM_TARGET(dist
 			COMMAND mkdir -p ${TMP}
 			COMMAND cp AUTHORS build_mingw32 build_mingw64 CMakeLists.txt configure COPYING INSTALL lmms.1 lmms.rc.in lmms.spec.in lmmsconfig.h.in lmmsversion.h.in README TODO ${TMP}
 			COMMAND cp -r buildtools cmake data include plugins src ${TMP}
-			COMMAND rm -rf `find ${TMP} -type d -name ".svn"`  `find ${TMP} -name cmake_install.cmake` `find ${TMP} -name Makefile` `find ${TMP} -type d -name CMakeFiles` ${TMP}/CMakeCache.txt
+			COMMAND rm -rf `find ${TMP} -name cmake_install.cmake` `find ${TMP} -name Makefile` `find ${TMP} -type d -name CMakeFiles` ${TMP}/CMakeCache.txt
 			COMMAND tar cjf lmms-${VERSION}.tar.bz2 ${TMP}
 			COMMAND rm -rf ${TMP})
 
-#
-# add win32-pkg-target (deprecated - use "package" target instead)
-#
-ADD_CUSTOM_TARGET(win32-pkg
-			COMMAND mkdir -p tmp/lmms/data
-			COMMAND mkdir -p tmp/lmms/plugins/ladspa/
-			COMMAND cp lmms.exe tmp/lmms
-			COMMAND find plugins/ -maxdepth 2 -name '*.dll'  -exec cp '{}' tmp/lmms/plugins/ "';'"
-			COMMAND rm tmp/lmms/plugins/caps.dll
-			COMMAND rm tmp/lmms/plugins/tap*.dll
-			COMMAND cp plugins/ladspa_effect/caps/caps.dll tmp/lmms/plugins/ladspa/
-			COMMAND cp plugins/ladspa_effect/tap/tap*.dll tmp/lmms/plugins/ladspa/
-			COMMAND cd data && make DESTDIR=${CMAKE_BINARY_DIR}/tmp/lmms/ install
-			COMMAND mv tmp/lmms/opt/mingw32/share/lmms/* tmp/lmms/data/ && rm -rf tmp/lmms/opt
-			COMMAND cp /opt/mingw32/bin/QtCore4.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/QtGui4.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/QtXml4.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/libz.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/libsndfile-1.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/libvorbis*.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/libogg-0.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/libfluidsynth-1.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/libfftw3f-3.dll tmp/lmms
-			COMMAND cp /opt/mingw32/bin/SDL.dll tmp/lmms
-			COMMAND cp /opt/mingw32/i586-mingw32/bin/mingwm10.dll tmp/lmms
-			COMMAND cp -L ${CMAKE_SOURCE_DIR}/COPYING tmp/lmms/LICENSE.TXT
-			COMMAND cp -L ${CMAKE_SOURCE_DIR}/README tmp/lmms/README.TXT
-			COMMAND ${STRIP} tmp/lmms/lmms.exe tmp/lmms/plugins/*.dll tmp/lmms/plugins/ladspa/*.dll
-			COMMAND mv tmp/lmms tmp/lmms-${VERSION}
-			COMMAND cd tmp && zip -r -9 ../lmms-${VERSION}-bin-win32.zip lmms-${VERSION}/*
-			COMMAND rm -rf tmp
-)
-
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${LMMS_ER_H} ${lmms_MOC_out} ${lmms_UI_out} lmmsconfig.h lmms.1.gz")
 
@@ -577,8 +539,7 @@ MESSAGE("\n"
 "Installation Summary\n"
 "--------------------\n"
 "* Install Directory           : ${CMAKE_INSTALL_PREFIX}\n"
-#"* Build type                  : ${CMAKE_BUILD_TYPE}\n"
-"* Use system's libsamplerate  : ${LMMS_HAVE_SAMPLERATE}\n"
+"* libsamplerate               : ${STATUS_SAMPLERATE}\n"
 )
 
 MESSAGE(
@@ -587,7 +548,7 @@ MESSAGE(
 "* ALSA                        : ${STATUS_ALSA}\n"
 "* JACK                        : ${STATUS_JACK}\n"
 "* OSS                         : ${STATUS_OSS}\n"
-#"* PortAudio                   : ${STATUS_PORTAUDIO}\n"
+"* PortAudio                   : ${STATUS_PORTAUDIO}\n"
 "* PulseAudio                  : ${STATUS_PULSEAUDIO}\n"
 "* SDL                         : ${STATUS_SDL}\n"
 )
@@ -614,13 +575,11 @@ MESSAGE(
 "* Stk Mallets                 : ${STATUS_STK}\n"
 "* VST-instrument hoster       : ${STATUS_VST}\n"
 "* VST-effect hoster           : ${STATUS_VST}\n"
-"* SpectrumAnalyzer            : ${STATUS_FFTW3F}\n"
 "* CALF LADSPA plugins         : ${STATUS_CALF}\n"
 "* CAPS LADSPA plugins         : ${STATUS_CAPS}\n"
 "* CMT LADSPA plugins          : ${STATUS_CMT}\n"
 "* TAP LADSPA plugins          : ${STATUS_TAP}\n"
 "* SWH LADSPA plugins          : ${STATUS_SWH}\n"
-"* ZynAddSubFX                 : ${STATUS_FFTW3F}\n"
 )
 
 MESSAGE(
@@ -633,7 +592,7 @@ MESSAGE(
 "\n\n")
 
 INCLUDE(InstallRequiredSystemLibraries)
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Linux MultiMedia Studio - easy music production for everyone!")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LMMS - easy music production for everyone!")
 SET(CPACK_PACKAGE_VENDOR "LMMS Developers")
 IF(LMMS_BUILD_APPLE)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/README ${CMAKE_BINARY_DIR}/README.txt COPYONLY)
@@ -651,29 +610,45 @@ SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
 IF(VERSION_SUFFIX)
 	SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}-${VERSION_SUFFIX}")
 ENDIF(VERSION_SUFFIX)
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LMMS ${VERSION}")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LMMS")
 IF(WIN32)
-SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data\\\\nsis_branding.bmp")
-SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/data\\\\lmms.ico")
+SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data/nsis_branding.bmp")
+SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/data/lmms.ico")
 SET(CPACK_NSIS_INSTALLED_ICON_NAME "lmms.exe")
-SET(CPACK_NSIS_DISPLAY_NAME "Linux MultiMedia Studio (LMMS)")
+SET(CPACK_NSIS_DISPLAY_NAME "LMMS ${VERSION}")
 SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\lmms.sourceforge.net")
 SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\lmms.sourceforge.net")
 SET(CPACK_NSIS_CONTACT "lmms-devel@lists.sourceforge.net")
-SET(CPACK_PACKAGE_EXECUTABLES "lmms.exe;Linux MultiMedia Studio")
-SET(CPACK_NSIS_MENU_LINKS "lmms.exe;Linux MultiMedia Studio")
+SET(CPACK_PACKAGE_EXECUTABLES "lmms.exe;LMMS")
+SET(CPACK_NSIS_MENU_LINKS "lmms.exe;LMMS")
+SET(CPACK_NSIS_DEFINES "!include ${CMAKE_SOURCE_DIR}/cmake/nsis/FileAssociation.nsh")
+SET(CPACK_PACKAGE_FILE_NAME "lmms-${VERSION}-win32")
+SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
+  \\\${registerExtension} \\\"$INSTDIR\\\\lmms.exe\\\" \\\".mmp\\\" \\\"LMMS Project\\\"
+  \\\${registerExtension} \\\"$INSTDIR\\\\lmms.exe\\\" \\\".mmpz\\\" \\\"LMMS Project (compressed)\\\"
+  ")
+SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
+  \\\${unregisterExtension} \\\".mmp\\\" \\\"LMMS Project\\\"
+  \\\${unregisterExtension} \\\".mmpz\\\" \\\"LMMS Project (compressed)\\\"
+  ")
 ELSE(WIN32)
 SET(CPACK_STRIP_FILES "bin/lmms;${PLUGIN_DIR}/*.so")
 SET(CPACK_PACKAGE_EXECUTABLES "lmms" "LMMS binary")
 ENDIF(WIN32)
 
+IF(WIN64)
+	SET(CPACK_PACKAGE_FILE_NAME "lmms-${VERSION}-win64")
+	SET(CPACK_NSIS_DEFINES "${CPACK_NSIS_DEFINES}
+		InstallDir \\\"\\\$PROGRAMFILES64\\\\${CPACK_PACKAGE_INSTALL_DIRECTORY}\\\"")
+ENDIF(WIN64)
+
 SET(MACOSX_BUNDLE_ICON_FILE "${CMAKE_SOURCE_DIR}/data/themes/default/icon.png")
 SET(MACOSX_BUNDLE_GUI_IDENTIFIER "LMMS")
 SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${VERSION}")
-SET(MACOSX_BUNDLE_BUNDLE_NAME "Linux MultiMedia Studio")
+SET(MACOSX_BUNDLE_BUNDLE_NAME "LMMS")
 SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${VERSION}")
 SET(MACOSX_BUNDLE_BUNDLE_VERSION "${VERSION}")
-SET(MACOSX_BUNDLE_COPYRIGHT "Tobias Doerffel, 2008")
+SET(MACOSX_BUNDLE_COPYRIGHT "Tobias Doerffel, 2008-2010")
 
 SET(CPACK_SOURCE_GENERATOR "TBZ2")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "lmms-${VERSION}")

ChangeLog.old

@@ -158,6 +158,11 @@
 	* plugins/flp_import/unrtf/convert.c:
 	Avoid compile warnings
 
+2009-01-03	Paul Giblock <drfaygo/at/gmail/dot/com>
+
+	* src/gui/widgets/automatable_button.cpp:
+	fix drag support for button groups
+
 2008-12-22	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* CMakeLists.txt:
@@ -247,6 +252,12 @@
 	* src/tracks/pattern.cpp:
 	backport: added support for panning editing of notes
 
+2008-12-15	Paul Giblock <drfaygo/at/gmail/dot/com>
+	
+	* src/core/track.cpp:
+	* include/track.h:
+	Cache background per-object instead of per-class.
+
 2008-12-14	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* CMakeLists.txt:

INSTALL

@@ -9,10 +9,13 @@ cmake ../
 make
 sudo make install
 
-This way an out-of-tree build is performed. You can also run "cmake ." directly
-in the root of source-tree although this is not recommended. When performing an
-out-of-tree build after there's already an in-tree build, make sure to run
-"make distclean" before running cmake inside build-directory.
+If your system does not have "sudo", become root with your preferred mechanism
+and run the "make install" command.
+
+With the above commands an out-of-tree build is performed. You can also run
+"cmake ." directly in the root of source tree although this is not recommended.
+When performing an out-of-tree build after there's already an in-tree build,
+make sure to run "make distclean" before running cmake inside build-directory.
 
 If you want to use custom compiler flags simply set the environment variables
 CFLAGS and CXXFLAGS.

README

@@ -1,7 +1,7 @@
-Linux MultiMedia Studio 0.4.7
-==============================
+LMMS 0.9.90
+===========
 
-Copyright (c) 2004-2010 by LMMS-developers
+Copyright (c) 2004-2014 by LMMS developers
 
 
 This program is free software; you can redistribute it and/or modify 

README.md

@@ -0,0 +1,37 @@
+Linux MultiMedia Studio
+=======================
+[![Build Status](https://travis-ci.org/LMMS/lmms.png)](https://travis-ci.org/LMMS/lmms)
+
+What is LMMS?
+--------------
+
+LMMS is a free cross-platform alternative to commercial programs like FL Studio (R), which allow you to produce music with your computer. This includes the creation of melodies and beats, the synthesis and mixing of sounds, and arranging of samples. You can have fun with your MIDI-keyboard and much more; all in a user-friendly and modern interface.
+
+
+Features
+---------
+
+* Song-Editor for composing songs
+* A Beat+Bassline-Editor for creating beats and basslines
+* An easy-to-use Piano-Roll for editing patterns and melodies
+* An FX mixer with 64 FX channels and arbitrary number of effects allow unlimited mixing possibilities
+* Many powerful instrument and effect-plugins out of the box
+* Full user-defined track-based automation and computer-controlled automation sources
+* Compatible with many standards such as SoundFont2, VST(i), LADSPA, GUS Patches, and full MIDI support
+* Import of MIDI and FLP (Fruityloops(R) Project) files
+
+
+Building
+---------
+
+See [Compiling LMMS](https://github.com/LMMS/lmms/wiki/Compiling-lmms) on our wiki for information on how to build LMMS.
+
+
+Join LMMS-development
+----------------------
+
+If you are interested in LMMS, it's programming, artwork, testing, writing demo-songs, (and improving this readme…) or something like that, you're welcome to participate on the development of LMMS!
+
+Information about what you can do and how can be found in the [wiki](https://github.com/LMMS/lmms/wiki).
+
+Before coding a new big feature, please _always_ [file an issue](https://github.com/LMMS/lmms/issues/new) for your idea and suggestions about your feature and about the intended implementation on GitHub or post to the LMMS-devel-mailinglist (lmms-devel@lists.sourceforge.net) and wait for replies! Maybe there're different ideas, improvements, hints or maybe your feature is not welcome/needed at the moment.

build_mingw32

@@ -1,6 +1,7 @@
 MINGW=/opt/mingw32
 export PATH=$PATH:$MINGW/bin
-export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5 -fno-tree-vectorize"
+#export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5 -fno-tree-vectorize"
+export CFLAGS="-march=pentium3 -mtune=generic -mpreferred-stack-boundary=5"
 export CXXFLAGS="$CFLAGS"
 cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win32Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/
 

build_mingw64

@@ -1,6 +1,6 @@
 MINGW=/opt/mingw64
 export PATH=$PATH:$MINGW/bin
-export CFLAGS="-fno-tree-vectorize"
+#export CFLAGS="-fno-tree-vectorize"
 export CXXFLAGS="$CFLAGS"
 cmake .. -DCMAKE_TOOLCHAIN_FILE=../cmake/modules/Win64Toolchain.cmake -DCMAKE_MODULE_PATH=`pwd`/../cmake/modules/
 

cmake/modules/BuildPlugin.cmake

@@ -54,7 +54,7 @@ MACRO(BUILD_PLUGIN)
 	CAR(PLUGIN_NAME ${PLUGIN_DEFAULT_ARGS})
 	CDR(PLUGIN_SOURCES ${PLUGIN_DEFAULT_ARGS})
 
-	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src/gui ${CMAKE_INSTALL_PREFIX}/include)
+	INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src/gui)
 
 	ADD_DEFINITIONS(-DPLUGIN_NAME=${PLUGIN_NAME})
 

cmake/modules/DetectMachine.cmake

@@ -39,19 +39,17 @@ ENDIF(IS_X86)
 IF(CMAKE_INSTALL_LIBDIR)
 	SET(LIB_DIR "${CMAKE_INSTALL_LIBDIR}")
 ELSE(CMAKE_INSTALL_LIBDIR)
-	IF(LMMS_HOST_X86_64)
-		SET(LIB_DIR lib64)
-	ELSE(LMMS_HOST_X86_64)
-		SET(LIB_DIR lib)
-	ENDIF(LMMS_HOST_X86_64)
+	SET(LIB_DIR lib)
 ENDIF(CMAKE_INSTALL_LIBDIR)
 
 
 IF(LMMS_BUILD_WIN32)
+	SET(BIN_DIR .)
 	SET(PLUGIN_DIR plugins)
 	SET(DATA_DIR data)
 	SET(LMMS_DATA_DIR data)
 ELSE(LMMS_BUILD_WIN32)
+	SET(BIN_DIR bin)
 	SET(PLUGIN_DIR ${LIB_DIR}/lmms)
 	SET(DATA_DIR share)
 	SET(LMMS_DATA_DIR ${DATA_DIR}/lmms)

cmake/modules/FindPkgConfig.cmake

@@ -1,360 +0,0 @@
-# - a pkg-config module for CMake
-#
-# Usage:
-#   pkg_check_modules(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
-#     checks for all the given modules
-#
-#   pkg_search_module(<PREFIX> [REQUIRED] <MODULE> [<MODULE>]*)
-#     checks for given modules and uses the first working one
-#
-# When the 'REQUIRED' argument was set, macros will fail with an error
-# when module(s) could not be found
-#
-# It sets the following variables:
-#   PKG_CONFIG_FOUND         ... true iff pkg-config works on the system
-#   PKG_CONFIG_EXECUTABLE    ... pathname of the pkg-config program
-#   <PREFIX>_FOUND           ... set to 1 iff module(s) exist
-#
-# For the following variables two sets of values exist; first one is the
-# common one and has the given PREFIX. The second set contains flags
-# which are given out when pkgconfig was called with the '--static'
-# option.
-#   <XPREFIX>_LIBRARIES      ... only the libraries (w/o the '-l')
-#   <XPREFIX>_LIBRARY_DIRS   ... the paths of the libraries (w/o the '-L')
-#   <XPREFIX>_LDFLAGS        ... all required linker flags
-#   <XPREFIX>_LDFLAGS_OTHERS ... all other linker flags
-#   <XPREFIX>_INCLUDE_DIRS   ... the '-I' preprocessor flags (w/o the '-I')
-#   <XPREFIX>_CFLAGS         ... all required cflags
-#   <XPREFIX>_CFLAGS_OTHERS  ... the other compiler flags
-#
-#   <XPREFIX> = <PREFIX>        for common case
-#   <XPREFIX> = <PREFIX>_STATIC for static linking
-#
-# There are some special variables whose prefix depends on the count
-# of given modules. When there is only one module, <PREFIX> stays
-# unchanged. When there are multiple modules, the prefix will be
-# changed to <PREFIX>_<MODNAME>:
-#   <XPREFIX>_VERSION    ... version of the module
-#   <XPREFIX>_PREFIX     ... prefix-directory of the module
-#   <XPREFIX>_INCLUDEDIR ... include-dir of the module
-#   <XPREFIX>_LIBDIR     ... lib-dir of the module
-#
-#   <XPREFIX> = <PREFIX>  when |MODULES| == 1, else
-#   <XPREFIX> = <PREFIX>_<MODNAME>
-#
-# A <MODULE> parameter can have the following formats:
-#   {MODNAME}            ... matches any version
-#   {MODNAME}>={VERSION} ... at least version <VERSION> is required
-#   {MODNAME}={VERSION}  ... exactly version <VERSION> is required
-#   {MODNAME}<={VERSION} ... modules must not be newer than <VERSION>
-#
-# Examples
-#   pkg_check_modules (GLIB2   glib-2.0)
-#
-#   pkg_check_modules (GLIB2   glib-2.0>=2.10)
-#     requires at least version 2.10 of glib2 and defines e.g.
-#       GLIB2_VERSION=2.10.3
-#
-#   pkg_check_modules (FOO     glib-2.0>=2.10 gtk+-2.0)
-#     requires both glib2 and gtk2, and defines e.g.
-#       FOO_glib-2.0_VERSION=2.10.3
-#       FOO_gtk+-2.0_VERSION=2.8.20
-#
-#   pkg_check_modules (XRENDER REQUIRED xrender)
-#     defines e.g.:
-#       XRENDER_LIBRARIES=Xrender;X11
-#       XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
-#
-#   pkg_search_module (BAR     libxml-2.0 libxml2 libxml>=2)
-
-
-# Copyright (C) 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
-#
-# Redistribution and use, with or without modification, are permitted
-# provided that the following conditions are met:
-# 
-#    1. Redistributions must retain the above copyright notice, this
-#       list of conditions and the following disclaimer.
-#    2. The name of the author may not be used to endorse or promote
-#       products derived from this software without specific prior
-#       written permission.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-### Common stuff ####
-set(PKG_CONFIG_VERSION 1)
-set(PKG_CONFIG_FOUND   0)
-
-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
-mark_as_advanced(PKG_CONFIG_EXECUTABLE)
-
-if(PKG_CONFIG_EXECUTABLE)
-  set(PKG_CONFIG_FOUND 1)
-endif(PKG_CONFIG_EXECUTABLE)
-
-
-# Unsets the given variables
-macro(_pkgconfig_unset var)
-  set(${var} "" CACHE INTERNAL "")
-endmacro(_pkgconfig_unset)
-
-macro(_pkgconfig_set var value)
-  set(${var} ${value} CACHE INTERNAL "")
-endmacro(_pkgconfig_set)
-
-# Invokes pkgconfig, cleans up the result and sets variables
-macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
-  set(_pkgconfig_invoke_result)
-
-  execute_process(
-    COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist}
-    OUTPUT_VARIABLE _pkgconfig_invoke_result
-    RESULT_VARIABLE _pkgconfig_failed)
-
-  if (_pkgconfig_failed)
-    set(_pkgconfig_${_varname} "")
-    _pkgconfig_unset(${_prefix}_${_varname})
-  else(_pkgconfig_failed)
-    string(REGEX REPLACE "[\r\n]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-    string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-
-    if (NOT ${_regexp} STREQUAL "")
-      string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-    endif(NOT ${_regexp} STREQUAL "")
-
-    separate_arguments(_pkgconfig_invoke_result)
-
-    #message(STATUS "  ${_varname} ... ${_pkgconfig_invoke_result}")
-    set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result})
-    _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}")
-  endif(_pkgconfig_failed)
-endmacro(_pkgconfig_invoke)
-
-# Invokes pkgconfig two times; once without '--static' and once with
-# '--static'
-macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp)
-  _pkgconfig_invoke("${_pkglist}" ${_prefix}        ${_varname} "${cleanup_regexp}" ${ARGN})
-  _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static  ${ARGN})
-endmacro(_pkgconfig_invoke_dyn)
-
-# Splits given arguments into options and a package list
-macro(_pkgconfig_parse_options _result _is_req)
-  set(${_is_req} 0)
-  
-  foreach(_pkg ${ARGN})
-    if (_pkg STREQUAL "REQUIRED")
-      set(${_is_req} 1)
-    endif (_pkg STREQUAL "REQUIRED")
-  endforeach(_pkg ${ARGN})
-
-  set(${_result} ${ARGN})
-  list(REMOVE_ITEM ${_result} "REQUIRED")
-endmacro(_pkgconfig_parse_options)
-
-###
-macro(_pkg_check_modules_internal _is_required _is_silent _prefix)
-  _pkgconfig_unset(${_prefix}_FOUND)
-  _pkgconfig_unset(${_prefix}_VERSION)
-  _pkgconfig_unset(${_prefix}_PREFIX)
-  _pkgconfig_unset(${_prefix}_INCLUDEDIR)
-  _pkgconfig_unset(${_prefix}_LIBDIR)
-  _pkgconfig_unset(${_prefix}_LIBS)
-  _pkgconfig_unset(${_prefix}_LIBS_L)
-  _pkgconfig_unset(${_prefix}_LIBS_PATHS)
-  _pkgconfig_unset(${_prefix}_LIBS_OTHER)
-  _pkgconfig_unset(${_prefix}_CFLAGS)
-  _pkgconfig_unset(${_prefix}_CFLAGS_I)
-  _pkgconfig_unset(${_prefix}_CFLAGS_OTHER)
-  _pkgconfig_unset(${_prefix}_STATIC_LIBDIR)
-  _pkgconfig_unset(${_prefix}_STATIC_LIBS)
-  _pkgconfig_unset(${_prefix}_STATIC_LIBS_L)
-  _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS)
-  _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER)
-  _pkgconfig_unset(${_prefix}_STATIC_CFLAGS)
-  _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I)
-  _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER)
-
-  # create a better addressable variable of the modules and calculate its size
-  set(_pkg_check_modules_list ${ARGN})
-  list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt)
-
-  if(PKG_CONFIG_EXECUTABLE)
-    # give out status message telling checked module
-    if (NOT ${_is_silent})
-      if (_pkg_check_modules_cnt EQUAL 1)
-        message(STATUS "checking for module '${_pkg_check_modules_list}'")
-      else(_pkg_check_modules_cnt EQUAL 1)
-        message(STATUS "checking for modules '${_pkg_check_modules_list}'")
-      endif(_pkg_check_modules_cnt EQUAL 1)
-    endif(NOT ${_is_silent})
-    
-    set(_pkg_check_modules_packages)
-    set(_pkg_check_modules_failed)
-
-    # iterate through module list and check whether they exist and match the required version
-    foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
-      set(_pkg_check_modules_exist_query)
-
-      # check whether version is given
-      if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op   "${_pkg_check_modules_pkg}")
-        string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver  "${_pkg_check_modules_pkg}")
-      else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
-        set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
-        set(_pkg_check_modules_pkg_op)
-        set(_pkg_check_modules_pkg_ver)
-      endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*")
-
-      # handle the operands
-      if (_pkg_check_modules_pkg_op STREQUAL ">=")
-        list(APPEND _pkg_check_modules_exist_query --atleast-version)
-      endif(_pkg_check_modules_pkg_op STREQUAL ">=")
-
-      if (_pkg_check_modules_pkg_op STREQUAL "=")
-        list(APPEND _pkg_check_modules_exist_query --exact-version)
-      endif(_pkg_check_modules_pkg_op STREQUAL "=")
-      
-      if (_pkg_check_modules_pkg_op STREQUAL "<=")
-        list(APPEND _pkg_check_modules_exist_query --max-version)
-      endif(_pkg_check_modules_pkg_op STREQUAL "<=")
-
-      # create the final query which is of the format:
-      # * --atleast-version <version> <pkg-name>
-      # * --exact-version <version> <pkg-name>      
-      # * --max-version <version> <pkg-name>
-      # * --exists <pkg-name>
-      if (_pkg_check_modules_pkg_op)
-        list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}")
-      else(_pkg_check_modules_pkg_op)
-        list(APPEND _pkg_check_modules_exist_query --exists)
-      endif(_pkg_check_modules_pkg_op)
-
-      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION)
-      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX)
-      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR)
-      _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR)
-
-      list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}")
-      list(APPEND _pkg_check_modules_packages    "${_pkg_check_modules_pkg_name}")
-
-      # execute the query
-      execute_process(
-        COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query}
-        RESULT_VARIABLE _pkgconfig_retval)
-
-      # evaluate result and tell failures
-      if (_pkgconfig_retval)
-        if(NOT ${_is_silent})
-          message(STATUS "  package '${_pkg_check_modules_pkg}' not found")
-        endif(NOT ${_is_silent})
-
-        set(_pkg_check_modules_failed 1)
-      endif(_pkgconfig_retval)
-    endforeach(_pkg_check_modules_pkg)
-
-    if(_pkg_check_modules_failed)
-      # fail when requested
-      if (${_is_required})
-        message(SEND_ERROR "A required package was not found")
-      endif (${_is_required})
-    else(_pkg_check_modules_failed)
-      # when we are here, we checked whether requested modules
-      # exist. Now, go through them and set variables
-      
-      _pkgconfig_set(${_prefix}_FOUND 1)
-      list(LENGTH _pkg_check_modules_packages pkg_count)
-
-      # iterate through all modules again and set individual variables
-      foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages})
-        # handle case when there is only one package required
-        if (pkg_count EQUAL 1)
-          set(_pkg_check_prefix "${_prefix}")
-        else(pkg_count EQUAL 1)
-          set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}")
-        endif(pkg_count EQUAL 1)
-        
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION    ""   --modversion )
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX     ""   --variable=prefix )
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR ""   --variable=includedir )
-        _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR     ""   --variable=libdir )
-
-        message(STATUS "  found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}")
-      endforeach(_pkg_check_modules_pkg)
-
-      # set variables which are combined for multiple modules
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES           "(^| )-l" --libs-only-l )
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS        "(^| )-L" --libs-only-L )
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS             ""        --libs )
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER       ""        --libs-only-other )
-
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS        "(^| )-I" --cflags-only-I )
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS              ""        --cflags )
-      _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER        ""        --cflags-only-other )
-    endif(_pkg_check_modules_failed)
-  else(PKG_CONFIG_EXECUTABLE)
-    if (${_is_required})
-      message(SEND_ERROR "pkg-config tool not found")
-    endif (${_is_required})
-  endif(PKG_CONFIG_EXECUTABLE)
-endmacro(_pkg_check_modules_internal)
-
-###
-### User visible macros start here
-###
-
-###
-macro(pkg_check_modules _prefix _module0)
-  # check cached value
-  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
-    _pkgconfig_parse_options   (_pkg_modules _pkg_is_required "${_module0}" ${ARGN})
-    _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules})
-
-    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
-endmacro(pkg_check_modules)
-
-###
-macro(pkg_search_module _prefix _module0)
-  # check cached value
-  if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})
-    set(_pkg_modules_found 0)
-    _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN})
-
-    message(STATUS "checking for one of the modules '${_pkg_modules_alt}'")
-
-    # iterate through all modules and stop at the first working one.
-    foreach(_pkg_alt ${_pkg_modules_alt})
-      if(NOT _pkg_modules_found)
-        _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}")
-      endif(NOT _pkg_modules_found)
-
-      if (${_prefix}_FOUND)
-        set(_pkg_modules_found 1)
-      endif(${_prefix}_FOUND)
-    endforeach(_pkg_alt)
-
-    if (NOT ${_prefix}_FOUND)
-      if(${_pkg_is_required})
-        message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found")
-      endif(${_pkg_is_required})
-    endif(NOT ${_prefix}_FOUND)
-    
-    _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
-  endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION})  
-endmacro(pkg_search_module)
-
-### Local Variables:
-### mode: cmake
-### End:

cmake/modules/FindPortaudio.cmake

@@ -17,37 +17,8 @@ if (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
   # in cache already
   set(PORTAUDIO_FOUND TRUE)
 else (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
-  find_path(PORTAUDIO_INCLUDE_DIR
-    NAMES
-      portaudio.h
-    PATHS
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /sw/include
-  )
-
-  find_library(PORTAUDIO_LIBRARY
-    NAMES
-      portaudio
-    PATHS
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib
-  )
-
-  set(PORTAUDIO_INCLUDE_DIRS
-    ${PORTAUDIO_INCLUDE_DIR}
-  )
-  set(PORTAUDIO_LIBRARIES
-    ${PORTAUDIO_LIBRARY}
-)
-
-  if (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES)
-     set(PORTAUDIO_FOUND TRUE)
-  endif (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES)
-
+   include(FindPkgConfig)
+   pkg_check_modules(PORTAUDIO portaudio-2.0)
   if (PORTAUDIO_FOUND)
     if (NOT Portaudio_FIND_QUIETLY)
       message(STATUS "Found Portaudio: ${PORTAUDIO_LIBRARIES}")

cmake/modules/FindWine.cmake

@@ -0,0 +1,19 @@
+# - Try to find the wine libraries
+# Once done this will define
+#
+#  WINE_FOUND - System has wine
+#  WINE_INCLUDE_DIRS - The wine include directories
+#  WINE_LIBRARIES - The libraries needed to use wine
+#  WINE_DEFINITIONS - Compiler switches required for using wine
+#
+
+FIND_PATH(WINE_INCLUDE_DIR windows/windows.h PATH_SUFFIXES wine)
+FIND_LIBRARY(WINE_LIBRARY NAMES wine)
+
+set(WINE_INCLUDE_DIRS ${WINE_INCLUDE_DIR} )
+set(WINE_LIBRARIES ${WINE_LIBRARY} )
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Wine DEFAULT_MSG WINE_LIBRARIES WINE_INCLUDE_DIRS)
+
+mark_as_advanced(WINE_INCLUDE_DIR WINE_LIBRARY)

cmake/modules/MinGWCrossCompile.cmake

@@ -12,23 +12,23 @@ SET(MINGW_TOOL_PREFIX		${MINGW_PREFIX}/bin/${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32
 # specify the cross compiler
 SET(CMAKE_C_COMPILER		${MINGW_TOOL_PREFIX}gcc)
 SET(CMAKE_CXX_COMPILER		${MINGW_TOOL_PREFIX}g++)
+SET(CMAKE_RC_COMPILER		${MINGW_TOOL_PREFIX}gcc)
+
+IF(WIN64)
+# specify the cross compiler
+SET(MINGW_TOOL_PREFIX32		${MINGW_PREFIX32}/bin/${CMAKE_SYSTEM_PROCESSOR32}-w64-mingw32-)
+SET(CMAKE_C_COMPILER32		${MINGW_TOOL_PREFIX32}gcc)
+SET(CMAKE_CXX_COMPILER32	${MINGW_TOOL_PREFIX32}g++)
+ENDIF()
 
 # specify location of some tools
 SET(STRIP					${MINGW_TOOL_PREFIX}strip)
 SET(WINDRES					${MINGW_TOOL_PREFIX}windres)
 SET(PKG_CONFIG_EXECUTABLE	${MINGW_TOOL_PREFIX}pkg-config)
+SET(PKG_CONFIG_FOUND		TRUE)
 
 SET(QT_BINARY_DIR			${MINGW_PREFIX}/bin)
-SET(QT_LIBRARY_DIR			${MINGW_PREFIX}/lib)
-SET(QT_QTCORE_LIBRARY		${MINGW_PREFIX}/lib/libQtCore4.a)
-SET(QT_INCLUDE_DIR			${MINGW_PREFIX}/include/qt4)
-SET(QT_HEADERS_DIR			${MINGW_PREFIX}/include/qt4)
-SET(QT_QTCORE_INCLUDE_DIR	${MINGW_PREFIX}/include/qt4/QtCore)
-SET(QT_MKSPECS_DIR			${MINGW_PREFIX}/share/qt4/mkspecs)
-SET(QT_MOC_EXECUTABLE		${QT_BINARY_DIR}/moc.exe)
-SET(QT_RCC_EXECUTABLE		${QT_BINARY_DIR}/rcc.exe)
-SET(QT_QMAKE_EXECUTABLE		/usr/bin/qmake)
-SET(QT_UIC_EXECUTABLE		${QT_BINARY_DIR}/uic.exe)
+SET(QT_QMAKE_EXECUTABLE		${QT_BINARY_DIR}/qmake)
 
 # search for programs in the build host directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

cmake/modules/Win64Toolchain.cmake

@@ -1,6 +1,8 @@
 SET(MINGW_PREFIX /opt/mingw64)
+SET(MINGW_PREFIX32 /opt/mingw32)
 
 SET(CMAKE_SYSTEM_PROCESSOR x86_64)
+SET(CMAKE_SYSTEM_PROCESSOR32 i686)
 
 SET(WIN64 TRUE)
 

cmake/nsis/FileAssociation.nsh

@@ -0,0 +1,190 @@
+/*
+_____________________________________________________________________________
+
+                       File Association
+_____________________________________________________________________________
+
+ Based on code taken from http://nsis.sourceforge.net/File_Association 
+
+ Usage in script:
+ 1. !include "FileAssociation.nsh"
+ 2. [Section|Function]
+      ${FileAssociationFunction} "Param1" "Param2" "..." $var
+    [SectionEnd|FunctionEnd]
+
+ FileAssociationFunction=[RegisterExtension|UnRegisterExtension]
+
+_____________________________________________________________________________
+
+ ${RegisterExtension} "[executable]" "[extension]" "[description]"
+
+"[executable]"     ; executable which opens the file format
+                   ;
+"[extension]"      ; extension, which represents the file format to open
+                   ;
+"[description]"    ; description for the extension. This will be display in Windows Explorer.
+                   ;
+
+
+ ${UnRegisterExtension} "[extension]" "[description]"
+
+"[extension]"      ; extension, which represents the file format to open
+                   ;
+"[description]"    ; description for the extension. This will be display in Windows Explorer.
+                   ;
+
+_____________________________________________________________________________
+
+                         Macros
+_____________________________________________________________________________
+
+ Change log window verbosity (default: 3=no script)
+
+ Example:
+ !include "FileAssociation.nsh"
+ !insertmacro RegisterExtension
+ ${FileAssociation_VERBOSE} 4   # all verbosity
+ !insertmacro UnRegisterExtension
+ ${FileAssociation_VERBOSE} 3   # no script
+*/
+
+
+!ifndef FileAssociation_INCLUDED
+!define FileAssociation_INCLUDED
+
+!include Util.nsh
+
+!verbose push
+!verbose 3
+!ifndef _FileAssociation_VERBOSE
+  !define _FileAssociation_VERBOSE 3
+!endif
+!verbose ${_FileAssociation_VERBOSE}
+!define FileAssociation_VERBOSE `!insertmacro FileAssociation_VERBOSE`
+!verbose pop
+
+!macro FileAssociation_VERBOSE _VERBOSE
+  !verbose push
+  !verbose 3
+  !undef _FileAssociation_VERBOSE
+  !define _FileAssociation_VERBOSE ${_VERBOSE}
+  !verbose pop
+!macroend
+
+
+
+!macro RegisterExtensionCall _EXECUTABLE _EXTENSION _DESCRIPTION
+  !verbose push
+  !verbose ${_FileAssociation_VERBOSE}
+  Push `${_DESCRIPTION}`
+  Push `${_EXTENSION}`
+  Push `${_EXECUTABLE}`
+  ${CallArtificialFunction} RegisterExtension_
+  !verbose pop
+!macroend
+
+!macro UnRegisterExtensionCall _EXTENSION _DESCRIPTION
+  !verbose push
+  !verbose ${_FileAssociation_VERBOSE}
+  Push `${_EXTENSION}`
+  Push `${_DESCRIPTION}`
+  ${CallArtificialFunction} UnRegisterExtension_
+  !verbose pop
+!macroend
+
+
+
+!define RegisterExtension `!insertmacro RegisterExtensionCall`
+!define un.RegisterExtension `!insertmacro RegisterExtensionCall`
+
+!macro RegisterExtension
+!macroend
+
+!macro un.RegisterExtension
+!macroend
+
+!macro RegisterExtension_
+  !verbose push
+  !verbose ${_FileAssociation_VERBOSE}
+
+  Exch $R2 ;exe
+  Exch
+  Exch $R1 ;ext
+  Exch
+  Exch 2
+  Exch $R0 ;desc
+  Exch 2
+  Push $0
+  Push $1
+
+  ReadRegStr $1 HKCR $R1 ""  ; read current file association
+  StrCmp "$1" "" NoBackup  ; is it empty
+  StrCmp "$1" "$R0" NoBackup  ; is it our own
+    WriteRegStr HKCR $R1 "backup_val" "$1"  ; backup current value
+NoBackup:
+  WriteRegStr HKCR $R1 "" "$R0"  ; set our file association
+
+  ReadRegStr $0 HKCR $R0 ""
+  StrCmp $0 "" 0 Skip
+    WriteRegStr HKCR "$R0" "" "$R0"
+    WriteRegStr HKCR "$R0\shell" "" "open"
+    WriteRegStr HKCR "$R0\DefaultIcon" "" "$R2,0"
+Skip:
+  WriteRegStr HKCR "$R0\shell\open\command" "" '"$R2" "%1"'
+  WriteRegStr HKCR "$R0\shell\edit" "" "Edit $R0"
+  WriteRegStr HKCR "$R0\shell\edit\command" "" '"$R2" "%1"'
+
+  Pop $1
+  Pop $0
+  Pop $R2
+  Pop $R1
+  Pop $R0
+
+  !verbose pop
+!macroend
+
+
+
+!define UnRegisterExtension `!insertmacro UnRegisterExtensionCall`
+!define un.UnRegisterExtension `!insertmacro UnRegisterExtensionCall`
+
+!macro UnRegisterExtension
+!macroend
+
+!macro un.UnRegisterExtension
+!macroend
+
+!macro UnRegisterExtension_
+  !verbose push
+  !verbose ${_FileAssociation_VERBOSE}
+
+  Exch $R1 ;desc
+  Exch
+  Exch $R0 ;ext
+  Exch
+  Push $0
+  Push $1
+
+  ReadRegStr $1 HKCR $R0 ""
+  StrCmp $1 $R1 0 NoOwn ; only do this if we own it
+  ReadRegStr $1 HKCR $R0 "backup_val"
+  StrCmp $1 "" 0 Restore ; if backup="" then delete the whole key
+  DeleteRegKey HKCR $R0
+  Goto NoOwn
+
+Restore:
+  WriteRegStr HKCR $R0 "" $1
+  DeleteRegValue HKCR $R0 "backup_val"
+  DeleteRegKey HKCR $R1 ;Delete key with association name settings
+
+NoOwn:
+
+  Pop $1
+  Pop $0
+  Pop $R1
+  Pop $R0
+
+  !verbose pop
+!macroend
+
+!endif # !FileAssociation_INCLUDED

data/locale/ca.ts

@@ -23,10 +23,6 @@
         <source>LMMS - easy music production for everyone</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Copyright (c) 2004-2008, LMMS developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://lmms.sourceforge.net</source>
         <translation type="unfinished"></translation>
@@ -49,6 +45,10 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copyright (c) 2004-2010, LMMS developers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arpeggiator</name>
@@ -289,10 +289,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>DEVICE</source>
         <translation type="unfinished">DISPOSITIU</translation>
     </message>
-    <message>
-        <source>CHANNELS</source>
-        <translation type="unfinished">CANALS</translation>
-    </message>
 </context>
 <context>
     <name>AudioPulseAudio::setupWidget</name>
@@ -352,7 +348,147 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreator</name>
+    <name>AutomationEditor</name>
+    <message>
+        <source>Play/pause current pattern (Space)</source>
+        <translation type="unfinished">Reprodueix/pausa el patró actual (Espai)</translation>
+    </message>
+    <message>
+        <source>Stop playing of current pattern (Space)</source>
+        <translation type="unfinished">Atura la reproducció del patró actual (Espai)</translation>
+    </message>
+    <message>
+        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if you want to stop playing of the current pattern.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Draw mode (Shift+D)</source>
+        <translation type="unfinished">Mode dibuixar (Maj+D)</translation>
+    </message>
+    <message>
+        <source>Erase mode (Shift+E)</source>
+        <translation type="unfinished">Mode esborrar (Maj+E)</translation>
+    </message>
+    <message>
+        <source>Select mode (Shift+S)</source>
+        <translation type="unfinished">Mode seleccionar (Maj+S)</translation>
+    </message>
+    <message>
+        <source>Move selection mode (Shift+M)</source>
+        <translation type="unfinished">Mode moure selecció (Maj+M)</translation>
+    </message>
+    <message>
+        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">Si piques aquí, el mode moure serà activat. En aquest mode pots moure els valors que has seleccionat en el mode seleccionar. També pots pitjar &apos;Maj+M&apos; al teclat per a activar aquest mode.</translation>
+    </message>
+    <message>
+        <source>Cut selected values (Ctrl+X)</source>
+        <translation type="unfinished">Talla els valors seleccionats (Ctrl+X)</translation>
+    </message>
+    <message>
+        <source>Copy selected values (Ctrl+C)</source>
+        <translation type="unfinished">Copia els valors seleccionats (Ctrl+C)</translation>
+    </message>
+    <message>
+        <source>Paste values from clipboard (Ctrl+V)</source>
+        <translation type="unfinished">Enganxa valors des del portapapers (Ctrl+V)</translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - no pattern</source>
+        <translation type="unfinished">Editor d&apos;Automatització - sense patró</translation>
+    </message>
+    <message>
+        <source>Automation Editor - %1</source>
+        <translation type="unfinished">Editor d&apos;Automatització - %1</translation>
+    </message>
+    <message>
+        <source>Please open an automation pattern with the context menu of a control!</source>
+        <translation type="unfinished">Per favor, obre un patró d&apos;automatització amb el menú contextual d&apos;un control!</translation>
+    </message>
+    <message>
+        <source>Values copied</source>
+        <translation type="unfinished">Valors copiats</translation>
+    </message>
+    <message>
+        <source>All selected values were copied to the clipboard.</source>
+        <translation type="unfinished">Tots els valors seleccionats s&apos;han copiat al portapapers.</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPattern</name>
+    <message>
+        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPatternView</name>
+    <message>
+        <source>double-click to open this pattern in automation editor</source>
+        <translation type="unfinished">pica dos cops per a obrir aquest patró a l&apos;editor d&apos;automatització</translation>
+    </message>
+    <message>
+        <source>Open in Automation editor</source>
+        <translation type="unfinished">Obre a l&apos;Editor d&apos;automatització</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished">Buida</translation>
+    </message>
+    <message>
+        <source>Reset name</source>
+        <translation type="unfinished">Restaura nom</translation>
+    </message>
+    <message>
+        <source>Change name</source>
+        <translation type="unfinished">Canvia nom</translation>
+    </message>
+    <message>
+        <source>%1 Connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect &quot;%1&quot;</source>
+        <translation type="unfinished">Desconnecta &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationTrack</name>
+    <message>
+        <source>Automation track</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InstrumentFunctionNoteStacking</name>
     <message>
         <source>octave</source>
         <translation type="unfinished">octava</translation>
@@ -719,7 +855,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreatorView</name>
+    <name>InstrumentFunctionNoteStackingView</name>
     <message>
         <source>CHORDS</source>
         <translation type="unfinished">ACORDS</translation>
@@ -2357,9 +2493,17 @@ Per favor, visita http://lmms.sf.net/wiki per a documentació sobre LMMS.</trans
         <translation type="unfinished">DECAÏMENT</translation>
     </message>
     <message>
-        <source>Release decay (not implemented):</source>
+        <source>ATTACK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attack:</source>
+        <translation type="unfinished">Atac:</translation>
+    </message>
+    <message>
+        <source>Release:</source>
+        <translation type="unfinished">Alliberament:</translation>
+    </message>
 </context>
 <context>
     <name>PeakControllerEffectControls</name>
@@ -2376,7 +2520,11 @@ Per favor, visita http://lmms.sf.net/wiki per a documentació sobre LMMS.</trans
         <translation type="unfinished">Apaga la sortida</translation>
     </message>
     <message>
-        <source>Release decay</source>
+        <source>Attack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2730,6 +2878,13 @@ Reason: &quot;%2&quot;</source>
         <translation type="unfinished">per</translation>
     </message>
 </context>
+<context>
+    <name>VstEffectControlDialog</name>
+    <message>
+        <source>Show/hide VST FX GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VstPlugin</name>
     <message>
@@ -2751,6 +2906,41 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
 Si funciona amb altre programari VST sota Linux, per favor contacta amb un desenvolupador de LMMS!</translation>
     </message>
 </context>
+<context>
+    <name>ZynAddSubFxInstrument</name>
+    <message>
+        <source>Portamento</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Center Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Change Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZynAddSubFxView</name>
     <message>
@@ -2761,6 +2951,66 @@ Si funciona amb altre programari VST sota Linux, per favor contacta amb un desen
         <source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Portamento:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PORT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FREQ</source>
+        <translation type="unfinished">FREQ</translation>
+    </message>
+    <message>
+        <source>Filter Resonance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES</source>
+        <translation type="unfinished">RES</translation>
+    </message>
+    <message>
+        <source>Bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM GAIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance center frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>audioFileProcessor</name>
@@ -2785,146 +3035,6 @@ Si funciona amb altre programari VST sota Linux, per favor contacta amb un desen
         <translation>Bucle</translation>
     </message>
 </context>
-<context>
-    <name>automationEditor</name>
-    <message>
-        <source>Play/pause current pattern (Space)</source>
-        <translation>Reprodueix/pausa el patró actual (Espai)</translation>
-    </message>
-    <message>
-        <source>Stop playing of current pattern (Space)</source>
-        <translation>Atura la reproducció del patró actual (Espai)</translation>
-    </message>
-    <message>
-        <source>Cut selected values (Ctrl+X)</source>
-        <translation>Talla els valors seleccionats (Ctrl+X)</translation>
-    </message>
-    <message>
-        <source>Copy selected values (Ctrl+C)</source>
-        <translation>Copia els valors seleccionats (Ctrl+C)</translation>
-    </message>
-    <message>
-        <source>Paste values from clipboard (Ctrl+V)</source>
-        <translation>Enganxa valors des del portapapers (Ctrl+V)</translation>
-    </message>
-    <message>
-        <source>Automation Editor - no pattern</source>
-        <translation>Editor d&apos;Automatització - sense patró</translation>
-    </message>
-    <message>
-        <source>Automation Editor - %1</source>
-        <translation>Editor d&apos;Automatització - %1</translation>
-    </message>
-    <message>
-        <source>Please open an automation pattern with the context menu of a control!</source>
-        <translation>Per favor, obre un patró d&apos;automatització amb el menú contextual d&apos;un control!</translation>
-    </message>
-    <message>
-        <source>Values copied</source>
-        <translation>Valors copiats</translation>
-    </message>
-    <message>
-        <source>All selected values were copied to the clipboard.</source>
-        <translation>Tots els valors seleccionats s&apos;han copiat al portapapers.</translation>
-    </message>
-    <message>
-        <source>Draw mode (Shift+D)</source>
-        <translation>Mode dibuixar (Maj+D)</translation>
-    </message>
-    <message>
-        <source>Erase mode (Shift+E)</source>
-        <translation>Mode esborrar (Maj+E)</translation>
-    </message>
-    <message>
-        <source>Select mode (Shift+S)</source>
-        <translation>Mode seleccionar (Maj+S)</translation>
-    </message>
-    <message>
-        <source>Move selection mode (Shift+M)</source>
-        <translation>Mode moure selecció (Maj+M)</translation>
-    </message>
-    <message>
-        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
-        <translation>Si piques aquí, el mode moure serà activat. En aquest mode pots moure els valors que has seleccionat en el mode seleccionar. També pots pitjar &apos;Maj+M&apos; al teclat per a activar aquest mode.</translation>
-    </message>
-    <message>
-        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here if you want to stop playing of the current pattern.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPattern</name>
-    <message>
-        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPatternView</name>
-    <message>
-        <source>double-click to open this pattern in automation editor</source>
-        <translation>pica dos cops per a obrir aquest patró a l&apos;editor d&apos;automatització</translation>
-    </message>
-    <message>
-        <source>Open in Automation editor</source>
-        <translation>Obre a l&apos;Editor d&apos;automatització</translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation>Buida</translation>
-    </message>
-    <message>
-        <source>Reset name</source>
-        <translation>Restaura nom</translation>
-    </message>
-    <message>
-        <source>Change name</source>
-        <translation>Canvia nom</translation>
-    </message>
-    <message>
-        <source>Disconnect &quot;%1&quot;</source>
-        <translation>Desconnecta &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <source>%1 Connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationTrack</name>
-    <message>
-        <source>Automation track</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>bassBoosterControlDialog</name>
     <message>
@@ -3023,6 +3133,10 @@ Si funciona amb altre programari VST sota Linux, per favor contacta amb un desen
         <source>Beat/Bassline %1</source>
         <translation>Ritme base %1</translation>
     </message>
+    <message>
+        <source>Clone of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>bitInvader</name>
@@ -4480,7 +4594,7 @@ usa la roda del ratolí per a ajustar el volum d&apos;un pas</translation>
         <translation>Llista connectors LADSPA instal·lats</translation>
     </message>
     <message>
-        <source>Incomplete monophonic immitation tb303</source>
+        <source>Incomplete monophonic imitation tb303</source>
         <translation>Imitació monofònica incompleta tb303</translation>
     </message>
     <message>
@@ -4935,6 +5049,10 @@ Latència: %2 ms</translation>
         <source>Choose background artwork</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>One instrument track window mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/locale/cs.ts

@@ -23,10 +23,6 @@
         <source>LMMS - easy music production for everyone</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Copyright (c) 2004-2008, LMMS developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://lmms.sourceforge.net</source>
         <translation type="unfinished"></translation>
@@ -49,6 +45,10 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copyright (c) 2004-2010, LMMS developers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arpeggiator</name>
@@ -289,10 +289,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>DEVICE</source>
         <translation type="unfinished">ZAŘÍZENÍ</translation>
     </message>
-    <message>
-        <source>CHANNELS</source>
-        <translation type="unfinished">KANÁLY</translation>
-    </message>
 </context>
 <context>
     <name>AudioPulseAudio::setupWidget</name>
@@ -352,7 +348,147 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreator</name>
+    <name>AutomationEditor</name>
+    <message>
+        <source>Play/pause current pattern (Space)</source>
+        <translation type="unfinished">Přehrát nebo pozastavit přehrávání aktuálního patternu (mezerník)</translation>
+    </message>
+    <message>
+        <source>Stop playing of current pattern (Space)</source>
+        <translation type="unfinished">Zastavit přehrávání aktuálního patternu (mezerník)</translation>
+    </message>
+    <message>
+        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
+        <translation type="unfinished">Klikněte zde, pokud chcete přehrát aktuální pattern. To je šikovné při editaci neboť pattern je automaticky přehráván ve smyčce.</translation>
+    </message>
+    <message>
+        <source>Click here if you want to stop playing of the current pattern.</source>
+        <translation type="unfinished">Klikněte zde, pokud chcete zastavit přehrávání aktuálního patternu.</translation>
+    </message>
+    <message>
+        <source>Draw mode (Shift+D)</source>
+        <translation type="unfinished">Režim kreslení (Shift+D)</translation>
+    </message>
+    <message>
+        <source>Erase mode (Shift+E)</source>
+        <translation type="unfinished">Režim mazání (Shift+E)</translation>
+    </message>
+    <message>
+        <source>Select mode (Shift+S)</source>
+        <translation type="unfinished">Režim výběru (Shift+S)</translation>
+    </message>
+    <message>
+        <source>Move selection mode (Shift+M)</source>
+        <translation type="unfinished">Režim přesunu výběrů (Shift+M)</translation>
+    </message>
+    <message>
+        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">Klikněte zde, pokud chcete aktivovat režim kreslení. V tomto výchozím a nejčastěji užívaném režimu lze přidávat a přesunovat jednotlivé hodnoty. Pro aktivaci můžete využít též klávesové zkratky Shift+D.</translation>
+    </message>
+    <message>
+        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">Klikněte zde, pokud chcete aktivovat režim mazání. V tomto režimu lze mazat jednotlivé hodnoty. Pro aktivaci můžete využít též klávesové zkratky Shift+E.</translation>
+    </message>
+    <message>
+        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">Klikněte zde, pokud chcete aktivovat režim výběru. Tento režimu umožňuje hodnoty vybírat a je nezbytný jestliže hodnoty chcete vyjmout, kopírovat, vložit, smazat nebo přesunout. Pro aktivaci můžete využít též klávesové zkratky Shift+S.</translation>
+    </message>
+    <message>
+        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">Klikněte zde pokud chcete aktivovat režim přesunu výběrů. V tomto režimu lze přesouvat hodnoty, které byly označeny v režimu výběru. Pro aktivaci můžete využít též klávesové zkratky &apos;Shift+M&apos;.</translation>
+    </message>
+    <message>
+        <source>Cut selected values (Ctrl+X)</source>
+        <translation type="unfinished">Vyjmout označené hodnoty (Ctrl+X)</translation>
+    </message>
+    <message>
+        <source>Copy selected values (Ctrl+C)</source>
+        <translation type="unfinished">Kopírovat označené hodnoty (Ctrl+C)</translation>
+    </message>
+    <message>
+        <source>Paste values from clipboard (Ctrl+V)</source>
+        <translation type="unfinished">Vložit hodnoty ze schránky (Ctrl+V)</translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished">Klikněte zde, pokud chcete označené hodnoty vyjmout a uložit do schránky. Vložit je pak můžete kdekoliv v libovolném patternu pomocí tlačítka Vložit.</translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished">Klikněte zde, pokud chcete označené hodnoty zkopírovat do schránky. Vložit je pak můžete kdekoliv v libovolného patternu pomocí tlačítka Vložit.</translation>
+    </message>
+    <message>
+        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
+        <translation type="unfinished">Kliknete-li zde, budou hodnoty ze schránky vloženy do prvního viditelného taktu.</translation>
+    </message>
+    <message>
+        <source>Automation Editor - no pattern</source>
+        <translation type="unfinished">Automatizační editor - žádný pattern</translation>
+    </message>
+    <message>
+        <source>Automation Editor - %1</source>
+        <translation type="unfinished">Automatizační editor - %1</translation>
+    </message>
+    <message>
+        <source>Please open an automation pattern with the context menu of a control!</source>
+        <translation type="unfinished">Otevřete prosím automatizační pattern pomocí kontextového menu ovládání!</translation>
+    </message>
+    <message>
+        <source>Values copied</source>
+        <translation type="unfinished">Hodnoty zkopírovány</translation>
+    </message>
+    <message>
+        <source>All selected values were copied to the clipboard.</source>
+        <translation type="unfinished">Všechny označené hodnoty byly zkopírovány do schránky.</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPattern</name>
+    <message>
+        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
+        <translation type="unfinished">Ovladač táhni při stisknutém &lt;CTRL&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPatternView</name>
+    <message>
+        <source>double-click to open this pattern in automation editor</source>
+        <translation type="unfinished">dvojklikem otevřít tento pattern v automatizačním editoru</translation>
+    </message>
+    <message>
+        <source>Open in Automation editor</source>
+        <translation type="unfinished">Otevřít v automatizačním editoru</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished">Vyčistit</translation>
+    </message>
+    <message>
+        <source>Reset name</source>
+        <translation type="unfinished">Resetovat jméno</translation>
+    </message>
+    <message>
+        <source>Change name</source>
+        <translation type="unfinished">Změnit jméno</translation>
+    </message>
+    <message>
+        <source>%1 Connections</source>
+        <translation type="unfinished">%1 Připojení</translation>
+    </message>
+    <message>
+        <source>Disconnect &quot;%1&quot;</source>
+        <translation type="unfinished">Odpojit &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationTrack</name>
+    <message>
+        <source>Automation track</source>
+        <translation type="unfinished">Automatizační stopa</translation>
+    </message>
+</context>
+<context>
+    <name>InstrumentFunctionNoteStacking</name>
     <message>
         <source>octave</source>
         <translation type="unfinished">oktáva</translation>
@@ -719,7 +855,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreatorView</name>
+    <name>InstrumentFunctionNoteStackingView</name>
     <message>
         <source>CHORDS</source>
         <translation type="unfinished">AKORDY</translation>
@@ -2357,7 +2493,15 @@ Navštivte prosím stránku s dokumentací k LMMS na adrese http://lmms.sf.net/w
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay (not implemented):</source>
+        <source>ATTACK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attack:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2376,7 +2520,11 @@ Navštivte prosím stránku s dokumentací k LMMS na adrese http://lmms.sf.net/w
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay</source>
+        <source>Attack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2731,6 +2879,13 @@ Důvod: &quot;%2&quot;</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VstEffectControlDialog</name>
+    <message>
+        <source>Show/hide VST FX GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VstPlugin</name>
     <message>
@@ -2752,6 +2907,41 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
 Jestliže tento plugin funguje v Linuxu v jiném VST softwaru, kontaktujte prosím LMMS vývojáře!</translation>
     </message>
 </context>
+<context>
+    <name>ZynAddSubFxInstrument</name>
+    <message>
+        <source>Portamento</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Center Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Change Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZynAddSubFxView</name>
     <message>
@@ -2762,6 +2952,66 @@ Jestliže tento plugin funguje v Linuxu v jiném VST softwaru, kontaktujte pros
         <source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Portamento:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PORT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FREQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM GAIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance center frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>audioFileProcessor</name>
@@ -2786,146 +3036,6 @@ Jestliže tento plugin funguje v Linuxu v jiném VST softwaru, kontaktujte pros
         <translation>Konec samplu</translation>
     </message>
 </context>
-<context>
-    <name>automationEditor</name>
-    <message>
-        <source>Play/pause current pattern (Space)</source>
-        <translation>Přehrát nebo pozastavit přehrávání aktuálního patternu (mezerník)</translation>
-    </message>
-    <message>
-        <source>Stop playing of current pattern (Space)</source>
-        <translation>Zastavit přehrávání aktuálního patternu (mezerník)</translation>
-    </message>
-    <message>
-        <source>Draw mode (Shift+D)</source>
-        <translation>Režim kreslení (Shift+D)</translation>
-    </message>
-    <message>
-        <source>Erase mode (Shift+E)</source>
-        <translation>Režim mazání (Shift+E)</translation>
-    </message>
-    <message>
-        <source>Select mode (Shift+S)</source>
-        <translation>Režim výběru (Shift+S)</translation>
-    </message>
-    <message>
-        <source>Move selection mode (Shift+M)</source>
-        <translation>Režim přesunu výběrů (Shift+M)</translation>
-    </message>
-    <message>
-        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
-        <translation>Klikněte zde pokud chcete aktivovat režim přesunu výběrů. V tomto režimu lze přesouvat hodnoty, které byly označeny v režimu výběru. Pro aktivaci můžete využít též klávesové zkratky &apos;Shift+M&apos;.</translation>
-    </message>
-    <message>
-        <source>Cut selected values (Ctrl+X)</source>
-        <translation>Vyjmout označené hodnoty (Ctrl+X)</translation>
-    </message>
-    <message>
-        <source>Copy selected values (Ctrl+C)</source>
-        <translation>Kopírovat označené hodnoty (Ctrl+C)</translation>
-    </message>
-    <message>
-        <source>Paste values from clipboard (Ctrl+V)</source>
-        <translation>Vložit hodnoty ze schránky (Ctrl+V)</translation>
-    </message>
-    <message>
-        <source>Automation Editor - no pattern</source>
-        <translation>Automatizační editor - žádný pattern</translation>
-    </message>
-    <message>
-        <source>Automation Editor - %1</source>
-        <translation>Automatizační editor - %1</translation>
-    </message>
-    <message>
-        <source>Please open an automation pattern with the context menu of a control!</source>
-        <translation>Otevřete prosím automatizační pattern pomocí kontextového menu ovládání!</translation>
-    </message>
-    <message>
-        <source>Values copied</source>
-        <translation>Hodnoty zkopírovány</translation>
-    </message>
-    <message>
-        <source>All selected values were copied to the clipboard.</source>
-        <translation>Všechny označené hodnoty byly zkopírovány do schránky.</translation>
-    </message>
-    <message>
-        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
-        <translation>Klikněte zde, pokud chcete přehrát aktuální pattern. To je šikovné při editaci neboť pattern je automaticky přehráván ve smyčce.</translation>
-    </message>
-    <message>
-        <source>Click here if you want to stop playing of the current pattern.</source>
-        <translation>Klikněte zde, pokud chcete zastavit přehrávání aktuálního patternu.</translation>
-    </message>
-    <message>
-        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
-        <translation>Klikněte zde, pokud chcete aktivovat režim kreslení. V tomto výchozím a nejčastěji užívaném režimu lze přidávat a přesunovat jednotlivé hodnoty. Pro aktivaci můžete využít též klávesové zkratky Shift+D.</translation>
-    </message>
-    <message>
-        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
-        <translation>Klikněte zde, pokud chcete aktivovat režim mazání. V tomto režimu lze mazat jednotlivé hodnoty. Pro aktivaci můžete využít též klávesové zkratky Shift+E.</translation>
-    </message>
-    <message>
-        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
-        <translation>Klikněte zde, pokud chcete aktivovat režim výběru. Tento režimu umožňuje hodnoty vybírat a je nezbytný jestliže hodnoty chcete vyjmout, kopírovat, vložit, smazat nebo přesunout. Pro aktivaci můžete využít též klávesové zkratky Shift+S.</translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation>Klikněte zde, pokud chcete označené hodnoty vyjmout a uložit do schránky. Vložit je pak můžete kdekoliv v libovolném patternu pomocí tlačítka Vložit.</translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation>Klikněte zde, pokud chcete označené hodnoty zkopírovat do schránky. Vložit je pak můžete kdekoliv v libovolného patternu pomocí tlačítka Vložit.</translation>
-    </message>
-    <message>
-        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
-        <translation>Kliknete-li zde, budou hodnoty ze schránky vloženy do prvního viditelného taktu.</translation>
-    </message>
-</context>
-<context>
-    <name>automationPattern</name>
-    <message>
-        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
-        <translation>Ovladač táhni při stisknutém &lt;CTRL&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>automationPatternView</name>
-    <message>
-        <source>double-click to open this pattern in automation editor</source>
-        <translation>dvojklikem otevřít tento pattern v automatizačním editoru</translation>
-    </message>
-    <message>
-        <source>Open in Automation editor</source>
-        <translation>Otevřít v automatizačním editoru</translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation>Vyčistit</translation>
-    </message>
-    <message>
-        <source>Reset name</source>
-        <translation>Resetovat jméno</translation>
-    </message>
-    <message>
-        <source>Change name</source>
-        <translation>Změnit jméno</translation>
-    </message>
-    <message>
-        <source>Disconnect &quot;%1&quot;</source>
-        <translation>Odpojit &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <source>%1 Connections</source>
-        <translation>%1 Připojení</translation>
-    </message>
-</context>
-<context>
-    <name>automationTrack</name>
-    <message>
-        <source>Automation track</source>
-        <translation>Automatizační stopa</translation>
-    </message>
-</context>
 <context>
     <name>bassBoosterControlDialog</name>
     <message>
@@ -3024,6 +3134,10 @@ Jestliže tento plugin funguje v Linuxu v jiném VST softwaru, kontaktujte pros
         <source>Beat/Bassline %1</source>
         <translation>Beat/Bassline %1</translation>
     </message>
+    <message>
+        <source>Clone of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>bitInvader</name>
@@ -4473,7 +4587,7 @@ k nastavení zesílení kroku použijte kolečko myši</translation>
         <translation>VST host pro užití VST(i) pluginů v LMMS</translation>
     </message>
     <message>
-        <source>Incomplete monophonic immitation tb303</source>
+        <source>Incomplete monophonic imitation tb303</source>
         <translation>Nekompletní monofonní imitace tb303</translation>
     </message>
     <message>
@@ -4936,6 +5050,10 @@ Zpoždění %2 ms</translation>
         <source>Choose background artwork</source>
         <translation>Vyberte obrázek na pozadí</translation>
     </message>
+    <message>
+        <source>One instrument track window mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/locale/en.ts

@@ -23,10 +23,6 @@
         <source>LMMS - easy music production for everyone</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Copyright (c) 2004-2008, LMMS developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://lmms.sourceforge.net</source>
         <translation type="unfinished"></translation>
@@ -49,6 +45,10 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copyright (c) 2004-2010, LMMS developers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arpeggiator</name>
@@ -289,10 +289,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>DEVICE</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>CHANNELS</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AudioPulseAudio::setupWidget</name>
@@ -352,7 +348,147 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreator</name>
+    <name>AutomationEditor</name>
+    <message>
+        <source>Play/pause current pattern (Space)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop playing of current pattern (Space)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if you want to stop playing of the current pattern.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Draw mode (Shift+D)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase mode (Shift+E)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select mode (Shift+S)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move selection mode (Shift+M)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut selected values (Ctrl+X)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy selected values (Ctrl+C)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste values from clipboard (Ctrl+V)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - no pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please open an automation pattern with the context menu of a control!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Values copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All selected values were copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPattern</name>
+    <message>
+        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPatternView</name>
+    <message>
+        <source>double-click to open this pattern in automation editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in Automation editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 Connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect &quot;%1&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationTrack</name>
+    <message>
+        <source>Automation track</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InstrumentFunctionNoteStacking</name>
     <message>
         <source>octave</source>
         <translation type="unfinished"></translation>
@@ -719,7 +855,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreatorView</name>
+    <name>InstrumentFunctionNoteStackingView</name>
     <message>
         <source>CHORDS</source>
         <translation type="unfinished"></translation>
@@ -2355,7 +2491,15 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay (not implemented):</source>
+        <source>ATTACK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attack:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2374,7 +2518,11 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay</source>
+        <source>Attack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2728,6 +2876,13 @@ Reason: &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VstEffectControlDialog</name>
+    <message>
+        <source>Show/hide VST FX GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VstPlugin</name>
     <message>
@@ -2748,6 +2903,41 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ZynAddSubFxInstrument</name>
+    <message>
+        <source>Portamento</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Center Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Change Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZynAddSubFxView</name>
     <message>
@@ -2758,6 +2948,66 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Portamento:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PORT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FREQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM GAIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance center frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>audioFileProcessor</name>
@@ -2782,146 +3032,6 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>automationEditor</name>
-    <message>
-        <source>Play/pause current pattern (Space)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop playing of current pattern (Space)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw mode (Shift+D)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erase mode (Shift+E)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select mode (Shift+S)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move selection mode (Shift+M)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut selected values (Ctrl+X)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy selected values (Ctrl+C)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste values from clipboard (Ctrl+V)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automation Editor - no pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automation Editor - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please open an automation pattern with the context menu of a control!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Values copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All selected values were copied to the clipboard.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here if you want to stop playing of the current pattern.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPattern</name>
-    <message>
-        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPatternView</name>
-    <message>
-        <source>double-click to open this pattern in automation editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Automation editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 Connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationTrack</name>
-    <message>
-        <source>Automation track</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>bassBoosterControlDialog</name>
     <message>
@@ -3020,6 +3130,10 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Beat/Bassline %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clone of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>bitInvader</name>
@@ -4407,7 +4521,7 @@ use mouse wheel to set volume of a step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Incomplete monophonic immitation tb303</source>
+        <source>Incomplete monophonic imitation tb303</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4917,6 +5031,10 @@ Latency: %2 ms</source>
         <source>Choose background artwork</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>One instrument track window mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/locale/es.ts

@@ -23,10 +23,6 @@
         <source>LMMS - easy music production for everyone</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Copyright (c) 2004-2008, LMMS developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://lmms.sourceforge.net</source>
         <translation type="unfinished"></translation>
@@ -49,6 +45,10 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copyright (c) 2004-2010, LMMS developers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arpeggiator</name>
@@ -289,10 +289,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>DEVICE</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>CHANNELS</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AudioPulseAudio::setupWidget</name>
@@ -352,7 +348,147 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreator</name>
+    <name>AutomationEditor</name>
+    <message>
+        <source>Play/pause current pattern (Space)</source>
+        <translation type="unfinished">Reproducir/Pausar el patrón actual (Espaciador)</translation>
+    </message>
+    <message>
+        <source>Stop playing of current pattern (Space)</source>
+        <translation type="unfinished">Detener la reproducción del patrón actual (Espaciador)</translation>
+    </message>
+    <message>
+        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if you want to stop playing of the current pattern.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Draw mode (Shift+D)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase mode (Shift+E)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select mode (Shift+S)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move selection mode (Shift+M)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut selected values (Ctrl+X)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy selected values (Ctrl+C)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste values from clipboard (Ctrl+V)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - no pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please open an automation pattern with the context menu of a control!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Values copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All selected values were copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPattern</name>
+    <message>
+        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPatternView</name>
+    <message>
+        <source>double-click to open this pattern in automation editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in Automation editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change name</source>
+        <translation type="unfinished">Cambiar nombre</translation>
+    </message>
+    <message>
+        <source>%1 Connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect &quot;%1&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationTrack</name>
+    <message>
+        <source>Automation track</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InstrumentFunctionNoteStacking</name>
     <message>
         <source>octave</source>
         <translation type="unfinished">Octava</translation>
@@ -719,7 +855,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreatorView</name>
+    <name>InstrumentFunctionNoteStackingView</name>
     <message>
         <source>CHORDS</source>
         <translation type="unfinished"></translation>
@@ -2355,9 +2491,17 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay (not implemented):</source>
+        <source>ATTACK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attack:</source>
+        <translation type="unfinished">Ataque:</translation>
+    </message>
+    <message>
+        <source>Release:</source>
+        <translation type="unfinished">Release:</translation>
+    </message>
 </context>
 <context>
     <name>PeakControllerEffectControls</name>
@@ -2374,7 +2518,11 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay</source>
+        <source>Attack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2729,6 +2877,13 @@ La desintonización fina esta comprendida entre -100 cents y +100 cents. Esto es
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VstEffectControlDialog</name>
+    <message>
+        <source>Show/hide VST FX GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VstPlugin</name>
     <message>
@@ -2749,6 +2904,41 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ZynAddSubFxInstrument</name>
+    <message>
+        <source>Portamento</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Center Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Change Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZynAddSubFxView</name>
     <message>
@@ -2759,6 +2949,66 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Portamento:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PORT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FREQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM GAIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance center frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>audioFileProcessor</name>
@@ -2783,146 +3033,6 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>automationEditor</name>
-    <message>
-        <source>Play/pause current pattern (Space)</source>
-        <translation type="unfinished">Reproducir/Pausar el patrón actual (Espaciador)</translation>
-    </message>
-    <message>
-        <source>Stop playing of current pattern (Space)</source>
-        <translation type="unfinished">Detener la reproducción del patrón actual (Espaciador)</translation>
-    </message>
-    <message>
-        <source>Draw mode (Shift+D)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erase mode (Shift+E)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select mode (Shift+S)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move selection mode (Shift+M)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut selected values (Ctrl+X)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy selected values (Ctrl+C)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste values from clipboard (Ctrl+V)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automation Editor - no pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automation Editor - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please open an automation pattern with the context menu of a control!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Values copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All selected values were copied to the clipboard.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here if you want to stop playing of the current pattern.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPattern</name>
-    <message>
-        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPatternView</name>
-    <message>
-        <source>double-click to open this pattern in automation editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Automation editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change name</source>
-        <translation type="unfinished">Cambiar nombre</translation>
-    </message>
-    <message>
-        <source>Disconnect &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 Connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationTrack</name>
-    <message>
-        <source>Automation track</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>bassBoosterControlDialog</name>
     <message>
@@ -3021,6 +3131,10 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Beat/Bassline %1</source>
         <translation>Ritmo base %1</translation>
     </message>
+    <message>
+        <source>Clone of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>bitInvader</name>
@@ -4408,7 +4522,7 @@ use mouse wheel to set volume of a step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Incomplete monophonic immitation tb303</source>
+        <source>Incomplete monophonic imitation tb303</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4918,6 +5032,10 @@ Latency: %2 ms</source>
         <source>Choose background artwork</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>One instrument track window mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/locale/fa.ts

@@ -23,10 +23,6 @@
         <source>LMMS - easy music production for everyone</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Copyright (c) 2004-2008, LMMS developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://lmms.sourceforge.net</source>
         <translation type="unfinished"></translation>
@@ -49,6 +45,10 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copyright (c) 2004-2010, LMMS developers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arpeggiator</name>
@@ -289,10 +289,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>DEVICE</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>CHANNELS</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AudioPulseAudio::setupWidget</name>
@@ -352,7 +348,147 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreator</name>
+    <name>AutomationEditor</name>
+    <message>
+        <source>Play/pause current pattern (Space)</source>
+        <translation type="unfinished">پخش/مکث الگوی جاری (فاصله)</translation>
+    </message>
+    <message>
+        <source>Stop playing of current pattern (Space)</source>
+        <translation type="unfinished">توقف پخش الگوی جاری (فاصله)</translation>
+    </message>
+    <message>
+        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if you want to stop playing of the current pattern.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Draw mode (Shift+D)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase mode (Shift+E)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select mode (Shift+S)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move selection mode (Shift+M)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut selected values (Ctrl+X)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy selected values (Ctrl+C)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste values from clipboard (Ctrl+V)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - no pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please open an automation pattern with the context menu of a control!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Values copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All selected values were copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPattern</name>
+    <message>
+        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPatternView</name>
+    <message>
+        <source>double-click to open this pattern in automation editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in Automation editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset name</source>
+        <translation type="unfinished">باز نشانی نام</translation>
+    </message>
+    <message>
+        <source>Change name</source>
+        <translation type="unfinished">تغییر نام</translation>
+    </message>
+    <message>
+        <source>%1 Connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect &quot;%1&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationTrack</name>
+    <message>
+        <source>Automation track</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InstrumentFunctionNoteStacking</name>
     <message>
         <source>octave</source>
         <translation type="unfinished">نت</translation>
@@ -719,7 +855,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreatorView</name>
+    <name>InstrumentFunctionNoteStackingView</name>
     <message>
         <source>CHORDS</source>
         <translation type="unfinished"></translation>
@@ -2355,9 +2491,17 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished">محو-DECAY</translation>
     </message>
     <message>
-        <source>Release decay (not implemented):</source>
+        <source>ATTACK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attack:</source>
+        <translation type="unfinished">تهاجم(Attack):</translation>
+    </message>
+    <message>
+        <source>Release:</source>
+        <translation type="unfinished">رهایی(Release):</translation>
+    </message>
 </context>
 <context>
     <name>PeakControllerEffectControls</name>
@@ -2374,7 +2518,11 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay</source>
+        <source>Attack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2728,6 +2876,13 @@ Reason: &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VstEffectControlDialog</name>
+    <message>
+        <source>Show/hide VST FX GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VstPlugin</name>
     <message>
@@ -2748,6 +2903,41 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ZynAddSubFxInstrument</name>
+    <message>
+        <source>Portamento</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Center Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Change Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZynAddSubFxView</name>
     <message>
@@ -2758,6 +2948,66 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Portamento:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PORT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FREQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM GAIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance center frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>audioFileProcessor</name>
@@ -2782,146 +3032,6 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>automationEditor</name>
-    <message>
-        <source>Play/pause current pattern (Space)</source>
-        <translation type="unfinished">پخش/مکث الگوی جاری (فاصله)</translation>
-    </message>
-    <message>
-        <source>Stop playing of current pattern (Space)</source>
-        <translation type="unfinished">توقف پخش الگوی جاری (فاصله)</translation>
-    </message>
-    <message>
-        <source>Draw mode (Shift+D)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erase mode (Shift+E)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select mode (Shift+S)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move selection mode (Shift+M)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut selected values (Ctrl+X)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy selected values (Ctrl+C)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste values from clipboard (Ctrl+V)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automation Editor - no pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automation Editor - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please open an automation pattern with the context menu of a control!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Values copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All selected values were copied to the clipboard.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here if you want to stop playing of the current pattern.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPattern</name>
-    <message>
-        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPatternView</name>
-    <message>
-        <source>double-click to open this pattern in automation editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Automation editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset name</source>
-        <translation type="unfinished">باز نشانی نام</translation>
-    </message>
-    <message>
-        <source>Change name</source>
-        <translation type="unfinished">تغییر نام</translation>
-    </message>
-    <message>
-        <source>Disconnect &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 Connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationTrack</name>
-    <message>
-        <source>Automation track</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>bassBoosterControlDialog</name>
     <message>
@@ -3020,6 +3130,10 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Beat/Bassline %1</source>
         <translation>خط-بم/تپش %1</translation>
     </message>
+    <message>
+        <source>Clone of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>bitInvader</name>
@@ -4407,7 +4521,7 @@ use mouse wheel to set volume of a step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Incomplete monophonic immitation tb303</source>
+        <source>Incomplete monophonic imitation tb303</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4917,6 +5031,10 @@ Latency: %2 ms</source>
         <source>Choose background artwork</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>One instrument track window mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/locale/it.ts

@@ -23,10 +23,6 @@
         <source>LMMS - easy music production for everyone</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Copyright (c) 2004-2008, LMMS developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://lmms.sourceforge.net</source>
         <translation type="unfinished"></translation>
@@ -49,6 +45,10 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copyright (c) 2004-2010, LMMS developers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arpeggiator</name>
@@ -289,10 +289,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>DEVICE</source>
         <translation type="unfinished">PERIFERICA</translation>
     </message>
-    <message>
-        <source>CHANNELS</source>
-        <translation type="unfinished">CANALI</translation>
-    </message>
 </context>
 <context>
     <name>AudioPulseAudio::setupWidget</name>
@@ -352,7 +348,147 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreator</name>
+    <name>AutomationEditor</name>
+    <message>
+        <source>Play/pause current pattern (Space)</source>
+        <translation type="unfinished">Riproduci/metti in pausa questo pattern (Spazio)</translation>
+    </message>
+    <message>
+        <source>Stop playing of current pattern (Space)</source>
+        <translation type="unfinished">Ferma la riproduzione di questo pattern (Spazio)</translation>
+    </message>
+    <message>
+        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
+        <translation type="unfinished">Cliccando qui si riproduce il pattern selezionato. Questo è utile mentre lo  si modifica. Il pattern viene automaticamente ripetuto quando finisce.</translation>
+    </message>
+    <message>
+        <source>Click here if you want to stop playing of the current pattern.</source>
+        <translation type="unfinished">Cliccando qui si ferma la riproduzione del pattern.</translation>
+    </message>
+    <message>
+        <source>Draw mode (Shift+D)</source>
+        <translation type="unfinished">Modalità disegno (Shift+D)</translation>
+    </message>
+    <message>
+        <source>Erase mode (Shift+E)</source>
+        <translation type="unfinished">Modalità cancellazione (Shift+E)</translation>
+    </message>
+    <message>
+        <source>Select mode (Shift+S)</source>
+        <translation type="unfinished">Modalità selezione (Shift+S)</translation>
+    </message>
+    <message>
+        <source>Move selection mode (Shift+M)</source>
+        <translation type="unfinished">Modalità spostamento della selezione (Shift+M)</translation>
+    </message>
+    <message>
+        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">Cliccando qui si attiva la modalità disegno. In questa modalità è possibile aggiungere e spostare singoli valori. Questa è la modalità predefinita, che viene usata la maggior parte del tempo. Questa modalità si attiva anche premendo la combinazione di tasti &apos;Shift+D&apos;.</translation>
+    </message>
+    <message>
+        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">Cliccando qui si attiva la modalità cancellazione. In questa modalità è possibile cancellare singoli valori. Questa modalità si attiva anche premendo la combinazione di tasti &apos;Shift+E&apos;.</translation>
+    </message>
+    <message>
+        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">Cliccando qui si attiva la modalità selezione. In questa modalità è possibile selezionare i valori. Questo è necessario per tagliare, copiare, incollare o spostare valori. Questa modalità si attiva anche premendo la combinazione di tasti &apos;Shift+S&apos;.</translation>
+    </message>
+    <message>
+        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">Cliccando qui si attiva la modalità spostamento. In questa modalità è possibile spostare le note selezionate in modalità selezione. Questa modalità si attiva anche premendo la combinazione di tasti &apos;Shift+M&apos;.</translation>
+    </message>
+    <message>
+        <source>Cut selected values (Ctrl+X)</source>
+        <translation type="unfinished">Taglia i valori selezionati (Ctrl+X)</translation>
+    </message>
+    <message>
+        <source>Copy selected values (Ctrl+C)</source>
+        <translation type="unfinished">Copia i valori selezionati (Ctrl+C)</translation>
+    </message>
+    <message>
+        <source>Paste values from clipboard (Ctrl+V)</source>
+        <translation type="unfinished">Incolla i valori selezionati (Ctrl+V)</translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished">Cliccando qui i valori selezionati vengono spostati nella clipboard. È possibile incollarli ovunque, in qualsiasi pattern, cliccando il pulsante Incolla.</translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished">Cliccando qui i valori selezionati vengono copiati della clipboard. È possibile incollarli ovunque, in qualsiasi pattern, cliccando il pulsante Incolla.</translation>
+    </message>
+    <message>
+        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
+        <translation type="unfinished">Cliccando qui i valori nella clipboard vengono incollati alla prima battuta visibile.</translation>
+    </message>
+    <message>
+        <source>Automation Editor - no pattern</source>
+        <translation type="unfinished">Editor dell&apos;automazione - nessun pattern</translation>
+    </message>
+    <message>
+        <source>Automation Editor - %1</source>
+        <translation type="unfinished">Editor dell&apos;automazione - %1</translation>
+    </message>
+    <message>
+        <source>Please open an automation pattern with the context menu of a control!</source>
+        <translation type="unfinished">È necessario aprire un pattern di automazione con il menu contestuale di un controllo!</translation>
+    </message>
+    <message>
+        <source>Values copied</source>
+        <translation type="unfinished">Valori copiati</translation>
+    </message>
+    <message>
+        <source>All selected values were copied to the clipboard.</source>
+        <translation type="unfinished">Tutti i valori sono stati copiati nella clipboard.</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPattern</name>
+    <message>
+        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
+        <translation type="unfinished">È possibile disegnare un controllo tenendo premuto &lt;Ctrl&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPatternView</name>
+    <message>
+        <source>double-click to open this pattern in automation editor</source>
+        <translation type="unfinished">Con un doppio click si apre il pattern nell&apos;editor dell&apos;automazione</translation>
+    </message>
+    <message>
+        <source>Open in Automation editor</source>
+        <translation type="unfinished">Apri dell&apos;editor dell&apos;Automazione</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished">Pulisci</translation>
+    </message>
+    <message>
+        <source>Reset name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change name</source>
+        <translation type="unfinished">Cambia nome</translation>
+    </message>
+    <message>
+        <source>%1 Connections</source>
+        <translation type="unfinished">%1 connessioni</translation>
+    </message>
+    <message>
+        <source>Disconnect &quot;%1&quot;</source>
+        <translation type="unfinished">Disconnetti &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationTrack</name>
+    <message>
+        <source>Automation track</source>
+        <translation type="unfinished">Traccia di automazione</translation>
+    </message>
+</context>
+<context>
+    <name>InstrumentFunctionNoteStacking</name>
     <message>
         <source>octave</source>
         <translation type="unfinished">ottava</translation>
@@ -719,7 +855,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreatorView</name>
+    <name>InstrumentFunctionNoteStackingView</name>
     <message>
         <source>CHORDS</source>
         <translation type="unfinished">ACCORDI</translation>
@@ -2369,9 +2505,17 @@ Visitare http://lmms.sf.net/wiki  per la documentazione di LMMS.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay (not implemented):</source>
+        <source>ATTACK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attack:</source>
+        <translation type="unfinished">Attacco:</translation>
+    </message>
+    <message>
+        <source>Release:</source>
+        <translation type="unfinished">Rilascio:</translation>
+    </message>
 </context>
 <context>
     <name>PeakControllerEffectControls</name>
@@ -2388,8 +2532,12 @@ Visitare http://lmms.sf.net/wiki  per la documentazione di LMMS.</translation>
         <translation type="unfinished">Uscita muta</translation>
     </message>
     <message>
-        <source>Release decay</source>
-        <translation type="unfinished"></translation>
+        <source>Attack</source>
+        <translation type="unfinished">Attacco</translation>
+    </message>
+    <message>
+        <source>Release</source>
+        <translation type="unfinished">Rilascio</translation>
     </message>
 </context>
 <context>
@@ -2743,6 +2891,13 @@ Motivo: &quot;%2&quot;</translation>
         <translation type="unfinished">by</translation>
     </message>
 </context>
+<context>
+    <name>VstEffectControlDialog</name>
+    <message>
+        <source>Show/hide VST FX GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VstPlugin</name>
     <message>
@@ -2764,6 +2919,41 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
 Se, con altre applicazioni GNU/Linux il plugin funziona, si prega di contattare uno sviluppatore di LMMS!</translation>
     </message>
 </context>
+<context>
+    <name>ZynAddSubFxInstrument</name>
+    <message>
+        <source>Portamento</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Center Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Change Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZynAddSubFxView</name>
     <message>
@@ -2774,6 +2964,66 @@ Se, con altre applicazioni GNU/Linux il plugin funziona, si prega di contattare
         <source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Portamento:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PORT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FREQ</source>
+        <translation type="unfinished">FREQ</translation>
+    </message>
+    <message>
+        <source>Filter Resonance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES</source>
+        <translation type="unfinished">RIS</translation>
+    </message>
+    <message>
+        <source>Bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM GAIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance center frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>audioFileProcessor</name>
@@ -2798,146 +3048,6 @@ Se, con altre applicazioni GNU/Linux il plugin funziona, si prega di contattare
         <translation>Ripetizione</translation>
     </message>
 </context>
-<context>
-    <name>automationEditor</name>
-    <message>
-        <source>Play/pause current pattern (Space)</source>
-        <translation>Riproduci/metti in pausa questo pattern (Spazio)</translation>
-    </message>
-    <message>
-        <source>Stop playing of current pattern (Space)</source>
-        <translation>Ferma la riproduzione di questo pattern (Spazio)</translation>
-    </message>
-    <message>
-        <source>Cut selected values (Ctrl+X)</source>
-        <translation>Taglia i valori selezionati (Ctrl+X)</translation>
-    </message>
-    <message>
-        <source>Copy selected values (Ctrl+C)</source>
-        <translation>Copia i valori selezionati (Ctrl+C)</translation>
-    </message>
-    <message>
-        <source>Paste values from clipboard (Ctrl+V)</source>
-        <translation>Incolla i valori selezionati (Ctrl+V)</translation>
-    </message>
-    <message>
-        <source>Automation Editor - no pattern</source>
-        <translation>Editor dell&apos;automazione - nessun pattern</translation>
-    </message>
-    <message>
-        <source>Automation Editor - %1</source>
-        <translation>Editor dell&apos;automazione - %1</translation>
-    </message>
-    <message>
-        <source>Please open an automation pattern with the context menu of a control!</source>
-        <translation>È necessario aprire un pattern di automazione con il menu contestuale di un controllo!</translation>
-    </message>
-    <message>
-        <source>Values copied</source>
-        <translation>Valori copiati</translation>
-    </message>
-    <message>
-        <source>All selected values were copied to the clipboard.</source>
-        <translation>Tutti i valori sono stati copiati nella clipboard.</translation>
-    </message>
-    <message>
-        <source>Draw mode (Shift+D)</source>
-        <translation>Modalità disegno (Shift+D)</translation>
-    </message>
-    <message>
-        <source>Erase mode (Shift+E)</source>
-        <translation>Modalità cancellazione (Shift+E)</translation>
-    </message>
-    <message>
-        <source>Select mode (Shift+S)</source>
-        <translation>Modalità selezione (Shift+S)</translation>
-    </message>
-    <message>
-        <source>Move selection mode (Shift+M)</source>
-        <translation>Modalità spostamento della selezione (Shift+M)</translation>
-    </message>
-    <message>
-        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
-        <translation>Cliccando qui si attiva la modalità spostamento. In questa modalità è possibile spostare le note selezionate in modalità selezione. Questa modalità si attiva anche premendo la combinazione di tasti &apos;Shift+M&apos;.</translation>
-    </message>
-    <message>
-        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
-        <translation>Cliccando qui si riproduce il pattern selezionato. Questo è utile mentre lo  si modifica. Il pattern viene automaticamente ripetuto quando finisce.</translation>
-    </message>
-    <message>
-        <source>Click here if you want to stop playing of the current pattern.</source>
-        <translation>Cliccando qui si ferma la riproduzione del pattern.</translation>
-    </message>
-    <message>
-        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
-        <translation>Cliccando qui si attiva la modalità disegno. In questa modalità è possibile aggiungere e spostare singoli valori. Questa è la modalità predefinita, che viene usata la maggior parte del tempo. Questa modalità si attiva anche premendo la combinazione di tasti &apos;Shift+D&apos;.</translation>
-    </message>
-    <message>
-        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
-        <translation>Cliccando qui si attiva la modalità cancellazione. In questa modalità è possibile cancellare singoli valori. Questa modalità si attiva anche premendo la combinazione di tasti &apos;Shift+E&apos;.</translation>
-    </message>
-    <message>
-        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
-        <translation>Cliccando qui si attiva la modalità selezione. In questa modalità è possibile selezionare i valori. Questo è necessario per tagliare, copiare, incollare o spostare valori. Questa modalità si attiva anche premendo la combinazione di tasti &apos;Shift+S&apos;.</translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation>Cliccando qui i valori selezionati vengono spostati nella clipboard. È possibile incollarli ovunque, in qualsiasi pattern, cliccando il pulsante Incolla.</translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation>Cliccando qui i valori selezionati vengono copiati della clipboard. È possibile incollarli ovunque, in qualsiasi pattern, cliccando il pulsante Incolla.</translation>
-    </message>
-    <message>
-        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
-        <translation>Cliccando qui i valori nella clipboard vengono incollati alla prima battuta visibile.</translation>
-    </message>
-</context>
-<context>
-    <name>automationPattern</name>
-    <message>
-        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
-        <translation>È possibile disegnare un controllo tenendo premuto &lt;Ctrl&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>automationPatternView</name>
-    <message>
-        <source>double-click to open this pattern in automation editor</source>
-        <translation>Con un doppio click si apre il pattern nell&apos;editor dell&apos;automazione</translation>
-    </message>
-    <message>
-        <source>Open in Automation editor</source>
-        <translation>Apri dell&apos;editor dell&apos;Automazione</translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation>Pulisci</translation>
-    </message>
-    <message>
-        <source>Reset name</source>
-        <translation>Reimposta nome</translation>
-    </message>
-    <message>
-        <source>Change name</source>
-        <translation>Cambia nome</translation>
-    </message>
-    <message>
-        <source>Disconnect &quot;%1&quot;</source>
-        <translation>Disconnetti &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <source>%1 Connections</source>
-        <translation>%1 connessioni</translation>
-    </message>
-</context>
-<context>
-    <name>automationTrack</name>
-    <message>
-        <source>Automation track</source>
-        <translation>Traccia di automazione</translation>
-    </message>
-</context>
 <context>
     <name>bassBoosterControlDialog</name>
     <message>
@@ -3036,6 +3146,10 @@ Se, con altre applicazioni GNU/Linux il plugin funziona, si prega di contattare
         <source>Beat/Bassline %1</source>
         <translation>Beat/Bassline %1</translation>
     </message>
+    <message>
+        <source>Clone of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>bitInvader</name>
@@ -4489,7 +4603,7 @@ la rotellina del mouse impostare il volume delle note</translation>
         <translation>Plugin per manipolare liberamente un&apos;uscita stereo</translation>
     </message>
     <message>
-        <source>Incomplete monophonic immitation tb303</source>
+        <source>Incomplete monophonic imitation tb303</source>
         <translation>Imitazione monofonica del tb303 incompleta</translation>
     </message>
     <message>
@@ -4949,6 +5063,10 @@ Latenza: %2 ms</translation>
         <source>Choose background artwork</source>
         <translation>Scegliere la grafica dello sfondo</translation>
     </message>
+    <message>
+        <source>One instrument track window mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/locale/ja.ts

@@ -23,10 +23,6 @@
         <source>LMMS - easy music production for everyone</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Copyright (c) 2004-2008, LMMS developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://lmms.sourceforge.net</source>
         <translation type="unfinished"></translation>
@@ -49,6 +45,10 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copyright (c) 2004-2010, LMMS developers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arpeggiator</name>
@@ -289,10 +289,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>DEVICE</source>
         <translation type="unfinished">デバイス</translation>
     </message>
-    <message>
-        <source>CHANNELS</source>
-        <translation type="unfinished">チャンネル</translation>
-    </message>
 </context>
 <context>
     <name>AudioPulseAudio::setupWidget</name>
@@ -352,7 +348,147 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreator</name>
+    <name>AutomationEditor</name>
+    <message>
+        <source>Play/pause current pattern (Space)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop playing of current pattern (Space)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
+        <translation type="unfinished">クリックすると現在のパターンを演奏します。パターン編集中の演奏に便利です。終了位置にくるとパターンは自動的にループされます。</translation>
+    </message>
+    <message>
+        <source>Click here if you want to stop playing of the current pattern.</source>
+        <translation type="unfinished">クリックすると現在のパターンの演奏を停止します。</translation>
+    </message>
+    <message>
+        <source>Draw mode (Shift+D)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase mode (Shift+E)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select mode (Shift+S)</source>
+        <translation type="unfinished">選択モード (Shift+S)</translation>
+    </message>
+    <message>
+        <source>Move selection mode (Shift+M)</source>
+        <translation type="unfinished">移動 選択　モード　(Shift+M)</translation>
+    </message>
+    <message>
+        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">クリックするとドローモードをONにします。ドローモードではひとつの値を追加したり移動したりします。このモードがデフォルトで普段つかいます。 &apos;Shift+D&apos; をおしてもドローモードをONにできます。</translation>
+    </message>
+    <message>
+        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">クリックすると消去モードをONにします。消去モードではひとつの値を消去できます。 &apos;Shift+E&apos; をおしても消去モードをONにできます。</translation>
+    </message>
+    <message>
+        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">クリックすると選択モードをONにします。選択モードではいくつかの値を選択できます。このモードはいくつかの値をカット・コピー・ペースト・消去・移動するときに必要です。 &apos;Shift+S&apos; をおしても選択ーモードをONにできます。</translation>
+    </message>
+    <message>
+        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut selected values (Ctrl+X)</source>
+        <translation type="unfinished">選択した値をカット (Shift+M)</translation>
+    </message>
+    <message>
+        <source>Copy selected values (Ctrl+C)</source>
+        <translation type="unfinished">選択した値をコピー  (Ctrl+C)</translation>
+    </message>
+    <message>
+        <source>Paste values from clipboard (Ctrl+V)</source>
+        <translation type="unfinished">値をクリップボードからペースト (Ctrl+V)</translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished">クリックすると選択した値をクリップボードにカットします。その値はペーストボタンを押すと任意のパタンの任意の場所にペーストできます。</translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished">クリックすると選択した値をクリップボードにコピーします。その値はペーストボタンを押すと任意のパタンの任意の場所にペーストできます。</translation>
+    </message>
+    <message>
+        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
+        <translation type="unfinished">クリックするとクリップボードから値が最初の可視状態の小節にペーストされます。</translation>
+    </message>
+    <message>
+        <source>Automation Editor - no pattern</source>
+        <translation type="unfinished">オートメーションエディタ - パターンなし</translation>
+    </message>
+    <message>
+        <source>Automation Editor - %1</source>
+        <translation type="unfinished">オートメーションエディタ - %1</translation>
+    </message>
+    <message>
+        <source>Please open an automation pattern with the context menu of a control!</source>
+        <translation type="unfinished">コントロールのコンテクストメニューでオートメーションパターンを選んでください</translation>
+    </message>
+    <message>
+        <source>Values copied</source>
+        <translation type="unfinished">値はコピーされました</translation>
+    </message>
+    <message>
+        <source>All selected values were copied to the clipboard.</source>
+        <translation type="unfinished">選択された値はすべてクリップボードにコピーされました</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPattern</name>
+    <message>
+        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
+        <translation type="unfinished">実行中のドラッグコントロール&lt;Ctrl&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPatternView</name>
+    <message>
+        <source>double-click to open this pattern in automation editor</source>
+        <translation type="unfinished">ダブルクリックでこのパターンをオートメーションエディタ中にひらきます</translation>
+    </message>
+    <message>
+        <source>Open in Automation editor</source>
+        <translation type="unfinished">オートメーションエディタ中に開く</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished">クリア</translation>
+    </message>
+    <message>
+        <source>Reset name</source>
+        <translation type="unfinished">名前をリセット</translation>
+    </message>
+    <message>
+        <source>Change name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 Connections</source>
+        <translation type="unfinished">%1 個の接続</translation>
+    </message>
+    <message>
+        <source>Disconnect &quot;%1&quot;</source>
+        <translation type="unfinished">&quot;%1&quot; を切断</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationTrack</name>
+    <message>
+        <source>Automation track</source>
+        <translation type="unfinished">オートメーショントラック</translation>
+    </message>
+</context>
+<context>
+    <name>InstrumentFunctionNoteStacking</name>
     <message>
         <source>octave</source>
         <translation type="unfinished"></translation>
@@ -719,7 +855,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreatorView</name>
+    <name>InstrumentFunctionNoteStackingView</name>
     <message>
         <source>CHORDS</source>
         <translation type="unfinished"></translation>
@@ -2371,7 +2507,15 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay (not implemented):</source>
+        <source>ATTACK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attack:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2390,7 +2534,11 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay</source>
+        <source>Attack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2745,6 +2893,13 @@ Reason: &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VstEffectControlDialog</name>
+    <message>
+        <source>Show/hide VST FX GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VstPlugin</name>
     <message>
@@ -2766,6 +2921,41 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
 もしそのVSTがLinuxのほかのVST-ソフトウェアで動くなら LMMS の開発者に連絡してください。</translation>
     </message>
 </context>
+<context>
+    <name>ZynAddSubFxInstrument</name>
+    <message>
+        <source>Portamento</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Center Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Change Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZynAddSubFxView</name>
     <message>
@@ -2776,6 +2966,66 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Portamento:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PORT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FREQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM GAIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance center frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>audioFileProcessor</name>
@@ -2800,148 +3050,6 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation type="unfinished">ループ</translation>
     </message>
 </context>
-<context>
-    <name>automationEditor</name>
-    <message>
-        <source>Play/pause current pattern (Space)</source>
-        <translation type="unfinished">現在のパターンの 再生/ポーズ (Space)</translation>
-    </message>
-    <message>
-        <source>Stop playing of current pattern (Space)</source>
-        <translation type="unfinished">現在のパターンの再生の停止　
-(Space)</translation>
-    </message>
-    <message>
-        <source>Draw mode (Shift+D)</source>
-        <translation type="unfinished">ドローモード (Shift+D)
-</translation>
-    </message>
-    <message>
-        <source>Erase mode (Shift+E)</source>
-        <translation type="unfinished">消去モード (Shift+E)</translation>
-    </message>
-    <message>
-        <source>Select mode (Shift+S)</source>
-        <translation type="unfinished">選択モード (Shift+S)</translation>
-    </message>
-    <message>
-        <source>Move selection mode (Shift+M)</source>
-        <translation type="unfinished">移動 選択　モード　(Shift+M)</translation>
-    </message>
-    <message>
-        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut selected values (Ctrl+X)</source>
-        <translation type="unfinished">選択した値をカット (Shift+M)</translation>
-    </message>
-    <message>
-        <source>Copy selected values (Ctrl+C)</source>
-        <translation type="unfinished">選択した値をコピー  (Ctrl+C)</translation>
-    </message>
-    <message>
-        <source>Paste values from clipboard (Ctrl+V)</source>
-        <translation type="unfinished">値をクリップボードからペースト (Ctrl+V)</translation>
-    </message>
-    <message>
-        <source>Automation Editor - no pattern</source>
-        <translation type="unfinished">オートメーションエディタ - パターンなし</translation>
-    </message>
-    <message>
-        <source>Automation Editor - %1</source>
-        <translation type="unfinished">オートメーションエディタ - %1</translation>
-    </message>
-    <message>
-        <source>Please open an automation pattern with the context menu of a control!</source>
-        <translation type="unfinished">コントロールのコンテクストメニューでオートメーションパターンを選んでください</translation>
-    </message>
-    <message>
-        <source>Values copied</source>
-        <translation type="unfinished">値はコピーされました</translation>
-    </message>
-    <message>
-        <source>All selected values were copied to the clipboard.</source>
-        <translation type="unfinished">選択された値はすべてクリップボードにコピーされました</translation>
-    </message>
-    <message>
-        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
-        <translation type="unfinished">クリックすると現在のパターンを演奏します。パターン編集中の演奏に便利です。終了位置にくるとパターンは自動的にループされます。</translation>
-    </message>
-    <message>
-        <source>Click here if you want to stop playing of the current pattern.</source>
-        <translation type="unfinished">クリックすると現在のパターンの演奏を停止します。</translation>
-    </message>
-    <message>
-        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished">クリックするとドローモードをONにします。ドローモードではひとつの値を追加したり移動したりします。このモードがデフォルトで普段つかいます。 &apos;Shift+D&apos; をおしてもドローモードをONにできます。</translation>
-    </message>
-    <message>
-        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished">クリックすると消去モードをONにします。消去モードではひとつの値を消去できます。 &apos;Shift+E&apos; をおしても消去モードをONにできます。</translation>
-    </message>
-    <message>
-        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished">クリックすると選択モードをONにします。選択モードではいくつかの値を選択できます。このモードはいくつかの値をカット・コピー・ペースト・消去・移動するときに必要です。 &apos;Shift+S&apos; をおしても選択ーモードをONにできます。</translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished">クリックすると選択した値をクリップボードにカットします。その値はペーストボタンを押すと任意のパタンの任意の場所にペーストできます。</translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished">クリックすると選択した値をクリップボードにコピーします。その値はペーストボタンを押すと任意のパタンの任意の場所にペーストできます。</translation>
-    </message>
-    <message>
-        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
-        <translation type="unfinished">クリックするとクリップボードから値が最初の可視状態の小節にペーストされます。</translation>
-    </message>
-</context>
-<context>
-    <name>automationPattern</name>
-    <message>
-        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
-        <translation type="unfinished">実行中のドラッグコントロール&lt;Ctrl&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>automationPatternView</name>
-    <message>
-        <source>double-click to open this pattern in automation editor</source>
-        <translation type="unfinished">ダブルクリックでこのパターンをオートメーションエディタ中にひらきます</translation>
-    </message>
-    <message>
-        <source>Open in Automation editor</source>
-        <translation type="unfinished">オートメーションエディタ中に開く</translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished">クリア</translation>
-    </message>
-    <message>
-        <source>Reset name</source>
-        <translation type="unfinished">名前をリセット</translation>
-    </message>
-    <message>
-        <source>Change name</source>
-        <translation type="unfinished">名前を変更</translation>
-    </message>
-    <message>
-        <source>Disconnect &quot;%1&quot;</source>
-        <translation type="unfinished">&quot;%1&quot; を切断</translation>
-    </message>
-    <message>
-        <source>%1 Connections</source>
-        <translation type="unfinished">%1 個の接続</translation>
-    </message>
-</context>
-<context>
-    <name>automationTrack</name>
-    <message>
-        <source>Automation track</source>
-        <translation type="unfinished">オートメーショントラック</translation>
-    </message>
-</context>
 <context>
     <name>bassBoosterControlDialog</name>
     <message>
@@ -3040,6 +3148,10 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Beat/Bassline %1</source>
         <translation type="unfinished">beat/bassline %1</translation>
     </message>
+    <message>
+        <source>Clone of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>bitInvader</name>
@@ -4439,7 +4551,7 @@ use mouse wheel to set volume of a step</source>
         <translation type="unfinished">楽器プラグイン</translation>
     </message>
     <message>
-        <source>Incomplete monophonic immitation tb303</source>
+        <source>Incomplete monophonic imitation tb303</source>
         <translation type="unfinished">tb303の不完全なモノフォニックイミテーション</translation>
     </message>
     <message>
@@ -4950,6 +5062,10 @@ Latency: %2 ms</source>
         <source>Choose background artwork</source>
         <translation type="unfinished">背景用アートワークを選びます</translation>
     </message>
+    <message>
+        <source>One instrument track window mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/locale/ko.ts

@@ -23,10 +23,6 @@
         <source>LMMS - easy music production for everyone</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Copyright (c) 2004-2008, LMMS developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://lmms.sourceforge.net</source>
         <translation type="unfinished"></translation>
@@ -49,6 +45,10 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copyright (c) 2004-2010, LMMS developers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arpeggiator</name>
@@ -289,10 +289,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>DEVICE</source>
         <translation type="unfinished">기기</translation>
     </message>
-    <message>
-        <source>CHANNELS</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AudioPulseAudio::setupWidget</name>
@@ -352,7 +348,147 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreator</name>
+    <name>AutomationEditor</name>
+    <message>
+        <source>Play/pause current pattern (Space)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop playing of current pattern (Space)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if you want to stop playing of the current pattern.</source>
+        <translation type="unfinished">현재 패턴의 재생을 중지하려면 여기를 누르세요</translation>
+    </message>
+    <message>
+        <source>Draw mode (Shift+D)</source>
+        <translation type="unfinished">그리기 모드 (Shift+D)</translation>
+    </message>
+    <message>
+        <source>Erase mode (Shift+E)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select mode (Shift+S)</source>
+        <translation type="unfinished">선택 모드 (Shift+S)</translation>
+    </message>
+    <message>
+        <source>Move selection mode (Shift+M)</source>
+        <translation type="unfinished">선택 모드 이동 (Shift+M)</translation>
+    </message>
+    <message>
+        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut selected values (Ctrl+X)</source>
+        <translation type="unfinished">선택된 값 잘라내기 (Ctrl+X)</translation>
+    </message>
+    <message>
+        <source>Copy selected values (Ctrl+C)</source>
+        <translation type="unfinished">선택된 값 복사 (Ctrl+C)</translation>
+    </message>
+    <message>
+        <source>Paste values from clipboard (Ctrl+V)</source>
+        <translation type="unfinished">클립보드에서 값 붙여넣기 (Ctrl+V)</translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - no pattern</source>
+        <translation type="unfinished">자동화 편집기 - 패턴 없음</translation>
+    </message>
+    <message>
+        <source>Automation Editor - %1</source>
+        <translation type="unfinished">자동화 편집기 - %1</translation>
+    </message>
+    <message>
+        <source>Please open an automation pattern with the context menu of a control!</source>
+        <translation type="unfinished">제어 문맥 메뉴를 가진 자동화 패턴으로 열어주세요!</translation>
+    </message>
+    <message>
+        <source>Values copied</source>
+        <translation type="unfinished">복사된 값</translation>
+    </message>
+    <message>
+        <source>All selected values were copied to the clipboard.</source>
+        <translation type="unfinished">전체 선택된 값을 클립보드로 복사했습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPattern</name>
+    <message>
+        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
+        <translation type="unfinished">&lt;Ctrl&gt; 누르는 동안 제어를 끌기</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPatternView</name>
+    <message>
+        <source>double-click to open this pattern in automation editor</source>
+        <translation type="unfinished">자동화 편집기에서 이 패턴을 열기위하여 이중 클릭</translation>
+    </message>
+    <message>
+        <source>Open in Automation editor</source>
+        <translation type="unfinished">자동화 편집기에서 열기</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished">제거</translation>
+    </message>
+    <message>
+        <source>Reset name</source>
+        <translation type="unfinished">이름 초기화</translation>
+    </message>
+    <message>
+        <source>Change name</source>
+        <translation type="unfinished">이름 변경</translation>
+    </message>
+    <message>
+        <source>%1 Connections</source>
+        <translation type="unfinished">%1 연결</translation>
+    </message>
+    <message>
+        <source>Disconnect &quot;%1&quot;</source>
+        <translation type="unfinished">연결해제  &quot;%1&quot;</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationTrack</name>
+    <message>
+        <source>Automation track</source>
+        <translation type="unfinished">자동화 트랙</translation>
+    </message>
+</context>
+<context>
+    <name>InstrumentFunctionNoteStacking</name>
     <message>
         <source>octave</source>
         <translation type="unfinished">옥타브</translation>
@@ -719,7 +855,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreatorView</name>
+    <name>InstrumentFunctionNoteStackingView</name>
     <message>
         <source>CHORDS</source>
         <translation type="unfinished"></translation>
@@ -2356,7 +2492,15 @@ LMMS 문서는 http://lmms.sf.net/wiki를 방문하세요.</translation>
         <translation type="unfinished">감쇄</translation>
     </message>
     <message>
-        <source>Release decay (not implemented):</source>
+        <source>ATTACK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attack:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2375,7 +2519,11 @@ LMMS 문서는 http://lmms.sf.net/wiki를 방문하세요.</translation>
         <translation type="unfinished">무음 출력</translation>
     </message>
     <message>
-        <source>Release decay</source>
+        <source>Attack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2730,6 +2878,13 @@ Reason: &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>VstEffectControlDialog</name>
+    <message>
+        <source>Show/hide VST FX GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VstPlugin</name>
     <message>
@@ -2750,6 +2905,41 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ZynAddSubFxInstrument</name>
+    <message>
+        <source>Portamento</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Center Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Change Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZynAddSubFxView</name>
     <message>
@@ -2760,6 +2950,66 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Portamento:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PORT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FREQ</source>
+        <translation type="unfinished">주파수</translation>
+    </message>
+    <message>
+        <source>Filter Resonance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES</source>
+        <translation type="unfinished">해상도</translation>
+    </message>
+    <message>
+        <source>Bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM GAIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance center frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>audioFileProcessor</name>
@@ -2784,146 +3034,6 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation>반복</translation>
     </message>
 </context>
-<context>
-    <name>automationEditor</name>
-    <message>
-        <source>Play/pause current pattern (Space)</source>
-        <translation>현재 패턴 재생/정지 (Space)</translation>
-    </message>
-    <message>
-        <source>Stop playing of current pattern (Space)</source>
-        <translation>현재 패턴 재생 정지 (Space)</translation>
-    </message>
-    <message>
-        <source>Draw mode (Shift+D)</source>
-        <translation>그리기 모드 (Shift+D)</translation>
-    </message>
-    <message>
-        <source>Erase mode (Shift+E)</source>
-        <translation>제거 모드 (Shift+E)</translation>
-    </message>
-    <message>
-        <source>Select mode (Shift+S)</source>
-        <translation>선택 모드 (Shift+S)</translation>
-    </message>
-    <message>
-        <source>Move selection mode (Shift+M)</source>
-        <translation>선택 모드 이동 (Shift+M)</translation>
-    </message>
-    <message>
-        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Cut selected values (Ctrl+X)</source>
-        <translation>선택된 값 잘라내기 (Ctrl+X)</translation>
-    </message>
-    <message>
-        <source>Copy selected values (Ctrl+C)</source>
-        <translation>선택된 값 복사 (Ctrl+C)</translation>
-    </message>
-    <message>
-        <source>Paste values from clipboard (Ctrl+V)</source>
-        <translation>클립보드에서 값 붙여넣기 (Ctrl+V)</translation>
-    </message>
-    <message>
-        <source>Automation Editor - no pattern</source>
-        <translation>자동화 편집기 - 패턴 없음</translation>
-    </message>
-    <message>
-        <source>Automation Editor - %1</source>
-        <translation>자동화 편집기 - %1</translation>
-    </message>
-    <message>
-        <source>Please open an automation pattern with the context menu of a control!</source>
-        <translation>제어 문맥 메뉴를 가진 자동화 패턴으로 열어주세요!</translation>
-    </message>
-    <message>
-        <source>Values copied</source>
-        <translation>복사된 값</translation>
-    </message>
-    <message>
-        <source>All selected values were copied to the clipboard.</source>
-        <translation>전체 선택된 값을 클립보드로 복사했습니다.</translation>
-    </message>
-    <message>
-        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Click here if you want to stop playing of the current pattern.</source>
-        <translation>현재 패턴의 재생을 중지하려면 여기를 누르세요</translation>
-    </message>
-    <message>
-        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>automationPattern</name>
-    <message>
-        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
-        <translation>&lt;Ctrl&gt; 누르는 동안 제어를 끌기</translation>
-    </message>
-</context>
-<context>
-    <name>automationPatternView</name>
-    <message>
-        <source>double-click to open this pattern in automation editor</source>
-        <translation>자동화 편집기에서 이 패턴을 열기위하여 이중 클릭</translation>
-    </message>
-    <message>
-        <source>Open in Automation editor</source>
-        <translation>자동화 편집기에서 열기</translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation>제거</translation>
-    </message>
-    <message>
-        <source>Reset name</source>
-        <translation>이름 초기화</translation>
-    </message>
-    <message>
-        <source>Change name</source>
-        <translation>이름 변경</translation>
-    </message>
-    <message>
-        <source>Disconnect &quot;%1&quot;</source>
-        <translation>연결해제  &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <source>%1 Connections</source>
-        <translation>%1 연결</translation>
-    </message>
-</context>
-<context>
-    <name>automationTrack</name>
-    <message>
-        <source>Automation track</source>
-        <translation>자동화 트랙</translation>
-    </message>
-</context>
 <context>
     <name>bassBoosterControlDialog</name>
     <message>
@@ -3022,6 +3132,10 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Beat/Bassline %1</source>
         <translation></translation>
     </message>
+    <message>
+        <source>Clone of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>bitInvader</name>
@@ -4410,7 +4524,7 @@ use mouse wheel to set volume of a step</source>
         <translation>기기 플러그인</translation>
     </message>
     <message>
-        <source>Incomplete monophonic immitation tb303</source>
+        <source>Incomplete monophonic imitation tb303</source>
         <translation></translation>
     </message>
     <message>
@@ -4922,6 +5036,10 @@ Latency: %2 ms</source>
         <source>Choose background artwork</source>
         <translation>배경 아트워크 선택</translation>
     </message>
+    <message>
+        <source>One instrument track window mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/locale/nl.ts

@@ -23,10 +23,6 @@
         <source>LMMS - easy music production for everyone</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Copyright (c) 2004-2008, LMMS developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://lmms.sourceforge.net</source>
         <translation type="unfinished"></translation>
@@ -49,6 +45,10 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copyright (c) 2004-2010, LMMS developers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arpeggiator</name>
@@ -289,10 +289,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>DEVICE</source>
         <translation type="unfinished">APPARAAT</translation>
     </message>
-    <message>
-        <source>CHANNELS</source>
-        <translation type="unfinished">KANALEN</translation>
-    </message>
 </context>
 <context>
     <name>AudioPulseAudio::setupWidget</name>
@@ -352,7 +348,147 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreator</name>
+    <name>AutomationEditor</name>
+    <message>
+        <source>Play/pause current pattern (Space)</source>
+        <translation type="unfinished">Huidige pattern afspelen/pauseren (Spatie)</translation>
+    </message>
+    <message>
+        <source>Stop playing of current pattern (Space)</source>
+        <translation type="unfinished">Afspelen huidige pattern stoppen (Spatie)</translation>
+    </message>
+    <message>
+        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if you want to stop playing of the current pattern.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Draw mode (Shift+D)</source>
+        <translation type="unfinished">Teken modus (Shift+D)</translation>
+    </message>
+    <message>
+        <source>Erase mode (Shift+E)</source>
+        <translation type="unfinished">Wis modus (Shift+E)</translation>
+    </message>
+    <message>
+        <source>Select mode (Shift+S)</source>
+        <translation type="unfinished">Selecteer modus (Shift+S)</translation>
+    </message>
+    <message>
+        <source>Move selection mode (Shift+M)</source>
+        <translation type="unfinished">Verplaats selectie modus (Shift+M)</translation>
+    </message>
+    <message>
+        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">Als je hier klikt, word de verplaats-modus geactiveerdt. In deze modus kun je de in de selecteer-modus geselecteerde waarden verplaatsen. Je kunt ook &apos;Shift+M&apos; op het toetsenbord gebruiken om deze modus te activeren.</translation>
+    </message>
+    <message>
+        <source>Cut selected values (Ctrl+X)</source>
+        <translation type="unfinished">Knip geselecteerde waarden (Ctrl+X)</translation>
+    </message>
+    <message>
+        <source>Copy selected values (Ctrl+C)</source>
+        <translation type="unfinished">Kopieer geselecteerde waarden (Ctrl+C)</translation>
+    </message>
+    <message>
+        <source>Paste values from clipboard (Ctrl+V)</source>
+        <translation type="unfinished">Plak waarden van klembord (Ctrl+V)</translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - no pattern</source>
+        <translation type="unfinished">Automation-Editor - geen Pattern</translation>
+    </message>
+    <message>
+        <source>Automation Editor - %1</source>
+        <translation type="unfinished">Automation-Editor - %1</translation>
+    </message>
+    <message>
+        <source>Please open an automation pattern with the context menu of a control!</source>
+        <translation type="unfinished">Open aub een automation pattern met het context menu van een controller!</translation>
+    </message>
+    <message>
+        <source>Values copied</source>
+        <translation type="unfinished">Waarden gekopieerd</translation>
+    </message>
+    <message>
+        <source>All selected values were copied to the clipboard.</source>
+        <translation type="unfinished">Alle geselecteerde waarden zijn naar het klembord gekopieerd. </translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPattern</name>
+    <message>
+        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPatternView</name>
+    <message>
+        <source>double-click to open this pattern in automation editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in Automation editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset name</source>
+        <translation type="unfinished">Naam herstellen</translation>
+    </message>
+    <message>
+        <source>Change name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 Connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect &quot;%1&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationTrack</name>
+    <message>
+        <source>Automation track</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InstrumentFunctionNoteStacking</name>
     <message>
         <source>octave</source>
         <translation type="unfinished">oktaaf</translation>
@@ -719,7 +855,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreatorView</name>
+    <name>InstrumentFunctionNoteStackingView</name>
     <message>
         <source>CHORDS</source>
         <translation type="unfinished">AKKOORDEN</translation>
@@ -2355,9 +2491,17 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay (not implemented):</source>
+        <source>ATTACK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attack:</source>
+        <translation type="unfinished">Attack:</translation>
+    </message>
+    <message>
+        <source>Release:</source>
+        <translation type="unfinished">Release:</translation>
+    </message>
 </context>
 <context>
     <name>PeakControllerEffectControls</name>
@@ -2374,7 +2518,11 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay</source>
+        <source>Attack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2728,6 +2876,13 @@ Reason: &quot;%2&quot;</source>
         <translation type="unfinished">door</translation>
     </message>
 </context>
+<context>
+    <name>VstEffectControlDialog</name>
+    <message>
+        <source>Show/hide VST FX GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VstPlugin</name>
     <message>
@@ -2749,6 +2904,41 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
 Als het wel werkt met andere VST-software onder Linux, neem dan contact op met een LMMS-ontwikkelaar!</translation>
     </message>
 </context>
+<context>
+    <name>ZynAddSubFxInstrument</name>
+    <message>
+        <source>Portamento</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Center Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Change Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZynAddSubFxView</name>
     <message>
@@ -2759,6 +2949,66 @@ Als het wel werkt met andere VST-software onder Linux, neem dan contact op met e
         <source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Portamento:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PORT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FREQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM GAIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance center frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>audioFileProcessor</name>
@@ -2783,146 +3033,6 @@ Als het wel werkt met andere VST-software onder Linux, neem dan contact op met e
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>automationEditor</name>
-    <message>
-        <source>Play/pause current pattern (Space)</source>
-        <translation>Huidige pattern afspelen/pauseren (Spatie)</translation>
-    </message>
-    <message>
-        <source>Stop playing of current pattern (Space)</source>
-        <translation>Afspelen huidige pattern stoppen (Spatie)</translation>
-    </message>
-    <message>
-        <source>Cut selected values (Ctrl+X)</source>
-        <translation>Knip geselecteerde waarden (Ctrl+X)</translation>
-    </message>
-    <message>
-        <source>Copy selected values (Ctrl+C)</source>
-        <translation>Kopieer geselecteerde waarden (Ctrl+C)</translation>
-    </message>
-    <message>
-        <source>Paste values from clipboard (Ctrl+V)</source>
-        <translation>Plak waarden van klembord (Ctrl+V)</translation>
-    </message>
-    <message>
-        <source>Automation Editor - no pattern</source>
-        <translation>Automation-Editor - geen Pattern</translation>
-    </message>
-    <message>
-        <source>Automation Editor - %1</source>
-        <translation>Automation-Editor - %1</translation>
-    </message>
-    <message>
-        <source>Please open an automation pattern with the context menu of a control!</source>
-        <translation>Open aub een automation pattern met het context menu van een controller!</translation>
-    </message>
-    <message>
-        <source>Values copied</source>
-        <translation>Waarden gekopieerd</translation>
-    </message>
-    <message>
-        <source>All selected values were copied to the clipboard.</source>
-        <translation>Alle geselecteerde waarden zijn naar het klembord gekopieerd. </translation>
-    </message>
-    <message>
-        <source>Draw mode (Shift+D)</source>
-        <translation>Teken modus (Shift+D)</translation>
-    </message>
-    <message>
-        <source>Erase mode (Shift+E)</source>
-        <translation>Wis modus (Shift+E)</translation>
-    </message>
-    <message>
-        <source>Select mode (Shift+S)</source>
-        <translation>Selecteer modus (Shift+S)</translation>
-    </message>
-    <message>
-        <source>Move selection mode (Shift+M)</source>
-        <translation>Verplaats selectie modus (Shift+M)</translation>
-    </message>
-    <message>
-        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
-        <translation>Als je hier klikt, word de verplaats-modus geactiveerdt. In deze modus kun je de in de selecteer-modus geselecteerde waarden verplaatsen. Je kunt ook &apos;Shift+M&apos; op het toetsenbord gebruiken om deze modus te activeren.</translation>
-    </message>
-    <message>
-        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here if you want to stop playing of the current pattern.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPattern</name>
-    <message>
-        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPatternView</name>
-    <message>
-        <source>double-click to open this pattern in automation editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Automation editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset name</source>
-        <translation type="unfinished">Naam herstellen</translation>
-    </message>
-    <message>
-        <source>Change name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 Connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationTrack</name>
-    <message>
-        <source>Automation track</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>bassBoosterControlDialog</name>
     <message>
@@ -3021,6 +3131,10 @@ Als het wel werkt met andere VST-software onder Linux, neem dan contact op met e
         <source>Beat/Bassline %1</source>
         <translation>Beat/Bassline %1</translation>
     </message>
+    <message>
+        <source>Clone of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>bitInvader</name>
@@ -4437,7 +4551,7 @@ volume van de steps is met het muiswiel te veranderen</translation>
         <translation>Filter voor importeren van FL Studio Projecten in LMMS</translation>
     </message>
     <message>
-        <source>Incomplete monophonic immitation tb303</source>
+        <source>Incomplete monophonic imitation tb303</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4920,6 +5034,10 @@ Vertraging: %2 ms</translation>
         <source>Choose background artwork</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>One instrument track window mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/locale/pt_br.ts

@@ -23,10 +23,6 @@
         <source>LMMS - easy music production for everyone</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Copyright (c) 2004-2008, LMMS developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://lmms.sourceforge.net</source>
         <translation type="unfinished"></translation>
@@ -49,6 +45,10 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copyright (c) 2004-2010, LMMS developers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arpeggiator</name>
@@ -289,10 +289,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>DEVICE</source>
         <translation type="unfinished">DISPOSITIVO</translation>
     </message>
-    <message>
-        <source>CHANNELS</source>
-        <translation type="unfinished">CANAIS</translation>
-    </message>
 </context>
 <context>
     <name>AudioPulseAudio::setupWidget</name>
@@ -352,7 +348,147 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreator</name>
+    <name>AutomationEditor</name>
+    <message>
+        <source>Play/pause current pattern (Space)</source>
+        <translation type="unfinished">Tocar/pausar padrão atual (Espaço)</translation>
+    </message>
+    <message>
+        <source>Stop playing of current pattern (Space)</source>
+        <translation type="unfinished">Parar de tocar o padrão atual (Espaço)</translation>
+    </message>
+    <message>
+        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if you want to stop playing of the current pattern.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Draw mode (Shift+D)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase mode (Shift+E)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select mode (Shift+S)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move selection mode (Shift+M)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut selected values (Ctrl+X)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy selected values (Ctrl+C)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste values from clipboard (Ctrl+V)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - no pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please open an automation pattern with the context menu of a control!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Values copied</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>All selected values were copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPattern</name>
+    <message>
+        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPatternView</name>
+    <message>
+        <source>double-click to open this pattern in automation editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in Automation editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset name</source>
+        <translation type="unfinished">Restaurar nome</translation>
+    </message>
+    <message>
+        <source>Change name</source>
+        <translation type="unfinished">Mudar nome</translation>
+    </message>
+    <message>
+        <source>%1 Connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect &quot;%1&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationTrack</name>
+    <message>
+        <source>Automation track</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InstrumentFunctionNoteStacking</name>
     <message>
         <source>octave</source>
         <translation type="unfinished">oitava</translation>
@@ -719,7 +855,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreatorView</name>
+    <name>InstrumentFunctionNoteStackingView</name>
     <message>
         <source>CHORDS</source>
         <translation type="unfinished">ACORDE</translation>
@@ -2355,9 +2491,17 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay (not implemented):</source>
+        <source>ATTACK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attack:</source>
+        <translation type="unfinished">Ataque:</translation>
+    </message>
+    <message>
+        <source>Release:</source>
+        <translation type="unfinished">Libera:</translation>
+    </message>
 </context>
 <context>
     <name>PeakControllerEffectControls</name>
@@ -2374,7 +2518,11 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay</source>
+        <source>Attack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2728,6 +2876,13 @@ Reason: &quot;%2&quot;</source>
         <translation type="unfinished">por</translation>
     </message>
 </context>
+<context>
+    <name>VstEffectControlDialog</name>
+    <message>
+        <source>Show/hide VST FX GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VstPlugin</name>
     <message>
@@ -2749,6 +2904,41 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
 Se ele rodar com outro programa VST no Linux, por favor entre em contato com um desenvolvedor do LMMS!</translation>
     </message>
 </context>
+<context>
+    <name>ZynAddSubFxInstrument</name>
+    <message>
+        <source>Portamento</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Center Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Change Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZynAddSubFxView</name>
     <message>
@@ -2759,6 +2949,66 @@ Se ele rodar com outro programa VST no Linux, por favor entre em contato com um
         <source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Portamento:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PORT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FREQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM GAIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance center frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>audioFileProcessor</name>
@@ -2783,146 +3033,6 @@ Se ele rodar com outro programa VST no Linux, por favor entre em contato com um
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>automationEditor</name>
-    <message>
-        <source>Play/pause current pattern (Space)</source>
-        <translation type="unfinished">Tocar/pausar padrão atual (Espaço)</translation>
-    </message>
-    <message>
-        <source>Stop playing of current pattern (Space)</source>
-        <translation type="unfinished">Parar de tocar o padrão atual (Espaço)</translation>
-    </message>
-    <message>
-        <source>Draw mode (Shift+D)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erase mode (Shift+E)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select mode (Shift+S)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move selection mode (Shift+M)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut selected values (Ctrl+X)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy selected values (Ctrl+C)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Paste values from clipboard (Ctrl+V)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automation Editor - no pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automation Editor - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please open an automation pattern with the context menu of a control!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Values copied</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All selected values were copied to the clipboard.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here if you want to stop playing of the current pattern.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPattern</name>
-    <message>
-        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPatternView</name>
-    <message>
-        <source>double-click to open this pattern in automation editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Automation editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset name</source>
-        <translation type="unfinished">Restaurar nome</translation>
-    </message>
-    <message>
-        <source>Change name</source>
-        <translation type="unfinished">Mudar nome</translation>
-    </message>
-    <message>
-        <source>Disconnect &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 Connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationTrack</name>
-    <message>
-        <source>Automation track</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>bassBoosterControlDialog</name>
     <message>
@@ -3021,6 +3131,10 @@ Se ele rodar com outro programa VST no Linux, por favor entre em contato com um
         <source>Beat/Bassline %1</source>
         <translation>Batida/Baixo %1</translation>
     </message>
+    <message>
+        <source>Clone of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>bitInvader</name>
@@ -4413,7 +4527,7 @@ use mouse wheel to set volume of a step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Incomplete monophonic immitation tb303</source>
+        <source>Incomplete monophonic imitation tb303</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4919,6 +5033,10 @@ Latency: %2 ms</source>
         <source>Choose background artwork</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>One instrument track window mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/locale/ru.ts

@@ -23,10 +23,6 @@
         <source>LMMS - easy music production for everyone</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Copyright (c) 2004-2008, LMMS developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://lmms.sourceforge.net</source>
         <translation type="unfinished"></translation>
@@ -49,6 +45,10 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copyright (c) 2004-2010, LMMS developers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arpeggiator</name>
@@ -289,10 +289,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>DEVICE</source>
         <translation type="unfinished">УСТРОЙСТВО</translation>
     </message>
-    <message>
-        <source>CHANNELS</source>
-        <translation type="unfinished">ЧИСЛО КАНАЛОВ</translation>
-    </message>
 </context>
 <context>
     <name>AudioPulseAudio::setupWidget</name>
@@ -352,7 +348,151 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreator</name>
+    <name>AutomationEditor</name>
+    <message>
+        <source>Play/pause current pattern (Space)</source>
+        <translation type="unfinished">Воспроизведение ткущего шаблона/пауза (Пробел)</translation>
+    </message>
+    <message>
+        <source>Stop playing of current pattern (Space)</source>
+        <translation type="unfinished">Остановить воспроизвдение шаблона (Пробел)</translation>
+    </message>
+    <message>
+        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
+        <translation type="unfinished">Нажмите здесь чтобы проиграть текущий шаблон. Это может пригодиться при его редактировании. Шаблон автоматически повторяется при достижении конца.</translation>
+    </message>
+    <message>
+        <source>Click here if you want to stop playing of the current pattern.</source>
+        <translation type="unfinished">Нажмите здесь, если вы хотите приостановить/продолжить воспроизведение текущего шаблона.</translation>
+    </message>
+    <message>
+        <source>Draw mode (Shift+D)</source>
+        <translation type="unfinished">Режим рисования (Shift+D)</translation>
+    </message>
+    <message>
+        <source>Erase mode (Shift+E)</source>
+        <translation type="unfinished">Режим стирания нот (Shift+E)</translation>
+    </message>
+    <message>
+        <source>Select mode (Shift+S)</source>
+        <translation type="unfinished">Режим выбора нот (Shift+S)</translation>
+    </message>
+    <message>
+        <source>Move selection mode (Shift+M)</source>
+        <translation type="unfinished">Режим перемещения  выбранных нот (Shift+M)</translation>
+    </message>
+    <message>
+        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">При нажатии на эту кнопку активируется режим рисования нот, который является режимом по умолчанию и используется большую часть времени. В этом режиме вы можете добавлять/перемещать и изменять длительность одиночных нот.
+Для включения этого режима можно использовать комбинацию клавиш Shift+D.</translation>
+    </message>
+    <message>
+        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">При нажатии на эту кнопку активируется режим стирания. В этом режиме вы можете стирать ноты по одной.
+Для включения этого режима можно использовать комбинацию клавиш Shift+E.</translation>
+    </message>
+    <message>
+        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">При нажатии на эту кнопку активируется режим выбора нот. В этом режиме вы можете выбирать ноты для последующих действий. Это необходимо, если вы хотите вырезать, копировать, вставлять или перемещать сразу несколько нот.
+Для включения этого режима можно использовать комбинацию клавиш Shift+S.</translation>
+    </message>
+    <message>
+        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished">При нажатии на эту кнопку активируется режим перемещения. В этом режиме вы можете перемещать выбранные ранее (в режиме выбора) ноты.
+Для включения этого режима можно использовать комбинацию клавиш Shift+E.</translation>
+    </message>
+    <message>
+        <source>Cut selected values (Ctrl+X)</source>
+        <translation type="unfinished">Вырезать выбранные ноты (Ctrl+X)</translation>
+    </message>
+    <message>
+        <source>Copy selected values (Ctrl+C)</source>
+        <translation type="unfinished">Копировать выбранные ноты в буфер (Ctrl+C)</translation>
+    </message>
+    <message>
+        <source>Paste values from clipboard (Ctrl+V)</source>
+        <translation type="unfinished">Вставить значения из буфера (Ctrl+V)</translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished">При нажатии на эту кнопку выделеные ноты будут перемещены в буфер. Позже вы можете вставить их в любое место любого шаблона с помощью кнопки &quot;Вставить&quot;.</translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished">При нажатии на эту кнопку выделеные ноты будут скопированы в буфер. Позже вы можете вставить их в любое место любого шаблона с помощью кнопки &quot;Вставить&quot;.</translation>
+    </message>
+    <message>
+        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
+        <translation type="unfinished">При нажатии на эту кнопку ноты из буфера будут вставлены в превый видимый такт.</translation>
+    </message>
+    <message>
+        <source>Automation Editor - no pattern</source>
+        <translation type="unfinished">Редактор временных зависимостей — нет шаблона</translation>
+    </message>
+    <message>
+        <source>Automation Editor - %1</source>
+        <translation type="unfinished">Редактор временных зависимостей — %1</translation>
+    </message>
+    <message>
+        <source>Please open an automation pattern with the context menu of a control!</source>
+        <translation type="unfinished">Открывайте редатор временных зависимостей через контекстное меню регулятора!</translation>
+    </message>
+    <message>
+        <source>Values copied</source>
+        <translation type="unfinished">Значения скопированы</translation>
+    </message>
+    <message>
+        <source>All selected values were copied to the clipboard.</source>
+        <translation type="unfinished">Выбранные значения скопированы в буфер обмена.</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPattern</name>
+    <message>
+        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPatternView</name>
+    <message>
+        <source>double-click to open this pattern in automation editor</source>
+        <translation type="unfinished">Дважды щёлкните мышью чтобы настроить зависимость от времени для этого шаблона</translation>
+    </message>
+    <message>
+        <source>Open in Automation editor</source>
+        <translation type="unfinished">Настройка зависимости от времени</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished">Очистить</translation>
+    </message>
+    <message>
+        <source>Reset name</source>
+        <translation type="unfinished">Сбросить название</translation>
+    </message>
+    <message>
+        <source>Change name</source>
+        <translation type="unfinished">Переименовать</translation>
+    </message>
+    <message>
+        <source>%1 Connections</source>
+        <translation type="unfinished">Соединения %1</translation>
+    </message>
+    <message>
+        <source>Disconnect &quot;%1&quot;</source>
+        <translation type="unfinished">Отсоединить «%1»</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationTrack</name>
+    <message>
+        <source>Automation track</source>
+        <translation type="unfinished">Дорожка автоматизации</translation>
+    </message>
+</context>
+<context>
+    <name>InstrumentFunctionNoteStacking</name>
     <message>
         <source>octave</source>
         <translation type="unfinished">Октава</translation>
@@ -719,7 +859,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreatorView</name>
+    <name>InstrumentFunctionNoteStackingView</name>
     <message>
         <source>CHORDS</source>
         <translation type="unfinished">АККОРД</translation>
@@ -2371,9 +2511,17 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished">СПАД</translation>
     </message>
     <message>
-        <source>Release decay (not implemented):</source>
+        <source>ATTACK</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attack:</source>
+        <translation type="unfinished">Длительность нарастания:</translation>
+    </message>
+    <message>
+        <source>Release:</source>
+        <translation type="unfinished">Длительность исчезновения:</translation>
+    </message>
 </context>
 <context>
     <name>PeakControllerEffectControls</name>
@@ -2390,8 +2538,12 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished">Заглушить</translation>
     </message>
     <message>
-        <source>Release decay</source>
-        <translation type="unfinished"></translation>
+        <source>Attack</source>
+        <translation type="unfinished">Длительность нарастания</translation>
+    </message>
+    <message>
+        <source>Release</source>
+        <translation type="unfinished">Длительность исчезновения</translation>
     </message>
 </context>
 <context>
@@ -2745,6 +2897,13 @@ Reason: &quot;%2&quot;</source>
         <translation type="unfinished">от</translation>
     </message>
 </context>
+<context>
+    <name>VstEffectControlDialog</name>
+    <message>
+        <source>Show/hide VST FX GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VstPlugin</name>
     <message>
@@ -2766,6 +2925,41 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
 Если другое программное обеспечение VST работает у Вас под Linux&apos;ом, свяжитесь с разработчиком LMMS!</translation>
     </message>
 </context>
+<context>
+    <name>ZynAddSubFxInstrument</name>
+    <message>
+        <source>Portamento</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Center Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Change Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZynAddSubFxView</name>
     <message>
@@ -2776,6 +2970,66 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Portamento:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PORT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FREQ</source>
+        <translation type="unfinished">ЧАСТ</translation>
+    </message>
+    <message>
+        <source>Filter Resonance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES</source>
+        <translation type="unfinished">УСИЛ</translation>
+    </message>
+    <message>
+        <source>Bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM GAIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance center frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>audioFileProcessor</name>
@@ -2800,150 +3054,6 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation>Повторять</translation>
     </message>
 </context>
-<context>
-    <name>automationEditor</name>
-    <message>
-        <source>Play/pause current pattern (Space)</source>
-        <translation>Воспроизведение ткущего шаблона/пауза (Пробел)</translation>
-    </message>
-    <message>
-        <source>Stop playing of current pattern (Space)</source>
-        <translation>Остановить воспроизвдение шаблона (Пробел)</translation>
-    </message>
-    <message>
-        <source>Draw mode (Shift+D)</source>
-        <translation>Режим рисования (Shift+D)</translation>
-    </message>
-    <message>
-        <source>Erase mode (Shift+E)</source>
-        <translation>Режим стирания нот (Shift+E)</translation>
-    </message>
-    <message>
-        <source>Select mode (Shift+S)</source>
-        <translation>Режим выбора нот (Shift+S)</translation>
-    </message>
-    <message>
-        <source>Move selection mode (Shift+M)</source>
-        <translation>Режим перемещения  выбранных нот (Shift+M)</translation>
-    </message>
-    <message>
-        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
-        <translation>При нажатии на эту кнопку активируется режим перемещения. В этом режиме вы можете перемещать выбранные ранее (в режиме выбора) ноты.
-Для включения этого режима можно использовать комбинацию клавиш Shift+E.</translation>
-    </message>
-    <message>
-        <source>Cut selected values (Ctrl+X)</source>
-        <translation>Вырезать выбранные ноты (Ctrl+X)</translation>
-    </message>
-    <message>
-        <source>Copy selected values (Ctrl+C)</source>
-        <translation>Копировать выбранные ноты в буфер (Ctrl+C)</translation>
-    </message>
-    <message>
-        <source>Paste values from clipboard (Ctrl+V)</source>
-        <translation>Вставить значения из буфера (Ctrl+V)</translation>
-    </message>
-    <message>
-        <source>Automation Editor - no pattern</source>
-        <translation>Редактор временных зависимостей — нет шаблона</translation>
-    </message>
-    <message>
-        <source>Automation Editor - %1</source>
-        <translation>Редактор временных зависимостей — %1</translation>
-    </message>
-    <message>
-        <source>Please open an automation pattern with the context menu of a control!</source>
-        <translation>Открывайте редатор временных зависимостей через контекстное меню регулятора!</translation>
-    </message>
-    <message>
-        <source>Values copied</source>
-        <translation>Значения скопированы</translation>
-    </message>
-    <message>
-        <source>All selected values were copied to the clipboard.</source>
-        <translation>Выбранные значения скопированы в буфер обмена.</translation>
-    </message>
-    <message>
-        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
-        <translation>Нажмите здесь чтобы проиграть текущий шаблон. Это может пригодиться при его редактировании. Шаблон автоматически повторяется при достижении конца.</translation>
-    </message>
-    <message>
-        <source>Click here if you want to stop playing of the current pattern.</source>
-        <translation>Нажмите здесь, если вы хотите приостановить/продолжить воспроизведение текущего шаблона.</translation>
-    </message>
-    <message>
-        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
-        <translation>При нажатии на эту кнопку активируется режим рисования нот, который является режимом по умолчанию и используется большую часть времени. В этом режиме вы можете добавлять/перемещать и изменять длительность одиночных нот.
-Для включения этого режима можно использовать комбинацию клавиш Shift+D.</translation>
-    </message>
-    <message>
-        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
-        <translation>При нажатии на эту кнопку активируется режим стирания. В этом режиме вы можете стирать ноты по одной.
-Для включения этого режима можно использовать комбинацию клавиш Shift+E.</translation>
-    </message>
-    <message>
-        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
-        <translation>При нажатии на эту кнопку активируется режим выбора нот. В этом режиме вы можете выбирать ноты для последующих действий. Это необходимо, если вы хотите вырезать, копировать, вставлять или перемещать сразу несколько нот.
-Для включения этого режима можно использовать комбинацию клавиш Shift+S.</translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation>При нажатии на эту кнопку выделеные ноты будут перемещены в буфер. Позже вы можете вставить их в любое место любого шаблона с помощью кнопки &quot;Вставить&quot;.</translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation>При нажатии на эту кнопку выделеные ноты будут скопированы в буфер. Позже вы можете вставить их в любое место любого шаблона с помощью кнопки &quot;Вставить&quot;.</translation>
-    </message>
-    <message>
-        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
-        <translation>При нажатии на эту кнопку ноты из буфера будут вставлены в превый видимый такт.</translation>
-    </message>
-</context>
-<context>
-    <name>automationPattern</name>
-    <message>
-        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPatternView</name>
-    <message>
-        <source>double-click to open this pattern in automation editor</source>
-        <translation>Дважды щёлкните мышью чтобы настроить зависимость от времени для этого шаблона</translation>
-    </message>
-    <message>
-        <source>Open in Automation editor</source>
-        <translation>Настройка зависимости от времени</translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation>Очистить</translation>
-    </message>
-    <message>
-        <source>Reset name</source>
-        <translation>Сбросить название</translation>
-    </message>
-    <message>
-        <source>Change name</source>
-        <translation>Переименовать</translation>
-    </message>
-    <message>
-        <source>%1 Connections</source>
-        <translation>Соединения %1</translation>
-    </message>
-    <message>
-        <source>Disconnect &quot;%1&quot;</source>
-        <translation>Отсоединить «%1»</translation>
-    </message>
-</context>
-<context>
-    <name>automationTrack</name>
-    <message>
-        <source>Automation track</source>
-        <translation>Дорожка автоматизации</translation>
-    </message>
-</context>
 <context>
     <name>bassBoosterControlDialog</name>
     <message>
@@ -3042,6 +3152,10 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Beat/Bassline %1</source>
         <translation>Лейтмотив %1</translation>
     </message>
+    <message>
+        <source>Clone of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>bitInvader</name>
@@ -4483,7 +4597,7 @@ use mouse wheel to set volume of a step</source>
         <translation>Фильтр для импортирования файлов FL Stuio</translation>
     </message>
     <message>
-        <source>Incomplete monophonic immitation tb303</source>
+        <source>Incomplete monophonic imitation tb303</source>
         <translation>Незавершённая монофоническая имитация tb303</translation>
     </message>
     <message>
@@ -4955,6 +5069,10 @@ Latency: %2 ms</source>
         <source>Choose background artwork</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>One instrument track window mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/locale/sv.ts

@@ -23,10 +23,6 @@
         <source>LMMS - easy music production for everyone</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Copyright (c) 2004-2008, LMMS developers</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>http://lmms.sourceforge.net</source>
         <translation type="unfinished"></translation>
@@ -49,6 +45,10 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Copyright (c) 2004-2010, LMMS developers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Arpeggiator</name>
@@ -289,10 +289,6 @@ If you&apos;re interested in translating LMMS in another language or want to imp
         <source>DEVICE</source>
         <translation type="unfinished">ENHET</translation>
     </message>
-    <message>
-        <source>CHANNELS</source>
-        <translation type="unfinished">KANALER</translation>
-    </message>
 </context>
 <context>
     <name>AudioPulseAudio::setupWidget</name>
@@ -352,7 +348,147 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreator</name>
+    <name>AutomationEditor</name>
+    <message>
+        <source>Play/pause current pattern (Space)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop playing of current pattern (Space)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here if you want to stop playing of the current pattern.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Draw mode (Shift+D)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Erase mode (Shift+E)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select mode (Shift+S)</source>
+        <translation type="unfinished">Markeringsläge (shift+s)</translation>
+    </message>
+    <message>
+        <source>Move selection mode (Shift+M)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut selected values (Ctrl+X)</source>
+        <translation type="unfinished">klipp ut valda värden (ctrl+X)</translation>
+    </message>
+    <message>
+        <source>Copy selected values (Ctrl+C)</source>
+        <translation type="unfinished">Kopiera valda värden (ctrl+C)</translation>
+    </message>
+    <message>
+        <source>Paste values from clipboard (Ctrl+V)</source>
+        <translation type="unfinished">Klistra in värden från urklipp(ctrl+V)</translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - no pattern</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automation Editor - %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Please open an automation pattern with the context menu of a control!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Values copied</source>
+        <translation type="unfinished">Värden kopierade</translation>
+    </message>
+    <message>
+        <source>All selected values were copied to the clipboard.</source>
+        <translation type="unfinished">Alla valda värden blev kopierade till urklipp.</translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPattern</name>
+    <message>
+        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationPatternView</name>
+    <message>
+        <source>double-click to open this pattern in automation editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in Automation editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Reset name</source>
+        <translation type="unfinished">Nollställ namn</translation>
+    </message>
+    <message>
+        <source>Change name</source>
+        <translation type="unfinished">Byt namn</translation>
+    </message>
+    <message>
+        <source>%1 Connections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect &quot;%1&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>AutomationTrack</name>
+    <message>
+        <source>Automation track</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InstrumentFunctionNoteStacking</name>
     <message>
         <source>octave</source>
         <translation type="unfinished">oktav</translation>
@@ -719,7 +855,7 @@ If you&apos;re interested in translating LMMS in another language or want to imp
     </message>
 </context>
 <context>
-    <name>ChordCreatorView</name>
+    <name>InstrumentFunctionNoteStackingView</name>
     <message>
         <source>CHORDS</source>
         <translation type="unfinished"></translation>
@@ -2355,7 +2491,15 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay (not implemented):</source>
+        <source>ATTACK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attack:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2374,7 +2518,11 @@ Please visit http://lmms.sf.net/wiki for documentation on LMMS.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Release decay</source>
+        <source>Attack</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Release</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2728,6 +2876,13 @@ Reason: &quot;%2&quot;</source>
         <translation type="unfinished">Av</translation>
     </message>
 </context>
+<context>
+    <name>VstEffectControlDialog</name>
+    <message>
+        <source>Show/hide VST FX GUI</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>VstPlugin</name>
     <message>
@@ -2748,6 +2903,41 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ZynAddSubFxInstrument</name>
+    <message>
+        <source>Portamento</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Center Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance Bandwidth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Change Events</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZynAddSubFxView</name>
     <message>
@@ -2758,6 +2948,66 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Click here to show or hide the graphical user interface (GUI) of ZynAddSubFX.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Portamento:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>PORT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FREQ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter Resonance:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM Gain:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>FM GAIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance center frequency:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES CF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resonance bandwidth:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RES BW</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forward MIDI Control Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>audioFileProcessor</name>
@@ -2782,146 +3032,6 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>automationEditor</name>
-    <message>
-        <source>Play/pause current pattern (Space)</source>
-        <translation>Spela/pausa aktullelt mönster (mellanslag)</translation>
-    </message>
-    <message>
-        <source>Stop playing of current pattern (Space)</source>
-        <translation>Sluta spela aktuellt mönster (mellanslag)</translation>
-    </message>
-    <message>
-        <source>Draw mode (Shift+D)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erase mode (Shift+E)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select mode (Shift+S)</source>
-        <translation>Markeringsläge (shift+s)</translation>
-    </message>
-    <message>
-        <source>Move selection mode (Shift+M)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press &apos;Shift+M&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cut selected values (Ctrl+X)</source>
-        <translation>klipp ut valda värden (ctrl+X)</translation>
-    </message>
-    <message>
-        <source>Copy selected values (Ctrl+C)</source>
-        <translation>Kopiera valda värden (ctrl+C)</translation>
-    </message>
-    <message>
-        <source>Paste values from clipboard (Ctrl+V)</source>
-        <translation>Klistra in värden från urklipp(ctrl+V)</translation>
-    </message>
-    <message>
-        <source>Automation Editor - no pattern</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automation Editor - %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please open an automation pattern with the context menu of a control!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Values copied</source>
-        <translation>Värden kopierade</translation>
-    </message>
-    <message>
-        <source>All selected values were copied to the clipboard.</source>
-        <translation>Alla valda värden blev kopierade till urklipp.</translation>
-    </message>
-    <message>
-        <source>Click here if you want to play the current pattern. This is useful while editing it.  The pattern is automatically looped when the end is reached.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here if you want to stop playing of the current pattern.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and draw-mode will be activated. In this mode you can add and move single values.  This is the default mode which is used most of the time.  You can also press &apos;Shift+D&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and erase-mode will be activated. In this mode you can erase single values. You can also press &apos;Shift+E&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and select-mode will be activated. In this mode you can select values. This is necessary if you want to cut, copy, paste, delete, or move values. You can also press &apos;Shift+S&apos; on your keyboard to activate this mode.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be cut into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and selected values will be copied into the clipboard.  You can paste them anywhere in any pattern by clicking on the paste button.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here and the values from the clipboard will be pasted at the first visible measure.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPattern</name>
-    <message>
-        <source>Drag a control while pressing &lt;Ctrl&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationPatternView</name>
-    <message>
-        <source>double-click to open this pattern in automation editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open in Automation editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset name</source>
-        <translation type="unfinished">Nollställ namn</translation>
-    </message>
-    <message>
-        <source>Change name</source>
-        <translation type="unfinished">Byt namn</translation>
-    </message>
-    <message>
-        <source>Disconnect &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 Connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>automationTrack</name>
-    <message>
-        <source>Automation track</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>bassBoosterControlDialog</name>
     <message>
@@ -3020,6 +3130,10 @@ If it runs with other VST-software under Linux, please contact an LMMS-developer
         <source>Beat/Bassline %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Clone of %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>bitInvader</name>
@@ -4435,7 +4549,7 @@ use mouse wheel to set volume of a step</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Incomplete monophonic immitation tb303</source>
+        <source>Incomplete monophonic imitation tb303</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4918,6 +5032,10 @@ Latency: %2 ms</source>
         <source>Choose background artwork</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>One instrument track window mode</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>sf2Instrument</name>

data/presets/BitInvader/alien_strings.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="alien_strings" basetone="9" tab="1" >
       <bitinvader sampleLength="128" interpolation="1" version="0.1" normalize="0" sampleShape="PKaOPeKT5r6uR+G9CtejvczMTL2PwvW8CtejvAAAAAAK16M8CtejPI/C9TzMzEw9j8J1PY/CdT2PwnU9j8J1PY/CdT2PwnU9j8J1PczMTD2PwvU8CtejPArXIzwK1yO8CtejvI/C9bzMzEy9KVyPvQrXo73sUbi9rkfhvY/C9b2PwvW9uB4FvpqZGb4K1yO+CtcjvnsULr7sUTi+XI9Cvs3MTL7NzEy+zcxMvs3MTL7NzEy+PgpXvq5HYb6uR2G+rkdhvh6Fa76PwnW+j8J1vo/Cdb6PwnW+j8J1vo/Cdb6PwnW+j8J1vo/Cdb6PwnW+j8J1vo/Cdb6PwnW+HoVrvq5HYb4+Cle+zcxMvlyPQr57FC6+CtcjvpqZGb64HgW+rkfhvc3MzL3sUbi9KVyPvczMTL0K1yO9j8L1vArXI7wK1yM8CtejPI/C9TyPwvU8CtcjPSlcjz3sUbg9rkfhPY/C9T24HgU+mpkZPgrXIz57FC4+7FE4PlyPQj7NzEw+PgpXPh6Faz64HoU+KVyPPuJ6lD5SuJ4+exSuPuxRuD5cj8I+hevRPq5H4T7Xo/A+j8L1PgAAAD+4HgU/zMwMP+F6FD8+Chc/9igcP2ZmJj/XozA/MzMzP5DCNT9I4To/XI9CP3A9Sj/NzEw/KVxPP4XrUT/helQ/9ihcP2ZmZj8=" />
       <eldata fres="0.21" ftype="0" fcut="3840" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.33" ctlenvamt="0" latt="0" sus="0.49" lspd="0.7311" att="0.4" pdel="0" lamt="0" dec="0.897" userwavefile="" x100="1" lshp="0" hold="0" />

data/presets/BitInvader/beehive.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="beehive" basetone="9" tab="1" >
       <bitinvader sampleLength="30" interpolation="1" version="0.1" normalize="1" sampleShape="AAAAAPMEtT56glo/eoJaP/IEtT72BLW+eoJav3iCWr/vBLW+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI/CdT3NzEw+rkfhPlK4Hj97FC4/pHA9P1yPQj89Clc/rkdhP65HYT/Xo3A/j8J1P0jhej8AAIA/" />
       <eldata fres="0.43" ftype="1" fcut="1120" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.65" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0.496" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0" />

data/presets/BitInvader/bell.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="bell" basetone="9" tab="0" >
       <bitinvader sampleLength="8" interpolation="1" version="0.1" normalize="0" sampleShape="AAAAAPMENT8AAIA/8wQ1Py69u7P1BDW/AACAv+8ENb8=" />
       <eldata fres="0.43" ftype="0" fcut="1280" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.351" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0" />

data/presets/BitInvader/cello.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="cello" basetone="9" tab="0" >
       <bitinvader sampleLength="128" interpolation="1" version="0.1" normalize="1" sampleShape="xUHivbW52r2yLVm+IY2QvlbDqr5qnbS+bhe3vm5Bt74UH4q+NgEbvlF9KL7+kX6+ILePviYNk74+YZ++W4utvighlL65edy9rZnWPeoZdT45f5w+VgurPjr5nD55STw+qsHUPIoBRbyeyc491VlqPszNZT7coW09IAEQvgYzg75QAai+fAO+vixDlr5++b692JHrPfYlez7W9Wo+vNFdPRRhCr7gOXC+JN+Rvui5c76P4Ue9IYUQPuepcz4vi5c+WCesPiNFkT6CycA9tiHbvao9Vb4GT4O+tZVavkuxJb2ygdg9Y1UxPuBZcD7EDWI+QumgPXQJur2WFUu+CWOEvkThob5y9bi+iEPEvo+Fx75vb7e+RrGivi2Zlr60KVq+8oF4vWjhsz1+0T4+dqk6PsoBZT2jUdG9qMVTvh9zj75dc66+MuuYvv7J/r3TwWk9hClCPjIjmT40UZo+FbkKPii5k72VcUq+ED2Ivi7/lr6+YV++KaEUvS7xFj4G7YI+NCmaPj4Bnz7evW4+luFKPf+R/73AwV++H2ePvlV1qr5owbO+VFmqvlY9q756rby+RK2hvgAtAL5+Kb894oVxPtgRbD4YYYw9/oH/vfdpe75Bc6C+WE2svvJZeb5F8SK9G5UNPvbFej5Ep6E+HhWPPrah2j2YWcy97ml3vtz1bb4=" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.727" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0.517" pdel="0" lamt="0" dec="0" userwavefile="" x100="0" lshp="0" hold="0" />

data/presets/BitInvader/drama.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="drama" basetone="9" tab="0" >
       <bitinvader sampleLength="128" interpolation="1" version="0.1" normalize="0" sampleShape="kNtHv4tFRb+EOUK/ftM+v3Y1O79vaTe/Z3Mzv19tL79Xdyu/T4Mnv0e1I79ACSC/OaEcvzNnGb8tbRa/J70TvyNNEb8eNQ+/G10NvxjRC78Vlwq/E58JvxLxCL8Rgwi/EU8IvxFZCL8RkQi/Eu0IvxN3Cb8UHwq/FucKvxexC78ZlQy/G3cNvx1bDr8fRw+/ICsQvyLxEL8jsxG/JWcSvyYHE78ngRO/KOETvygpFL8pWRS/KXEUvylnFL8pSxS/KBUUvyjHE78naxO/JusSvyVhEr8jvRG/IgkRvyFDEL8fdw+/HaMOvxu9Db8azQy/GN8LvxbnCr8U6wm/Eu8IvxD5B78O/wa/DAUGvwoXBb8IKwS/B0MDvwVbAr8DdwG/AZsAv/+N/7787f2++Vn8vvbF+r7yQfm+8NX3vu119r7qDfW+553zvuRB8r7i2fC+34nvvtwp7r7Zvey+12HrvtQZ6r7Szei+z23nvswV5r7KzeS+x1XjvsTZ4b7BXeC+vs3evrtF3b63mdu+tBHavrGF2L6u9da+q2XVvqjN076kMdK+oZnQvp7lzr6aLc2+l33LvpO9yb6Q8ce+jCXGvoldxL6FmcK+gsHAvn7tvr56Cb2+d027vnNxub5vpbe+bMm1vmj1s75kIbK+YVGwvl2Frr5Zpay+Vs2qvlINqb4=" />
       <eldata fres="0.43" ftype="6" fcut="1120" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.351" ctlenvamt="0" latt="0" sus="0" lspd="0.7311" att="0.058" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="1" lshp="0" hold="0" />

data/presets/BitInvader/epiano.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="epiano" basetone="9" tab="1" >
       <bitinvader sampleLength="30" interpolation="1" version="0.1" normalize="1" sampleShape="AAAAAPMEtT56glo/eoJaP/IEtT72BLW+eoJav3iCWr/vBLW+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" />
       <eldata fres="0.43" ftype="0" fcut="1280" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.351" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.22" />

data/presets/BitInvader/soft_pad.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="soft_pad" basetone="9" tab="0" >
       <bitinvader sampleLength="128" interpolation="1" version="0.1" normalize="0" sampleShape="4lVxvqJBUb6xfVi+j0VHvkFRIL7UGeq9Z2GzvV4hr72iwdC98Kn3vQjdA77+2f697NH1vQuFBb5JhSS+nEVOvuDRb77vXXe+v0lfvmqlNL4eCQ++Ar0Avh6tDr5cKS6+lWVKvqjZU76RVUi+X2kvvighFL71Qfq9pMHRvURhor2CAUG9OAGcu2xxNj2O2cY9NbEaPqjNUz4O+4Y+Q1+hPmgLtD52B7s+bbG2PlzJrT5Vf6o+aDu0Ppdbyz7SO+k+BPsBPxTCCT8WCws/ECUIPwgcBD8AOQA/7Af2PsWJ4j6Ff8I+NVWaPtaBaj5+ST8+gMk/Pst5ZT4ax4w+QEGgPkpBpT47cZ0+Ia2QPg7Thj4EC4I+9k17PsphZT50BTo+75n3PbRxWj24Ady7jFFGvRrZjL0gSZC9x1FjvZzBzbwc4Y08DWmGPcGx4D0YUQw+IKEPPvzJ/T2fkc89YGmwPV5Brz2KKcU9sKHXPZqhzD06EZ09YuEwPZpBTTz7gf27bAG2vGPBMb1Syai9HkUPvp15Tr72vXq+BN+Bvtida76KFUW+UjkpvlOFKb6JVUS+0JlnvvzVfb70JXq+v6VfvnwpPr5MaSa+QGUgvk5hJ75dsS6+WDUsvjxVHr4XeQu+8XH4vdOR6b3S0ei95qnyvQotBb48nR2+jr1Gvvr9fL4=" />
       <eldata fres="0.5" ftype="0" fcut="9120" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.727" ctlenvamt="1" latt="0" sus="0" lspd="0.1" att="0.657" pdel="0" lamt="0" dec="0" userwavefile="" x100="0" lshp="0" hold="0" />

data/presets/BitInvader/spacefx.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="spacefx" basetone="9" tab="1" >
       <bitinvader sampleLength="68" interpolation="0" version="0.1" normalize="0" sampleShape="W/iCvqwtgL2mPdg+iodDP+wPEz9vmss5NYLSvr5Zp764oRs9I/l+PjGqND73GnY9WMfrPUu8ej6Rqlk+PSsXO54U/L10nDk97x62Pmty2z4tfu49K3SIvvHCjb7lk/090lz+Pl543T6v5qQ8QySRvjVzN75K9Es+qUf9Pr9J8D7l4AY+KxKgvlRRD78AQsa+9qL8PTwnFj+X3yc/b+W2PlNf0zsVwCq+fEhGvtRdQL4b0Bu+nLoCvc53Fz63MJY+ch6qPq4daj76RsO87J6ovjZj8L6GTpO+gpDEPXm/tT5TBo4+iBUcvXS8nr608KW+QNtwvf8ioz5qDgY/iTKrPksJMr70uhu/nh8Xv01bA74=" />
       <eldata fres="0.43" ftype="4" fcut="1120" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="0" rel="0.65" ctlenvamt="0" latt="0" sus="0" lspd="0.7311" att="0.496" pdel="0" lamt="1" dec="0.499" userwavefile="" x100="1" lshp="0" hold="0" />

data/presets/BitInvader/subbass.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="7" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="7" vol="100" name="subbass" basetone="9" tab="0" >
       <bitinvader sampleLength="128" interpolation="1" version="0.1" normalize="1" sampleShape="2kpgviIPhz3VQAM+oJkyu8pZrr5y/Ta/5nhxv9QFf7+cp3a//hNovwSBTb+OOR+/s2TIvruEJL5Oy2I9DDSIPmge7D4MVx0/pyQ5P5aHTz8Qp2M/XIhxP/SJdT/mnnI/vbltP2jiZj+x51o/F5pJP9gINj84YiE/iLIJP/+T3D5WAaQ+bGVePt5p8j06A3o81CG5vQSrP77SmIm+xamuvjpD1L5u/vu+wEURv+w7Ib878Su/XHgxv3ClM7+oLzS/HPIyv4ZlLr/YxSW/wR0avzoZDb+KHv++RRrjvoILxr7yV6e+DyCFvhxUO74+g8a9lA3luyFIqz0CcTM+qPOIPq+Rtj68guA++kkDP1jHFD8MlyQ/vC4yP8h7PT/ZxEY/uqdNP9osUT9WVlE/Ct5PP56cTj8xiU0/zBpLPzCMRj9S4UA/EWU7P7zTNT8MlC4/AWwkP/B3Fz/0qQg/ZfLxPrRG0j5sRbM+YtmUPgeFaz7TSik+YFjFPaeVzTw4qT69Je/yvQgvRb4juYm+LTGxvrwJ176QXPm+WKkLv5mbGL924iO/Fsstv16RNr9kaD6/HV9Fv3NZS7+CQFC/wBJUvxubVr/NUle/VvdVvwo8U78WaFC/qfpNv4QBS79SKUa/ykU/vwxcN7+UOy+/upQmv4KdHL+EJRG/OqYEv9Ya774=" />
       <eldata fres="1.13" ftype="0" fcut="4960" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/BitInvader/sweep_pad.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="sweep_pad" basetone="9" tab="1" >
       <bitinvader sampleLength="8" interpolation="0" version="0.1" normalize="0" sampleShape="+MrwPiRn7r4WUV6/xEkNv429tL6ofBA+P7uAPtTiwD4=" />
       <eldata fres="0.43" ftype="0" fcut="1280" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.351" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0.164" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/BitInvader/toy_piano.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="toy_piano" basetone="9" tab="1" >
       <bitinvader sampleLength="128" interpolation="1" version="0.1" normalize="0" sampleShape="cAE4OuAB8DkIAYS6gAFAugABALmgAdC5AAEAuiABEDp4Abw6UAEoOggBhLogAZC6gAHAuAgBhLpAASC7oAFQugABgDqAAUA5gAHAOJABSLpaAa27gAFAvHLBuLxBgSC9xCFive4hd72LYUW9GCEMvUZBI70UMYq9+YH8vZIpSb7DkWG+S4Elvnwhvr044Zu9MbGYvQlRhL2JkcS9UjEpvrABWL7rgXW+EhWJvgYFg765sVy+ftk+vj9pH74dUQ6+W2ktvrmxXL4G1YK+J0mTvhuNjb7owXO+0DFovsYRY76teVa+31lvvg2Nhr7iQXG+ujldvgmphL4G7YK+IDkQvjpBHb3sAfa7dsE6PeQB8j0CMQE+SAGkPSWBkjxSAam7PNGdPWt5NT6dWU4+zhlnPgLJgD6uyVY+eWE8PsBBYD7bSW0+5glzPhGdiD4DeYE+23ltPi9Jlz5hebA+Fh2LPpGRSD7RmWg+Gu2MPgYBgz6+2V4+vglfPvD5dz7haXA+cgk5Pi15Fj4lmRI+VvGqPbRB2rzcMe69O2kdvsOh4b3jYXG9J1GTvS1hFr0PYQc9KAGUuyYBk71Voaq9XNGtvWrxtL0CKQG+c2E5vn4hP76RYUi+8Ul4viDZj74RmYi+dBE6vgr5BL4wIRi+q5HVvYeBw7wOAYe8gEFAvamR1L0=" />
       <eldata fres="0.5" ftype="0" fcut="9120" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.727" ctlenvamt="1" latt="0" sus="0.717" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.673" userwavefile="" x100="0" lshp="0" hold="0.37" />

data/presets/BitInvader/wah_synth.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.2-cvs20060123" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="6" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="6" vol="100" name="wah_synth" basetone="9" tab="0" >
       <bitinvader sampleLength="56" interpolation="1" version="0.1" normalize="1" sampleShape="AAAAAKJN5T2H3GM+VxqpPgMm3j5BMwg/CJ0fP/MENT89Ctc+XI/CPlyPwj57FK4+CtejPpqZmT4pXI8+rkdhPq5HYT7NzEw+zcxMPo/CdT4pXI8+CtejPgrXoz57FK4+7FG4PlyPwj6H3GM+nE3lPS69u7OzTeW9k9xjvlYaqb4DJt6+rkfhvq5H4b49Cte+zczMvs3MzL5cj8K+exSuvnsUrr57FK6+CtejvpqZmb4pXI++KVyPvilcj74pXI++KVyPvilcj74pXI++CtejvuxRuL5cj8K+gtxjvpBN5b0=" />
       <eldata fres="0.21" ftype="6" fcut="2720" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.528" ctlenvamt="0" latt="0" sus="0" lspd="0.7311" att="0" pdel="0" lamt="0" dec="0.897" userwavefile="" x100="1" lshp="0" hold="0.234" />

data/presets/LB302/Oh Synth.xpf

@@ -3,7 +3,7 @@
 <multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-svn20071123" type="instrumenttracksettings" >
  <head/>
  <instrumenttracksettings>
-  <instrumenttrack width="250" x="583" y="240" fxch="0" height="470" surpos-x="0" surpos-y="0" visible="1" basenote="75" name="Default" vol="102" tab="0" >
+  <instrumenttrack width="250" x="583" y="240" fxch="0" height="470" surpos-x="0" surpos-y="0" visible="1" basenote="75" name="Oh Synth" vol="102" tab="0" >
    <lb302 db24="1" vcf_res="1.045" vcf_dec="0.42" vco_detune="-16" dead="0" vcf_cut="0.15" vcf_mod="0.61" dist="0" slide_dec="0.57" slide="0" shape="3" />
    <eldata fres="0.5" ftype="0" fcut="14000" fwet="0" >
     <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4" />

data/presets/LB302/STrash.xpf

@@ -2,7 +2,7 @@
 <!DOCTYPE multimedia-project>
 <multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-rc3" type="instrumenttracksettings" >
   <head/>
-  <instrumenttracksettings muted="0" type="0" name="Default preset" >
+  <instrumenttracksettings muted="0" type="0" name="STrash" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="81" vol="88" >
       <instrument name="lb302" >
         <lb302 db24="0" vcf_res="1.01" vcf_dec="0.1" dead="0" vcf_cut="0.18" vcf_mod="1" dist="1" slide_dec="0.5" slide="1" shape="0" />

data/presets/OpulenZ/Bagpipe.xpf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Bagpipe" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="1" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="54" op1_waveform="0" op1_scale="1" op2_perc="0" op2_a="9" op1_perc="0" op1_mul="1" op2_lvl="54" op2_d="0" op1_a="8" op1_d="3" op2_scale="0" op2_mul="2" op1_vib="0" feedback="3" op2_r="3" trem_depth="0" op2_s="15" op1_ksr="0" op1_r="15" op1_s="13" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="1" enabled="1">
+        <effect autoquit_numerator="4" autoquit_denominator="4" syncmode="0" autoquit="1" gate="0" name="ladspaeffect" wet="1" on="1">
+          <ladspacontrols link="1" ports="0"/>
+          <key>
+            <attribute value="dc_remove_1207" name="file"/>
+            <attribute value="dcRemove" name="plugin"/>
+          </key>
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Bells.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Bells" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="1" op1_trem="0" op1_lvl="40" op1_waveform="0" op1_scale="2" op2_perc="1" op2_a="0" op1_perc="1" op1_mul="7" op2_lvl="54" op2_d="10" op1_a="0" op1_d="9" op2_scale="2" op2_mul="1" op1_vib="0" feedback="1" op2_r="14" trem_depth="0" op2_s="14" op1_ksr="0" op1_r="13" op1_s="12" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Brass.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Brass" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="45" op1_waveform="0" op1_scale="2" op2_perc="0" op2_a="7" op1_perc="0" op1_mul="1" op2_lvl="53" op2_d="0" op1_a="7" op1_d="10" op2_scale="0" op2_mul="1" op1_vib="0" feedback="6" op2_r="6" trem_depth="0" op2_s="15" op1_ksr="0" op1_r="8" op1_s="14" op2_vib="0" vib_depth="1"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Bubbly_days.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Bubbly days" solo="1">
+    <instrumenttrack pan="0" fxch="1" pitchrange="1" pitch="0" basenote="57" vol="98">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="46" op1_waveform="2" op1_scale="0" op2_perc="0" op2_a="0" op1_perc="1" op1_mul="0" op2_lvl="63" op2_d="10" op1_a="0" op1_d="9" op2_scale="0" op2_mul="1" op1_vib="1" feedback="6" op2_r="3" trem_depth="0" op2_s="7" op1_ksr="0" op1_r="3" op1_s="5" op2_vib="1" vib_depth="0"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="107" arprange="3" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="1" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="1"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Cheesy_synth.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Cheesy Synth" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="1" op1_trem="0" op1_lvl="40" op1_waveform="0" op1_scale="1" op2_perc="0" op2_a="8" op1_perc="0" op1_mul="1" op2_lvl="54" op2_d="5" op1_a="10" op1_d="11" op2_scale="0" op2_mul="2" op1_vib="1" feedback="6" op2_r="10" trem_depth="0" op2_s="15" op1_ksr="1" op1_r="10" op1_s="15" op2_vib="1" vib_depth="1"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Clarinet.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Clarinet" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="47" op1_waveform="0" op1_scale="2" op2_perc="0" op2_a="8" op1_perc="0" op1_mul="2" op2_lvl="54" op2_d="13" op1_a="6" op1_d="4" op2_scale="0" op2_mul="1" op1_vib="0" feedback="2" op2_r="8" trem_depth="0" op2_s="14" op1_ksr="1" op1_r="14" op1_s="13" op2_vib="0" vib_depth="1"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Combo_organ.xpf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Combo organ" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="1" op2_trem="0" fm="0" op2_ksr="0" op1_trem="1" op1_lvl="62" op1_waveform="1" op1_scale="0" op2_perc="0" op2_a="1" op1_perc="0" op1_mul="0" op2_lvl="63" op2_d="15" op1_a="0" op1_d="14" op2_scale="0" op2_mul="1" op1_vib="0" feedback="3" op2_r="0" trem_depth="0" op2_s="14" op1_ksr="0" op1_r="0" op1_s="0" op2_vib="1" vib_depth="0"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="1" enabled="1">
+        <effect autoquit_numerator="4" autoquit_denominator="4" syncmode="0" autoquit="1" gate="0" name="ladspaeffect" wet="1" on="1">
+          <ladspacontrols link="1" ports="0"/>
+          <key>
+            <attribute value="dc_remove_1207" name="file"/>
+            <attribute value="dcRemove" name="plugin"/>
+          </key>
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Epiano.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Piano" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="40" op1_waveform="0" op1_scale="1" op2_perc="0" op2_a="0" op1_perc="1" op1_mul="1" op2_lvl="54" op2_d="14" op1_a="0" op1_d="14" op2_scale="0" op2_mul="1" op1_vib="0" feedback="0" op2_r="7" trem_depth="0" op2_s="13" op1_ksr="0" op1_r="7" op1_s="12" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Funky.xpf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Funky" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="1" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="62" op1_waveform="1" op1_scale="0" op2_perc="0" op2_a="1" op1_perc="0" op1_mul="0" op2_lvl="63" op2_d="15" op1_a="0" op1_d="14" op2_scale="0" op2_mul="1" op1_vib="0" feedback="0" op2_r="0" trem_depth="0" op2_s="14" op1_ksr="0" op1_r="0" op1_s="3" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <eldata fres="0.5" ftype="2" fcut="141" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="1" enabled="1">
+        <effect autoquit_numerator="4" autoquit_denominator="4" syncmode="0" autoquit="1" gate="0" name="ladspaeffect" wet="1" on="1">
+          <ladspacontrols link="1" ports="0"/>
+          <key>
+            <attribute value="dc_remove_1207" name="file"/>
+            <attribute value="dcRemove" name="plugin"/>
+          </key>
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Halo_pad.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Halo Pad" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="54" op1_waveform="0" op1_scale="2" op2_perc="0" op2_a="11" op1_perc="0" op1_mul="1" op2_lvl="51" op2_d="13" op1_a="14" op1_d="14" op2_scale="0" op2_mul="1" op1_vib="0" feedback="5" op2_r="10" trem_depth="0" op2_s="13" op1_ksr="0" op1_r="12" op1_s="12" op2_vib="1" vib_depth="0"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Harp.xpf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Harp" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="34" op1_waveform="1" op1_scale="0" op2_perc="1" op2_a="0" op1_perc="1" op1_mul="2" op2_lvl="54" op2_d="12" op1_a="0" op1_d="10" op2_scale="2" op2_mul="1" op1_vib="0" feedback="0" op2_r="11" trem_depth="0" op2_s="0" op1_ksr="0" op1_r="10" op1_s="8" op2_vib="0" vib_depth="1"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="1" enabled="1">
+        <effect autoquit_numerator="4" autoquit_denominator="4" syncmode="0" autoquit="1" gate="0" name="ladspaeffect" wet="1" on="1">
+          <ladspacontrols link="1" ports="0"/>
+          <key>
+            <attribute value="dc_remove_1207" name="file"/>
+            <attribute value="dcRemove" name="plugin"/>
+          </key>
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Organ_leslie.xpf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Ham with Leslie" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="1" op1_trem="0" op1_lvl="45" op1_waveform="0" op1_scale="2" op2_perc="0" op2_a="0" op1_perc="0" op1_mul="1" op2_lvl="54" op2_d="14" op1_a="0" op1_d="9" op2_scale="0" op2_mul="1" op1_vib="1" feedback="1" op2_r="8" trem_depth="0" op2_s="15" op1_ksr="1" op1_r="11" op1_s="14" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="1" enabled="1">
+        <effect autoquit_numerator="4" autoquit_denominator="4" syncmode="0" autoquit="1" gate="0" name="ladspaeffect" wet="1" on="1">
+          <ladspacontrols port04="2" port05="0.5" port06="0.5" port07="0.5" port08="28.025" port09="28.025" ports="10" port010="0.75" port011="0.25" port012="0.5" port013="0"/>
+          <key>
+            <attribute value="calf" name="file"/>
+            <attribute value="RotarySpeaker" name="plugin"/>
+          </key>
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Pad.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Pad" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="1" fm="1" op2_ksr="1" op1_trem="0" op1_lvl="32" op1_waveform="0" op1_scale="0" op2_perc="0" op2_a="13" op1_perc="0" op1_mul="1" op2_lvl="54" op2_d="10" op1_a="5" op1_d="7" op2_scale="2" op2_mul="1" op1_vib="1" feedback="5" op2_r="12" trem_depth="0" op2_s="15" op1_ksr="0" op1_r="14" op1_s="14" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Square.xpf

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Square" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="0" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="38" op1_waveform="2" op1_scale="1" op2_perc="0" op2_a="0" op1_perc="0" op1_mul="2" op2_lvl="54" op2_d="0" op1_a="0" op1_d="0" op2_scale="0" op2_mul="1" op1_vib="0" feedback="0" op2_r="0" trem_depth="0" op2_s="15" op1_ksr="0" op1_r="12" op1_s="15" op2_vib="0" vib_depth="1"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="1" enabled="1">
+        <effect autoquit_numerator="4" autoquit_denominator="4" syncmode="0" autoquit="1" gate="0" name="ladspaeffect" wet="1" on="1">
+          <ladspacontrols link="1" ports="0"/>
+          <key>
+            <attribute value="dc_remove_1207" name="file"/>
+            <attribute value="dcRemove" name="plugin"/>
+          </key>
+        </effect>
+      </fxchain>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/OpulenZ/Vibraphone.xpf

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE multimedia-project>
+<multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.15" type="instrumenttracksettings">
+  <head/>
+  <instrumenttracksettings muted="0" type="0" name="Vibraphone" solo="0">
+    <instrumenttrack pan="0" fxch="0" pitchrange="1" pitch="0" basenote="57" vol="100">
+      <instrument name="OPL2">
+        <OPL2 op2_waveform="0" op2_trem="1" fm="1" op2_ksr="0" op1_trem="0" op1_lvl="29" op1_waveform="0" op1_scale="1" op2_perc="1" op2_a="0" op1_perc="1" op1_mul="8" op2_lvl="54" op2_d="13" op1_a="0" op1_d="12" op2_scale="0" op2_mul="1" op1_vib="0" feedback="0" op2_r="9" trem_depth="0" op2_s="0" op1_ksr="1" op1_r="9" op1_s="1" op2_vib="0" vib_depth="0"/>
+      </instrument>
+      <eldata fres="0.5" ftype="0" fcut="14000" fwet="0">
+        <elvol lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elcut lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+        <elres lspd_denominator="4" pdel="0" userwavefile="" dec="0.5" lamt="0" syncmode="0" latt="0" rel="0.1" sus="0.5" amt="0" x100="0" att="0" lpdel="0" hold="0.5" lshp="0" lspd="0.1" ctlenvamt="0" lspd_numerator="4"/>
+      </eldata>
+      <chordcreator chord="0" chordrange="1" chord-enabled="0"/>
+      <arpeggiator arptime="100" arprange="1" arptime_denominator="4" syncmode="0" arpmode="0" arp-enabled="0" arp="0" arptime_numerator="4" arpdir="0" arpgate="100"/>
+      <midiport inputcontroller="0" fixedoutputvelocity="-1" inputchannel="0" outputcontroller="0" writable="0" outputchannel="1" fixedinputvelocity="-1" fixedoutputnote="-1" outputprogram="1" readable="0"/>
+      <fxchain numofeffects="0" enabled="0"/>
+    </instrumenttrack>
+  </instrumenttracksettings>
+</multimedia-project>

data/presets/Organic/organ_blues.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="organ_blues" basetone="9" tab="0" >
       <organic harmonic4="3" wavetype1="0" harmonic5="4" wavetype2="0" vol0="100" harmonic6="5" wavetype3="0" vol1="100" num_osc="8" harmonic7="6" wavetype4="0" vol2="100" wavetype5="0" vol3="0" detune0="0" wavetype6="0" vol4="0" detune1="0" wavetype7="0" vol5="0" detune2="0" vol6="0" detune3="0" vol7="0" detune4="0" pan0="0" detune5="0" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="100" pan6="0" harmonic1="0.75" foldback="0" pan7="0" harmonic2="1" harmonic3="2" wavetype0="0" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/Organic/organ_risingsun.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="24" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="24" name="organ_risingsun" basetone="9" tab="0" >
       <organic harmonic4="3" wavetype1="0" harmonic5="4" wavetype2="0" vol0="100" harmonic6="5" wavetype3="0" vol1="77" num_osc="8" harmonic7="6" wavetype4="0" vol2="100" wavetype5="0" vol3="73" detune0="0" wavetype6="0" vol4="55" detune1="0" wavetype7="0" vol5="47" detune2="1" vol6="73" detune3="0" vol7="100" detune4="0" pan0="0" detune5="0" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="166" pan6="0" harmonic1="0.75" foldback="0" pan7="0" harmonic2="1" harmonic3="2" wavetype0="0" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/Organic/organ_swish.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="organ_swish" basetone="9" tab="0" >
       <organic harmonic4="3" wavetype1="0" harmonic5="4" wavetype2="0" vol0="5" harmonic6="5" wavetype3="0" vol1="64" num_osc="8" harmonic7="6" wavetype4="0" vol2="66" wavetype5="0" vol3="67" detune0="3" wavetype6="0" vol4="32" detune1="0" wavetype7="0" vol5="32" detune2="1" vol6="4" detune3="1" vol7="0" detune4="0" pan0="0" detune5="40" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="100" pan6="0" harmonic1="0.75" foldback="0" pan7="0" harmonic2="1" harmonic3="2" wavetype0="0" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.471" ctlenvamt="0" latt="0" sus="0.313" lspd="0.1" att="0.241" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/Organic/pad_ethereal.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="0" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="pad_ethereal" basetone="0" tab="1" >
       <organic harmonic4="3" wavetype1="3" harmonic5="4" wavetype2="3" vol0="79" harmonic6="5" wavetype3="3" vol1="72" num_osc="8" harmonic7="6" wavetype4="0" vol2="31" wavetype5="0" vol3="77" detune0="0" wavetype6="4" vol4="0" detune1="0" wavetype7="0" vol5="13" detune2="0" vol6="20" detune3="0" vol7="69" detune4="0" pan0="0" detune5="0" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="100" pan6="0" harmonic1="0.75" foldback="0" pan7="0" harmonic2="1" harmonic3="2" wavetype0="3" />
       <eldata fres="0.89" ftype="0" fcut="5600" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.404" ctlenvamt="0" latt="0" sus="0.329" lspd="0.1" att="0.247" pdel="0" lamt="0" dec="0.702" userwavefile="" x100="0" lshp="0" hold="0.329" />

data/presets/Organic/pad_rich.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="pad_rich" basetone="9" tab="0" >
       <organic harmonic4="3" wavetype1="2" harmonic5="4" wavetype2="5" vol0="100" harmonic6="5" wavetype3="1" vol1="100" num_osc="8" harmonic7="6" wavetype4="2" vol2="100" wavetype5="5" vol3="100" detune0="1" wavetype6="0" vol4="100" detune1="0" wavetype7="0" vol5="100" detune2="0" vol6="100" detune3="0" vol7="0" detune4="0" pan0="0" detune5="0" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="100" pan6="0" harmonic1="0.75" foldback="0.26" pan7="0" harmonic2="1" harmonic3="2" wavetype0="4" />
       <eldata fres="1.19" ftype="0" fcut="320" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.708" ctlenvamt="0" latt="0" sus="0.039" lspd="0.1" att="0.363" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/Organic/pad_sweep.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="Default" basetone="9" tab="1" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="5" vol="100" name="pad_sweep" basetone="9" tab="1" >
       <organic harmonic4="3" wavetype1="1" harmonic5="4" wavetype2="1" vol0="37" harmonic6="5" wavetype3="0" vol1="81" num_osc="8" harmonic7="6" wavetype4="5" vol2="100" wavetype5="0" vol3="24" detune0="0" wavetype6="0" vol4="52" detune1="0" wavetype7="0" vol5="0" detune2="0" vol6="0" detune3="0" vol7="0" detune4="0" pan0="0" detune5="0" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="200" pan6="6" harmonic1="0.75" foldback="0.06" pan7="0" harmonic2="1" harmonic3="2" wavetype0="1" />
       <eldata fres="0.37" ftype="0" fcut="960" fwet="1" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.576" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0.345" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.116" />

data/presets/Organic/puresine.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="0" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="puresine" basetone="9" tab="0" >
       <organic harmonic4="3" wavetype1="0" harmonic5="4" wavetype2="0" vol0="0" harmonic6="5" wavetype3="0" vol1="1" num_osc="8" harmonic7="6" wavetype4="0" vol2="100" wavetype5="0" vol3="5" detune0="0" wavetype6="0" vol4="1" detune1="0" wavetype7="0" vol5="0" detune2="0" vol6="0" detune3="0" vol7="0" detune4="0" pan0="0" detune5="0" pan1="0" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="200" pan6="0" harmonic1="0.75" foldback="0" pan7="0" harmonic2="1" harmonic3="2" wavetype0="0" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="0" rel="0.1" ctlenvamt="0" latt="0" sus="0.499" lspd="0.1" att="0" pdel="0" lamt="0" dec="0.499" userwavefile="" x100="0" lshp="0" hold="0.499" />

data/presets/Organic/sequencer_64.xpf

@@ -3,7 +3,7 @@
 <multimediaproject creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.1.4-cvs20060209" type="channelsettings" version="1.0" >
   <head/>
   <channelsettings>
-    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="Default" basetone="9" tab="2" >
+    <channeltrack surpos="134219776" fxch="0" baseoct="4" vol="100" name="sequencer_64" basetone="9" tab="2" >
       <organic harmonic4="3" wavetype1="3" harmonic5="4" wavetype2="3" vol0="100" harmonic6="5" wavetype3="0" vol1="100" num_osc="8" harmonic7="6" wavetype4="0" vol2="100" wavetype5="0" vol3="1" detune0="0" wavetype6="0" vol4="5" detune1="0" wavetype7="0" vol5="10" detune2="0" vol6="33" detune3="0" vol7="23" detune4="0" pan0="-20" detune5="0" pan1="20" detune6="0" pan2="0" detune7="0" pan3="0" pan4="0" pan5="0" harmonic0="0.5" vol="70" pan6="0" harmonic1="0.75" foldback="0.75" pan7="0" harmonic2="1" harmonic3="2" wavetype0="3" />
       <eldata fres="0.5" ftype="0" fcut="16000" fwet="0" >
         <elvol lfosyncmode="0" lpdel="0" amt="1" rel="0.169" ctlenvamt="0" latt="0" sus="0" lspd="0.1" att="0" pdel="0" lamt="0" dec="0" userwavefile="" x100="0" lshp="0" hold="0.171" />

data/presets/TripleOscillator/SBass.xpf

@@ -2,7 +2,7 @@
 <!DOCTYPE multimedia-project>
 <multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-rc3" type="instrumenttracksettings" >
   <head/>
-  <instrumenttracksettings muted="0" type="0" name="Default preset" >
+  <instrumenttracksettings muted="0" type="0" name="SBass" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="81" vol="200" >
       <instrument name="tripleoscillator" >
         <tripleoscillator phoffset2="0" userwavefile0="" finer0="0" userwavefile1="" finer1="-4" userwavefile2="" finer2="2" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="4" modalgo1="0" modalgo2="0" finel2="-2" pan0="0" modalgo3="2" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="3" stphdetun2="0" wavetype1="5" wavetype2="5" vol0="33" vol1="33" phoffset0="0" phoffset1="0" vol2="33" />

data/presets/TripleOscillator/SBass2.xpf

@@ -2,7 +2,7 @@
 <!DOCTYPE multimedia-project>
 <multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-rc3" type="instrumenttracksettings" >
   <head/>
-  <instrumenttracksettings muted="0" type="0" name="Default preset" >
+  <instrumenttracksettings muted="0" type="0" name="SBass2" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="81" vol="175" >
       <instrument name="tripleoscillator" >
         <tripleoscillator phoffset2="240" userwavefile0="" finer0="0" userwavefile1="" finer1="-2" userwavefile2="" finer2="2" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="2" modalgo1="0" modalgo2="0" finel2="-2" pan0="0" modalgo3="2" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="2" stphdetun2="0" wavetype1="1" wavetype2="0" vol0="33" vol1="33" phoffset0="0" phoffset1="120" vol2="33" />

data/presets/TripleOscillator/SEGuitar.xpf

@@ -2,7 +2,7 @@
 <!DOCTYPE multimedia-project>
 <multimedia-project version="1.0" creator="Linux MultiMedia Studio (LMMS)" creatorversion="0.4.0-rc3" type="instrumenttracksettings" >
   <head/>
-  <instrumenttracksettings muted="0" type="0" name="Default preset" >
+  <instrumenttracksettings muted="0" type="0" name="SEGuitar" >
     <instrumenttrack pan="0" fxch="0" pitch="0" basenote="69" vol="200" >
       <instrument name="tripleoscillator" >
         <tripleoscillator phoffset2="0" userwavefile0="" finer0="-2" userwavefile1="" finer1="2" userwavefile2="" finer2="0" coarse0="0" coarse1="0" coarse2="0" finel0="0" finel1="-2" modalgo1="1" modalgo2="0" finel2="-2" pan0="0" modalgo3="2" pan1="0" stphdetun0="0" pan2="0" stphdetun1="0" wavetype0="5" stphdetun2="0" wavetype1="5" wavetype2="5" vol0="33" vol1="33" phoffset0="0" phoffset1="0" vol2="33" />

data/presets/ZynAddSubFX/Plucked/progressive-house-pluck.xiz

@@ -0,0 +1,465 @@
+<!DOCTYPE ZynAddSubFX-data>
+<ZynAddSubFX-data version-revision="1" version-minor="4" version-major="2" ZynAddSubFX-author="Nasca Octavian Paul">
+ <INFORMATION/>
+ <BASE_PARAMETERS>
+  <par value="16" name="max_midi_parts"/>
+  <par value="16" name="max_kit_items_per_instrument"/>
+  <par value="4" name="max_system_effects"/>
+  <par value="8" name="max_insertion_effects"/>
+  <par value="3" name="max_instrument_effects"/>
+  <par value="8" name="max_addsynth_voices"/>
+ </BASE_PARAMETERS>
+ <INSTRUMENT>
+  <INFO>
+   <string name="name">Analog Piano 3</string>
+   <string name="author"></string>
+   <string name="comments"></string>
+   <par value="0" name="type"/>
+  </INFO>
+  <INSTRUMENT_KIT>
+   <par value="0" name="kit_mode"/>
+   <par_bool value="no" name="drum_mode"/>
+   <INSTRUMENT_KIT_ITEM id="0">
+    <par_bool value="yes" name="enabled"/>
+    <string name="name">Analog Piano 3</string>
+    <par_bool value="no" name="muted"/>
+    <par value="0" name="min_key"/>
+    <par value="127" name="max_key"/>
+    <par value="0" name="send_to_instrument_effect"/>
+    <par_bool value="yes" name="add_enabled"/>
+    <ADD_SYNTH_PARAMETERS>
+     <par_bool value="yes" name="stereo"/>
+     <AMPLITUDE_PARAMETERS>
+      <par value="90" name="volume"/>
+      <par value="64" name="panning"/>
+      <par value="64" name="velocity_sensing"/>
+      <par value="0" name="punch_strength"/>
+      <par value="60" name="punch_time"/>
+      <par value="64" name="punch_stretch"/>
+      <par value="72" name="punch_velocity_sensing"/>
+      <par value="0" name="harmonic_randomness_grouping"/>
+      <AMPLITUDE_ENVELOPE>
+       <par_bool value="no" name="free_mode"/>
+       <par value="4" name="env_points"/>
+       <par value="2" name="env_sustain"/>
+       <par value="0" name="env_stretch"/>
+       <par_bool value="yes" name="forced_release"/>
+       <par_bool value="no" name="linear_envelope"/>
+       <par value="0" name="A_dt"/>
+       <par value="88" name="D_dt"/>
+       <par value="63" name="R_dt"/>
+       <par value="64" name="A_val"/>
+       <par value="64" name="D_val"/>
+       <par value="0" name="S_val"/>
+       <par value="64" name="R_val"/>
+      </AMPLITUDE_ENVELOPE>
+      <AMPLITUDE_LFO>
+       <par_real value="0.629921" name="freq"/>
+       <par value="0" name="intensity"/>
+       <par value="64" name="start_phase"/>
+       <par value="0" name="lfo_type"/>
+       <par value="0" name="randomness_amplitude"/>
+       <par value="0" name="randomness_frequency"/>
+       <par value="0" name="delay"/>
+       <par value="64" name="stretch"/>
+       <par_bool value="no" name="continous"/>
+      </AMPLITUDE_LFO>
+     </AMPLITUDE_PARAMETERS>
+     <FREQUENCY_PARAMETERS>
+      <par value="8192" name="detune"/>
+      <par value="0" name="coarse_detune"/>
+      <par value="1" name="detune_type"/>
+      <par value="64" name="bandwidth"/>
+      <FREQUENCY_ENVELOPE>
+       <par_bool value="no" name="free_mode"/>
+       <par value="3" name="env_points"/>
+       <par value="1" name="env_sustain"/>
+       <par value="0" name="env_stretch"/>
+       <par_bool value="no" name="forced_release"/>
+       <par_bool value="no" name="linear_envelope"/>
+       <par value="50" name="A_dt"/>
+       <par value="10" name="D_dt"/>
+       <par value="60" name="R_dt"/>
+       <par value="64" name="A_val"/>
+       <par value="64" name="D_val"/>
+       <par value="64" name="S_val"/>
+       <par value="64" name="R_val"/>
+      </FREQUENCY_ENVELOPE>
+      <FREQUENCY_LFO>
+       <par_real value="0.614173" name="freq"/>
+       <par value="26" name="intensity"/>
+       <par value="64" name="start_phase"/>
+       <par value="0" name="lfo_type"/>
+       <par value="0" name="randomness_amplitude"/>
+       <par value="0" name="randomness_frequency"/>
+       <par value="0" name="delay"/>
+       <par value="64" name="stretch"/>
+       <par_bool value="no" name="continous"/>
+      </FREQUENCY_LFO>
+     </FREQUENCY_PARAMETERS>
+     <FILTER_PARAMETERS>
+      <par value="26" name="velocity_sensing_amplitude"/>
+      <par value="64" name="velocity_sensing"/>
+      <FILTER>
+       <par value="0" name="category"/>
+       <par value="2" name="type"/>
+       <par value="53" name="freq"/>
+       <par value="42" name="q"/>
+       <par value="0" name="stages"/>
+       <par value="64" name="freq_track"/>
+       <par value="64" name="gain"/>
+      </FILTER>
+      <FILTER_ENVELOPE>
+       <par_bool value="no" name="free_mode"/>
+       <par value="4" name="env_points"/>
+       <par value="2" name="env_sustain"/>
+       <par value="0" name="env_stretch"/>
+       <par_bool value="yes" name="forced_release"/>
+       <par_bool value="no" name="linear_envelope"/>
+       <par value="0" name="A_dt"/>
+       <par value="44" name="D_dt"/>
+       <par value="60" name="R_dt"/>
+       <par value="46" name="A_val"/>
+       <par value="127" name="D_val"/>
+       <par value="64" name="S_val"/>
+       <par value="64" name="R_val"/>
+      </FILTER_ENVELOPE>
+      <FILTER_LFO>
+       <par_real value="0.629921" name="freq"/>
+       <par value="0" name="intensity"/>
+       <par value="64" name="start_phase"/>
+       <par value="0" name="lfo_type"/>
+       <par value="0" name="randomness_amplitude"/>
+       <par value="0" name="randomness_frequency"/>
+       <par value="0" name="delay"/>
+       <par value="64" name="stretch"/>
+       <par_bool value="no" name="continous"/>
+      </FILTER_LFO>
+     </FILTER_PARAMETERS>
+     <RESONANCE>
+      <par_bool value="no" name="enabled"/>
+     </RESONANCE>
+     <VOICE id="0">
+      <par_bool value="yes" name="enabled"/>
+      <par value="0" name="type"/>
+      <par value="1" name="unison_size"/>
+      <par value="60" name="unison_frequency_spread"/>
+      <par value="64" name="unison_stereo_spread"/>
+      <par value="64" name="unison_vibratto"/>
+      <par value="64" name="unison_vibratto_speed"/>
+      <par value="0" name="unison_invert_phase"/>
+      <par value="0" name="delay"/>
+      <par_bool value="yes" name="resonance"/>
+      <par value="-1" name="ext_oscil"/>
+      <par value="-1" name="ext_fm_oscil"/>
+      <par value="64" name="oscil_phase"/>
+      <par value="64" name="oscil_fm_phase"/>
+      <par_bool value="no" name="filter_enabled"/>
+      <par_bool value="no" name="filter_bypass"/>
+      <par value="0" name="fm_enabled"/>
+      <OSCIL>
+       <par value="0" name="harmonic_mag_type"/>
+       <par value="4" name="base_function"/>
+       <par value="51" name="base_function_par"/>
+       <par value="0" name="base_function_modulation"/>
+       <par value="64" name="base_function_modulation_par1"/>
+       <par value="64" name="base_function_modulation_par2"/>
+       <par value="32" name="base_function_modulation_par3"/>
+       <par value="0" name="modulation"/>
+       <par value="64" name="modulation_par1"/>
+       <par value="64" name="modulation_par2"/>
+       <par value="32" name="modulation_par3"/>
+       <par value="64" name="wave_shaping"/>
+       <par value="0" name="wave_shaping_function"/>
+       <par value="0" name="filter_type"/>
+       <par value="64" name="filter_par1"/>
+       <par value="64" name="filter_par2"/>
+       <par value="0" name="filter_before_wave_shaping"/>
+       <par value="0" name="spectrum_adjust_type"/>
+       <par value="64" name="spectrum_adjust_par"/>
+       <par value="0" name="rand"/>
+       <par value="0" name="amp_rand_type"/>
+       <par value="64" name="amp_rand_power"/>
+       <par value="0" name="harmonic_shift"/>
+       <par_bool value="no" name="harmonic_shift_first"/>
+       <par value="0" name="adaptive_harmonics"/>
+       <par value="128" name="adaptive_harmonics_base_frequency"/>
+       <par value="100" name="adaptive_harmonics_power"/>
+       <HARMONICS>
+        <HARMONIC id="1">
+         <par value="127" name="mag"/>
+         <par value="64" name="phase"/>
+        </HARMONIC>
+       </HARMONICS>
+      </OSCIL>
+      <AMPLITUDE_PARAMETERS>
+       <par value="32" name="panning"/>
+       <par value="100" name="volume"/>
+       <par_bool value="no" name="volume_minus"/>
+       <par value="127" name="velocity_sensing"/>
+       <par_bool value="no" name="amp_envelope_enabled"/>
+       <par_bool value="no" name="amp_lfo_enabled"/>
+      </AMPLITUDE_PARAMETERS>
+      <FREQUENCY_PARAMETERS>
+       <par_bool value="no" name="fixed_freq"/>
+       <par value="0" name="fixed_freq_et"/>
+       <par value="7095" name="detune"/>
+       <par value="0" name="coarse_detune"/>
+       <par value="0" name="detune_type"/>
+       <par_bool value="no" name="freq_envelope_enabled"/>
+       <par_bool value="no" name="freq_lfo_enabled"/>
+      </FREQUENCY_PARAMETERS>
+     </VOICE>
+     <VOICE id="1">
+      <par_bool value="yes" name="enabled"/>
+      <par value="0" name="type"/>
+      <par value="1" name="unison_size"/>
+      <par value="60" name="unison_frequency_spread"/>
+      <par value="64" name="unison_stereo_spread"/>
+      <par value="64" name="unison_vibratto"/>
+      <par value="64" name="unison_vibratto_speed"/>
+      <par value="0" name="unison_invert_phase"/>
+      <par value="0" name="delay"/>
+      <par_bool value="yes" name="resonance"/>
+      <par value="0" name="ext_oscil"/>
+      <par value="-1" name="ext_fm_oscil"/>
+      <par value="64" name="oscil_phase"/>
+      <par value="64" name="oscil_fm_phase"/>
+      <par_bool value="no" name="filter_enabled"/>
+      <par_bool value="no" name="filter_bypass"/>
+      <par value="0" name="fm_enabled"/>
+      <OSCIL>
+       <par value="0" name="harmonic_mag_type"/>
+       <par value="0" name="base_function"/>
+       <par value="64" name="base_function_par"/>
+       <par value="0" name="base_function_modulation"/>
+       <par value="64" name="base_function_modulation_par1"/>
+       <par value="64" name="base_function_modulation_par2"/>
+       <par value="32" name="base_function_modulation_par3"/>
+       <par value="0" name="modulation"/>
+       <par value="64" name="modulation_par1"/>
+       <par value="64" name="modulation_par2"/>
+       <par value="32" name="modulation_par3"/>
+       <par value="64" name="wave_shaping"/>
+       <par value="0" name="wave_shaping_function"/>
+       <par value="0" name="filter_type"/>
+       <par value="64" name="filter_par1"/>
+       <par value="64" name="filter_par2"/>
+       <par value="0" name="filter_before_wave_shaping"/>
+       <par value="0" name="spectrum_adjust_type"/>
+       <par value="64" name="spectrum_adjust_par"/>
+       <par value="64" name="rand"/>
+       <par value="0" name="amp_rand_type"/>
+       <par value="64" name="amp_rand_power"/>
+       <par value="0" name="harmonic_shift"/>
+       <par_bool value="no" name="harmonic_shift_first"/>
+       <par value="0" name="adaptive_harmonics"/>
+       <par value="128" name="adaptive_harmonics_base_frequency"/>
+       <par value="100" name="adaptive_harmonics_power"/>
+       <HARMONICS>
+        <HARMONIC id="1">
+         <par value="127" name="mag"/>
+         <par value="64" name="phase"/>
+        </HARMONIC>
+       </HARMONICS>
+      </OSCIL>
+      <AMPLITUDE_PARAMETERS>
+       <par value="96" name="panning"/>
+       <par value="100" name="volume"/>
+       <par_bool value="no" name="volume_minus"/>
+       <par value="127" name="velocity_sensing"/>
+       <par_bool value="no" name="amp_envelope_enabled"/>
+       <par_bool value="no" name="amp_lfo_enabled"/>
+      </AMPLITUDE_PARAMETERS>
+      <FREQUENCY_PARAMETERS>
+       <par_bool value="no" name="fixed_freq"/>
+       <par value="0" name="fixed_freq_et"/>
+       <par value="8514" name="detune"/>
+       <par value="0" name="coarse_detune"/>
+       <par value="0" name="detune_type"/>
+       <par_bool value="no" name="freq_envelope_enabled"/>
+       <par_bool value="no" name="freq_lfo_enabled"/>
+      </FREQUENCY_PARAMETERS>
+     </VOICE>
+     <VOICE id="2">
+      <par_bool value="yes" name="enabled"/>
+      <par value="0" name="type"/>
+      <par value="1" name="unison_size"/>
+      <par value="60" name="unison_frequency_spread"/>
+      <par value="64" name="unison_stereo_spread"/>
+      <par value="64" name="unison_vibratto"/>
+      <par value="64" name="unison_vibratto_speed"/>
+      <par value="0" name="unison_invert_phase"/>
+      <par value="0" name="delay"/>
+      <par_bool value="yes" name="resonance"/>
+      <par value="0" name="ext_oscil"/>
+      <par value="-1" name="ext_fm_oscil"/>
+      <par value="64" name="oscil_phase"/>
+      <par value="64" name="oscil_fm_phase"/>
+      <par_bool value="no" name="filter_enabled"/>
+      <par_bool value="no" name="filter_bypass"/>
+      <par value="0" name="fm_enabled"/>
+      <OSCIL>
+       <par value="0" name="harmonic_mag_type"/>
+       <par value="0" name="base_function"/>
+       <par value="64" name="base_function_par"/>
+       <par value="0" name="base_function_modulation"/>
+       <par value="64" name="base_function_modulation_par1"/>
+       <par value="64" name="base_function_modulation_par2"/>
+       <par value="32" name="base_function_modulation_par3"/>
+       <par value="0" name="modulation"/>
+       <par value="64" name="modulation_par1"/>
+       <par value="64" name="modulation_par2"/>
+       <par value="32" name="modulation_par3"/>
+       <par value="64" name="wave_shaping"/>
+       <par value="0" name="wave_shaping_function"/>
+       <par value="0" name="filter_type"/>
+       <par value="64" name="filter_par1"/>
+       <par value="64" name="filter_par2"/>
+       <par value="0" name="filter_before_wave_shaping"/>
+       <par value="0" name="spectrum_adjust_type"/>
+       <par value="64" name="spectrum_adjust_par"/>
+       <par value="64" name="rand"/>
+       <par value="0" name="amp_rand_type"/>
+       <par value="64" name="amp_rand_power"/>
+       <par value="0" name="harmonic_shift"/>
+       <par_bool value="no" name="harmonic_shift_first"/>
+       <par value="0" name="adaptive_harmonics"/>
+       <par value="128" name="adaptive_harmonics_base_frequency"/>
+       <par value="100" name="adaptive_harmonics_power"/>
+       <HARMONICS>
+        <HARMONIC id="1">
+         <par value="127" name="mag"/>
+         <par value="64" name="phase"/>
+        </HARMONIC>
+       </HARMONICS>
+      </OSCIL>
+      <AMPLITUDE_PARAMETERS>
+       <par value="0" name="panning"/>
+       <par value="100" name="volume"/>
+       <par_bool value="no" name="volume_minus"/>
+       <par value="127" name="velocity_sensing"/>
+       <par_bool value="no" name="amp_envelope_enabled"/>
+       <par_bool value="no" name="amp_lfo_enabled"/>
+      </AMPLITUDE_PARAMETERS>
+      <FREQUENCY_PARAMETERS>
+       <par_bool value="no" name="fixed_freq"/>
+       <par value="0" name="fixed_freq_et"/>
+       <par value="9890" name="detune"/>
+       <par value="0" name="coarse_detune"/>
+       <par value="0" name="detune_type"/>
+       <par_bool value="no" name="freq_envelope_enabled"/>
+       <par_bool value="no" name="freq_lfo_enabled"/>
+      </FREQUENCY_PARAMETERS>
+     </VOICE>
+     <VOICE id="3">
+      <par_bool value="no" name="enabled"/>
+     </VOICE>
+     <VOICE id="4">
+      <par_bool value="no" name="enabled"/>
+     </VOICE>
+     <VOICE id="5">
+      <par_bool value="no" name="enabled"/>
+     </VOICE>
+     <VOICE id="6">
+      <par_bool value="no" name="enabled"/>
+     </VOICE>
+     <VOICE id="7">
+      <par_bool value="no" name="enabled"/>
+     </VOICE>
+    </ADD_SYNTH_PARAMETERS>
+    <par_bool value="no" name="sub_enabled"/>
+    <par_bool value="no" name="pad_enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="1">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="2">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="3">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="4">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="5">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="6">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="7">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="8">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="9">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="10">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="11">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="12">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="13">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="14">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+   <INSTRUMENT_KIT_ITEM id="15">
+    <par_bool value="no" name="enabled"/>
+   </INSTRUMENT_KIT_ITEM>
+  </INSTRUMENT_KIT>
+  <INSTRUMENT_EFFECTS>
+   <INSTRUMENT_EFFECT id="0">
+    <EFFECT>
+     <par value="2" name="type"/>
+     <par value="0" name="preset"/>
+     <EFFECT_PARAMETERS>
+      <par_no id="0">
+       <par value="34" name="par"/>
+      </par_no>
+      <par_no id="1">
+       <par value="64" name="par"/>
+      </par_no>
+      <par_no id="2">
+       <par value="20" name="par"/>
+      </par_no>
+      <par_no id="3">
+       <par value="64" name="par"/>
+      </par_no>
+      <par_no id="4">
+       <par value="30" name="par"/>
+      </par_no>
+      <par_no id="5">
+       <par value="59" name="par"/>
+      </par_no>
+     </EFFECT_PARAMETERS>
+    </EFFECT>
+    <par value="0" name="route"/>
+    <par_bool value="no" name="bypass"/>
+   </INSTRUMENT_EFFECT>
+   <INSTRUMENT_EFFECT id="1">
+    <EFFECT>
+     <par value="0" name="type"/>
+    </EFFECT>
+    <par value="0" name="route"/>
+    <par_bool value="no" name="bypass"/>
+   </INSTRUMENT_EFFECT>
+   <INSTRUMENT_EFFECT id="2">
+    <EFFECT>
+     <par value="0" name="type"/>
+    </EFFECT>
+    <par value="0" name="route"/>
+    <par_bool value="no" name="bypass"/>
+   </INSTRUMENT_EFFECT>
+  </INSTRUMENT_EFFECTS>
+ </INSTRUMENT>
+</ZynAddSubFX-data>