SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
GIT_SILENT Upgrade KDE Applications version to 18.12.0.
2025-12-05 15:59:59 +01:00 · 2018-12-06 08:29:49 +01:00 · 2018-12-05 00:35:47 +01:00 · 2018-12-02 17:18:55 +01:00 · 2018-12-02 17:18:42 +01:00 · 2018-11-29 07:13:47 +01:00
1735 changed files with 170819 additions and 273021 deletions
--- a/.arcconfig
+++ b/.arcconfig
@@ -0,0 +1,4 @@
+{
+    "project.name" : "Kdenlive",
+    "phabricator.uri" : "https://phabricator.kde.org/"
+}
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
-build
+*~
+build*
+CMakeLists.txt.user*
+po
--- a/.tarignore
+++ b/.tarignore
@@ -0,0 +1,8 @@
+*~
+build
+CMakeLists.txt.user*
+.kdev*
+*.kdev*
+.git*
+.tarignore
+*.sh
--- a/50
+++ b/50
@@ -1,9 +1,41 @@
-Jean-Baptiste Mardelle <jb@kdenlive.org>: MLT and KDE SC 4 porting, main developer and maintainer
-Marco Gittler <g.marco@freenet.de>: MLT transitions and effects, timeline, audio thumbs
-Dan Dennedy <dan@dennedy.org>: bug fixing, etc.
-Simon A. Eugster <simon.eu@gmail.com>: color scopes, bug fixing, etc.
-Till Theato <root@ttill.de>: bug fixing, etc.
-Alberto Villa <avilla@FreeBSD.org>: bug fixing, logo, etc.
-Jean-Michel Poure <jm@poure.com>: rendering profiles customization
-Ray Lehtiniemi <rayl@mail.com>: bug fixing, etc.
-Jason Wood <jasonwood@blueyonder.co.uk>: original KDE 3 version author (not active anymore)
+Active Kdenlive authors
+
+    Jean-Baptiste Mardelle <jb@kdenlive.org>
+        Main developer and maintainer, MLT and KDE SC 4 / KF5 port, 
+        2005-present
+    Vincent Pinon <vpinon@kde.org>
+        Interim maintainer, Windows cross-build, KF5 port, profiles updates, etc.
+        2012-present
+
+Former Kdenlive authors
+
+    Laurent Montel <montel@kde.org>
+        Bugs fixing, code clean up, review
+        2013-2017
+    Till Theato <root@ttill.de>
+        Bug fixing, etc.
+        2010-2015
+    Steve Guilford <s.guilford@dbplugins.com>
+        Bug fixing
+        2014
+    Simon A. Eugster (Granjow) <simon.eu@gmail.com>
+        Colour and audio scopes, titler, manual, bug fixing, etc.
+        2009-2012
+    Marco Gittler <g.marco@freenet.de>
+        MLT transitions and effects, timeline, audio thumbs
+        2009-2012
+    Dan Dennedy <dan@dennedy.org>
+        Bug fixing
+        2009-2011
+    Alberto Villa <avilla@FreeBSD.org>
+        Bug fixing, logo, etc.
+        2009-2013
+    Jean-Michel Poure <jm@poure.com>
+        Rendering profiles customization
+        2004-2009
+    Ray Lehtiniemi <rayl@mail.com>
+        Bug fixing, etc.
+        2009
+    Jason Wood <jasonwood@blueyonder.co.uk>
+        Original KDE 3 version author
+        2002-2005
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,74 +1,146 @@
-project(kdenlive)
+project(Kdenlive)

-set(BASE_VERSION 0.8)
-set(LIBMLT_REQUIRED_VERSION 0.7)
+# An odd patch version number means development version, while an even one means
+# stable release. An additional number can be used for bugfix-only releases.

-option(RELEASE_BUILD "Remove compilation date from program version (use for stable releases)" ON)
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
+# KDE Application Version, managed by release script
+set (KDE_APPLICATIONS_VERSION_MAJOR "18")
+set (KDE_APPLICATIONS_VERSION_MINOR "12")
+set (KDE_APPLICATIONS_VERSION_MICRO "0")

-# Search packages used by KDE.
-find_package(KDE4 REQUIRED)
-set(CMAKE_C_FLAGS " --std=c99") # To compile kiss_fft
-include(KDE4Defaults)
-include(MacroLibrary)
-include(FindGettext)
-include(MacroOptionalAddSubdirectory)
-set(catalogname kdenlive)
-find_package(Qt COMPONENTS QtOpenGL)
-if ( NOT QT_QTOPENGL_FOUND )
-  message(FATAL_ERROR "QtOpenGL (most likely called libqt4-opengl-dev) not found.")
-else ( NOT QT_QTOPENGL_FOUND )
-  message(-- " Found QtOpenGL.")
-endif ( NOT QT_QTOPENGL_FOUND )
-find_library(Qt COMPONENTS QtOpenGL REQUIRED)
-add_definitions(${QT_DEFINITIONS})
+set(KDENLIVE_VERSION ${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO})
+cmake_minimum_required(VERSION 3.0)
+if(POLICY CMP0063)
+  cmake_policy(SET CMP0063 NEW)
+endif()
+if (POLICY CMP0053)
+    cmake_policy(SET CMP0053 NEW)
+endif()
+# Minimum versions of main dependencies.
+set(MLT_MIN_MAJOR_VERSION 6)
+set(MLT_MIN_MINOR_VERSION 10)
+set(MLT_MIN_PATCH_VERSION 0)
+set(MLT_MIN_VERSION ${MLT_MIN_MAJOR_VERSION}.${MLT_MIN_MINOR_VERSION}.${MLT_MIN_PATCH_VERSION})

-# Search MLT package.
-find_package(LIBMLT REQUIRED)
-if(LIBMLT_VERSION VERSION_LESS ${LIBMLT_REQUIRED_VERSION})
-  message(FATAL_ERROR "MLT must be at least version ${LIBMLT_REQUIRED_VERSION}, you have ${LIBMLT_VERSION}\nPlease install recent MLT http://www.mltframework.org")
-endif(LIBMLT_VERSION VERSION_LESS ${LIBMLT_REQUIRED_VERSION})
+set(QT_MIN_VERSION 5.6.0)

-find_package(MSGFMT REQUIRED)
-find_program(EXTRACTRC_EXECUTABLE extractrc)
-find_program(MSGFMT_EXECUTABLE msgfmt)
-find_program(MSGMERGE_EXECUTABLE msgmerge)
-find_program(XGETTEXT_EXECUTABLE xgettext)
+find_package(ECM 5.18.0 REQUIRED CONFIG)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
+include(KDECompilerSettings NO_POLICY_SCOPE)
+include(FeatureSummary)
+include(ECMInstallIcons)
+include(GenerateExportHeader)
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(ECMOptionalAddSubdirectory)
+include(ECMMarkNonGuiExecutable)
+include(ECMAddAppIcon)
+include(ECMQtDeclareLoggingCategory)
+
+add_definitions(-DQT_NO_CAST_TO_ASCII)
+add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+add_definitions(-DTRANSLATION_DOMAIN=\"kdenlive\")
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+# To be switched on when releasing.
+option(RELEASE_BUILD "Remove Git revision from program version (use for stable releases)" ON)

 # Get current version.
-if(RELEASE_BUILD)
-  set(VERSION "\"${BASE_VERSION}\"")
-else(RELEASE_BUILD)
-  if(EXISTS ${PROJECT_SOURCE_DIR}/.svn)
-    # Probably a SVN workspace: determine the revision.
-    find_package(Subversion)
-    if(Subversion_FOUND)
-      Subversion_WC_INFO(${PROJECT_SOURCE_DIR} KDENLIVE)
-      message("Current revision is ${KDENLIVE_WC_REVISION}")
-      set(VERSION "\"${BASE_VERSION} (rev. ${KDENLIVE_WC_REVISION})\"")
-    else(Subversion_FOUND)
-      message("Could not determine the SVN revision")
-      set(VERSION "\"${BASE_VERSION}\"")
-    endif(Subversion_FOUND)
-  else(EXISTS ${PROJECT_SOURCE_DIR}/.svn)
-    set(VERSION "\"${BASE_VERSION}\"")
-  endif(EXISTS ${PROJECT_SOURCE_DIR}/.svn)
-endif(RELEASE_BUILD)
+set(KDENLIVE_VERSION_STRING "${KDENLIVE_VERSION}")
+if(NOT RELEASE_BUILD AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
+  # Probably a Git workspace; determine the revision.
+  find_package(Git QUIET)
+  if(GIT_FOUND)
+    exec_program(${GIT_EXECUTABLE}
+      ${CMAKE_SOURCE_DIR}
+	ARGS "log -n 1 --pretty=format:\"%h\""
+      OUTPUT_VARIABLE KDENLIVE_GIT_REVISION
+      RETURN_VALUE TAG_RESULT
+    )
+
+    # git log failed; maybe the repository was checked with depth=1.
+    if(NOT ${TAG_RESULT} EQUAL 0)
+      exec_program(${GIT_EXECUTABLE}
+        ${CMAKE_SOURCE_DIR}
+        ARGS "describe --always"
+        OUTPUT_VARIABLE KDENLIVE_GIT_REVISION
+      )
+    endif()
+    message(STATUS "Kdenlive Git revision: ${KDENLIVE_GIT_REVISION}")
+    set(KDENLIVE_VERSION_STRING "${KDENLIVE_VERSION} (rev. ${KDENLIVE_GIT_REVISION})")
+  else()
+    message(STATUS "Kdenlive Git revision could not be determined")
+  endif()
+endif()
+
+include(CheckIncludeFiles)
+check_include_files(malloc.h HAVE_MALLOC_H)
+check_include_files(pthread.h HAVE_PTHREAD_H)
+
+find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick Concurrent)
+find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
+
+find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET)
+if (KF5XmlGui_FOUND)
+  message(STATUS "Found KF5 >= 5.23.0 enabling icon coloring")
+else()
+  message(STATUS "KF5 < 5.23.0 Disable icon coloring")
+  set(KF5_ICON_COMPATIBILITY TRUE)
+endif()
+
+find_package(KF5 REQUIRED COMPONENTS Archive Bookmarks CoreAddons Config ConfigWidgets 
+                            DBusAddons KIO WidgetsAddons NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes
+                 OPTIONAL_COMPONENTS DocTools FileMetaData Crash Purpose)
+if(WIN32)
+    find_package(DrMinGW)
+endif(WIN32)
+
+if (KF5FileMetaData_FOUND)
+  message(STATUS "Found KF5 FileMetadata to extract file metadata")
+  set(KF5_FILEMETADATA TRUE)
+else()
+  message(STATUS "KF5 FileMetadata not found, file metadata will not be available")
+endif()
+
+if (KF5Purpose_FOUND)
+  message(STATUS "Found KF5 Purpose, filesharing enabled")
+  set(KF5_PURPOSE TRUE)
+else()
+  message(STATUS "KF5 Purpose not found, filesharing disabled")
+endif()
+
+# Search MLT package.
+find_package(MLT ${MLT_MIN_VERSION} REQUIRED)
+set_package_properties(MLT PROPERTIES 
+                DESCRIPTION "Multimedia framework and video playout server for TV broadcasting"
+                URL "http://mltframework.org"
+                TYPE RUNTIME
+                PURPOSE "Required to do video processing")
+
+if(NOT WIN32)
+    set(MLT_PREFIX ${MLT_ROOT_DIR})
+else()
+    set(MLT_PREFIX "..")
+endif()

-add_subdirectory(src src/cmake_bindir)
-add_subdirectory(renderer renderer/cmake_bindir)
-add_subdirectory(thumbnailer thumbnailer/cmake_bindir)
-add_subdirectory(plugins)
-add_subdirectory(effects)
-add_subdirectory(export)
-add_subdirectory(icons)
 add_subdirectory(data)
-add_subdirectory(lumas)
-add_subdirectory(titles)
-add_subdirectory(po)
-add_subdirectory(man)
+if(KF5DocTools_FOUND)
+    add_subdirectory(doc)
+endif()
+#add_subdirectory(plugins)
+add_subdirectory(renderer)
+add_subdirectory(src)
+add_subdirectory(thumbnailer)
+#add_subdirectory(testingArea)
+ki18n_install(po)
+if (KF5DocTools_FOUND)
+ kdoctools_install(po)
+endif()

-configure_file(${CMAKE_SOURCE_DIR}/kdenlive-config.h.cmake kdenlive-config.h @ONLY)
+install( FILES kdenlive.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
+include(GNUInstallDirs)
+install( FILES AUTHORS COPYING README DESTINATION ${CMAKE_INSTALL_DOCDIR})

-
-message("-- C flags are now: " ${CMAKE_C_FLAGS})
+configure_file(config-kdenlive.h.cmake config-kdenlive.h @ONLY)
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- a/2
+++ b/2
@@ -2,7 +2,7 @@
 		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+               51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

--- a/350
+++ b/350
@@ -0,0 +1,350 @@
+15.08
+	Changes (~450 commits):
+	* New file format
+	  - Can load old format but not save to it: no way back
+	    wait a bit for big projects!
+	  - All data are now in MLT structures
+	    should ease exchanges with Shotcut and other editors?
+	* New monitor, using OpenGL & QML
+	  - *brings back Movit* (GPU effects), but not mandatory ;)
+	  - great *split screen* functionality to tune effect parameter
+	* Completely renewed bin manager (previously named project list)
+	  - Allows *adding effects to bin clips*, affecting all timeline instances
+	  - Free directory structure
+	  - Icon / list / tree views
+	  - More clip properties can be changed
+	  - Much work to restore all old functions :\
+	* Effects list improvements
+	  - improve sorting and marking item as favorite
+	* New audio waveform on timeline (à la Shotcut)
+	  making information more visible
+	* New duplicate clip function (cool for titles)
+	* Propose predefined monitor zoom values
+	* Fixed several look issues (sizes, colors, icons...)
+	* Refactoring: replacing XML manipulations by MLT API calls
+	  - reduces data duplication: faster, safer...
+	* Automatic builds (CI) on Linux and OSX
+	* Code checked by several static analyzers
+	* Some bugs fixed from 15.04 port (capture, effects, ...)
+
+15.04
+    Changes:
+    * Port to KDE Frameworks 5
+    * Add ripple delete function
+    * Add stem audio export
+    * Make images sequences generation more convenient
+    * Save and restore title widget size
+    * Start some refactoring
+    * Fix warnings from compiler, static analyzers, execution...
+
+    Bug fix:
+    * #3407 don't copy clips if project is also on removable drive
+    * #3408 crash on selecting clip with grouped effects
+    * #3405 crash on adding 1st clip not matching project profile
+    * #3338 import clip keyframes
+    * #3160 Autosave new projects before saving
+    * #3415 FFmpeg recording freeze
+
+0.9.10
+    Changes:
+    * handle VBR encoding profiles, and use it!
+    * video stabilizer: added new "vid.stab", removed older ones
+    * environment variable MLT_PREFIX overrides profiles & melt path
+    * several fixes for high dpi screens
+    * change proxy profile, obsolete with libav
+    * add SVG to image formats for slideshows	
+    * restore project render bitrate (#3326)
+    * show proxy name in clipproperties
+    * add link to MLT doc in render edit dialog (#3355)
+
+    Bug fix:
+    * update maximum track height (#3241)
+    * resize render path box (#3300)
+    * change transition settings layout (#3336)
+    * heat colormap in spectrogram (#3142)
+    * fix clip monitor switch on proxy creation end (#3308)
+    * fix clip jobs (stabilize) operating on proxies (#3337)
+    * fix timeline corruption by clip resize end + zoom change
+    * fix title clip duration not taken into account (#3309)
+    * fix timeline thumbs flicker when fully zoomed (#3247)
+    * fix thumbnailer aspect ratio
+    * fix fades for split audio (#3323)
+    * fix transcoding (#3334)
+    * fix 'Clip in Timeline' when project monitor is inactive (#3261)
+    * fix audio analysis (use dynamic memory instead of stack)
+    * fix render end notification
+    * fix render timecode overlay (#3260)	
+    * set tooltip for monitor pause button (#3256)
+    * fix slideshow clips adding 1 frame (#3289)
+    * fix archive project icon (#3325)
+    * fix compilation on armhf (#3345)
+    * don't allow creating keyframes for "fixed" filters (#2956)	
+    * re-enable compilation on KDE < 4.5 (squeeze) (#3319)
+    * re-enable Clip menu (fix bug #3347)
+    * fix screen recording failure (#3358)
+    * fix crash detected with undo/redo (bug #3240)
+    * fix crash cutting group on a clip edge (#3312, #3350)
+    * fix crash on image sequence (#3331)
+    * fix crash in tracks config editor (#3367)
+    * fix crash on audiofiles
+    * fix crash on opening project file with images
+    * fix warnings from static analyzers (cppcheck, krazy)
+    * sort source files, easier to understand (for new developpers)
+
+0.9.8
+    Changes:
+    * Clean encoding profiles using MLT presets & profiles
+    * Fades ui: video instead of audio on AV clips
+    * Support a custom suffix for FFmpeg binaries (mostly for packagers)
+    * Make audio align work asynchronously
+    * Remove the MLT processing threads option that never really worked
+    * Copy proxies with 'move project'
+    * Add support for JogShuttle on newer systems, make shuttle device selection more straightforward, add ProV2 keys
+
+    Bug fix:
+    * Code cleanup (use const ref, fix includes, mem leaks, optimize...)
+    * Fix warnings from gcc, cppcheck, clang, scan-build: fixes many crashs & leaks
+    * Fix keyframing messed up for some effects
+    * Fix timeline corruption when trying to move clip before 0
+    * Fix crash when closing title widget
+    * Fix thumbnails for image clips in timeline
+    * Fix crash on quick undo/redo (#3240)
+    * Fix multithreading (#3186)
+    * Fix some problems with transitions keyframes
+    * Fix scopes (#3052)
+
+0.9.6
+
+    Changes:
+    * New Median filter from Marko Cebokli
+    * Show project duration in status bar
+    * Add reverse clip to clip actions (#2933)
+    * Make audio / video bitrate easily configurable in custom render profiles (#3012)
+    * Implement deinterlacer and rescale options for MLT consumer
+    * Automatic recovery of corrupted files produced by Kdenlive 0.9.4
+    * Make monitor ruler slightly bigger so it's easier to click for seeking
+    * Show clip size & fps in project tree tooltip
+    * Allow retrieval of metadata created by Magic Lantern for canon cams
+
+    Bug fix:
+    * Fix font GUI issue (#3049)
+    * Fixes timeline corruption by spacer tool
+    * Correctly handle unsupported filters
+    * Remove space from filename start / end in render dialog (#3018)
+    * Fix possible crash when changing speed effect
+    * Fix vstab angle parameter (#2955)
+    * Fix playlist corruption & crash when moving clip (#3046)
+    * Fix moving transition sometimes losing properties (#3025)
+    * Fix crash in title widget (#3032)
+    * Fix crash when doing clip resize and clicking item quickly
+    * Fix wrong group moving when groups overlap
+    * Set document as modified when changing project metadata (#2996)
+    * Don't corrupt project when adding a title clip and a transition already is in place
+    * Fix monitor displaying corrupt image on startup (#2992)
+    * Fix clip monitor not activated on open (#2992)
+    * Fix cutting of geometry keyframes (like pan & zoom) (#2991)
+    * Optimize jogshuttle code
+    * Fix metadata not properly set for project (#2996)
+    * Fix "Clip in project tree" in groups (#2781)
+    * Fix keyframes when undoing a clip / group cut
+    * Fix double click in a timeline clip to add keyframe
+    * Warn before overwriting stabilized clip
+    * Fix monitor focus on ruler wheel event
+    * Fix proxy of playlist aspect ratio broken on some locales
+    * Fix Coverity warnings from v0.9.4
+    * Fix crash when opening invalid file from command line (#2984)
+    * Fix DVD chapters broken when using an intro movie, show chapters in monitor ruler
+    * Fix small UI bugs in title widget (#1257)
+    * Fix timeline seek sometimes not refreshing on last frame of the seek, small update for monitor ruler colors
+    * Small cleanup in render widget, fix error message (no matching profile) sometimes appearing when it should not
+    * Fix monitor timecode not visible with some window decorations (#2979)
+    * Fix moving guide bug
+    * Fix some clips metadata corrupting project file (#2976)
+    * Fix possible crash on track deletion (#2967)
+    * Fix compilation on OSX (moc issue)
+    * Fix keyframe line not painted over clips in timeline
+
+0.9.4
+    * Fix color parameter in some effects not working correctly (#2644)
+    * Fix V4l licensing issue (#2632)
+    * Fix keyframes lost / broken when pasting an effect
+
+0.9.2
+    * Fix firewire capture (preview not showing)
+    * Fix freeze when reloading previously missing clip
+    * Fade effects lost when moving / resizing clip
+    * Undoing change in clip crop start breaking clip
+    * Make disabling of track effects possible
+    * Fix slideshow clips not working
+    * Fix crash on composite transition
+    * Fix crash when opening stop motion widget
+    * Fix rendering of projects created in another locale
+
+0.9
+    * Fix monitor effect scene sometimes forcing monitor minimum size
+    * Improve detection of locale issues (default to POSIX when there is a locale conflict on the system)
+    * Improve timeline operation for small clips (disable resizing, only allow move)
+    * Add background color parameter to "Rotate" and "Pan and Zoom" effects
+    * Allow to scroll using the mouse wheel in monitor editing scene
+    * Zoom to mouse when using CTRL + mouse wheel in monitor editing scene
+    * Add support for new slope mode in "Color Selection" effect to allow smooth alpha transition
+    * Introduce grouping of effects; groups can also be saved
+    * Allow dragging an effect to another clip/track
+    * Allow record monitor to go fullscreen
+    * Image sequences can now start at an arbitrary frame (#2508)
+    * Add automatic clip alignment based on audio (experimental, has to be manually enabled)s
+    * Allow archiving for offline use (only archive proxies)
+    * Offline editing: Allow working on project with only proxies available (#2509)
+    * Allow rendering to another framerate
+    * Check for missing locale and ask to install instead of opening corrupted project
+    * Allow to open project files manually extracted from archived project
+    * Support dropping a folder in the project tree (#1288)
+    * Add "select all clips in track" and "select all clips in timeline" features (#1950)
+    * Put audio effects in subcategories to avoid uberlong menus (#2436)
+    * Support for project metadata (can be embedded in rendered file)
+    * Add Online Resource Widget allowing easy search and download of online services (freesound, openclipart, archive.org)
+    * Introduce MLT clip analysis to get auto normalize data in sox gain effect
+    * Connect recording to audio scopes
+    * Add audio only recording (works while playing)
+    * Add extract zone function: part of clip is copied to new file without re-encoding
+    * Introduce generic job framework to process clips
+    * Improve the Choose color widget: Use less space and make it easier to pick the average color value from an area
+    * Add GUI for effect Dynamic Text: Allows to display timecode/framecount and other data
+    * Rework effect stack: All effects are shown at once and are collapsible
+    * Add two different video stabilizers
+    * Add IIR Blur GUI
+    * Add date column to project tree
+
+    * Fix clip move sometimes giving error when it should work 
+    * Fix custom effects not considering capital letters in name (#2580)
+    * Fix script rendering when script name contains whitespace
+    * Ensure clip in project tree is visible after rename (scroll if necessary) (#2563)
+    * Fix monitor scene never resetting scrollbars
+    * Fix issues with transitions when inserting track (#2477)
+    * Fix some GUI elements not responding to color theme change
+    * Do not hide render profile list when there is only one item to avoid confusion (#2543)
+    * Fix consecutive error messages overwriting each other (#2519)
+    * Fix crash when editing properties of several missing clips
+    * Fix vectorscope for 24b RGB images (#2478)
+    * Fix archiving sometimes not saving playlist clips and subclips (#2475)
+    * Fix archiving feature not saving playlist clips and slowmotion clips inside them (#2475)
+    * Fix crash recovery feature issues with long or non UTF-8 filenames (#2441), (#2450)
+    * Fix rendering jobs sometimes not starting
+    * Fix crash on proxy creation (concurrency issue) (#2471)
+    * Fix zone playing (#2468)
+    * Fix click on monitor sometimes not triggering play
+    * Fix crash when moving a folder and a clip in project tree (#2458)
+    * Fix color change not working in title widget (#2459)
+    * Fix slideshow clips created with invalid frame duration
+    * Fix profile warning with clips that have 1088 pixels height
+    * Fix unnecessary proxy reload on document load
+    * Fix detection of broken render scripts
+
+0.8.2.1
+    * Fix title text oultine transparency not working
+    * Make titler window fit on smaller resolutions (1024x768)
+    * Fix corruption when undoing and redoing a transition add + move
+    * Fix possible crash in thumbnails
+    * Fix possible crashes in clip transcoding and improve feedback when failing
+    * Various small optimizations (unnecessary clip reloads)
+    * Fix timecode widget hard to edit and sometimes giving random values
+    * Workaround locale issue ahappening when system C locale and Qt's locale did not give the same numeric separator
+    * Fix audio thumbnail concurrency issue
+    * Fix various video thumbnails issues (don't load several times the same thumb, load all of them, ...)
+    * Fix crash when opening a file dialog on KDE < 4.5
+    * Fix various proxy issues (missing extension, concurrency, disabling broken proxy, ...)
+    * Fix startup crash caused by invalid parsing of v4l data
+    * Fix project tree disabled after loading some projects / creating new one
+    * Fix corrupted timeline / monitor timecode
+    * Fix search path for Luma files when missing
+
+0.8.2
+    * Load zone thumbnails from disk if available.
+    * Optimise document loading.
+    * In case of missing or invalid clips, open only one dialog box instead of one for each clip.
+    * Display proxy creation progress in project tree.
+    * Improve way of picking an average color of an area.
+    * Make audio bitrate in render dialog selectable.
+    * Add support for handling different versions of filters and add rules to convert between them.
+    * Move all cached data in one operation, so that user does not get one dialog box for each file in case of duplicates. (#2297)
+    * Show filter version in filter info box.
+    * When multiple clips are selected do not allow resizing, but moving only. (#2257)
+    * Add remux with MKV transcode preset.
+    * Make audio only render profiles faster by telling ffmpeg to skip video.
+    * Open documents using a locale different to the system as read only.
+    * Replace locale-dependent comma with slash in geometry value.
+    * Add Kdenlive manual converted from UserBase QuickStart page.
+    * Improve handling of missing luma files. (#2216)
+    * Remove the "avformat-novalidate" trick for faster loading, caused crash. (#2205)
+    * Allow to assign a shortcut to usage of proxies in project.
+    * Use separate thread for generation of timeline thumbnails when zoom is at frame level to keep UI responsive.
+    * Allow to use JScript in render profile parameter values. Values that need evalutation need to be indicated by '%'.
+    * Check for missing proxies on document opening.
+    * Check document for invalid (overlapping) transitions.
+    * Check for duration mismatch in clip producers when opening a document (can cause corruption).
+    * Automatically create backups of the project file; they can be restored in a recovery dialog.
+    * Allow to manually edit video4linux capture profile.
+    * Allow to store presets for proxy creation parameters.
+    * Enable proxies for playlist clips (*.mlt, *.kdenlive).
+    * Directly encode capture from Decklink card to make it usable in Kdenlive.
+    * Allow to use bitrate different from presets in render dialog.
+    * Whole projects (including all necessary files) can be archieved into a directory or file.
+    * Allow use of different ffmpeg preset for 1st and 2nd render pass.
+    * Notes widget: context menu now allows to insert clickable timecode to make easy reference to some place in the project.
+
+    * Fix encoding of dvd vob menu file.
+    * Fix possible crash when doing fast start/stop.
+    * Fix multiple concurrency crashes related to thumbnail and proxy creation.
+    * Fix name of dvgrab captured file. (#2344)
+    * Fix issues with simultaneous 2-pass rendering (x264). (#2338)
+    * Fix rendering progress not shown if multiple copies of Kdenlive are open. (#1265)
+    * Fix DVD chapters discarded when opening from render dialog. (#2335)
+    * Fix possible corruption caused by vertical offset of transitions in timeline.
+    * Fix aspect ratio of thumbnails to correctly use the project's arpect ratio.
+    * Fix bitrate broken when editing render profile or making it a favorite. (#2321)
+    * Fix audio issues in rendered file when using a recent ffmpeg version by replacing 'b' with 'vb' (ffmpeg bitrate parameter). (#2318)
+    * Fix rendering to Flash could be broken by setting the number of encoder threads. (#2312)
+    * Fix DVD wizard losing chapters data when switching to menu page.
+    * Fix previewing of affine transitions with transparent png.
+    * Fix timeline corruption when using 'Remove space' tool (transitions could overlap).
+    * Fix 'adjust to original size' and 'fit to width/height' for title and color clips in geometry widget (pan and zoom, composite, affine).
+    * Fix vorbis rendering by setting the audio quality (aq).
+    * Rotoscoping: do not allow to add keyframes until initial spline is created to avoid corruptions.
+    * Fix possible crash in DVD wizard chapters. (#2264)
+    * Do not duplicate effect stack after split audio but move audio effects only.
+    * Fix issues related to the usage of comma as numeric separator in some locales.
+    * Fix build on GNU/kFreeBSD.
+    * Fix cursor not visible in title widget. (#2231)
+    * Fix aspect ratio in title widget background image. (#2225)
+    * Fix layout in save profile dialog. (#2224)
+    * Fix timeline corruption because resizing a clip end could overlap another clip in some cases.
+    * Fix last keyframe for composite transition (and other geometry effects) inserted one frame after the end of the transition.
+    * Prevent crash when deleting a clip while playing. (#2200)
+    * Disable save action if we are in the same state as last save.
+    * Fix pan and zoom keyframes lost after clip resize. (#2210)
+    * Fix mouse wheel in slider section of (effect) parameters with a large range (> 1000).
+    * Fix GUI setup issues with some list parameters (for effects).
+    * Fix timecode widget not communicating changes upon focus leave.
+    * Fix list of effects in effect stack taking up to much space by default.
+    * Fix transition track not correctly saved. (#2187)
+    * Fix "save zone" saving proxy instead of real clip. (#2184)
+    * Fix freeze when saving while timeline is at maximum zoom. (#2174)
+    * Fix crash when deleting a track and having an audio clip on last track. (#2168)
+    * Do not allow to create overlapping transitions that could corrupt timeline. (#1901)
+    * Fix sometimes effects were missing. (#2152)
+    * Fix crash in histogram scope.
+    * Fix multiple possible timeline corruptions. (#2157)
+    * Do not allow rendering to a frame rate different than current project's profile. (#2138)
+    * Fix DVD menu entries hidden under some circumstances.
+    * Fix channels in audio thumbnails being displaced by one frame. (#1976)
+    * Fix possible crash caused by audio thumbnails. (#2147)
+    * Fix possible freeze and error on project opening. (#2144)
+    * Fix progress bar running twice on 2pass render.
+    * Fix proxy file path issue on system installation.
+    * Use luma as default channel for levels effect.
+    * Fix handling of proxies when duration != duration of original clip.
+    * Fix filename encoding problem in renderer. (#2110)
+    * Fix user specified CFLAGS ignored. (#2108)
+
+0.8
+    See http://kdenlive.org/discover/0.8
--- a/26
+++ b/26
@@ -1,26 +0,0 @@
-Kdenlive Installation Instrucions
-=================================
-
-
-To compile and install, go in the source directory and type:
-
-mkdir build;cd build
-cmake ..
-(If you want to install in a different path, use instead:
-cmake .. -DCMAKE_INSTALL_PREFIX=/install/path)
-make
-
-To install, become root:
-
-sudo make install
-(enter root password at prompt)
-
-Once installed, you can start Kdenlive by typing "kdenlive".
-
-Note that you should also install MLT to do anything useful with Kdenlive. See
-the README file for details.
-
-Have Fun!
-
-
-
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,26 +1,9 @@
-#! /bin/sh
-EXTRACTRC=`which extractrc`
-# XGETTEXT="`which xgettext` --kde -ki18n --no-location -s "
-XGETTEXT="`which xgettext` -s "
-podir=`pwd`/po
-kdenlive_subdirs="src src/widgets renderer plugins"
+#!bin/sh

+kdenlive_subdirs="plugins renderer data src src/ui"

-kde_inc=${includedir:-${KDEDIR:-@CMAKE_INSTALL_PREFIX@}/include/kde}/kde.pot
+$EXTRACTRC --tag=name --tag=description --tag=label --tag=comment --tag=paramlistdisplay data/effects/*.xml data/kdenliveeffectscategory.rc >> rc.cpp
+$EXTRACTRC `find $kdenlive_subdirs -name \*.rc -a ! -name encodingprofiles.rc -a ! -name camcorderfilters.rc -o -name \*.ui` >> rc.cpp

-if [ -f ${kde_inc} ]; then
-   kde_inc=" -x ${kde_inc} "
-else
-   kde_inc=""
-fi
-
-$EXTRACTRC --tag=name --tag=description --tag=label --tag=comment --tag=paramlistdisplay effects/*.xml data/*.rc >> rc.cpp || exit 11
-
-$EXTRACTRC `find $kdenlive_subdirs -name \*.ui` >> rc.cpp || exit 11
-$EXTRACTRC `find $kdenlive_subdirs -name \*.rc` >> rc.cpp || exit 11
-
-$XGETTEXT --from-code=utf-8 -C -kde -ci18n -ki18n:1 -ki18nc:1c,2 -ki18np:1,2 -ki18ncp:1c,2,3 -ktr2i18n:1 \
-        -kI18N_NOOP:1 -kI18N_NOOP2:1c,2 -ktranslate -kaliasLocale -kki18n:1 -kki18nc:1c,2 -kki18np:1,2 -kki18ncp:1c,2,3 --add-comments=\"TRANSLATORS:\" ${kde_inc} `find $kdenlive_subdirs -name \*.cpp -o -name \*.h` *.cpp -o $podir/kdenlive.pot
-
-#$XGETTEXT -C -kki18n -ki18n -ktr2i18n -kI18N_NOOP -ktr `find $kdenlive_subdirs -name \*.cpp -o -name \*.h` *.cpp -o $podir/kdenlive.pot
+$XGETTEXT `find $kdenlive_subdirs -name \*.cpp -o -name \*.h` *.cpp -o $podir/kdenlive.pot
 rm -f rc.cpp
--- a/43
+++ b/43
@@ -1,28 +1,29 @@
-Kdenlive 0.8
-by Jean-Baptiste Mardelle <jb@kdenlive.org> and the Kdenlive team
+# About Kdenlive

-Kdenlive is a video editing application based on KDE Platform 4.
+Kdenlive (https://kdenlive.org) is a Free and Open Source video editing application, based on MLT Framework and KDE Frameworks 5. It is distributed under the GNU General Public Licence Version 2.

-Please check the project page for more information, and to report new bugs.
+# Builing from source

-http://kdenlive.org
+Instructions to build Kdenlive are available on the KDE wiki : https://community.kde.org/Kdenlive/Development

-To use Kdenlive, you will need to download and install MLT, available from
-the following web page:
+# Contributing to Kdenlive

-http://www.mltframework.org
+Please note that Kdenlive's Github repo is just a mirror: see https://community.kde.org/Infrastructure/Github_Mirror for detailed explanations on how to submit patches.

-The recommended MLT version is 0.7. It may work with other
-versions, but this is not guaranteed, or (at this stage of development) likely.
+We welcome all feedback and offers for help!

-We welcome all bug reports, feedback, and offers for help!
-So please visit our bug tracker and forums:
-
-Forum: 
-http://kdenlive.org/forum
-
-Bug Tracker:
-http://kdenlive.org/mantis
-
-Cheers,
-Jean-Baptiste
+* Talk about us!
+* Report bugs you encounter (if not already done) on:
+  https://bugs.kde.org
+* Help other users on forum and bug tracker:
+  http://forum.kde.org/viewforum.php?f=262
+* Help to fill the manual at:
+  http://userbase.kde.org/Kdenlive
+* Complete and check application and documentation translation:
+  http://l10n.kde.org
+* Prepare video tutorials (intro, special tricks...) in your language
+  and send us a link to add in homepage or doc
+* Detail improvement suggestions
+  we don't test every (any?) other video editor, so give precise explanations
+* Code! Help fixing bugs, improving usability, optimizing, porting...
+  register on KDE infrastructure, study its guidelines, and pick from roadmap:
--- a/cmake/modules/FindDrMinGW.cmake
+++ b/cmake/modules/FindDrMinGW.cmake
@@ -0,0 +1,25 @@
+# cmake macro to find DrMinGW Windows crash handler
+#
+# copyright (c) 2018, Vincent Pinon <vpinon@kde.org>
+#
+# once done this will define:
+#
+#  DRMINGW_FOUND - system has DrMinGW
+#  DRMINGW_INCLUDE_DIR - the DrMinGW include directory
+#  DRMINGW_LIBRARY - the libraries needed to use DrMinGW
+#
+# redistribution and use is allowed according to the terms of the bsd license.
+
+if (DRMINGW_INCLUDE_DIR AND DRMINGW_LIBRARY)
+    # already in cache, be silent
+    set (DRMINGW_FIND_QUIETLY true)
+endif (DRMINGW_INCLUDE_DIR AND DRMINGW_LIBRARY)
+
+find_path (DRMINGW_INCLUDE_DIR exchndl.h)
+find_library (DRMINGW_LIBRARY exchndl)
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (DrMinGW DEFAULT_MSG DRMINGW_INCLUDE_DIR DRMINGW_LIBRARY)
+
+mark_as_advanced(DRMINGW_INCLUDE_DIR DRMINGW_LIBRARY)
+
--- a/cmake/modules/FindKdeLibs.cmake
+++ b/cmake/modules/FindKdeLibs.cmake
@@ -1,151 +0,0 @@
-include(FindQt3)
-include(FindKDE3)
-
-
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" FORCE)
-
-SET(LIB_SEARCH_PATHES   ${KDE3_LIB_DIR}
-  $ENV{KDEDIR}/lib
-  /opt/kde/lib
-  /opt/kde3/lib
-  /usr/lib
-  /usr/local/lib
-)
-
-IF (LIB_SUFFIX)
-    SET(LIB_SEARCH_PATHES
-        $ENV{KDEDIR}/lib${LIB_SUFFIX}
-        /opt/kde/lib${LIB_SUFFIX}
-        /opt/kde3/lib${LIB_SUFFIX}
-        /usr/lib${LIB_SUFFIX}
-        /usr/local/lib${LIB_SUFFIX}
-        ${LIB_SEARCH_PATHES})
-ENDIF (LIB_SUFFIX)
-
-FIND_LIBRARY(KDE3_UI_LIBRARY NAMES kdeui
-  PATHS
-  ${LIB_SEARCH_PATHES}
-)
-
-FIND_LIBRARY(KDE3_PART_LIBRARY NAMES kparts
-  PATHS
-  ${LIB_SEARCH_PATHES}
-)
-
-FIND_LIBRARY(KDE3_KIO_LIBRARY NAMES kio
-  PATHS
-  ${LIB_SEARCH_PATHES}
-)
-
-FIND_LIBRARY(KDE3_DCOP_LIBRARY NAMES DCOP
-  PATHS
-  ${LIB_SEARCH_PATHES}
-)
-
-FIND_LIBRARY(KDE3_WALLET_LIBRARY NAMES kwalletclient
-  PATHS
-  ${LIB_SEARCH_PATHES}
-)
-
-FIND_LIBRARY(KDE3_KINIT_KDED_LIBRARY NAMES kdeinit_kded
-  PATHS
-  ${LIB_SEARCH_PATHES}
-)
-
-FIND_PROGRAM(KDE3_KDECONFIG_EXECUTABLE NAME kde-config PATHS
-    $ENV{KDEDIR}/bin
-    /opt/kde/bin
-    /opt/kde3/bin
-)
-
-FIND_PROGRAM(MSGFMT
-    NAMES gmsgfmt msgfmt)
-
-FIND_PROGRAM(STRIP
-    NAMES strip)
-
-FIND_PROGRAM(KDE3_MEINPROC_EXECUTABLE NAME meinproc PATHS
-     ${KDE3_BIN_INSTALL_DIR}
-     $ENV{KDEDIR}/bin
-     /opt/kde/bin
-     /opt/kde3/bin
-)
-
-IF(KDE3_MEINPROC_EXECUTABLE)
-    MESSAGE(STATUS "Found meinproc: ${KDE3_MEINPROC_EXECUTABLE}")
-ELSE(KDE3_MEINPROC_EXECUTABLE)
-    MESSAGE(STATUS "Didn't find meinproc!")
-ENDIF(KDE3_MEINPROC_EXECUTABLE)
-
-IF(MSGFMT)
-    EXECUTE_PROCESS(COMMAND ${MSGFMT} "--version" "2>&1"
-    OUTPUT_VARIABLE _msgout)
-    STRING(REGEX MATCH "GNU[\t ]gettext" _isgnu "${_msgout}")
-    IF (NOT _isgnu)
-        MESSAGE(STATUS "No gnu msgfmt found!")
-        SET(MSGFMT ":" CACHE STRING "Msgfmt program")
-    ELSE(NOT _isgnu)
-        MESSAGE(STATUS "Found gnu msgfmt: ${MSGFMT}")
-    ENDIF (NOT _isgnu)
-ELSE(MSGFMT)
-    SET(MSGFMT ":" CACHE STRING "Msgfmt program")
-ENDIF(MSGFMT)
-
-# 'cause my own defines were not good I take them from kde4 trunk
-#add some KDE specific stuff
-set(SHARE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Base directory for files which go to share/" FORCE)
-set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX}       CACHE PATH  "Base directory for executables and libraries" FORCE)
-#
-## the following are directories where stuff will be installed to
-set(BIN_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/bin"                  CACHE PATH "The kde bin install dir (default prefix/bin)" FORCE)
-set(SBIN_INSTALL_DIR         "${EXEC_INSTALL_PREFIX}/sbin"                 CACHE PATH "The kde sbin install dir (default prefix/sbin)" FORCE)
-set(LIB_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"     CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
-set(LIBEXEC_INSTALL_DIR      "${LIB_INSTALL_DIR}/kde3/libexec"             CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib/kde3/libexec)" FORCE)
-set(PLUGIN_INSTALL_DIR       "${LIB_INSTALL_DIR}/kde3"                     CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde3)" FORCE)
-set(INCLUDE_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/include"             CACHE PATH "The subdirectory to the header prefix" FORCE)
-set(CONFIG_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/config"              CACHE PATH "The config file install dir" FORCE)
-set(DATA_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/apps"                CACHE PATH "The parent directory where applications can install their data" FORCE)
-set(HTML_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/doc/HTML"            CACHE PATH "The HTML install dir for documentation"  FORCE)
-set(ICON_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/icons"               CACHE PATH "The icon install dir (default prefix/share/icons/)" FORCE)
-set(KCFG_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/config.kcfg"         CACHE PATH "The install dir for kconfig files" FORCE)
-set(LOCALE_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/locale"              CACHE PATH "The install dir for translations" FORCE)
-set(MIME_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/mimelnk"             CACHE PATH "The install dir for the mimetype desktop files" FORCE)
-set(SERVICES_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/services"            CACHE PATH "The install dir for service (desktop, protocol, ...) files" FORCE)
-set(SERVICETYPES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/servicetypes"        CACHE PATH "The install dir for servicestypes desktop files" FORCE)
-set(SOUND_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/sounds"              CACHE PATH "The install dir for sound files" FORCE)
-set(TEMPLATES_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/templates"           CACHE PATH "The install dir for templates (Create new file...)" FORCE)
-set(WALLPAPER_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/wallpapers"          CACHE PATH "The install dir for wallpapers" FORCE)
-set(KCONF_UPDATE_INSTALL_DIR "${DATA_INSTALL_DIR}/kconf_update"            CACHE PATH "The kconf_update install dir" FORCE)
-# this one shouldn't be used anymore
-set(APPLNK_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/applnk"              CACHE PATH "Is this still used ?" FORCE)
-set(AUTOSTART_INSTALL_DIR    "${SHARE_INSTALL_PREFIX}/autostart"           CACHE PATH "The install dir for autostart files" FORCE)
-set(XDG_APPS_DIR             "${SHARE_INSTALL_PREFIX}/applications/kde"    CACHE PATH "The XDG apps dir" FORCE)
-set(XDG_DIRECTORY_DIR        "${SHARE_INSTALL_PREFIX}/desktop-directories" CACHE PATH "The XDG directory" FORCE)
-set(SYSCONF_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/etc"                 CACHE PATH "The kde sysconfig install dir (default/etc)" FORCE)
-set(MAN_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/man"                 CACHE PATH "The kde man install dir (default prefix/share/man/)" FORCE)
-set(INFO_INSTALL_DIR         "${CMAKE_INSTALL_PREFIX}/info"                CACHE PATH "The kde info install dir (default prefix/info)" FORCE)
-
-
-MACRO(ADD_POFILES packagename)
-    SET(_gmofiles)
-    FILE(GLOB _pofiles *.po)
-
-    FOREACH(_current_po ${_pofiles})
-        GET_FILENAME_COMPONENT(_name ${_current_po} NAME_WE)
-        STRING(REGEX REPLACE "^.*/([a-zA-Z]+)(\\.po)" "\\1" _lang "${_current_po}")
-        SET(_gmofile "${CMAKE_CURRENT_BINARY_DIR}/${_name}.gmo")
-        ADD_CUSTOM_COMMAND(OUTPUT ${_gmofile}
-            COMMAND ${MSGFMT}
-            ARGS "-o" "${_gmofile}" "${_current_po}"
-            DEPENDS ${_current_po}
-            )
-        SET(_gmofiles ${_gmofiles} ${_gmofile})
-        INSTALL(FILES ${_gmofile}
-            DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES
-            RENAME ${packagename}.mo)
-    ENDFOREACH(_current_po ${_pofiles})
-
-    ADD_CUSTOM_TARGET(translations ALL
-        DEPENDS ${_gmofiles})
-
-ENDMACRO(ADD_POFILES)
--- a/cmake/modules/FindLIBMLT.cmake
+++ b/cmake/modules/FindLIBMLT.cmake
@@ -1,60 +0,0 @@
-#
-# Find the MLT includes and libraries.
-#
-
-include(FindPkgConfig)
-pkg_check_modules(MLT REQUIRED mlt++)
-add_definitions(-DMLT_PREFIX=\\\"\"${MLT_PREFIX}\"\\\")
-
-find_path(LIBMLT_INCLUDE_DIR
-  NAMES framework/mlt.h
-  PATHS ${MLT_INCLUDEDIR}/mlt ${MLT_PREFIX}/include/mlt /usr/local/include/mlt /usr/include/mlt
-  NO_DEFAULT_PATH
-)
-
-find_library(LIBMLT_LIBRARY
-  NAMES mlt
-  PATHS ${MLT_LIBDIR} ${MLT_PREFIX}/lib /usr/lib /usr/local/lib
-  NO_DEFAULT_PATH
-)
-
-find_path(LIBMLTPLUS_INCLUDE_DIR
-  NAMES mlt++/Mlt.h
-  PATHS ${MLT_INCLUDEDIR} ${MLT_PREFIX}/include /usr/local/include /usr/include
-  NO_DEFAULT_PATH
-)
-
-find_library(LIBMLTPLUS_LIBRARY
-  NAMES mlt++
-  PATHS ${MLT_LIBDIR} ${MLT_PREFIX}/lib /usr/lib /usr/local/lib
-  NO_DEFAULT_PATH
-)
-
-if(LIBMLT_LIBRARY AND LIBMLT_INCLUDE_DIR)
-  set(LIBMLT_FOUND 1)
-  set(LIBMLT_LIBRARIES ${LIBMLT_LIBRARY})
-else(LIBMLT_LIBRARY AND LIBMLT_INCLUDE_DIR)
-  set(LIBMLT_FOUND 0)
-endif(LIBMLT_LIBRARY AND LIBMLT_INCLUDE_DIR)
-
-if(LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR)
-  set(LIBMLT_FOUND 1)
-  set(LIBMLTPLUS_LIBRARIES ${LIBMLTPLUS_LIBRARY})
-else(LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR)
-  set(LIBMLT_FOUND 0)
-endif(LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR)
-
-if(LIBMLT_FOUND)
-  set(LIBMLT_VERSION ${MLT_VERSION})
-  if(NOT LIBMLT_FIND_QUIETLY)
-    message(STATUS "MLT install path: ${MLT_PREFIX}")
-    message(STATUS "MLT includes: ${LIBMLT_INCLUDE_DIR}")
-    message(STATUS "MLT library: ${LIBMLT_LIBRARY}")
-    message(STATUS "MLT++ includes: ${LIBMLTPLUS_INCLUDE_DIR}")
-    message(STATUS "MLT++ library: ${LIBMLTPLUS_LIBRARY}")
-  endif(NOT LIBMLT_FIND_QUIETLY)
-else(LIBMLT_FOUND)
-  if(LIBMLT_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find MLT library")
-  endif(LIBMLT_FIND_REQUIRED)
-endif(LIBMLT_FOUND)
--- a/cmake/modules/FindLibV4L2.cmake
+++ b/cmake/modules/FindLibV4L2.cmake
@@ -0,0 +1,27 @@
+# cmake macro to find LibV4L2
+#
+# Copyright (c) 2009, Jaroslav Reznik <jreznik@redhat.com>
+#
+# Once done this will define:
+#
+#  LIBV4L2_FOUND - System has LibV4L2
+#  LIBV4L2_INCLUDE_DIR - The LibV4L2 include directory
+#  LIBV4L2_LIBRARY - The libraries needed to use LibV4L2
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+IF (LIBV4L2_INCLUDE_DIR AND LIBV4L2_LIBRARY)
+    # Already in cache, be silent
+    SET (LIBV4L2_FIND_QUIETLY TRUE)
+ENDIF (LIBV4L2_INCLUDE_DIR AND LIBV4L2_LIBRARY)
+
+FIND_PATH (LIBV4L2_INCLUDE_DIR libv4l2.h)
+
+FIND_LIBRARY (LIBV4L2_LIBRARY v4l2)
+
+INCLUDE (FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (LibV4L2 DEFAULT_MSG LIBV4L2_INCLUDE_DIR LIBV4L2_LIBRARY)
+
+MARK_AS_ADVANCED(LIBV4L2_INCLUDE_DIR LIBV4L2_LIBRARY)
+
--- a/cmake/modules/FindMLT.cmake
+++ b/cmake/modules/FindMLT.cmake
@@ -0,0 +1,64 @@
+# Find the MLT includes and libraries
+#
+# Copyright (c) 2007-2012 Jean-Baptiste Mardell (jb@kdenlive.org)
+# Copyright (c) 2012 Alberto Villa <avilla@FreeBSD.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+
+find_package(PkgConfig QUIET)
+pkg_check_modules(PC_MLT mlt++)
+
+find_path(MLT_INCLUDE_DIR
+  NAMES framework/mlt.h
+  HINTS
+    ${PC_MLT_INCLUDEDIR}
+    ${PC_MLT_PREFIX}/include
+  PATHS
+    /usr/local/include
+    /usr/include
+  PATH_SUFFIXES mlt
+)
+
+find_library(MLT_LIBRARIES
+  NAMES mlt
+  HINTS
+    ${PC_MLT_LIBDIR}
+    ${PC_MLT_PREFIX}/lib
+  PATHS
+    /usr/local/lib
+    /usr/lib
+)
+
+find_path(MLTPP_INCLUDE_DIR
+  NAMES mlt++/Mlt.h
+  HINTS
+    ${PC_MLT_INCLUDEDIR}
+    ${PC_MLT_PREFIX}/include
+  PATHS
+    /usr/local/include
+    /usr/include
+)
+
+find_library(MLTPP_LIBRARIES
+  NAMES mlt++
+  HINTS
+    ${PC_MLT_LIBDIR}
+    ${PC_MLT_PREFIX}/lib
+  PATHS
+    /usr/local/lib
+    /usr/lib
+)
+
+get_filename_component(MLT_ROOT_DIR ${MLTPP_INCLUDE_DIR} PATH)
+
+if(PC_MLT_VERSION)
+  set(MLT_VERSION_STRING ${PC_MLT_VERSION})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(MLT
+  REQUIRED_VARS MLT_LIBRARIES MLTPP_LIBRARIES MLT_INCLUDE_DIR MLTPP_INCLUDE_DIR
+  VERSION_VAR MLT_VERSION_STRING
+)
+
+mark_as_advanced(MLT_INCLUDE_DIR MLT_LIBRARIES MLTPP_INCLUDE_DIR MLTPP_LIBRARIES)
--- a/cmake/modules/FindMSGFMT.cmake
+++ b/cmake/modules/FindMSGFMT.cmake
@@ -1,50 +0,0 @@
-#
-# Find the msgfmt program
-#
-# Modified from Rosegarden project
-#
-# Defined variables:
-#  MSGFMT_FOUND
-#  MSGFMT_EXECUTABLE
-#
-# Macro:
-#  ADD_TRANSLATIONS
-#
-
-IF(MSGFMT_EXECUTABLE)
-  SET(MSGFMT_FOUND TRUE)
-ELSE(MSGFMT_EXECUTABLE)
-  FIND_PROGRAM(MSGFMT_EXECUTABLE
-  NAMES msgfmt gmsgfmt
-  PATHS /bin /usr/bin /usr/local/bin )
-  IF(MSGFMT_EXECUTABLE)
-    SET(MSGFMT_FOUND TRUE)
-  ELSE(MSGFMT_EXECUTABLE)
-    IF(NOT MSGFMT_FIND_QUIETLY)
-      IF(MSGFMT_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "msgfmt program couldn't be found")
-      ENDIF(MSGFMT_FIND_REQUIRED)
-    ENDIF(NOT MSGFMT_FIND_QUIETLY)
-  ENDIF(MSGFMT_EXECUTABLE)
-  MARK_AS_ADVANCED(MSGFMT_EXECUTABLE)
-ENDIF (MSGFMT_EXECUTABLE)
-IF(MSGFMT_FOUND)
-  MESSAGE(STATUS "Found msgfmt: ${MSGFMT_EXECUTABLE}")
-ENDIF(MSGFMT_FOUND)
-
-MACRO(ADD_TRANSLATIONS _lang)
-  SET(_outputs)
-  FOREACH(_file ${ARGN})
-    GET_FILENAME_COMPONENT(_file_we ${_file} NAME_WE)
-    SET(_out "${CMAKE_CURRENT_BINARY_DIR}/${_file_we}.mo")
-    SET(_in  "${CMAKE_CURRENT_SOURCE_DIR}/${_file_we}.po")
-    ADD_CUSTOM_COMMAND(
-      OUTPUT ${_out}
-      COMMAND ${MSGFMT_EXECUTABLE} -o ${_out} ${_in}
-      DEPENDS ${_in} )
-    INSTALL(FILES ${_out}
-      DESTINATION ${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES )
-    SET(_outputs ${_outputs} ${_out})
-  ENDFOREACH(_file)
-  ADD_CUSTOM_TARGET(translations ALL DEPENDS ${_outputs})
-ENDMACRO(ADD_TRANSLATIONS)
--- a/cmake/modules/FindOpenGLES.cmake
+++ b/cmake/modules/FindOpenGLES.cmake
@@ -0,0 +1,52 @@
+# - Try to find OpenGLES
+# Once done this will define
+#  
+#  OPENGLES_FOUND           - system has OpenGLES and EGL
+#  OPENGL_EGL_FOUND         - system has EGL
+#  OPENGLES_INCLUDE_DIR     - the GLES include directory
+#  OPENGLES_LIBRARY	    - the GLES library
+#  OPENGLES_EGL_INCLUDE_DIR - the EGL include directory
+#  OPENGLES_EGL_LIBRARY	    - the EGL library
+#  OPENGLES_LIBRARIES       - all libraries needed for OpenGLES
+#  OPENGLES_INCLUDES        - all includes needed for OpenGLES
+
+FIND_PATH(OPENGLES_INCLUDE_DIR GLES2/gl2.h
+  /usr/openwin/share/include
+  /opt/graphics/OpenGL/include /usr/X11R6/include
+  /usr/include
+)
+
+FIND_LIBRARY(OPENGLES_LIBRARY
+  NAMES GLESv2
+  PATHS /opt/graphics/OpenGL/lib
+        /usr/openwin/lib
+        /usr/shlib /usr/X11R6/lib
+        /usr/lib
+)
+
+FIND_PATH(OPENGLES_EGL_INCLUDE_DIR EGL/egl.h
+  /usr/openwin/share/include
+  /opt/graphics/OpenGL/include /usr/X11R6/include
+  /usr/include
+)
+
+FIND_LIBRARY(OPENGLES_EGL_LIBRARY
+    NAMES EGL
+    PATHS /usr/shlib /usr/X11R6/lib
+          /usr/lib
+)
+
+SET(OPENGL_EGL_FOUND "NO")
+IF(OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
+    SET(OPENGL_EGL_FOUND "YES")
+ENDIF()
+
+SET(OPENGLES_FOUND "NO")
+IF(OPENGLES_LIBRARY AND OPENGLES_INCLUDE_DIR AND
+   OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
+    SET(OPENGLES_LIBRARIES ${OPENGLES_LIBRARY} ${OPENGLES_LIBRARIES}
+                           ${OPENGLES_EGL_LIBRARY})
+    SET(OPENGLES_INCLUDES ${OPENGLES_INCLUDE_DIR} ${OPENGLES_EGL_INCLUDE_DIR})
+    SET(OPENGLES_FOUND "YES")
+ENDIF()
+
--- a/cmake/modules/FindQJSON.cmake
+++ b/cmake/modules/FindQJSON.cmake
@@ -1,47 +0,0 @@
-# Find QJSON - JSON handling library for Qt
-# Source: http://gitorious.org/libmygpo-qt/libmygpo-qt/blobs/634b150fabdcafddcfb98a9a08cc414d95ae0dbe/cmake/modules/FindQJSON.cmake
-#
-# This module defines
-#  QJSON_FOUND - whether the qsjon library was found
-#  QJSON_LIBRARIES - the qjson library
-#  QJSON_INCLUDE_DIR - the include path of the qjson library
-#
-
-if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
-
-  # Already in cache
-  set (QJSON_FOUND TRUE)
-
-else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
-
-  if (NOT WIN32)
-    # use pkg-config to get the values of QJSON_INCLUDE_DIRS
-    # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
-    include (FindPkgConfig)
-    pkg_check_modules (QJSON REQUIRED QJson>=0.5)
-  endif (NOT WIN32)
-
-  find_library (QJSON_LIBRARIES
-    NAMES
-    qjson
-    PATHS
-    ${QJSON_LIBRARY_DIRS}
-    ${LIB_INSTALL_DIR}
-    ${KDE4_LIB_DIR}
-  )
-
-  find_path (QJSON_INCLUDE_DIR
-    NAMES
-    parser.h
-    PATH_SUFFIXES
-    qjson
-    PATHS
-    ${QJSON_INCLUDE_DIRS}
-    ${INCLUDE_INSTALL_DIR}
-    ${KDE4_INCLUDE_DIR}
-  )
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)
-
-endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
--- a/cmake/modules/KdenlivePackageMessages.cmake
+++ b/cmake/modules/KdenlivePackageMessages.cmake
@@ -1,22 +0,0 @@
- 
- FIND_PROGRAM(XGETTEXT_EXECUTABLE xgettext)
- FIND_PROGRAM(FIND_EXECUTABLE find)
- FIND_PROGRAM(RM_EXECUTABLE rm)
- FIND_PROGRAM(XTRACTRC_EXECUTABLE extractrc)
-
- SET(KDE_POT_FILE ${KDE3_INCLUDE_DIR}/kde.pot)
- 
- ADD_CUSTOM_TARGET(package-messages
-     COMMAND $(MAKE) all # first make sure all generated source exists
-        COMMAND ${RM_EXECUTABLE} -f po/*.gmo
-        #COMMAND ${XTRACTRC_EXECUTABLE} ${CMAKE_SOURCE_DIR}/kdenlive/*.rc >> ${CMAKE_SOURCE_DIR}/rc.cpp
-        COMMAND ${XTRACTRC_EXECUTABLE} --tag=name --tag=description --tag=label --context=effectNames ${CMAKE_SOURCE_DIR}/effects/*.xml >> ${CMAKE_SOURCE_DIR}/rc.cpp
-        COMMAND ${XGETTEXT_EXECUTABLE} -C
-            -ki18n -ktr2i18n -kI18N_NOOP
-            -x ${KDE_POT_FILE}
-            `${FIND_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR} -name \\*.ui -o -name \\*.cpp`
-            `${FIND_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR} -name \\*.ui -o -name \\*.cpp`
-            -o ${CMAKE_SOURCE_DIR}/po/kdenlive.pot
-        COMMAND $(MAKE) translations
-        # DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kwave/menus.config
-    )
--- a/config-kdenlive.h.cmake
+++ b/config-kdenlive.h.cmake
@@ -0,0 +1,16 @@
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#define KDENLIVE_VERSION "@KDENLIVE_VERSION_STRING@"
+
+#define MLT_PREFIX "@MLT_PREFIX@"
+#define MLT_MIN_MAJOR_VERSION @MLT_MIN_MAJOR_VERSION@
+#define MLT_MIN_MINOR_VERSION @MLT_MIN_MINOR_VERSION@
+#define MLT_MIN_PATCH_VERSION @MLT_MIN_PATCH_VERSION@
+
+#define FFMPEG_SUFFIX "@FFMPEG_SUFFIX@"
+
+#cmakedefine HAVE_MALLOC_H 1
+#cmakedefine HAVE_PTHREAD_H 1
+
+#endif
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,4 +1,40 @@
-install(FILES banner.png timeline_nothumbs.png timeline_athumbs.png timeline_vthumbs.png timeline_avthumbs.png metadata.properties blacklisted_effects.txt blacklisted_transitions.txt DESTINATION ${DATA_INSTALL_DIR}/kdenlive )
-install( FILES kdenliveeffectscategory.rc DESTINATION  ${CONFIG_INSTALL_DIR} )
-install (FILES kdenlive.xpm DESTINATION share/pixmaps)
-install (FILES kdenlive.menu DESTINATION share/menu RENAME kdenlive)
+add_subdirectory(effects)
+add_subdirectory(generators)
+add_subdirectory(transitions)
+add_subdirectory(icons)
+add_subdirectory(lumas)
+add_subdirectory(man)
+add_subdirectory(titles)
+add_subdirectory(profiles)
+
+if (KF5_ICON_COMPATIBILITY)
+  add_subdirectory(pics)
+endif()
+
+install(FILES
+  banner.png
+  blacklisted_effects.txt
+  blacklisted_transitions.txt
+  encodingprofiles.rc
+  metadata.properties
+  meta_ffmpeg.png
+  meta_libav.png
+  meta_magiclantern.png
+  timeline_athumbs.png
+  timeline_avthumbs.png
+  timeline_nothumbs.png
+  timeline_vthumbs.png
+  kdenliveeffectscategory.rc
+  kdenlivetranscodingrc
+
+  DESTINATION ${DATA_INSTALL_DIR}/kdenlive)
+install(FILES  kdenlive.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
+install(FILES kdenlive_renderprofiles.knsrc kdenlive_wipes.knsrc kdenlive_titles.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
+install(FILES profiles.xml DESTINATION ${DATA_INSTALL_DIR}/kdenlive/export)
+install(FILES org.kde.kdenlive.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
+install(FILES org.kde.kdenlive.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+
+find_package(SharedMimeInfo REQUIRED)
+install(FILES org.kde.kdenlive.xml westley.xml DESTINATION ${XDG_MIME_INSTALL_DIR})
+update_xdg_mimetypes(${XDG_MIME_INSTALL_DIR})
+
--- a/data/EffectToolBar.qml
+++ b/data/EffectToolBar.qml
@@ -0,0 +1,70 @@
+import QtQuick.Controls 1.3
+import QtQuick.Controls.Styles 1.3
+import QtQuick 2.0
+
+Rectangle {
+    id: effecttoolbar
+    objectName: "effecttoolbar"
+    width: fullscreenButton.width
+    height: fullscreenButton.height * 5 + zoomSlider.height + 2
+    SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }
+    color: Qt.rgba(myPalette.window.r, myPalette.window.g, myPalette.window.b, 0.7)
+    radius: 4
+    border.color : Qt.rgba(0, 0, 0, 0.3)
+    border.width: 1
+
+    function setZoom(zoom) {
+        if (zoom >= 1) {
+            zoomSlider.value = zoom + 2
+        } else if (zoom == 0.5) {
+            zoomSlider.value = 2
+        } else if (zoom == 0.25) {
+            zoomSlider.value = 1
+        } else if (zoom == 0.125) {
+            zoomSlider.value = 0
+        }
+    }
+
+    Column {
+        ToolButton {
+            id: fullscreenButton
+            objectName: "fullScreen"
+            iconName: "view-fullscreen"
+            tooltip: "Switch Full Screen"
+        }
+        ToolButton {
+            objectName: "nextKeyframe"
+            iconName: "go-next"
+            tooltip: "Go to Next Keyframe"
+        }
+        ToolButton {
+            objectName: "prevKeyframe"
+            iconName: "go-previous"
+            tooltip: "Go to Previous Keyframe"
+        }
+        ToolButton {
+            objectName: "addKeyframe"
+            iconName: "list-add"
+            tooltip: "Add Keyframe"
+        }
+        ToolButton {
+            objectName: "removeKeyframe"
+            iconName: "list-remove"
+            tooltip: "Remove Keyframe"
+        }
+        Slider {
+            id: zoomSlider
+            signal zoomChanged(real value)
+            anchors.horizontalCenter:parent.horizontalCenter
+            objectName: "zoomSlider"
+            orientation: Qt.Vertical
+            height: fullscreenButton.height * 3
+            maximumValue: 5.0
+            stepSize: 1.0
+            value: 3.0
+            onValueChanged: {
+                zoomSlider.zoomChanged(value);
+            }
+        }
+    }
+}
--- a/data/SceneToolBar.qml
+++ b/data/SceneToolBar.qml
@@ -0,0 +1,70 @@
+import QtQuick.Controls 1.3
+import QtQuick.Controls.Styles 1.3
+import QtQuick 2.0
+
+Rectangle {
+    id: scenetoolbar
+    objectName: "scenetoolbar"
+    width: fullscreenButton.width
+    height: fullscreenButton.height * 5 + zoomSlider.height + 2
+    SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }
+    color: Qt.rgba(myPalette.window.r, myPalette.window.g, myPalette.window.b, 0.7)
+    radius: 4
+    border.color : Qt.rgba(0, 0, 0, 0.3)
+    border.width: 1
+
+    function setZoom(zoom) {
+        if (zoom >= 1) {
+            zoomSlider.value = zoom + 2
+        } else if (zoom == 0.5) {
+            zoomSlider.value = 2
+        } else if (zoom == 0.25) {
+            zoomSlider.value = 1
+        } else if (zoom == 0.125) {
+            zoomSlider.value = 0
+        }
+    }
+
+    Column {
+        ToolButton {
+            id: fullscreenButton
+            objectName: "fullScreen"
+            iconName: "view-fullscreen"
+            tooltip: "Switch Full Screen"
+        }
+        ToolButton {
+            objectName: "nextSnap"
+            iconName: "go-next"
+            tooltip: "Go to Next Snap Point"
+        }
+        ToolButton {
+            objectName: "prevSnap"
+            iconName: "go-previous"
+            tooltip: "Go to Previous Snap Point"
+        }
+        ToolButton {
+            objectName: "addMarker"
+            iconName: "list-add"
+            tooltip: "Add Marker"
+        }
+        ToolButton {
+            objectName: "removeMarker"
+            iconName: "list-remove"
+            tooltip: "Remove Marker"
+        }
+        Slider {
+            id: zoomSlider
+            signal zoomChanged(real value)
+            anchors.horizontalCenter:parent.horizontalCenter
+            objectName: "zoomSlider"
+            orientation: Qt.Vertical
+            height: fullscreenButton.height * 3
+            maximumValue: 5.0
+            stepSize: 1.0
+            value: 3.0
+            onValueChanged: {
+                zoomSlider.zoomChanged(value);
+            }
+        }
+    }
+}
--- a/data/XmlMessages.sh
+++ b/data/XmlMessages.sh
@@ -0,0 +1,22 @@
+function get_files
+{
+    echo org.kde.kdenlive.xml
+}
+
+function po_for_file
+{
+    case "$1" in
+       org.kde.kdenlive.xml)
+           echo kdenlive_xml_mimetypes.po
+       ;;
+    esac
+}
+
+function tags_for_file
+{
+    case "$1" in
+       org.kde.kdenlive.xml)
+           echo comment
+       ;;
+    esac
+}
--- a/data/blacklisted_effects.txt
+++ b/data/blacklisted_effects.txt
@@ -25,6 +25,7 @@ frei0r.cluster
 frei0r.c0rners
 frei0r.coloradj_RGB
 frei0r.colordistance
+frei0r.colortap
 frei0r.contrast0r
 frei0r.curves
 frei0r.defish0r
@@ -38,6 +39,8 @@ frei0r.facedetect
 frei0r.facebl0r
 frei0r.flippo
 frei0r.glow
+frei0r.IIRblur
+frei0r.keyspillm0pup
 frei0r.hqdn3d
 frei0r.hueshift0r
 frei0r.lenscorrection
@@ -69,9 +72,25 @@ frei0r.tint0r
 frei0r.twolay0r
 frei0r.vectorscope
 frei0r.vertigo
+frei0r.vignette
+
+#Movit effects with XML UI
+movit.blur
+movit.sharpen
+movit.diffusion
+movit.glow
+movit.lift_gamma_gain
+movit.mirror
+movit.opacity
+movit.rect
+movit.saturation
+movit.unsharp_mask
+movit.vignette
+movit.white_balance

 #MLT effects with XML UI
-
+channelcopy
+crop
 dust
 grain
 lines
@@ -79,6 +98,86 @@ oldfilm
 tcolor
 rotoscoping
 wave
-
-#effects that have simplekeyframes
 vignette
+volume
+lift_gamma_gain
+audiowaveform
+audiowave
+qtblend
+
+#Effects not usable with a simple GUI
+sox
+ladspa
+jackrack
+luma
+data_show
+gtkrescale
+watermark
+region
+resize
+resample
+mono
+transition
+
+# Effects need extra GUI to create the resulting melt.xml with the corrected content
+videostab
+videostab2
+
+# Unimplemented/unusable Avfilter Effects
+avfilter.abench
+avfilter.adelay
+avfilter.aemphasis
+avfilter.aeval
+avfilter.afade
+avfilter.afftfilt
+avfilter.aformat
+avfilter.ssim
+avfilter.ass
+avfilter.bbox
+avfilter.bench
+
+# Crashing avfilters (would require an XML file to correctly define parameters
+avfilter.acompressor
+avfilter.aecho
+avfilter.agate
+avfilter.ametadata
+avfilter.arealtime
+avfilter.areverse
+avfilter.ashowinfo
+avfilter.channelmap
+avfilter.chorus
+avfilter.curves
+avfilter.drawtext
+avfilter.earwax
+avfilter.fade
+avfilter.field
+avfilter.fieldhint
+avfilter.fieldorder
+avfilter.find_rect
+avfilter.geq
+avfilter.hflip
+avfilter.metadata
+avfilter.negate
+avfilter.nnedi
+avfilter.qp
+avfilter.realtime
+avfilter.removelogo
+avfilter.reverse
+avfilter.showinfo
+avfilter.stereo3d
+avfilter.subtitles
+avfilter.super2xsai
+avfilter.swapuv
+avfilter.vectorscope
+avfilter.vflip
+avfilter.vignette
+avfilter.volume
+avfilter.volumedetect
+
+# Avfilter Effects with XML
+avfilter.acompressor
+avfilter.aecho
+avfilter.agate
+avfilter.lut3d
+avfilter.selectivecolor
+
--- a/data/blacklisted_transitions.txt
+++ b/data/blacklisted_transitions.txt
@@ -1,5 +1,11 @@
 # redundant transitions
 frei0r.composition
+frei0r.cairoblend
+frei0r.cairoaffineblend
+qtblend

-# unusable transitions
+# unusable transitions (parameters required, not implemented in Kdenlive)
 frei0r.alphainjection
+frei0r.blend
+frei0r.xfade0r
+webvfx
--- a/data/camcorderfilters.rc
+++ b/data/camcorderfilters.rc
@@ -0,0 +1,4 @@
+[Model]
+NEX-VG20E=full_luma 1
+NEX-5=full_luma 1
+
--- a/data/effects/CMakeLists.txt
+++ b/data/effects/CMakeLists.txt
@@ -1,7 +1,10 @@
 INSTALL (FILES 

 audiowave.xml
+audiowaveform.xml
 automask.xml
+audiobalance.xml
+audiopan.xml
 boxblur.xml
 brightness.xml
 channelcopy.xml
@@ -10,28 +13,20 @@ chroma_hold.xml
 chroma.xml
 crop.xml
 dust.xml
+dynamictext.xml
 freeze.xml
 gamma.xml
 grain.xml
 greyscale.xml
 invert.xml
-ladspa_declipper.xml
-ladspa_equalizer.xml
-ladspa_equalizer_15.xml
-ladspa_limiter.xml
-ladspa_phaser.xml
-ladspa_pitch_scale.xml
-ladspa_pitch.xml
-ladspa_rate_scale.xml
-ladspa_reverb.xml
-ladspa_room_reverb.xml
-ladspa_vinyl.xml
+loudness.xml
 mirror.xml
 mute.xml
 normalise.xml
 oldfilm.xml
 pan_zoom.xml
 obscure.xml
+region.xml
 rotation.xml
 rotation_keyframable.xml
 scratchlines.xml
@@ -57,8 +52,10 @@ frei0r_bezier_curves.xml
 frei0r_brightness.xml
 frei0r_cartoon.xml
 frei0r_cluster.xml
+frei0r_colgate.xml
 frei0r_coloradj_rgb.xml
 frei0r_colordistance.xml
+frei0r_colortap.xml
 frei0r_contrast0r.xml
 frei0r_c0rners.xml
 frei0r_curves.xml
@@ -73,12 +70,15 @@ frei0r_flippo.xml
 frei0r_glow.xml
 frei0r_hqdn3d.xml
 frei0r_hueshift0r.xml
+frei0r_iirblur.xml
+frei0r_keyspillm0pup.xml
 frei0r_lenscorrection.xml
 frei0r_letterb0xed.xml
 frei0r_levels.xml
 frei0r_lightgraffiti.xml
 frei0r_luminance.xml
 frei0r_mask0mate.xml
+frei0r_medians.xml
 frei0r_nervous.xml
 frei0r_nosync0r.xml
 frei0r_pixeliz0r.xml
@@ -98,21 +98,40 @@ frei0r_tehroxx0r.xml
 frei0r_three_point_balance.xml
 frei0r_threelay0r.xml
 frei0r_threshold0r.xml
+frei0r_timeout.xml
 frei0r_tint0r.xml
 frei0r_twolay0r.xml
 frei0r_vectorscope.xml
 frei0r_vertigo.xml
+frei0r_vignette.xml
 frei0r_facebl0r.xml
 frei0r_facedetect.xml
-gain.xml
 fade_from_black.xml
 fade_to_black.xml
+gain.xml
+lift_gamma_gain.xml
+movit_blur.xml
+movit_deconvolution_sharpen.xml
+movit_diffusion.xml
+movit_glow.xml
+movit_lift_gamma_gain.xml
+movit_mirror.xml
+movit_opacity.xml
+movit_rect.xml
+movit_saturation.xml
+movit_unsharp_mask.xml
+movit_vignette.xml
+movit_white_balance.xml
+qtblend.xml
+rotoscoping.xml
 speed.xml
+swapchannels.xml
 tcolor.xml
 vignette.xml
-swapchannels.xml
-audiobalance.xml
-audiopan.xml
-rotoscoping.xml
+tracker.xml
+

 DESTINATION ${DATA_INSTALL_DIR}/kdenlive/effects)
+
+add_subdirectory(update)
+add_subdirectory(avfilter)
--- a/data/effects/README
+++ b/data/effects/README
@@ -5,7 +5,7 @@
 ==========
 Kdenlive uses MLT for all video/audio effects/filters.
 For filters that provide metadata the GUI can be generated automatically.
-If the generated GUI is not sufficient a cusom one can be build using a XML
+If the generated GUI is not sufficient a custom one can be build using a XML
 file describing the effect and its parameters.
 ==========

@@ -39,17 +39,19 @@ Line 2:
 Line 3:
    - name of the effect that will appear to the user
 Line 4:
-    - Short description of the effect to be shown in the effect list
+    - Short description of the effect to be shown in the effects list
    - Additionally a <full> part can be added inside. It's content will be available in the effect stack (see frei0r_lightgraffiti.xml for an example):
-        - supports HTML formatting (requires the of CDATA)
+        - supports HTML formatting (requires the use of CDATA)
 Line 5:
    - name of the author(s) of the filter (not of the XML file ;))
 The rest:
    - list of effect parameters:
        - tag "name": visible name of the parameter (depending on the GUI this parameter uses)
-        - tag "comment": (optional) description of the parameter (support HTML formatting) (not yet support by all widgets)
+        - tag "comment": (optional) description of the parameter (support HTML formatting) (not yet supported by all widgets)
        - attribute "name": MLT filter parameter name
+        - attribute "paramprefix": a string to be prepended to the parameter value before passing it to MLT
        - attribute "default": initial value, format depends on parameter type
+        - attribue  "optional": if it is set, it means that this parameter can have an empty value. So then loading a project, don't set its value to default
        - attribute "type": widget (GUI) to use
            - "fixed":
                - sets a (MLT filter) parameter, but does not expose it to the user (no GUI)
@@ -57,7 +59,8 @@ The rest:
                - number
                - represented by a slider
                - additional parameter attributes:
-                    - "factor": (optional) values coming from MLT will be multiplied with factor, values from the GUI divided by factor
+                    - "factor": (optional) values coming from MLT will be multiplied with factor
+                    - "offset": (optional) will be added to values coming from MLT after "factor" is applied
                    - "min": smallest value possible (after multiplying with "factor")
                    - "max": largest value possible (after multiplying with "factor")
                    - "suffix": (optional) displayed unit of the values
@@ -66,32 +69,37 @@ The rest:
            - "bool": 
                - true/false
                - represented by a checkbox
+            - "switch":
+                - 2 possible options defined by strings (max / min)
+                - represented by a checkbox
            - "list":
                - multiple choice
                - represented by a drop-down menu
                - additional parameter attribute:
-                    - "paramlist": list of possible values separated by comma (no whitespaces!)
+                    - "paramlist": list of possible values separated by semicolon (no whitespaces!)
                - addtional tag:
-                    - "paramlistdisplay": (optional) list of names to use for the values
+                    - "paramlistdisplay": (optional) list of names to use for the values separated by comma
            - "position":
                - time stored as frame number
                - represented by a slider
            - "color":
-                - color value in similar to HTML ("#rrggbb" or "0xrrggbb")
+                - color value, similar to representation HTML ("#rrggbb"/"#aarrggbb" or "0xrrggbbaa")
                - represented by a button opening the KDE color dialog + a color picker button
+                - additional attributes:
+                    - "alpha": (default = "0") use to enable alpha support
            - "keyframe":
                - keyframable number
                - keyframes are opt-in (only one keyframe by default -> should be prefered over "constant" whenever possible)
                - works with MLT filters that utilize start/end values
                - same attributes as "constant"
-                - additional attribute:
+                - additional attributes:
                    - "intimeline": (default = "0") parameter to preselect for editing in the timeline (only one parameter can have "1")
                    - "widget": (optional) GUI based on the standard keyframe GUI (possible values: "corners")
            - "simplekeyframe":
                - works with MLT filters that use mlt_geometry for keyframe support (includes all frei0r filters)
                - same attributes as "keyframe"
            - "geometry":
-                - a rectangle: postion + dimension + additional value
+                - a rectangle: position + dimension + additional value
                - works with MLT filters using mlt_geometry
                - the rect can be edited on the project monitor
                - additional attributes:
@@ -101,6 +109,8 @@ The rest:
            - "url":
                - url/path
                - represented by button to open "file open" dialog
+                - additional attributes:
+                     - "filter": Filter for file extensions. Example : "*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header files" or as using MIME type: "image/png text/html"
            - "wipe":
                - special GUI for the wipe transition makes it possible to select a direction of a slide
            - "addedgeometry":
@@ -111,6 +121,15 @@ The rest:
                - cubic Bézier spline editor for the frei0r color curves filter (new version, might be reused for other filters)
            - "roto-spline":
                - GUI for the rotoscoping filter (spline on the monitor)
+            - "keywords":
+                - Text entry with a selection of possible keywords to be inserted in the text.
+                - additional tags:
+                    - "keywords": list of possible keyword values separated by semicolon
+                    - "keywordsdisplay": list of names to use for the values separated by semicolon
+            - "fontfamily":
+                - Font typeface entry
+            - "readonly" :
+                - Data (usually an animated geometry) that can be pasted to clipboard or dragged/dropped on another geometry parameter. Cannot be modified directly by user.
 ==========

 ==========
@@ -119,6 +138,10 @@ All effects with a custom XML GUI need to be blacklisted.
 ==========

 ==========
-Kdenlive parses the effect folder at each startup, so that if you have an XML file describing a new effect,
-just copy it in your ~/.kde/share/apps/kdenlive/effects/ folder and restart Kdenlive to enable the new effect.
+Effects can be assigned to an effect category in kdenlive/data/kdenliveeffectscategory.rc.
+==========
+
+==========
+Kdenlive parses the effect folder at each startup, so that if you have an XML file describing a new effect,
+just copy it to your ~/.kde/share/apps/kdenlive/effects/ folder and restart Kdenlive to enable the new effect.
 ==========
--- a/data/effects/audiobalance.xml
+++ b/data/effects/audiobalance.xml
--- a/data/effects/audiopan.xml
+++ b/data/effects/audiopan.xml
@@ -3,7 +3,7 @@
 	<name>Pan</name>
 	<description>Adjust the left/right spread of a channel</description>
 	<author>Dan Dennedy</author>
-        <parameter type="list" name="channel" default="0" paramlist="0,1">
+        <parameter type="list" name="channel" default="0" paramlist="0;1">
                <paramlistdisplay>Left,Right</paramlistdisplay>
                <name>Channel</name>
        </parameter>
--- a/data/effects/audiowave.xml
+++ b/data/effects/audiowave.xml
--- a/data/effects/audiowaveform.xml
+++ b/data/effects/audiowaveform.xml
@@ -0,0 +1,20 @@
+<!DOCTYPE kpartgui>
+<effect tag="audiowaveform" id="audiowaveform" type="audio">
+	<name>Audio Waveform Filter</name>
+	<author>Brian Matherly</author>
+	<parameter type="color" name="bgcolor" default="0x00000000" alpha="1">
+          <name>Background Color</name>
+	</parameter>
+        <parameter type="color" name="color.1" default="0xffffffff" alpha="1">
+          <name>Foreground Color</name>
+        </parameter>
+	<parameter type="constant" name="thickness" max="20" min="0" default="0">
+		<name>Line Thickness</name>
+	</parameter>
+        <parameter type="geometry" name="rect" default="0 0:100% 100%" fixed="1" opacity="false">
+                <name>Rectangle</name>
+        </parameter>
+        <parameter type="bool" name="fill" default="0">
+                <name>Fill</name>
+        </parameter>
+</effect>
--- a/data/effects/automask.xml
+++ b/data/effects/automask.xml
@@ -0,0 +1,38 @@
+<!DOCTYPE kpartgui>
+<effect tag="autotrack_rectangle" id="autotrack_rectangle">
+	<name>Auto Mask</name>
+	<description>Hide a selected zone and follow its movements</description>
+	<author>Zachary Drew</author>
+	<parameter type="geometry" name="geometry" default="50%,50%:50%x50%" fixed="1" opacity="false">
+		<name>Geometry</name>
+	</parameter>
+	<parameter type="constant" name="motion_est.macroblock_width" max="100" min="1" default="16" suffix="pixels">
+		<name>Macroblock width</name>
+	</parameter>
+	<parameter type="constant" name="motion_est.macroblock_height" max="100" min="1" default="16" suffix="pixels">
+		<name>Macroblock height</name>
+	</parameter>
+	<parameter type="constant" name="motion_est.limit_x" max="500" min="1" default="64" suffix="pixels">
+		<name>Maximum x distance</name>
+	</parameter>
+	<parameter type="constant" name="motion_est.limit_y" max="500" min="1" default="64" suffix="pixels">
+		<name>Maximum y distance</name>
+	</parameter>
+	<parameter type="bool" name="motion_est.denoise" default="0">
+		<name>Denoise</name>
+	</parameter>
+	<parameter type="bool" name="debug" default="0">
+		<name>Debug</name>
+	</parameter>
+	<parameter type="bool" name="obscure" default="1">
+		<name>Obscure</name>
+	</parameter>
+	<parameter type="filterjob" filtertag="autotrack_rectangle" filterparams="_serialize=1 motion_vector_list=0 %params in=%position" consumer="null" consumerparams="all=1 terminate_on_pause=1">
+		<jobparam name="storedata" />
+		<jobparam name="projecttreefilter" />
+		<jobparam name="key">motion_vector_list</jobparam>
+		<jobparam name="finalfilter">autotrack_rectangle</jobparam>
+		<jobparam name="displaydataname">Motion vectors</jobparam>
+		<name>Analyse</name>
+	</parameter>
+</effect>
--- a/data/effects/avfilter/CMakeLists.txt
+++ b/data/effects/avfilter/CMakeLists.txt
@@ -0,0 +1,8 @@
+INSTALL (FILES 
+
+acompressor.xml
+aecho.xml
+agate.xml
+selectivecolor.xml
+avfilter_lut3d.xml
+DESTINATION ${DATA_INSTALL_DIR}/kdenlive/effects)
--- a/data/effects/avfilter/acompressor.xml
+++ b/data/effects/avfilter/acompressor.xml
@@ -0,0 +1,42 @@
+<!DOCTYPE kpartgui>
+<effect tag="avfilter.acompressor" type="audio">
+	<name>Compressor (avfilter)</name>
+	<description>Audio Compressor</description>
+	<author>libavfilter</author>
+	<parameter type="constant" name="av.level_in" max="64" min="0.016" default="1" decimals="3">
+		<name>Input Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.threshold" max="1" min="0.001" default="0.125" decimals="3">
+		<name>Threshold</name>
+	</parameter>
+        <parameter type="constant" name="av.ratio" max="20" min="1" default="2">
+		<name>Ratio</name>
+	</parameter>
+        <parameter type="constant" name="av.attack" max="2000" min="0.01" default="20" decimals="3">
+		<name>Attack</name>
+	</parameter>
+        <parameter type="constant" name="av.release" max="9000" min="0.01" default="250" decimals="3">
+		<name>Release</name>
+	</parameter>
+        <parameter type="constant" name="av.makeup" max="64" min="1" default="2">
+		<name>Make Up Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.knee" max="8" min="1" default="2.828" decimals="3">
+		<name>Knee</name>
+	</parameter>
+        <parameter type="list" name="av.link" default="0" paramlist="0;1">
+	   <paramlistdisplay>Average,Maximum</paramlistdisplay>
+		<name>Link Type</name>
+	</parameter>
+        <parameter type="list" name="av.detection" default="0" paramlist="0;1">
+	   <paramlistdisplay>Peak,Rms</paramlistdisplay>
+		<name>Detection</name>
+	</parameter>
+        <parameter type="constant" name="av.level_sc" max="64" min="0.016" default="1" decimals="3">
+		<name>Sidechain Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.mix" max="1" min="0" default="1" decimals="3">
+		<name>Mix</name>
+	</parameter>
+</effect>
+
--- a/data/effects/avfilter/aecho.xml
+++ b/data/effects/avfilter/aecho.xml
@@ -0,0 +1,19 @@
+<!DOCTYPE kpartgui>
+<effect tag="avfilter.aecho" type="audio">
+	<name>Echo (avfilter)</name>
+	<description>Add Echo</description>
+	<author>libavfilter</author>
+	<parameter type="constant" name="av.in_gain" max="1" min="0" default="0.6" decimals="3">
+		<name>Input Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.out_gain" max="1" min="0" default="0.3" decimals="3">
+		<name>Output Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.delays" max="90000" min="0" default="1000">
+		<name>Delay</name>
+	</parameter>
+        <parameter type="constant" name="av.decays" max="1" min="0" default="0.5" decimals="2">
+		<name>Decay</name>
+	</parameter>
+</effect>
+
--- a/data/effects/avfilter/agate.xml
+++ b/data/effects/avfilter/agate.xml
@@ -0,0 +1,39 @@
+<!DOCTYPE kpartgui>
+<effect tag="avfilter.agate" type="audio">
+	<name>Gate (avfilter)</name>
+	<description>Audio Gate</description>
+	<author>libavfilter</author>
+	<parameter type="constant" name="av.level_in" max="64" min="0.016" default="1" decimals="3">
+		<name>Input Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.range" max="1" min="0" default="0.061" decimals="3">
+		<name>Range</name>
+	</parameter>
+        <parameter type="constant" name="av.threshold" max="1" min="0" default="0.125" decimals="3">
+		<name>Threshold</name>
+	</parameter>
+        <parameter type="constant" name="av.ratio" max="9000" min="1" default="1">
+		<name>Ratio</name>
+	</parameter>
+        <parameter type="constant" name="av.attack" max="9000" min="0.01" default="20" decimals="3" suffif="ms">
+		<name>Attack</name>
+	</parameter>
+        <parameter type="constant" name="av.release" max="9000" min="0.01" default="250" decimals="3" suffif="ms">
+		<name>Release</name>
+	</parameter>
+        <parameter type="constant" name="av.makeup" max="64" min="1" default="1">
+		<name>Make Up Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.knee" max="8" min="1" default="2.828" decimals="3">
+		<name>Knee</name>
+	</parameter>
+        <parameter type="list" name="av.detection" default="0" paramlist="0;1">
+	   <paramlistdisplay>Peak,Rms</paramlistdisplay>
+		<name>Detection</name>
+	</parameter>
+        <parameter type="list" name="av.link" default="0" paramlist="0;1">
+	   <paramlistdisplay>Average,Maximum</paramlistdisplay>
+		<name>Link Type</name>
+	</parameter>
+</effect>
+
--- a/data/effects/avfilter/avfilter_lut3d.xml
+++ b/data/effects/avfilter/avfilter_lut3d.xml
@@ -0,0 +1,15 @@
+<!DOCTYPE kpartgui>
+<effect tag="avfilter.lut3d" id="avfilter.lut3d">
+	<name>Apply LUT</name>
+  <description>Apply a Look Up Table (LUT) to the video.
+  <full><![CDATA[A LUT is an easy way to correct the color of a video. Supported formats: .3dl (AfterEffects), .cube (Iridas), .dat(DaVinci), .m3d (Pandora)]]></full></description>
+	<author>libavfilter</author>
+  <parameter type="url" name="av.file" filter="*.cube *.3dl *.dat *.m3d|LUT files">
+		<name>LUT file to apply</name>
+	</parameter>
+  <parameter type="list" name="av.interp" default="0" paramlist="nearest;trilinear;tetrahedral ">
+		<name>Interpolation Mode</name>
+	  <paramlistdisplay>Nearest, Trilinear, Tetrahedral</paramlistdisplay>
+	</parameter>
+</effect>
+
--- a/data/effects/avfilter/selectivecolor.xml
+++ b/data/effects/avfilter/selectivecolor.xml
@@ -0,0 +1,38 @@
+<!DOCTYPE kpartgui>
+<effect tag="avfilter.selectivecolor" id="avfilter.selectivecolor">
+	<name>CMYK adjust (avfilter)</name>
+	<description>Apply CMYK correction to specific color ranges</description>
+	<author>libavfilter</author>
+	<parameter type="cmyk" name="av.reds" default="">
+		<name>Reds</name>
+	</parameter>
+        <parameter type="cmyk" name="av.yellows" default="">
+		<name>Yellows</name>
+	</parameter>
+        <parameter type="cmyk" name="av.greens" default="">
+		<name>Greens</name>
+	</parameter>
+        <parameter type="cmyk" name="av.cyans" default="">
+		<name>Cyans</name>
+	</parameter>
+        <parameter type="cmyk" name="av.blues" default="">
+		<name>Blues</name>
+	</parameter>
+        <parameter type="cmyk" name="av.magentas" default="">
+		<name>Magentas</name>
+	</parameter>
+        <parameter type="cmyk" name="av.whites" default="">
+		<name>Whites</name>
+	</parameter>
+        <parameter type="cmyk" name="av.neutrals" default="">
+		<name>Neutrals</name>
+	</parameter>
+        <parameter type="cmyk" name="av.blacks" default="">
+		<name>Blacks</name>
+	</parameter>
+        <parameter type="list" name="av.correction_method" default="0" paramlist="0;1">
+	   <paramlistdisplay>Absolute,Relative</paramlistdisplay>
+		<name>Correction Method</name>
+	</parameter>
+</effect>
+
--- a/data/effects/boxblur.xml
+++ b/data/effects/boxblur.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE kpartgui>
 <effect tag="boxblur" id="boxblur">
 	<name>Box Blur</name>
-	<description>Blur image with keyframes</description>
+	<description>Box blur (separate horizontal and vertical blur)</description>
 	<author>Leny Grisel</author>
 	<parameter type="constant" name="hori" max="50" min="1" default="1">
 		<name>Horizontal multiplicator</name>
--- a/data/effects/brightness.xml
+++ b/data/effects/brightness.xml
@@ -3,7 +3,7 @@
 	<name>Brightness (keyframable)</name>
 	<description>Change image brightness with keyframes</description>
 	<author>Charles Yates</author>
-	<parameter type="keyframe" name="intensity" max="300" min="0" default="100" factor="100">
+	<parameter type="animated" name="level" max="400" min="0" default="1" factor="100">
 		<name>Intensity</name>
 	</parameter>
 </effect>
--- a/data/effects/channelcopy.xml
+++ b/data/effects/channelcopy.xml
@@ -1,13 +1,13 @@
 <!DOCTYPE kpartgui>
- <effect tag="channelcopy" id="channelcopy" type="audio">
+ <effect tag="channelcopy" id="stereocopy" type="audio">
         <name>Mono to stereo</name>
         <description>Copy one channel to another</description>
         <author>Dan Dennedy</author>
-         <parameter type="list" name="from" default="0" paramlist="0,1">
+         <parameter type="list" name="from" default="0" paramlist="0;1">
                 <paramlistdisplay>Left,Right</paramlistdisplay>
                 <name>From</name>
         </parameter>
-         <parameter type="list" name="to" default="1" paramlist="0,1">
+         <parameter type="list" name="to" default="1" paramlist="0;1">
                 <paramlistdisplay>Left,Right</paramlistdisplay>
                 <name>To</name>
         </parameter>
--- a/data/effects/charcoal.xml
+++ b/data/effects/charcoal.xml
--- a/data/effects/chroma.xml
+++ b/data/effects/chroma.xml
@@ -1,12 +1,12 @@
 <!DOCTYPE kpartgui>
 <effect tag="chroma" id="chroma">
-	<name>Blue Screen</name>
+	<name>Chroma Key</name>
 	<description>Make selected color transparent</description>
 	<author>Charles Yates</author>
-	<parameter type="color" name="key" default="0x0000FF">
+	<parameter type="color" name="key" default="0x0000ffff">
 		<name>Color key</name>
 	</parameter>
-	<parameter type="constant" name="variance" max="100" min="0" factor="100" default="15">
+	<parameter type="constant" name="variance" max="1000" min="0" factor="1000" default="150">
 		<name>Variance</name>
 	</parameter>
 </effect>
--- a/data/effects/chroma_hold.xml
+++ b/data/effects/chroma_hold.xml
@@ -3,7 +3,7 @@
 	<name>Chroma Hold</name>
 	<description>Make image greyscale except for chosen color</description>
 	<author>Charles Yates</author>
-	<parameter type="color" name="key" default="0x000000">
+	<parameter type="color" name="key" default="0x000000ff">
 		<name>Color key</name>
 	</parameter>
 	<parameter type="constant" name="variance" max="100" min="0" factor="100" default="15" >
--- a/data/effects/crop.xml
+++ b/data/effects/crop.xml
@@ -1,24 +1,24 @@
 <!DOCTYPE kpartgui>
 <effect tag="crop" id="crop">
-	<name>Crop</name>
+	<name>Edge Crop</name>
 	<description>Trim the edges of a clip</description>
 	<author>Dan Dennedy</author>
-	<parameter type="constant" name="top" max="5000" min="0" default="0">
+	<parameter type="constant" name="top" max="%maxHeight" min="0" default="0" suffix="pixels">
 		<name>Top</name>
 	</parameter>
-	<parameter type="constant" name="left" max="5000" min="0" default="0">
+	<parameter type="constant" name="left" max="%maxWidth" min="0" default="0" suffix="pixels">
 		<name>Left</name>
 	</parameter>
-	<parameter type="constant" name="bottom" max="5000" min="0" default="0">
+	<parameter type="constant" name="bottom" max="%maxHeight" min="0" default="0" suffix="pixels">
 		<name>Bottom</name>
 	</parameter>
-	<parameter type="constant" name="right" max="5000" min="0" default="0">
+	<parameter type="constant" name="right" max="%maxWidth" min="0" default="0" suffix="pixels">
 		<name>Right</name>
 	</parameter>
 	<parameter type="bool" name="center" default="0">
 		<name>Automatic center-crop</name>
 	</parameter>
-	<parameter type="constant" name="center_bias" max="5000" min="-5000" default="0">
+	<parameter type="constant" name="center_bias" max="%maxWidth" min="-%maxWidth" default="0">
 		<name>Center balance</name>
 	</parameter>
        <parameter type="bool" name="use_profile" default="0">
--- a/data/effects/dust.xml
+++ b/data/effects/dust.xml
@@ -3,7 +3,7 @@
 	<name>Dust</name>
 	<description>Add dust and specks to the video, as in old movies</description>
 	<author>Marco Gittler</author>
-	<parameter type="double" name="maxdiameter" max="100" min="0" default="2">
+	<parameter type="double" name="maxdiameter" max="100" min="0" default="2" suffix="%">
 		<name>Maximal Diameter</name>
 	</parameter>
 	<parameter type="double" name="maxcount" max="400" min="0" default="10">
--- a/data/effects/dynamictext.xml
+++ b/data/effects/dynamictext.xml
@@ -0,0 +1,46 @@
+<!DOCTYPE kpartgui>
+<effect tag="dynamictext" id="dynamictext">
+    <name>Dynamic Text</name>
+    <description>Overlay text with keywords replaced</description>
+    <author>Brian Matherly</author>
+    <parameter type="geometry" name="geometry" default="0 0:%width %height:100" fixed="0">
+        <name>Geometry</name>
+    </parameter>
+    <parameter type="fontfamily" name="family" default="DejaVu Sans">
+        <name>Font Family</name>
+    </parameter>
+    <parameter type="constant" name="size" max="200" min="8" default="48">
+        <name>Font Size</name>
+    </parameter>
+    <parameter type="constant" name="weight" max="900" min="100" default="400">
+        <name>Font Weight</name>
+    </parameter>
+    <parameter type="color" name="fgcolour" default="0x000000ff" alpha="1">
+        <name>Foreground Color</name>
+    </parameter>
+    <parameter type="color" name="bgcolour" default="0x00000020" alpha="1">
+        <name>Background Color</name>
+    </parameter>
+    <parameter type="color" name="olcolour" default="0x00000000" alpha="1">
+        <name>Outline Color</name>
+    </parameter>
+    <parameter type="constant" name="outline" max="3" min="0" default="0">
+        <name>Outline Width</name>
+    </parameter>
+    <parameter type="constant" name="pad" max="500" min="0" default="0">
+        <name>Padding</name>
+    </parameter>
+    <parameter type="list" name="halign" default="left" paramlist="left;centre;right">
+        <paramlistdisplay>Left,Center,Right</paramlistdisplay>
+        <name>Horizontal Alignment</name>
+    </parameter>
+    <parameter type="list" name="valign" default="top" paramlist="top;middle;bottom">
+        <paramlistdisplay>Top,Middle,Bottom</paramlistdisplay>
+        <name>Vertical Alignment</name>
+    </parameter>
+    <parameter type="keywords" name="argument" default="#timecode#">
+        <name>Text</name>
+        <keywords>#timecode#;#frame#;#filedate#;#localfiledate#;#meta.media.0.stream.frame_rate#;#meta.media.0.codec.name#;#meta.media.0.codec.bit_rate#;#meta.media.width#;#meta.media.height#;#meta.attr.comment.markup#</keywords>
+        <keywordsdisplay>timecode;frame;file date;local file date;source frame rate;source codec;source bit rate;source width;source height;source comment</keywordsdisplay>
+    </parameter>
+</effect>
--- a/data/effects/fade_from_black.xml
+++ b/data/effects/fade_from_black.xml
--- a/data/effects/fade_to_black.xml
+++ b/data/effects/fade_to_black.xml
@@ -3,7 +3,7 @@
 	<name>Fade to Black</name>
 	<description>Fade video to black</description>
 	<author>Charles Yates</author>
-	<parameter type="position" name="in" max="0" min="0" default="75">
+	<parameter type="position" name="in" max="0" min="0" default="-75">
 		<name>Duration</name>
 	</parameter>
 	<parameter type="fixed" name="out" max="99999" min="0" default="0">
--- a/data/effects/fadein.xml
+++ b/data/effects/fadein.xml
--- a/data/effects/fadeout.xml
+++ b/data/effects/fadeout.xml
@@ -1,9 +1,9 @@
 <!DOCTYPE kpartgui>
 <effect tag="volume" id="fadeout" type="audio" unique="1">
 	<name>Fade out</name>
-	<description>Fade in audio track</description>
+	<description>Fade out audio track</description>
 	<author></author>
-	<parameter type="position" name="in" max="0" min="0" default="75">
+	<parameter type="position" name="in" max="0" min="0" default="-75">
 		<name>Duration</name>
 	</parameter>
 	<parameter type="fixed" name="out" max="90000" min="0" default="0">
--- a/data/effects/freeze.xml
+++ b/data/effects/freeze.xml
--- a/data/effects/frei0r_3dflippo.xml
+++ b/data/effects/frei0r_3dflippo.xml
--- a/data/effects/frei0r_alpha0ps.xml
+++ b/data/effects/frei0r_alpha0ps.xml
@@ -0,0 +1,66 @@
+<!DOCTYPE kpartgui>
+<group>
+    <effect LC_NUMERIC="C" tag="frei0r.alpha0ps" id="frei0r.alpha0ps">
+	    <name>Alpha operations</name>
+	    <description>Display and manipulation of the alpha channel</description>
+	    <author>Marko Cebokli</author>
+        
+	    <parameter type="list" name="Display" default="0.0" paramlist="0.0;0.21;0.36;0.50;0.64;0.79;1.0">
+		  <paramlistdisplay>Image,Alpha as gray,Gray + red,Selection on black,Selection on gray,Selection on white,Selection on checkers</paramlistdisplay>
+		  <name>Display</name>
+	    </parameter>
+        
+	    <parameter type="bool" name="Display input alpha" default="0">
+		    <name>Display input alpha</name>
+	    </parameter>
+        
+	    <parameter type="list" name="Operation" default="0.0" paramlist="0.0;0.21;0.36;0.50;0.64;0.79;1.0">
+		    <paramlistdisplay>NO OP,Shave,Shrink hard,Shrink soft,Grow hard,Grow soft,Threshold</paramlistdisplay>
+		    <name>Operation</name>
+	    </parameter>
+        
+	    <parameter type="simplekeyframe" name="Threshold" default="500" min="0" max="1000" factor="1000">
+		    <name>Threshold</name>
+	    </parameter>
+        
+	    <parameter type="simplekeyframe" name="Shrink/grow amount" default="500" min="0" max="1000" factor="1000" intimeline="1">
+		    <name>Shrink/grow amount</name>
+	    </parameter>
+        
+	    <parameter type="bool" name="Invert" default="0">
+		    <name>Invert</name>
+	    </parameter>
+    </effect>
+
+    <effect LC_NUMERIC="C" tag="frei0r.alpha0ps" id="frei0r.alpha0ps" version="0.3">
+	    <name>Alpha operations</name>
+	    <description>Display and manipulation of the alpha channel</description>
+	    <author>Marko Cebokli</author>
+        
+	    <parameter type="list" name="Display" default="0.0" paramlist="0.0;0.21;0.36;0.50;0.64;0.79;1.0">
+		  <paramlistdisplay>Image,Alpha as gray,Gray + red,Selection on black,Selection on gray,Selection on white,Selection on checkers</paramlistdisplay>
+		  <name>Display</name>
+	    </parameter>
+        
+	    <parameter type="bool" name="Display input alpha" default="0">
+		    <name>Display input alpha</name>
+	    </parameter>
+        
+	    <parameter type="list" name="Operation" default="0.0" paramlist="0.0;0.2;0.3;0.4;0.6;0.7;0.8;1.0">
+		    <paramlistdisplay>NO OP,Shave,Shrink hard,Shrink soft,Grow hard,Grow soft,Threshold,Blur</paramlistdisplay>
+		    <name>Operation</name>
+	    </parameter>
+        
+	    <parameter type="simplekeyframe" name="Threshold" default="500" min="0" max="1000" factor="1000">
+		    <name>Threshold</name>
+	    </parameter>
+        
+	    <parameter type="simplekeyframe" name="Shrink/Grow/Blur amount" default="500" min="0" max="1000" factor="1000" intimeline="1">
+		    <name>Shrink/Grow/Blur amount</name>
+	    </parameter>
+        
+	    <parameter type="bool" name="Invert" default="0">
+		    <name>Invert</name>
+	    </parameter>
+    </effect>
+</group>
--- a/data/effects/frei0r_alphagrad.xml
+++ b/data/effects/frei0r_alphagrad.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.alphagrad" id="frei0r.alphagrad">
+<effect LC_NUMERIC="C" tag="frei0r.alphagrad" id="frei0r.alphagrad">
        <name>Alpha gradient</name>
        <description>Fill the alpha channel with a specified gradient</description>
        <author>Marko Cebokli</author>
@@ -25,7 +25,7 @@
                <name>Max</name>
        </parameter>
        
-        <parameter type="list" name="Operation" default="0.0" paramlist="0.0,0.3,0.5,0.7,1.0">
+        <parameter type="list" name="Operation" default="0.0" paramlist="0.0;0.3;0.5;0.7;1.0">
                <paramlistdisplay>Write on clear,Max,Min,Add,Subtract</paramlistdisplay>
                <name>Operation</name>
        </parameter>
--- a/data/effects/frei0r_alphaspot.xml
+++ b/data/effects/frei0r_alphaspot.xml
@@ -1,11 +1,11 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.alphaspot" id="frei0r.alphaspot">
+<effect LC_NUMERIC="C" tag="frei0r.alphaspot" id="frei0r.alphaspot">
        <name>Alpha shapes</name>
        <description>Draws simple shapes into the alpha channel</description>
        <author>Marko Cebokli</author>
        
        
-        <parameter type="list" name="Shape" default="0.0" paramlist="0.0,0.38,0.62,1.0">
+        <parameter type="list" name="Shape" default="0.0" paramlist="0.0;0.38;0.62;1.0">
                <paramlistdisplay>Rectangle,Ellipse,Triangle,Diamond</paramlistdisplay>
                <name>Shape</name>
        </parameter>
@@ -42,7 +42,7 @@
                <name>Max</name>
        </parameter>
        
-        <parameter type="list" name="Operation" default="0.0" paramlist="0.0,0.3,0.5,0.7,1.0">
+        <parameter type="list" name="Operation" default="0.0" paramlist="0.0;0.3;0.5;0.7;1.0">
                <paramlistdisplay>Write on clear,Max,Min,Add,Subtract</paramlistdisplay>
                <name>Operation</name>
        </parameter>
--- a/data/effects/frei0r_balanc0r.xml
+++ b/data/effects/frei0r_balanc0r.xml
@@ -0,0 +1,25 @@
+<!DOCTYPE kpartgui>
+<group>
+    <effect tag="frei0r.balanc0r" id="frei0r.balanc0r">
+	<name>White Balance</name>
+	<description>Adjust the white balance / color temperature</description>
+	<author>Dan Dennedy</author>
+	<parameter type="color" name="Neutral Color" default="0xffffffff">
+		<name>Neutral Color</name>
+	</parameter>
+        <parameter type="simplekeyframe" name="Green Tint" default="1200" min="0" max="2500" factor="1000">
+		<name>Green Tint</name>
+	</parameter>
+    </effect>
+    <effect LC_NUMERIC="C" tag="frei0r.balanc0r" id="frei0r.balanc0r" version="0.3">
+	<name>White Balance</name>
+	<description>Adjust the white balance / color temperature</description>
+	<author>Dan Dennedy</author>
+	<parameter type="color" name="Neutral Color" default="0xffffffff">
+		<name>Neutral Color</name>
+	</parameter>
+        <parameter type="simplekeyframe" name="Green Tint" default="1333" min="0" max="10000" factor="10000">
+		<name>Green Tint</name>
+	</parameter>
+    </effect>
+</group>
--- a/data/effects/frei0r_baltan.xml
+++ b/data/effects/frei0r_baltan.xml
--- a/data/effects/frei0r_bezier_curves.xml
+++ b/data/effects/frei0r_bezier_curves.xml
@@ -1,20 +1,18 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.curves" id="frei0r.bezier_curves" version="0.2">
+<effect LC_NUMERIC="C" tag="frei0r.curves" id="frei0r.bezier_curves" version="0.2">
        <name>Bézier Curves</name>
        <description>Color curves adjustment</description>
        <author>Till Theato, Maksim Golovkin</author>

-        <parameter type="list" name="Channel" default="0.5" paramlist="0.5,0,0.1,0.2,0.3,0.4,0.6,0.71">
+        <parameter type="list" name="Channel" default="0.5" paramlist="0.5;0;0.1;0.2;0.3;0.4;0.6;0.71">
                <paramlistdisplay>RGB,Red,Green,Blue,Alpha,Luma,Hue,Saturation</paramlistdisplay>
                <name>Channel</name>
        </parameter>

-        <parameter type="list" name="Luma formula" default="1" paramlist="0,1">
+        <parameter type="list" name="Luma formula" default="1" paramlist="0;1">
                <paramlistdisplay>Rec. 601,Rec. 709</paramlistdisplay>
                <name>Luma formula</name>
        </parameter>

-        <parameter type="bezier_spline" name="Bézier spline" depends="Channel" default="-1;-1#0;0#0.1;0.1|0.9;0.9#1;1#2;2">
-                <name>Bézier Spline Widget</name>
-        </parameter>
+        <parameter type="bezier_spline" name="Bézier spline" depends="Channel" default="-1;-1#0;0#0.1;0.1|0.9;0.9#1;1#2;2" />
 </effect>
--- a/data/effects/frei0r_brightness.xml
+++ b/data/effects/frei0r_brightness.xml
--- a/data/effects/frei0r_c0rners.xml
+++ b/data/effects/frei0r_c0rners.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.c0rners" id="frei0r.c0rners">
+<effect LC_NUMERIC="C" tag="frei0r.c0rners" id="frei0r.c0rners">
 	<name>Corners</name>
 	<description>Four corners geometry engine</description>
 	<author>Marko Cebokli</author>
@@ -52,7 +52,7 @@
 		<name>Enable Stretch</name>
 	</parameter>

-        <parameter type="list" name="Interpolator" default="0.166" paramlist="0,0.166,0.333,0.5,0.666,0.833,1.0">
+        <parameter type="list" name="Interpolator" default="0.166" paramlist="0;0.166;0.333;0.5;0.666;0.833;1.0">
                <paramlistdisplay>Nearest neighbor,Bilinear,Bicubic smooth,Bicubic sharp,Spline 4x4,Spline 6x6,Lanczos</paramlistdisplay>
 		<name>Interpolator</name>
 	</parameter>
@@ -61,7 +61,7 @@
 		<name>Transparent Background</name>
 	</parameter>
        
-        <parameter type="list" name="Alpha operation" default="0.0" paramlist="0.0,0.3,0.5,0.7,1.0">
+        <parameter type="list" name="Alpha operation" default="0.0" paramlist="0.0;0.3;0.5;0.7;1.0">
                <paramlistdisplay>Write on clear,Maximum,Minimum,Add,Subtract</paramlistdisplay>
                <name>Alpha operation</name>
        </parameter>
--- a/data/effects/frei0r_cartoon.xml
+++ b/data/effects/frei0r_cartoon.xml
@@ -0,0 +1,25 @@
+<!DOCTYPE kpartgui>
+<group>
+    <effect tag="frei0r.cartoon" id="frei0r.cartoon" type="video">
+	<name>Cartoon</name>
+	<description>Cartoonify video, do a form of edge detect</description>
+	<author>Dries Pruimboom, Jaromil</author>
+	<parameter type="constant" name="triplevel" max="100000" min="0" default="500">
+		<name>Level of trip</name>
+	</parameter>
+	<parameter type="constant" name="diffspace" max="256" min="0" default="1">
+		<name>Difference space</name>
+	</parameter>
+    </effect>
+    <effect LC_NUMERIC="C" tag="frei0r.cartoon" id="frei0r.cartoon" type="video" version="2.1">
+        <name>Cartoon</name>
+        <description>Cartoonify video, do a form of edge detect</description>
+        <author>Dries Pruimboom, Jaromil</author>
+        <parameter type="constant" name="triplevel" max="100000" min="0" default="99900" factor="100000">
+                <name>Level of trip</name>
+        </parameter>
+        <parameter type="constant" name="diffspace" max="256" min="0" default="1" factor="256">
+                <name>Difference space</name>
+        </parameter>
+    </effect>
+</group>
--- a/data/effects/frei0r_cluster.xml
+++ b/data/effects/frei0r_cluster.xml
--- a/data/effects/frei0r_colgate.xml
+++ b/data/effects/frei0r_colgate.xml
@@ -0,0 +1,14 @@
+<!DOCTYPE kpartgui>
+<effect tag="frei0r.colgate" id="frei0r.colgate" context="nomovit">
+    <name>White Balance (LMS space)</name>
+    <description>Do simple color correction, in a physically meaningful
+way</description>
+    <author>Steiner H. Gunderson</author>
+    <parameter type="color" name="Neutral Color" default="0x7f7f7fff">
+        <name>Neutral Color</name>
+    </parameter>
+    <parameter type="simplekeyframe" name="Color Temperature"
+default="6500" min="1000" max="15000" factor="15000">
+        <name>Color Temperature</name>
+    </parameter>
+</effect>
--- a/data/effects/frei0r_coloradj_rgb.xml
+++ b/data/effects/frei0r_coloradj_rgb.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.coloradj_RGB" id="frei0r.coloradj_RGB">
+<effect LC_NUMERIC="C" tag="frei0r.coloradj_RGB" id="frei0r.coloradj_RGB">
        <name>RGB adjustment</name>
        <description>Simple color adjustment</description>
        <author>Marko Cebokli</author>
@@ -16,7 +16,7 @@
                <name>B</name>
        </parameter>
        
-        <parameter type="list" name="Action" default="0.5" paramlist="0.0,0.5,1.0">
+        <parameter type="list" name="Action" default="0.5" paramlist="0.0;0.5;1.0">
                <paramlistdisplay>Add constant,Change gamma,Multiply</paramlistdisplay>
                <name>Action</name>
        </parameter>
@@ -29,7 +29,7 @@
                <name>Alpha controlled</name>
        </parameter>
        
-        <parameter type="list" name="Luma formula" default="1.0" paramlist="0.0,1.0">
+        <parameter type="list" name="Luma formula" default="1.0" paramlist="0.0;1.0">
                <paramlistdisplay>Rec. 601,Rec. 709</paramlistdisplay>
                <name>Luma formula</name>
        </parameter>
--- a/data/effects/frei0r_colordistance.xml
+++ b/data/effects/frei0r_colordistance.xml
@@ -3,7 +3,7 @@
 	<name>Color Distance</name>
 	<description>Calculates the distance between the selected color and the current pixel and uses that value as new pixel value</description>
 	<author>Richard Spindler</author>
-	<parameter type="color" name="Color" default="0x000000">
+	<parameter type="color" name="Color" default="0x000000ff">
 		<name>Source Color</name>
 	</parameter>
 </effect>
--- a/data/effects/frei0r_colortap.xml
+++ b/data/effects/frei0r_colortap.xml
@@ -0,0 +1,9 @@
+<!DOCTYPE kpartgui>
+<effect tag="frei0r.colortap" id="frei0r.colortap">
+	<name>Color Effect</name>
+	<description>Applies a pre-made color effect to image</description>
+	<author>Janne Liljeblad</author>
+	<parameter type="list" name="table" default="xpro" paramlist="xpro;sepia;heat;red_green;old_photo;xray;esses;yellow_blue">
+                <name>Type</name>
+        </parameter>
+</effect>
--- a/data/effects/frei0r_contrast0r.xml
+++ b/data/effects/frei0r_contrast0r.xml
--- a/data/effects/frei0r_curves.xml
+++ b/data/effects/frei0r_curves.xml
@@ -0,0 +1,117 @@
+<!DOCTYPE kpartgui>
+<group>
+  <effect tag="frei0r.curves" id="frei0r.curves">
+	  <name>Curves</name>
+	  <description>Color curves adjustment</description>
+	  <author>Maksim Golovkin</author>
+    <parameter type="list" name="Channel" default="0" paramlist="0;1;2;3">
+      <paramlistdisplay>Red,Green,Blue,Luma</paramlistdisplay>
+		  <name>Channel</name>
+	  </parameter>
+    <parameter type="list" name="Luma formula" default="1" paramlist="0;1">
+      <paramlistdisplay>Rec. 601,Rec. 709</paramlistdisplay>
+      <name>Luma formula</name>
+    </parameter>
+
+    <!-- No actual parameter: Represents the curve widget -->
+    <parameter type="curve" default="0" depends="Channel" number="Curve point number" inpoints="Point %i input value" outpoints="Point %i output value" min="1" max="5" />
+
+	  <parameter type="fixed" name="Curve point number" default="2" min="2" max="5">
+		  <name>Number of curve points</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 1 input value" default="0" min="0" max="1">
+		  <name>Point 1 input value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 1 output value" default="0" min="0" max="1">
+		  <name>Point 1 output value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 2 input value" default="1" min="0" max="1">
+		  <name>Point 2 input value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 2 output value" default="1" min="0" max="1">
+		  <name>Point 2 output value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 3 input value" default="0" min="0" max="1">
+		  <name>Point 3 input value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 3 output value" default="0" min="0" max="1">
+		  <name>Point 3 output value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 4 input value" default="0" min="0" max="1">
+		  <name>Point 4 input value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 4 output value" default="0" min="0" max="1">
+		  <name>Point 4 output value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 5 input value" default="0" min="0" max="1">
+		  <name>Point 5 input value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 5 output value" default="0" min="0" max="1">
+		  <name>Point 5 output value</name>
+	  </parameter>
+	  <parameter type="bool" name="Show curves" default="0">
+      <name>Show graph in picture</name>
+    </parameter>
+    <parameter type="list" name="Graph position" default="3" paramlist="0;1;2;3">
+      <paramlistdisplay>Top Left,Top Right,Bottom Left,Bottom Right</paramlistdisplay>
+      <name>Graph position</name>
+    </parameter>
+  </effect>
+  <effect LC_NUMERIC="C" tag="frei0r.curves" id="frei0r.curves" version="0.3">
+    <name>Curves</name>
+    <description>Color curves adjustment</description>
+    <author>Maksim Golovkin</author>
+    <parameter type="list" name="Channel" default="0.5" paramlist="0.5;0;0.1;0.2;0.3;0.4;0.6;0.71">
+      <paramlistdisplay>RGB,Red,Green,Blue,Alpha,Luma,Hue,Saturation</paramlistdisplay>
+      <name>Channel</name>
+    </parameter>
+    <parameter type="list" name="Luma formula" default="1" paramlist="0;1">
+      <paramlistdisplay>Rec. 601,Rec. 709</paramlistdisplay>
+      <name>Luma formula</name>
+    </parameter>
+    
+    <!-- No actual parameter: Represents the curve widget -->
+    <parameter type="curve" default="0" depends="Channel" number="Curve point number" inpoints="Point %i input value" outpoints="Point %i output value" min="1" max="5" />
+
+    <parameter type="fixed" name="Curve point number" default="0.2" min="0.2" max="0.5">
+      <name>Number of curve points</name>
+    </parameter>
+    <parameter type="fixed" name="Point 1 input value" default="0" min="0" max="1">
+      <name>Point 1 input value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 1 output value" default="0" min="0" max="1">
+      <name>Point 1 output value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 2 input value" default="1" min="0" max="1">
+      <name>Point 2 input value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 2 output value" default="1" min="0" max="1">
+      <name>Point 2 output value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 3 input value" default="0" min="0" max="1">
+      <name>Point 3 input value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 3 output value" default="0" min="0" max="1">
+      <name>Point 3 output value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 4 input value" default="0" min="0" max="1">
+      <name>Point 4 input value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 4 output value" default="0" min="0" max="1">
+      <name>Point 4 output value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 5 input value" default="0" min="0" max="1">
+      <name>Point 5 input value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 5 output value" default="0" min="0" max="1">
+      <name>Point 5 output value</name>
+    </parameter>
+    <parameter type="bool" name="Show curves" default="0">
+      <name>Show graph in picture</name>
+    </parameter>
+    <parameter type="list" name="Graph position" default="0.3" paramlist="0;0.1;0.2;0.3">
+      <paramlistdisplay>Top Left,Top Right,Bottom Left,Bottom Right</paramlistdisplay>
+      <name>Graph position</name>
+    </parameter>
+  </effect>
+</group>
--- a/data/effects/frei0r_d90stairsteppingfix.xml
+++ b/data/effects/frei0r_d90stairsteppingfix.xml
--- a/data/effects/frei0r_defish0r.xml
+++ b/data/effects/frei0r_defish0r.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.defish0r" id="frei0r.defish0r">
+<effect LC_NUMERIC="C" tag="frei0r.defish0r" id="frei0r.defish0r">
 	<name>Defish</name>
 	<description>Non rectilinear lens mappings</description>
 	<author>Marko Cebokli</author>
@@ -9,22 +9,22 @@
 	<parameter type="bool" name="DeFish" default="1">
 		<name>DeFish</name>
 	</parameter>
-        <parameter type="list" name="Type" default="0.666" paramlist="0,0.333,0.666,1.0">
+        <parameter type="list" name="Type" default="0.666" paramlist="0;0.333;0.666;1.0">
                <paramlistdisplay>Equidistant,Orthographic,Equiarea,Stereographic</paramlistdisplay>
 		<name>Type</name>
 	</parameter>
-        <parameter type="list" name="Scaling" default="0" paramlist="0,0.333,0.666,1.0">
+        <parameter type="list" name="Scaling" default="0" paramlist="0;0.333;0.666;1.0">
                <paramlistdisplay>Fill,Center,Fit,Manual</paramlistdisplay>
 		<name>Scaling</name>
 	</parameter>
 	<parameter type="constant" name="Manual Scale" default="500" min="0" max="1000" factor="1000">
 		<name>Manual Scale</name>
 	</parameter>
-        <parameter type="list" name="Interpolator" default="0.166" paramlist="0,0.166,0.333,0.5,0.666,0.833,1.0">
+        <parameter type="list" name="Interpolator" default="0.166" paramlist="0;0.166;0.333;0.5;0.666;0.833;1.0">
                <paramlistdisplay>Nearest neighbor,Bilinear,Bicubic smooth,Bicubic sharp,Spline 4x4,Spline 6x6,Lanczos</paramlistdisplay>
 		<name>Interpolator</name>
 	</parameter>
-        <parameter type="list" name="Aspect type" default="0" paramlist="0,0.25,0.5,0.75,1.0">
+        <parameter type="list" name="Aspect type" default="0" paramlist="0;0.25;0.5;0.75;1.0">
                <paramlistdisplay>Square,PAL DV,NTSC DV,HDV,Manual</paramlistdisplay>
 		<name>Aspect type</name>
 	</parameter>
--- a/data/effects/frei0r_delay0r.xml
+++ b/data/effects/frei0r_delay0r.xml
--- a/data/effects/frei0r_delaygrab.xml
+++ b/data/effects/frei0r_delaygrab.xml
--- a/data/effects/frei0r_distort0r.xml
+++ b/data/effects/frei0r_distort0r.xml
--- a/data/effects/frei0r_edgeglow.xml
+++ b/data/effects/frei0r_edgeglow.xml
--- a/data/effects/frei0r_equaliz0r.xml
+++ b/data/effects/frei0r_equaliz0r.xml
--- a/data/effects/frei0r_facebl0r.xml
+++ b/data/effects/frei0r_facebl0r.xml
--- a/data/effects/frei0r_facedetect.xml
+++ b/data/effects/frei0r_facedetect.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.facedetect" id="frei0r.facedetect">
+<effect LC_NUMERIC="C" tag="frei0r.facedetect" id="frei0r.facedetect">
    <name>Face detect</name>
    <description>Detect faces and draw shapes on them using OpenCV</description>
    <author>binarymillenium, Dan Dennedy</author>
@@ -24,7 +24,7 @@
        <comment>How often to detect a face. In between checks, it does object motion tracking.</comment>
    </parameter>
    
-    <parameter type="list" name="Shape" default="0.0" paramlist="0.0,0.1,0.2,1.0">
+    <parameter type="list" name="Shape" default="0.0" paramlist="0.0;0.1;0.2;1.0">
        <paramlistdisplay>circle,ellipse,rectangle,random</paramlistdisplay>
        <name>Shape</name>
    </parameter>
--- a/data/effects/frei0r_flippo.xml
+++ b/data/effects/frei0r_flippo.xml
--- a/data/effects/frei0r_glow.xml
+++ b/data/effects/frei0r_glow.xml
--- a/data/effects/frei0r_hqdn3d.xml
+++ b/data/effects/frei0r_hqdn3d.xml
--- a/data/effects/frei0r_hueshift0r.xml
+++ b/data/effects/frei0r_hueshift0r.xml
--- a/data/effects/frei0r_iirblur.xml
+++ b/data/effects/frei0r_iirblur.xml
@@ -0,0 +1,23 @@
+<!DOCTYPE kpartgui>
+<effect tag="frei0r.IIRblur" id="frei0r.IIRblur">
+        <name>Blur</name>
+        <description>Blur using 2D IIR filters (Exponential, Lowpass, Gaussian)</description>
+        <author>Marko Cebokli</author>
+        
+        <parameter type="simplekeyframe" name="Amount" default="40" min="0" max="1000" factor="1000">
+            <name>Amount</name>
+            <comment>Amount of blur</comment>
+        </parameter>
+        
+        <parameter type="list" name="Type" default="0.5" paramlist="0.0,0.5,0.999">
+            <paramlistdisplay>Exponential,Lowpass,Gaussian</paramlistdisplay>
+            <name>Type</name>
+            <comment>Select blurring algorithm</comment>
+        </parameter>
+
+        <parameter type="bool" name="Edge" default="1">
+            <name>Edge</name>
+            <comment>Enable edge compensation</comment>
+        </parameter>
+
+</effect>
--- a/data/effects/frei0r_keyspillm0pup.xml
+++ b/data/effects/frei0r_keyspillm0pup.xml
@@ -0,0 +1,61 @@
+<!DOCTYPE kpartgui>
+<effect LC_NUMERIC="C" tag="frei0r.keyspillm0pup" id="frei0r.keyspillm0pup">
+    <name>Key Spill Mop Up</name>
+    <description>Reduces the visibility of key color spill in chroma keying</description>
+    <author>Marko Cebokli</author>
+    
+    <parameter type="color" name="Key color" default="0x1010D0ff">
+        <name>Key color</name>
+    </parameter>
+    
+    <parameter type="color" name="Target color" default="0xC87F65ff">
+        <name>Target color</name>
+    </parameter>
+
+    <parameter type="list" name="Mask type" default="0" paramlist="0;1;2;3">
+        <paramlistdisplay>Color distance, Transparency, Edge inwards, Edge outwards</paramlistdisplay>
+        <name>Mask type</name>
+    </parameter>
+
+    <parameter type="constant" name="Tolerance" default="240" min="0" max="1000" factor="1000">
+    <name>Tolerance</name>
+    </parameter>
+    
+    <parameter type="constant" name="Slope" default="400" min="0" max="1000" factor="1000">
+    <name>Slope</name>
+    </parameter>
+
+    <parameter type="constant" name="Hue gate" default="250" min="0" max="1000" factor="1000">
+        <name>Hue gate</name>
+    </parameter>
+
+    <parameter type="constant" name="Saturation threshold" default="150" min="0" max="1000" factor="1000">
+        <name>Saturation threshold</name>
+    </parameter>
+
+    <parameter type="list" name="Operation 1" default="1" paramlist="0;1;2;3;4">
+        <paramlistdisplay>None, De-Key, Target, Desaturate, Luma adjust</paramlistdisplay>
+        <name>Operation 1</name>
+    </parameter>
+
+    <parameter type="constant" name="Amount 1" default="500" min="0" max="1000" factor="1000">
+        <name>Amount 1</name>
+    </parameter>
+
+    <parameter type="list" name="Operation 2" default="0" paramlist="0;1;2;3;4">
+        <paramlistdisplay>None, De-Key, Target, Desaturate, Luma adjust</paramlistdisplay>
+        <name>Operation 2</name>
+    </parameter>
+
+    <parameter type="constant" name="Amount 2" default="0" min="0" max="1000" factor="1000">
+        <name>Amount 2</name>
+    </parameter>
+
+    <parameter type="bool" name="Show mask" default="0">
+        <name>Show mask</name>
+    </parameter>
+
+    <parameter type="bool" name="Mask to Alpha" default="0">
+        <name>Mask to Alpha</name>
+    </parameter>
+</effect>
--- a/data/effects/frei0r_lenscorrection.xml
+++ b/data/effects/frei0r_lenscorrection.xml
--- a/data/effects/frei0r_letterb0xed.xml
+++ b/data/effects/frei0r_letterb0xed.xml
--- a/data/effects/frei0r_levels.xml
+++ b/data/effects/frei0r_levels.xml
@@ -0,0 +1,67 @@
+<!DOCTYPE kpartgui>
+<group>
+    <effect tag="frei0r.levels" id="frei0r.levels">
+	<name>Levels</name>
+	<description>Adjust levels</description>
+	<author>Maksim Golovkin</author>
+
+        <parameter type="list" name="Channel" default="3" paramlist="0;1;2;3">
+                <paramlistdisplay>Red,Green,Blue,Luma</paramlistdisplay>
+		<name>Channel</name>
+	</parameter>
+        <parameter type="simplekeyframe" name="Input black level" default="0" min="0" max="1000" factor="1000">
+		<name>Input black level</name>
+	</parameter>
+        <parameter type="simplekeyframe" name="Input white level" default="1000" min="0" max="1000" factor="1000">
+		<name>Input white level</name>
+	</parameter>
+        <parameter type="simplekeyframe" name="Gamma" default="1000" min="10" max="4000" factor="4000">
+		<name>Gamma</name>
+	</parameter>
+        <parameter type="simplekeyframe" name="Black output" default="0" min="0" max="1000" factor="1000">
+		<name>Black output</name>
+	</parameter>
+        <parameter type="simplekeyframe" name="White output" default="1000" min="0" max="1000" factor="1000">
+		<name>White output</name>
+	</parameter>
+	<parameter type="bool" name="Show histogram" default="0">
+		<name>Show histogram</name>
+	</parameter>
+        <parameter type="list" name="Histogram position" default="3" paramlist="0;1;2;3">
+                <paramlistdisplay>Top Left,Top Right,Bottom Left,Bottom Right</paramlistdisplay>
+		<name>Histogram position</name>
+	</parameter>
+    </effect>
+    <effect LC_NUMERIC="C" tag="frei0r.levels" id="frei0r.levels" version="0.2">
+        <name>Levels</name>
+        <description>Adjust levels</description>
+        <author>Maksim Golovkin</author>
+
+        <parameter type="list" name="Channel" default="0.3" paramlist="0;0.1;0.2;0.3">
+                <paramlistdisplay>Red,Green,Blue,Luma</paramlistdisplay>
+                <name>Channel</name>
+        </parameter>
+        <parameter type="simplekeyframe" name="Input black level" default="0" min="0" max="1000" factor="1000">
+                <name>Input black level</name>
+        </parameter>
+        <parameter type="simplekeyframe" name="Input white level" default="1000" min="0" max="1000" factor="1000">
+                <name>Input white level</name>
+        </parameter>
+        <parameter type="simplekeyframe" name="Gamma" default="1000" min="10" max="4000" factor="4000">
+                <name>Gamma</name>
+        </parameter>
+        <parameter type="simplekeyframe" name="Black output" default="0" min="0" max="1000" factor="1000">
+                <name>Black output</name>
+        </parameter>
+        <parameter type="simplekeyframe" name="White output" default="1000" min="0" max="1000" factor="1000">
+                <name>White output</name>
+        </parameter>
+        <parameter type="bool" name="Show histogram" default="0">
+                <name>Show histogram</name>
+        </parameter>
+        <parameter type="list" name="Histogram position" default="0.3" paramlist="0;0.1;0.2;0.3">
+                <paramlistdisplay>Top Left,Top Right,Bottom Left,Bottom Right</paramlistdisplay>
+                <name>Histogram position</name>
+        </parameter>
+    </effect>
+</group>
--- a/data/effects/frei0r_lightgraffiti.xml
+++ b/data/effects/frei0r_lightgraffiti.xml
@@ -0,0 +1,148 @@
+<!DOCTYPE kpartgui>
+<group>
+    <effect tag="frei0r.lightgraffiti" id="frei0r.lightgraffiti">
+        <name>Light Graffiti</name>
+        <description>Light Graffiti effect.
+        <full><![CDATA[This effect allows to do Light Painting (i.e. painting with light sources on a photo by keeping the shutter
+        opened for a while), but for video.]]></full></description>
+        <author>Simon A. Eugster (Granjow)</author>
+        <parameter type="simplekeyframe" name="thresholdBrightness" default="450" min="0" max="765" factor="1">
+            <name>Brightness Threshold</name>
+            <comment><![CDATA[How bright (<code>R+G+B</code>) does a pixel need to be in order to be recognized as a light source?<br/>
+            Increasing this threshold requires brighter light sources (i.e. more white or less color, respectively) but prevents some «false alarms» where semi-bright parts, e.g. hands where colors can change quite a lot compared to the background, are incorrectly recognized as light source.]]></comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="thresholdDifference" default="80" min="0" max="255" factor="1">
+            <name>Difference Threshold</name>
+            <comment><![CDATA[How much does the strongest color channel of a pixel have to change, compared to the background image (<code>max(dR, dG, dB)</code>), in order to be recognized as light source? <br/>
+            Increasing this threshold makes it harder for light sources to be accepted on bright backgrounds, but decreases the danger of noise or generally bright spots counting as light source.]]></comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="thresholdDiffSum" default="0" min="0" max="765" factor="1">
+            <name>Difference Sum Threshold</name>
+            <comment><![CDATA[How much does the sum of all color channels <em>relative to the background image</em> (<code>dR + dG + dB</code>) have to change until a pixel is recognized as a light source?<br/>
+            Raising this value might, in some cases, avoid that some light objects lit by the light source are added to the light mask.]]></comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="sensitivity" default="100" min="0" max="500" factor="100">
+            <name>Sensitivity</name>
+            <comment><![CDATA[Light sensitivity.<br/>
+            For slowly moving light source try to use a lower sensitivity to obtain a better exposure.]]></comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="lowerOverexposure" default="0" min="0" max="10" factor="1">
+            <name>Lower Overexposure</name>
+            <comment><![CDATA[Lowers overexposure.<br/>
+            The light mask does not get white immediately when the light source is moving slowly or staying steady.]]></comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="dim" default="0" min="0" max="255" factor="255">
+            <name>Dimming</name>
+            <comment>Dims the light mask. Lights will leave a fainting trail if it is set to a value > 0.</comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="backgroundWeight" default="0" min="0" max="100" factor="100">
+            <name>Background Weight</name>
+            <comment>Strength of the (calculated) background image. Setting it to 100 paints the light mask directly over the background, without the painting person in the image if the video starts with a «clean» background image. (See the α parameter.)</comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="longAlpha" default="0" min="0" max="256" factor="256">
+            <name>α</name>
+            <comment><![CDATA[Determines how the effect tries to adapt to background changes. <br/>
+            The Light Graffiti effect remembers the first frame of the clip it is applied to, so the clip should <em>always</em> start with the painter outside of the video. If the background constantly changes, e.g. on a street, try to set α > 0 to calculate an average background image.]]></comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="saturation" default="150" min="0" max="400" factor="100">
+            <name>Saturation</name>
+            <comment>Increases the saturation of lights.</comment>
+        </parameter>
+        <parameter type="bool" name="statsBrightness" default="0">
+            <name>Show brightness statistics</name>
+            <comment><![CDATA[The stats switches allow easy and accurate adjustment of the threshold parameters.<br/>
+            Example: To adjust the brightness threshold, check this box and adjust the threshold until the whole light source is highlighted. Repeat the same with the other parameters. Only parts that are highlighted in <em>all</em> thresholds will count as light source.]]></comment>
+        </parameter>
+        <parameter type="bool" name="statsDifference" default="0">
+            <name>Show background difference statistics</name>
+        </parameter>
+        <parameter type="bool" name="statsDiffSum" default="0">
+            <name>Show background difference sum statistics</name>
+        </parameter>
+        <parameter type="bool" name="transparentBackground" default="0">
+            <name>Transparent Background</name>
+            <comment>Makes the background transparent, allowing to apply a composite effect and paint the light mask over a completely different video.</comment>
+        </parameter>
+        <parameter type="bool" name="nonlinearDim" default="0">
+            <name>Nonlinear dimming</name>
+            <comment>If normal dimming does not look natural enough, try this one.</comment>
+        </parameter>
+        <parameter type="bool" name="reset" default="0">
+            <name>Reset</name>
+            <comment>Resets the light mask and the background image. This is necessary e.g. if you apply this effect to a clip in the timeline and then move the timeline cursor from outside of the clip to the middle of it. The effect receives this frame in the middle as first frame and uses it as background image. For proper threshold adjusting move the timeline cursor to the beginning of the clip, check the Reset box and uncheck it again.</comment>
+        </parameter>
+    </effect>
+
+    <effect LC_NUMERIC="C" tag="frei0r.lightgraffiti" id="frei0r.lightgraffiti" version="0.2">
+        <name>Light Graffiti</name>
+        <description>Light Graffiti effect.
+        <full><![CDATA[This effect allows to do Light Painting (i.e. painting with light sources on a photo by keeping the shutter
+        opened for a while), but for video.]]></full></description>
+        <author>Simon A. Eugster (Granjow)</author>
+        <parameter type="simplekeyframe" name="thresholdBrightness" default="450" min="0" max="765" factor="765">
+            <name>Brightness Threshold</name>
+            <comment><![CDATA[How bright (<code>R+G+B</code>) does a pixel need to be in order to be recognized as a light source?<br/>
+            Increasing this threshold requires brighter light sources (i.e. more white or less color, respectively) but prevents some «false alarms» where semi-bright parts, e.g. hands where colors can change quite a lot compared to the background, are incorrectly recognized as light source.]]></comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="thresholdDifference" default="80" min="0" max="255" factor="255">
+            <name>Difference Threshold</name>
+            <comment><![CDATA[How much does the strongest color channel of a pixel have to change, compared to the background image (<code>max(dR, dG, dB)</code>), in order to be recognized as light source? <br/>
+            Increasing this threshold makes it harder for light sources to be accepted on bright backgrounds, but decreases the danger of noise or generally bright spots counting as light source.]]></comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="thresholdDiffSum" default="0" min="0" max="765" factor="765">
+            <name>Difference Sum Threshold</name>
+            <comment><![CDATA[How much does the sum of all color channels <em>relative to the background image</em> (<code>dR + dG + dB</code>) have to change until a pixel is recognized as a light source?<br/>
+            Raising this value might, in some cases, avoid that some light objects lit by the light source are added to the light mask.]]></comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="sensitivity" default="100" min="0" max="500" factor="500">
+            <name>Sensitivity</name>
+            <comment><![CDATA[Light sensitivity.<br/>
+            For slowly moving light source try to use a lower sensitivity to obtain a better exposure.]]></comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="lowerOverexposure" default="0" min="0" max="10" factor="10">
+            <name>Lower Overexposure</name>
+            <comment><![CDATA[Lowers overexposure.<br/>
+            The light mask does not get white immediately when the light source is moving slowly or staying steady.]]></comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="dim" default="0" min="0" max="255" factor="255">
+            <name>Dimming</name>
+            <comment>Dims the light mask. Lights will leave a fainting trail if it is set to a value > 0.</comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="backgroundWeight" default="0" min="0" max="100" factor="100">
+            <name>Background Weight</name>
+            <comment>Strength of the (calculated) background image. Setting it to 100 paints the light mask directly over the background, without the painting person in the image if the video starts with a «clean» background image. (See the α parameter.)</comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="longAlpha" default="0" min="0" max="256" factor="256">
+            <name>α</name>
+            <comment><![CDATA[Determines how the effect tries to adapt to background changes. <br/>
+            The Light Graffiti effect remembers the first frame of the clip it is applied to, so the clip should <em>always</em> start with the painter outside of the video. If the background constantly changes, e.g. on a street, try to set α > 0 to calculate an average background image.]]></comment>
+        </parameter>
+        <parameter type="simplekeyframe" name="saturation" default="150" min="0" max="400" factor="400">
+            <name>Saturation</name>
+            <comment>Increases the saturation of lights.</comment>
+        </parameter>
+        <parameter type="bool" name="statsBrightness" default="0">
+            <name>Show brightness statistics</name>
+            <comment><![CDATA[The stats switches allow easy and accurate adjustment of the threshold parameters.<br/>
+            Example: To adjust the brightness threshold, check this box and adjust the threshold until the whole light source is highlighted. Repeat the same with the other parameters. Only parts that are highlighted in <em>all</em> thresholds will count as light source.]]></comment>
+        </parameter>
+        <parameter type="bool" name="statsDifference" default="0">
+            <name>Show background difference statistics</name>
+        </parameter>
+        <parameter type="bool" name="statsDiffSum" default="0">
+            <name>Show background difference sum statistics</name>
+        </parameter>
+        <parameter type="bool" name="transparentBackground" default="0">
+            <name>Transparent Background</name>
+            <comment>Makes the background transparent, allowing to apply a composite effect and paint the light mask over a completely different video.</comment>
+        </parameter>
+        <parameter type="bool" name="nonlinearDim" default="0">
+            <name>Nonlinear dimming</name>
+            <comment>If normal dimming does not look natural enough, try this one.</comment>
+        </parameter>
+        <parameter type="bool" name="reset" default="0">
+            <name>Reset</name>
+            <comment>Resets the light mask and the background image. This is necessary e.g. if you apply this effect to a clip in the timeline and then move the timeline cursor from outside of the clip to the middle of it. The effect receives this frame in the middle as first frame and uses it as background image. For proper threshold adjusting move the timeline cursor to the beginning of the clip, check the Reset box and uncheck it again.</comment>
+        </parameter>
+    </effect>
+</group>
--- a/data/effects/frei0r_luminance.xml
+++ b/data/effects/frei0r_luminance.xml
--- a/data/effects/frei0r_mask0mate.xml
+++ b/data/effects/frei0r_mask0mate.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui>
 <effect tag="frei0r.mask0mate" id="frei0r.mask0mate" type="video" unique="1">
-	<name>Mask0Mate</name>
+	<name>Rectangular Alpha mask</name>
 	<description>Creates an square alpha-channel mask</description>
 	<author>Richard Spindler</author>
 	<parameter type="constant" name="Left" max="1000" min="0" default="0" factor="1000">
--- a/data/effects/frei0r_medians.xml
+++ b/data/effects/frei0r_medians.xml
@@ -0,0 +1,17 @@
+<!DOCTYPE kpartgui>
+<effect LC_NUMERIC="C" tag="frei0r.medians" id="frei0r.medians">
+	<name>Medians</name>
+	<description>Implements several median-type filters</description>
+	<author>Marko Cebokli</author>
+	
+	<parameter type="list" name="Type" default="Square3x3" paramlist="Cross5;Square3x3;Bilevel;Diamond3x3;Square5x5;Temp3;Temp5;ArceBI;ML3D;ML3dEX;VarSize">
+                <paramlistdisplay>Cross5,Square3x3,Bilevel,Diamond3x3,Square5x5,Temp3,Temp5,ArceBI,ML3D,ML3dEX,VarSize</paramlistdisplay>
+		<name>Type</name>
+	</parameter>
+
+	<parameter type="constant" name="Size" default="5" min="0" max="50" factor="50">
+	<name>Size</name>
+	</parameter>
+	
+
+</effect>
--- a/data/effects/frei0r_nervous.xml
+++ b/data/effects/frei0r_nervous.xml
--- a/data/effects/frei0r_nosync0r.xml
+++ b/data/effects/frei0r_nosync0r.xml
--- a/data/effects/frei0r_pixeliz0r.xml
+++ b/data/effects/frei0r_pixeliz0r.xml
--- a/data/effects/frei0r_pr0be.xml
+++ b/data/effects/frei0r_pr0be.xml
@@ -1,10 +1,10 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.pr0be" id="frei0r.pr0be">
-        <name>pr0be</name>
+<effect LC_NUMERIC="C" tag="frei0r.pr0be" id="frei0r.pr0be">
+        <name>Video values</name>
        <description>Measure video values</description>
        <author>Marko Cebokli</author>
        
-        <parameter type="list" name="Measurement" default="0.0" paramlist="0.0,0.3,0.5,0.7,1.0">
+        <parameter type="list" name="Measurement" default="0.0" paramlist="0.0;0.3;0.5;0.7;1.0">
                <paramlistdisplay>RGB,Y'PbPr - rec. 601,Y'PbPr - rec. 709,HSV,HSL</paramlistdisplay>
                <name>Measurement</name>
        </parameter>
--- a/data/effects/frei0r_pr0file.xml
+++ b/data/effects/frei0r_pr0file.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.pr0file" id="frei0r.pr0file">
-        <name>pr0file</name>
+<effect LC_NUMERIC="C" tag="frei0r.pr0file" id="frei0r.pr0file">
+        <name>Oscilloscope</name>
        <description>2D video oscilloscope</description>
        <author>Marko Cebokli</author>
        
@@ -20,7 +20,7 @@
                <name>Length</name>
        </parameter>
        
-        <parameter type="list" name="Channel" default="0.5" paramlist="0.0,0.2,0.4,0.5,0.6,0.8,1.0">
+        <parameter type="list" name="Channel" default="0.5" paramlist="0.0;0.2;0.4;0.5;0.6;0.8;1.0">
                <paramlistdisplay>R,G,B,Y',Pr,Pb,Alpha</paramlistdisplay>
                <name>Channel</name>
        </parameter>
@@ -81,7 +81,7 @@
                <name>256 scale</name>
        </parameter>
        
-        <parameter type="list" name="Color" default="0.0" paramlist="0.0,1.0">
+        <parameter type="list" name="Color" default="0.0" paramlist="0.0;1.0">
                <paramlistdisplay>CCIR rec. 601,CCIR rec. 709</paramlistdisplay>
                <name>Color</name>
        </parameter>
--- a/data/effects/frei0r_primaries.xml
+++ b/data/effects/frei0r_primaries.xml
--- a/data/effects/frei0r_rgbparade.xml
+++ b/data/effects/frei0r_rgbparade.xml
--- a/Show More
+++ b/Show More