jogshuttle: minor code cleanup

jogshuttle: use call by reference
mark old methods as deprecated
2025-12-08 01:09:59 +01:00 · 2014-03-08 22:44:22 +01:00 · 2014-03-08 21:18:42 +01:00 · 2014-03-08 21:17:10 +01:00 · 2014-03-08 18:51:10 +01:00 · 2014-03-08 18:49:44 +01:00
705 changed files with 36830 additions and 228629 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+*~
 build
+CMakeLists.txt.user
--- a/1
+++ b/1
@@ -29,3 +29,4 @@ Former Kdenlive authors
        2009
    Jason Wood <jasonwood@blueyonder.co.uk>
        Original KDE 3 version author
+        2002-2005
--- a/91
+++ b/91
@@ -1,91 +0,0 @@
-
-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. (http://kdenlive.org/mantis/view.php?id=2297)
-    * Show filter version in filter info box.
-    * When multiple clips are selected do not allow resizing, but moving only. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2216)
-    * Remove the "avformat-novalidate" trick for faster loading, caused crash. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2344)
-    * Fix issues with simultaneous 2-pass rendering (x264). (http://kdenlive.org/mantis/view.php?id=2338)
-    * Fix rendering progress not shown if multiple copies of Kdenlive are open. (http://kdenlive.org/mantis/view.php?id=1265)
-    * Fix DVD chapters discarded when opening from render dialog. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2321)
-    * Fix audio issues in rendered file when using a recent ffmpeg version by replacing 'b' with 'vb' (ffmpeg bitrate parameter). (http://kdenlive.org/mantis/view.php?id=2318)
-    * Fix rendering to Flash could be broken by setting the number of encoder threads. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2231)
-    * Fix aspect ratio in title widget background image. (http://kdenlive.org/mantis/view.php?id=2225)
-    * Fix layout in save profile dialog. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2200)
-    * Disable save action if we are in the same state as last save.
-    * Fix pan and zoom keyframes lost after clip resize. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2187)
-    * Fix "save zone" saving proxy instead of real clip. (http://kdenlive.org/mantis/view.php?id=2184)
-    * Fix freeze when saving while timeline is at maximum zoom. (http://kdenlive.org/mantis/view.php?id=2174)
-    * Fix crash when deleting a track and having an audio clip on last track. (http://kdenlive.org/mantis/view.php?id=2168)
-    * Do not allow to create overlapping transitions that could corrupt timeline. (http://kdenlive.org/mantis/view.php?id=1901)
-    * Fix sometimes effects were missing. (http://kdenlive.org/mantis/view.php?id=2152)
-    * Fix crash in histogram scope.
-    * Fix multiple possible timeline corruptions. (http://kdenlive.org/mantis/view.php?id=2157)
-    * Do not allow rendering to a frame rate different than current project's profile. (http://kdenlive.org/mantis/view.php?id=2138)
-    * Fix DVD menu entries hidden under some circumstances.
-    * Fix channels in audio thumbnails being displaced by one frame. (http://kdenlive.org/mantis/view.php?id=1976)
-    * Fix possible crash caused by audio thumbnails. (http://kdenlive.org/mantis/view.php?id=2147)
-    * Fix possible freeze and error on project opening. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2110)
-    * Fix user specified CFLAGS ignored. (http://kdenlive.org/mantis/view.php?id=2108)
-
-0.8
-    See http://kdenlive.org/discover/0.8
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,77 +1,95 @@
 project(kdenlive)

-set(BASE_VERSION 0.8.2)
-set(LIBMLT_REQUIRED_VERSION 0.7.6)
+# 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.
+set(KDENLIVE_VERSION 0.9.7)
+
+# Minimum versions of main dependencies.
+set(LIBMLT_MIN_VERSION 0.8.8)
+set(QT_MIN_VERSION 4.5.0)
+set(KDE_MIN_VERSION 4.3.0)

-option(RELEASE_BUILD "Remove compilation date from program version (use for stable releases)" ON)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)

-# Search packages used by KDE.
-find_package(KDE4 REQUIRED)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99") # To compile kiss_fft
-include(KDE4Defaults)
-include(MacroLibrary)
-include(FindGettext)
-include(MacroOptionalAddSubdirectory)
-set(catalogname kdenlive)
-
-find_package(Qt4 COMPONENTS QtCore QtGui QtOpenGL QtScript REQUIRED)
-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 QtScript REQUIRED)
-
-add_definitions(${QT_DEFINITIONS})
-
-# 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})
-
-find_package(MSGFMT REQUIRED)
-find_program(EXTRACTRC_EXECUTABLE extractrc)
-find_program(MSGFMT_EXECUTABLE msgfmt)
-find_program(MSGMERGE_EXECUTABLE msgmerge)
-find_program(XGETTEXT_EXECUTABLE xgettext)
+# To be switched on when releasing.
+option(RELEASE_BUILD "Remove Git revision from program version (use for stable releases)" OFF)

 # 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(VERSION "\"${KDENLIVE_VERSION}\"")
+if(NOT RELEASE_BUILD)
+  if(EXISTS ${PROJECT_SOURCE_DIR}/.git)
+    # Probably a Git workspace: determine the revision.
+    find_package(Git)
+    if(GIT_FOUND)
+      exec_program(${GIT_EXECUTABLE}
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ARGS "describe --tags"
+        OUTPUT_VARIABLE KDENLIVE_GIT_REVISION
+        RETURN_VALUE TAG_RESULT
+      )
+      # git describe --tags failed, for example it fails if repo was checked with depth=1
+      if(NOT ${TAG_RESULT} EQUAL 0)
+        exec_program(${GIT_EXECUTABLE}
+          ${CMAKE_CURRENT_SOURCE_DIR}
+          ARGS "describe --always"
+          OUTPUT_VARIABLE KDENLIVE_GIT_REVISION
+        )
+      endif(NOT ${TAG_RESULT} EQUAL 0)
+      message("Current Kdenlive Git revision is ${KDENLIVE_GIT_REVISION}")
+      set(VERSION "\"${KDENLIVE_VERSION} (rev. ${KDENLIVE_GIT_REVISION})\"")
+    else(GIT_FOUND)
+      message("Could not determine the Git revision")
+    endif(GIT_FOUND)
+  endif(EXISTS ${PROJECT_SOURCE_DIR}/.git)
+endif(NOT RELEASE_BUILD)

-add_subdirectory(src src/cmake_bindir)
-add_subdirectory(renderer renderer/cmake_bindir)
-add_subdirectory(thumbnailer thumbnailer/cmake_bindir)
-add_subdirectory(plugins)
+include(CheckIncludeFiles)
+check_include_files(malloc.h HAVE_MALLOC_H)
+check_include_files(pthread.h HAVE_PTHREAD_H)
+
+# Search KDE and dependent packages.
+find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+macro_log_feature(KDE4_FOUND
+  "KDELibs"
+  "KDE core libraries"
+  "http://www.kde.org"
+  TRUE
+  ${KDE_MIN_VERSION}
+)
+
+# Find Qt core modules (QtCore and QtGui).
+find_package(Qt4 ${QT_MIN_VERSION} REQUIRED)
+
+# Search MLT package.
+find_package(LIBMLT ${LIBMLT_MIN_VERSION} REQUIRED)
+if(LIBMLT_VERSION VERSION_LESS ${LIBMLT_MIN_VERSION})
+  set(LIBMLT_FOUND FALSE)
+endif(LIBMLT_VERSION VERSION_LESS ${LIBMLT_MIN_VERSION})
+macro_log_feature(LIBMLT_FOUND
+  "MLT"
+  "Multimedia framework and video playout server for TV broadcasting"
+  "http://mltframework.org"
+  TRUE
+  ${LIBMLT_MIN_VERSION}
+)
+
+add_subdirectory(data)
+macro_optional_add_subdirectory(doc)
 add_subdirectory(effects)
 add_subdirectory(export)
 add_subdirectory(icons)
-add_subdirectory(data)
 add_subdirectory(lumas)
-add_subdirectory(titles)
-add_subdirectory(po)
 add_subdirectory(man)
-add_subdirectory(doc)
+add_subdirectory(plugins)
+macro_optional_add_subdirectory(po)
+add_subdirectory(renderer)
+add_subdirectory(src)
+add_subdirectory(thumbnailer)
+add_subdirectory(titles)
+add_subdirectory(testingArea)

-configure_file(${CMAKE_SOURCE_DIR}/kdenlive-config.h.cmake kdenlive-config.h @ONLY)
+macro_display_feature_log()

-
-message("-- C flags are now: " ${CMAKE_C_FLAGS})
+configure_file(config-kdenlive.h.cmake config-kdenlive.h @ONLY)
--- 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/206
+++ b/206
@@ -0,0 +1,206 @@
+0.9.6
+    * Fix keyframes when cutting a clip / undoing a clip cut
+    * Warn before overwriting .mlt stabilized file
+    * Fix monitor confusion (clip monitor sometimes playing timeline,...)
+    * Fix the Mono to Stereo effect UI
+    * Fix proxy of playlist having wrong aspect ratio in some locales
+    * Fix transition widget not correctly updated when resizing a transition
+    * Fix DVD chapters broken when using an intro movie
+    * Fix error message (No matching profile) poping up in render widget when everything was ok
+    * Fix clip keyframes not showing on project load
+    * Fix bug when moving guide (was not moving to the correct place)
+    * Fix project corruption (wrong character) caused by some clip's metadata
+    * Fix possible crash on track deletion
+    * Fix timeline corruption when using spacer tool or overwrite edit mode
+    * Fix possible crash when editing speed effect
+    * Fix transition losing all its properties when moved
+    * Fix crash when pressing del when editing animation in title widget
+    * Fix crash when doing quick clip resize
+    * Fix corruption when groups where overlapping
+    * Fix corruption when adding a title clip where a transition already existed
+    * Fix timeline preview corruption with some transitions
+
+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 (http://kdenlive.org/mantis/view.php?id=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 (http://kdenlive.org/mantis/view.php?id=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 (http://kdenlive.org/mantis/view.php?id=1288)
+    * Add "select all clips in track" and "select all clips in timeline" features (http://kdenlive.org/mantis/view.php?id=1950)
+    * Put audio effects in subcategories to avoid uberlong menus (http://kdenlive.org/mantis/view.php?id=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 (http://kdenlive.org/mantis/view.php?id=2580)
+    * Fix script rendering when script name contains whitespace
+    * Ensure clip in project tree is visible after rename (scroll if necessary) (http://kdenlive.org/mantis/view.php?id=2563)
+    * Fix monitor scene never resetting scrollbars
+    * Fix issues with transitions when inserting track (http://kdenlive.org/mantis/view.php?id=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 (http://kdenlive.org/mantis/view.php?id=2543)
+    * Fix consecutive error messages overwriting each other (http://www.kdenlive.org/mantis/view.php?id=2519)
+    * Fix crash when editing properties of several missing clips
+    * Fix vectorscope for 24b RGB images (http://kdenlive.org/mantis/view.php?id=2478)
+    * Fix archiving sometimes not saving playlist clips and subclips (http://kdenlive.org/mantis/view.php?id=2475)
+    * Fix archiving feature not saving playlist clips and slowmotion clips inside them (http://kdenlive.org/mantis/view.php?id=2475)
+    * Fix crash recovery feature issues with long or non UTF-8 filenames (http://kdenlive.org/mantis/view.php?id=2441, http://kdenlive.org/mantis/view.php?id=2450)
+    * Fix rendering jobs sometimes not starting
+    * Fix crash on proxy creation (concurrency issue) (http://kdenlive.org/mantis/view.php?id=2471)
+    * Fix zone playing (http://kdenlive.org/mantis/view.php?id=2468)
+    * Fix click on monitor sometimes not triggering play
+    * Fix crash when moving a folder and a clip in project tree (http://kdenlive.org/mantis/view.php?id=2458)
+    * Fix color change not working in title widget (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2297)
+    * Show filter version in filter info box.
+    * When multiple clips are selected do not allow resizing, but moving only. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2216)
+    * Remove the "avformat-novalidate" trick for faster loading, caused crash. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2344)
+    * Fix issues with simultaneous 2-pass rendering (x264). (http://kdenlive.org/mantis/view.php?id=2338)
+    * Fix rendering progress not shown if multiple copies of Kdenlive are open. (http://kdenlive.org/mantis/view.php?id=1265)
+    * Fix DVD chapters discarded when opening from render dialog. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2321)
+    * Fix audio issues in rendered file when using a recent ffmpeg version by replacing 'b' with 'vb' (ffmpeg bitrate parameter). (http://kdenlive.org/mantis/view.php?id=2318)
+    * Fix rendering to Flash could be broken by setting the number of encoder threads. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2231)
+    * Fix aspect ratio in title widget background image. (http://kdenlive.org/mantis/view.php?id=2225)
+    * Fix layout in save profile dialog. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2200)
+    * Disable save action if we are in the same state as last save.
+    * Fix pan and zoom keyframes lost after clip resize. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2187)
+    * Fix "save zone" saving proxy instead of real clip. (http://kdenlive.org/mantis/view.php?id=2184)
+    * Fix freeze when saving while timeline is at maximum zoom. (http://kdenlive.org/mantis/view.php?id=2174)
+    * Fix crash when deleting a track and having an audio clip on last track. (http://kdenlive.org/mantis/view.php?id=2168)
+    * Do not allow to create overlapping transitions that could corrupt timeline. (http://kdenlive.org/mantis/view.php?id=1901)
+    * Fix sometimes effects were missing. (http://kdenlive.org/mantis/view.php?id=2152)
+    * Fix crash in histogram scope.
+    * Fix multiple possible timeline corruptions. (http://kdenlive.org/mantis/view.php?id=2157)
+    * Do not allow rendering to a frame rate different than current project's profile. (http://kdenlive.org/mantis/view.php?id=2138)
+    * Fix DVD menu entries hidden under some circumstances.
+    * Fix channels in audio thumbnails being displaced by one frame. (http://kdenlive.org/mantis/view.php?id=1976)
+    * Fix possible crash caused by audio thumbnails. (http://kdenlive.org/mantis/view.php?id=2147)
+    * Fix possible freeze and error on project opening. (http://kdenlive.org/mantis/view.php?id=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. (http://kdenlive.org/mantis/view.php?id=2110)
+    * Fix user specified CFLAGS ignored. (http://kdenlive.org/mantis/view.php?id=2108)
+
+0.8
+    See http://kdenlive.org/discover/0.8
--- a/1
+++ b/1
@@ -1,4 +1,3 @@
-
 This is the coding guideline for Kdenlive.

 Committing
--- a/6
+++ b/6
@@ -1,7 +1,6 @@
-Kdenlive Installation Instrucions
+Kdenlive installation instrucions
 =================================

-
 To compile and install, go in the source directory and type:

 mkdir build;cd build
@@ -21,6 +20,3 @@ 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,33 +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 src src/ui"

-if [ $(expr length "${EXTRACTRC}") -eq 0 ]
-then
-    echo "extractrc not found. Please install it (it is maybe in the kdesdk-scripts package)."
-    exit 1
-fi
+$EXTRACTRC --tag=name --tag=description --tag=label --tag=comment --tag=paramlistdisplay effects/*.xml data/kdenliveeffectscategory.rc >> rc.cpp
+$EXTRACTRC `find $kdenlive_subdirs -name \*.rc -a ! -name encodingprofiles.rc -o -name \*.ui` >> rc.cpp

-
-kde_inc=${includedir:-${KDEDIR:-@CMAKE_INSTALL_PREFIX@}/include/kde}/kde.pot
-
-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/6
+++ b/6
@@ -1,4 +1,4 @@
-Kdenlive 0.8.2
+Kdenlive 0.9.6
 by Jean-Baptiste Mardelle <jb@kdenlive.org> and the Kdenlive team

 Kdenlive is a video editing application based on KDE Platform 4.
@@ -12,13 +12,13 @@ the following web page:

 http://www.mltframework.org

-The recommended MLT version is 0.7.6. It may work with other
+It is recommended to use the latest MLT version. It may work with older
 versions, but this is not guaranteed, or (at this stage of development) likely.

 We welcome all bug reports, feedback, and offers for help!
 So please visit our bug tracker and forums:

-Forum: 
+Forum:
 http://kdenlive.org/forum

 Bug Tracker:
--- a/README.translators
+++ b/README.translators
@@ -0,0 +1,20 @@
+This file is intended to contain tips and Q/A for translating.
+
+* What is String Freeze?
+  Some weeks (usually 2) before a new release, string freeze is declared. From
+  then it is guaranteed that no strings in the source code will be changed
+  anymore so that translators can work without constantly having to update again
+  and again.
+
+* There is a duplicate string (like «Clip:» and «Clip: » or «Audio device» and
+  «Audio Device»). What to do?
+  File a bug report on Mantis so that they can be corrected for the next
+  release.
+
+* There is some other weird thing (singular form has to be translated both
+  separately and together with its plural form, etc.).
+  As above: bug report.
+
+* There is HTML and some CDATA tags in a string to translate.
+  Yes. This is not a mistake but intended, for formatting. Please keep these
+  tags. :)
--- a/1
+++ b/1
@@ -1,4 +1,3 @@
-
 This file contains a to-do-list for releases. In braces the responsible person; none given means everybody.

 All time
--- a/70
+++ b/70
@@ -0,0 +1,70 @@
+Some ideas for a big refactoring of code.
+
+
+Input
+=========
+        handle MLT connection ((re-)move from renderer.cpp (hacks, special cases))
+        handle project document entry
+        draw layer on clip instances in timeline (thumbnails)
+        settings management (available through project tree items)
+        proxy creation
+        input method (register mimetype in file dialog, custom widget)
+        effect support (a, v, av, special effects (freeze, speed))
+	support for multi-channel sound (5.1, ...)
+
+        => modules for avformat, qimage/gtk_image(?), generators (slideshow, color, f0r)
+
+
+Timeline
+=========
+        provides basic operations (resize, move, add, remove) (GUI + XML + MLT) to be applied on any item
+
+        => modules for input modes (drag & drop, 3/4-point editing, cut, resize by dragging end), spacer, ripple edit, push/pull edit, ...)
+
+Clip instances
+-------
+        connection to input module
+        manage project document entry
+        information about support for timeline operations
+        owns an effect device
+        per instance settings (functionality provided by input module)
+        graphical timeline item (modules can register layers they want to draw (thumbnails, effect names, keyframes))
+
+Clip groups
+------
+        manage project document entry
+        pass on operations to items
+
+
+Effect system
+=========
+Keyframe manager
+------
+        pipe information from/to timeline effect device, effect stack, effect parameter
+
+Effect parameter
+------
+        custom widget
+        function to handle keyframes -> connect to keyframe manager
+        written in QScript/QML ?
+
+Effect device
+------
+        manages list of effects attached to clip, track, timeline, group, the world
+        passes info from/to timeline items and effect stack
+        manage project document entry
+
+
+Project
+=========
+        read/write
+        project settings management
+        provide functionality to manage settings (remove hardcoded stuff (slideshow, proxy, ...))
+
+
+Interface
+=========
+        provide functions to add menu items, global actions (for shortcut management)
+        layout management
+        styles management (see digikam)
+        ...
--- a/cmake/modules/FindGLEW.cmake
+++ b/cmake/modules/FindGLEW.cmake
@@ -0,0 +1,105 @@
+# Copyright (c) 2009 Boudewijn Rempt <boud@valdyas.org>                                                                                          
+#                                                                                                                                                
+# Redistribution and use is allowed according to the terms of the BSD license.                                                                   
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. 
+# 
+# - try to find glew library and include files
+#  GLEW_INCLUDE_DIR, where to find GL/glew.h, etc.
+#  GLEW_LIBRARIES, the libraries to link against
+#  GLEW_FOUND, If false, do not try to use GLEW.
+# Also defined, but not for general use are:
+#  GLEW_GLEW_LIBRARY = the full path to the glew library.
+
+IF (WIN32)
+
+  IF(CYGWIN)
+
+    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h)
+
+    FIND_LIBRARY( GLEW_GLEW_LIBRARY glew32
+      ${OPENGL_LIBRARY_DIR}
+      /usr/lib/w32api
+      /usr/X11R6/lib
+    )
+
+
+  ELSE(CYGWIN)
+  
+    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h
+      $ENV{GLEW_ROOT_PATH}/include
+    )
+
+    FIND_LIBRARY( GLEW_GLEW_LIBRARY
+      NAMES glew glew32
+      PATHS
+      $ENV{GLEW_ROOT_PATH}/lib
+      ${OPENGL_LIBRARY_DIR}
+    )
+
+  ENDIF(CYGWIN)
+
+ELSE (WIN32)
+
+  IF (APPLE)
+# These values for Apple could probably do with improvement.
+    FIND_PATH( GLEW_INCLUDE_DIR glew.h
+      /System/Library/Frameworks/GLEW.framework/Versions/A/Headers
+      ${OPENGL_LIBRARY_DIR}
+    )
+    SET(GLEW_GLEW_LIBRARY "-framework GLEW" CACHE STRING "GLEW library for OSX")
+    SET(GLEW_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
+  ELSE (APPLE)
+
+    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h
+      /usr/include/GL
+      /usr/openwin/share/include
+      /usr/openwin/include
+      /usr/X11R6/include
+      /usr/include/X11
+      /opt/graphics/OpenGL/include
+      /opt/graphics/OpenGL/contrib/libglew
+    )
+
+    FIND_LIBRARY( GLEW_GLEW_LIBRARY GLEW
+      /usr/openwin/lib
+      /usr/X11R6/lib
+    )
+
+  ENDIF (APPLE)
+
+ENDIF (WIN32)
+
+SET( GLEW_FOUND "NO" )
+IF(GLEW_INCLUDE_DIR)
+  IF(GLEW_GLEW_LIBRARY)
+    # Is -lXi and -lXmu required on all platforms that have it?
+    # If not, we need some way to figure out what platform we are on.
+    SET( GLEW_LIBRARIES
+      ${GLEW_GLEW_LIBRARY}
+      ${GLEW_cocoa_LIBRARY}
+    )
+    SET( GLEW_FOUND "YES" )
+
+#The following deprecated settings are for backwards compatibility with CMake1.4
+    SET (GLEW_LIBRARY ${GLEW_LIBRARIES})
+    SET (GLEW_INCLUDE_PATH ${GLEW_INCLUDE_DIR})
+
+  ENDIF(GLEW_GLEW_LIBRARY)
+ENDIF(GLEW_INCLUDE_DIR)
+
+IF(GLEW_FOUND)
+  IF(NOT GLEW_FIND_QUIETLY)
+    MESSAGE(STATUS "Found Glew: ${GLEW_LIBRARIES}")
+  ENDIF(NOT GLEW_FIND_QUIETLY)
+ELSE(GLEW_FOUND)
+  IF(GLEW_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find Glew")
+  ENDIF(GLEW_FIND_REQUIRED)
+ENDIF(GLEW_FOUND)
+
+MARK_AS_ADVANCED(
+  GLEW_INCLUDE_DIR
+  GLEW_GLEW_LIBRARY
+  GLEW_Xmu_LIBRARY
+  GLEW_Xi_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
@@ -3,30 +3,46 @@
 #

 include(FindPkgConfig)
-pkg_check_modules(MLT REQUIRED mlt++)
+pkg_check_modules(MLT 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
+  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
+  PATHS
+    ${MLT_LIBDIR}
+    ${MLT_PREFIX}/lib
+    /usr/local/lib
+    /usr/lib
  NO_DEFAULT_PATH
 )

 find_path(LIBMLTPLUS_INCLUDE_DIR
  NAMES mlt++/Mlt.h
-  PATHS ${MLT_INCLUDEDIR} ${MLT_PREFIX}/include /usr/local/include /usr/include
+  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
+  PATHS
+    ${MLT_LIBDIR}
+    ${MLT_PREFIX}/lib
+    /usr/local/lib
+    /usr/lib
  NO_DEFAULT_PATH
 )

@@ -37,24 +53,20 @@ 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)
+if(LIBMLT_FOUND AND LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR)
  set(LIBMLT_FOUND 1)
  set(LIBMLTPLUS_LIBRARIES ${LIBMLTPLUS_LIBRARY})
-else(LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR)
+else(LIBMLT_FOUND AND LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR)
  set(LIBMLT_FOUND 0)
-endif(LIBMLTPLUS_LIBRARY AND LIBMLTPLUS_INCLUDE_DIR)
+endif(LIBMLT_FOUND AND 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}")
+    message(STATUS "Found MLT++: ${LIBMLTPLUS_LIBRARY}")
  endif(NOT LIBMLT_FIND_QUIETLY)
 else(LIBMLT_FOUND)
  if(LIBMLT_FIND_REQUIRED)
-    message(FATAL_ERROR "Could not find MLT library")
+    message(FATAL_ERROR "Could not find MLT++")
  endif(LIBMLT_FIND_REQUIRED)
-endif(LIBMLT_FOUND)
+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/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/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
@@ -3,5 +3,7 @@

 #cmakedefine VERSION @VERSION@

-#endif
+#cmakedefine HAVE_MALLOC_H 1
+#cmakedefine HAVE_PTHREAD_H 1

+#endif
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,4 +1,4 @@
-install(FILES banner.png timeline_nothumbs.png timeline_athumbs.png timeline_vthumbs.png timeline_avthumbs.png metadata.properties blacklisted_effects.txt blacklisted_transitions.txt encodingprofiles.rc DESTINATION ${DATA_INSTALL_DIR}/kdenlive )
+install(FILES banner.png timeline_nothumbs.png timeline_athumbs.png timeline_vthumbs.png timeline_avthumbs.png metadata.properties blacklisted_effects.txt blacklisted_transitions.txt encodingprofiles.rc meta_ffmpeg.png meta_libav.png meta_magiclantern.png 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)
--- 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
@@ -73,6 +76,8 @@ frei0r.vignette


 #MLT effects with XML UI
+channelcopy
+crop
 dust
 grain
 lines
@@ -80,9 +85,8 @@ oldfilm
 tcolor
 rotoscoping
 wave
-volume
 vignette
-
+volume

 #Effects not usable with a simple GUI
 sox
@@ -97,7 +101,6 @@ resize
 resample
 mono

-dynamictext

 # Effects need extra GUI to create the resulting melt.xml with the corrected content
 videostab
--- a/data/blacklisted_transitions.txt
+++ b/data/blacklisted_transitions.txt
@@ -1,5 +1,8 @@
 # redundant transitions
 frei0r.composition

-# unusable transitions
+# unusable transitions (parameters required, not implemented in Kdenlive)
 frei0r.alphainjection
+frei0r.blend
+frei0r.xfade0r
+
--- 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/encodingprofiles.rc
+++ b/data/encodingprofiles.rc
@@ -3,9 +3,11 @@ DNxHD=vcodec=dnxhd vb=145000k acodec=pcm_s16le threads=%threads;mov
 Normal MPEG=vcodec=mpeg2video qscale=10 acodec=mp2 ac=2 ab=128k ar=48000 threads=%threads;mpg

 [proxy]
-Normal MPEG=-f mpegts -acodec libmp3lame -ac 2 -ab 128k -ar 48000 -vcodec mpeg2video -g 5 -deinterlace -s 480x270 -vb 400k;ts
+Normal MPEG=-f mpegts -acodec libmp3lame -ac 2 -ab 128k -ar 48000 -vcodec mpeg2video -g 5 -deinterlace -s 640x360 -vb 700k;ts
+
+[screengrab]
+X246 mute=-vcodec libx264 -preset fast -threads 0;mkv
+X246 with audio=-i pulse -acodec libvorbis -ab 256k -vcodec libx264 -preset fast -threads 0;mkv

 [video4linux]
-Normal MPEG=f=mpeg acodec=mp2 ab=128k ar=48000 vcodec=mpeg2video minrate=0 vb=4000k;mpg
-
-
+Normal MPEG=acodec=mp2 ab=128k ar=48000 vcodec=mpeg2video minrate=0 vb=4000k;mpg
--- a/data/kdenliveeffectscategory.rc
+++ b/data/kdenliveeffectscategory.rc
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 <data name="effects" version="0">
-  <group list="brightness,gamma,frei0r.balanc0r,frei0r.brightness,frei0r.levels,frei0r.three_point_balance,frei0r.curves,frei0r.coloradj_RGB,frei0r.sopsat,frei0r.bezier_curves">
+  <group list="brightness,gamma,frei0r.colgate,frei0r.balanc0r,frei0r.brightness,frei0r.levels,frei0r.three_point_balance,frei0r.curves,frei0r.coloradj_RGB,frei0r.sopsat,frei0r.bezier_curves">
    <text>Colour correction</text>
  </group>
  <group list="invert,sepia,tcolor,greyscale,frei0r.B,frei0r.G,frei0r.R,frei0r.contrast0r,frei0r.saturat0r,frei0r.tint0r,frei0r.primaries,frei0r.rgbparade,chroma_hold,frei0r.hueshift0r">
@@ -31,7 +31,7 @@
  <group list="wave,mirror,frei0r.distort0r,frei0r.lenscorrection,frei0r.c0rners,frei0r.defish0r,frei0r.pixeliz0r">
    <text>Distort</text>
  </group>
-  <group list="chroma,frei0r.alpha0ps,frei0r.alphagrad,frei0r.alphaspot,frei0r.transparency,frei0r.select0r,frei0r.mask0mate,rotoscoping">
+  <group list="chroma,frei0r.alpha0ps,frei0r.alphagrad,frei0r.alphaspot,frei0r.transparency,frei0r.select0r,frei0r.mask0mate,rotoscoping,frei0r.keyspillm0pup">
    <text>Alpha manipulation</text>
  </group>
  <group list="frei0r.d90stairsteppingfix,frei0r.hqdn3d,frei0r.sharpness">
--- a/data/meta_ffmpeg.png
+++ b/data/meta_ffmpeg.png
--- a/data/meta_libav.png
+++ b/data/meta_libav.png
--- a/data/meta_magiclantern.png
+++ b/data/meta_magiclantern.png
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,6 +1,4 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kdenlive)
-
-ADD_SUBDIRECTORY(da)
-ADD_SUBDIRECTORY(fr)
-ADD_SUBDIRECTORY(uk)
-ADD_SUBDIRECTORY(nl)
+kde4_create_handbook(index.docbook
+  INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en
+  SUBDIR kdenlive
+)
--- a/doc/da/CMakeLists.txt
+++ b/doc/da/CMakeLists.txt
@@ -1 +0,0 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/da SUBDIR kdenlive)
--- a/doc/da/index.docbook
+++ b/doc/da/index.docbook
@@ -1,359 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY % addindex "IGNORE">
-  <!ENTITY % Danish "INCLUDE">
-]>
-<book lang="&language;">
-<bookinfo>
-<title>Kdenlive manual - Kom godt i gang</title>
-<authorgroup>
-<author>
-<personname>
-    <firstname>Dette dokument er blevet konverteret fra siden <ulink url=" http://userbase.kde.org/Kdenlive/Manual/QuickStart/da">Kdenlive/Manual/QuickStart/da</ulink> på KDE UserBase.</firstname>
-<surname></surname>
-</personname>
-    </author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-    </authorgroup>
-<legalnotice>&FDLNotice;</legalnotice>
-<date>2011-06-17</date>
-    <releaseinfo>0.8.2</releaseinfo>
-<abstract>
-<para></para>
-    </abstract>
-    <keywordset>
-<keyword>KDE</keyword>
-</keywordset>
-</bookinfo>
-<!--userbase <timestamp>2011-06-17T21:17:41Z</timestamp>-->
-
-<!--userbase-content-->
-<chapter id="lav-et-nyt-projekt"><title>Lav et nyt projekt</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Folder-Structure.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Kdenlive directory structure</phrase>
-    </textobject>
-    <caption>
-      <para>Kdenlive directory structure</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Første skridt er at lave en ny (tom) mappe. Jeg vil kalde den <filename>quickstart-tutorial/</filename> i denne vejledning. Anskaf så nogle videoklip; du kan fx downloade dem på <ulink url="http://granjow.net/uploads/kdenlive/manual/kdenlive-tutorial-videos-2011-avi.tar.bz2">kdenlive-tutorial-videos-2011-avi.tar.bz2</ulink> (7 MB)<footnote><para>Hvis du foretrækker Theora (hvilket du nok ikke gør, da Ogg Video sædvanligvis skaber problemer), så kan du i stedet downloade <ulink url="http://granjow.net/uploads/kdenlive/manual/kdenlive-tutorial-videos-2011-ogv.tar.bz2">kdenlive-tutorial-videos-2011-ogv.tar.bz2</ulink>.</para></footnote> og udpakke dem til fx undermappen <filename>quickstart-tutorial/Videos/</filename> i projektmappen.</para>
-<para>Billedet til venstre viser den foreslåede mappestruktur: Hvert projekt har sin egen mappe med videofiler i undermappen <filename>Videos</filename>, lydfiler i mappen <filename>Audio</filename> osv. (<ulink url="http://userbase.kde.org/Special:myLanguage/Kdenlive/Manual/Projects_and_Files#File_Structure">læs mere</ulink>)</para>
-<para>(Vejledningen antage herefter, at du bruger de nævnte eksempelvideoer, med den virker osgå med andre.)</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-New-Project.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Dialogen til nye projekter</phrase>
-    </textobject>
-    <caption>
-      <para>Dialogen til nye projekter</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Åbn Kdenlive og lav et nyt projekt (<menuchoice><guimenu>Fil</guimenu><guimenuitem>Ny</guimenuitem></menuchoice>).</para>
-<para>Vælg projektmappen (<filename>quickstart-tutorial/</filename>), som du lavede tidligere og vælg er passende projektprofil. Videofilerne, som du hentede ovenfor er 720p, 23.98 fps.<footnote><para><ulink url="http://en.wikipedia.org/wiki/720p">720</ulink> er videoens højde, p står for <ulink url="http://en.wikipedia.org/wiki/Progressive_scan">progressiv scanning</ulink> i modsætning til <ulink url="http://en.wikipedia.org/wiki/Interlaced_video">interlacet video</ulink> og fps-tallet angiver antallet af hele billeder pr. sekund.</para></footnote> Hvis du bruger dine egne filer og ikke ved, hvilken profil, du skal bruge, så vil <application>Kdenlive</application> foreslå en passende en når det første klip bliver tilføjet, så du behøver ikke at vælge noget i dette felt.</para>
-</chapter>
-<chapter id="tilføj-klip"><title>Tilføj klip</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Add-Clips.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Projekttræet: Tilføj videoklip</phrase>
-    </textobject>
-    <caption>
-      <para>Projekttræet: Tilføj videoklip</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Nu da projektet er klart, så lad os begynde med at tilføje nogle klip (dem du downloadede). Dette sker ved hjælp af <emphasis>Projekttræ</emphasis>-visningen; et klik på ikonet <guilabel>Tilføj klip</guilabel> åbner en fildialog, mens et klik på den lille pil giver dig en liste med andre slags klip, som også kan tilføjes. Videoklip, lydklip, billeder og andre <application>Kdenlive</application>-projekter kan tilføjes via den almindelige <guilabel>Tilføj klip</guilabel>-dialog.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Mainwindow.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Kdenlive 0.8 med vejledningsfilerne i vinduet</phrase>
-    </textobject>
-    <caption>
-      <para>Kdenlive 0.8 med vejledningsfilerne i vinduet</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Efter at have indlæst klippene vil <application>Kdenlive</application> se nogenlunde sådan ud. Øverst til venstre er det allerede kendte projekttræ. Til højre for det er monitorer, som viser video: Klipmonitoren viser video fra de oprindelige klip; projektmonitoren viser, hvordan den resulterende video vil se ud med alle effekter og overgange anvendt. Den tredje vigtige ting er tidslinjen (under monitorene). Det er her videoklippene vil blive redigeret. Der er to forskellige slags spor, Video og Audio. Videospor kan indeholde enhver slags klip, også lydspor &amp;mdash; men trækker du et videoklip til Audio-sporet, så vil kun lyden blive brugt.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Save-Project.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Gem et Kdenlive-projekt</phrase>
-    </textobject>
-    <caption>
-      <para>Gem et Kdenlive-projekt</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Lad os gemme arbejdet med menuen <menuchoice><guimenu>Fil</guimenu><guimenuitem>Gem</guimenuitem></menuchoice>. Dette gemmer projektet, dvs. hvor vi placerede klippene på tidslinjen, hvilke effekter vi anvendte og så videre. Det kan <emphasis>ikke</emphasis> spilles.<footnote><para>For fuldstændighedens skyld, så <emphasis>kan</emphasis> det spilles ved brug af <screen>melt ditprojekt.kdenlive</screen>, men sådan vil du næppe ønske at præsentere din færdige video, eftersom det (formentligt) er alt for langsomt. Desuden virker det kun, hvis <guilabel>melt</guilabel> er installeret.</para></footnote> Processen med at lave den endelige video kaldes <emphasis>generering</emphasis>.</para>
-</chapter>
-<chapter id="tidslinjen"><title>Tidslinjen</title>
-<para>Nu kommer den egentlige redigering. Projektets klip kombineres til det endelige resultat på tidslinjen. Du henter dem ved træk og slip: Træk Napoli fra projekttræet og slip den på tidslinjen.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Timeline-Clips.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>De første klip på tidslinjen</phrase>
-    </textobject>
-    <caption>
-      <para>De første klip på tidslinjen</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Vi for også brug for noget bestik, så træk også Spoon over på det første spor. Træk så Napoli til begyndelsen af tidslinjen (ellers vil den genererede tidslinje starte med nogle sekunders sort skærm) og træk Spoon, så den ligger lige efter Napoli, sådan at det ser ud som på billedet til venstre. (Jeg har zoomet ind med <keycombo>&Ctrl;<keycap>musehjul</keycap></keycombo>.)</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-TimelineCursor.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Tidslinjemarkøren</phrase>
-    </textobject>
-    <caption>
-      <para>Tidslinjemarkøren</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Du kan allerede se en forhåndsvisning af resultatet ved at taste <keycap>Mellemrum</keycap> (eller klikke på knappen <guilabel>Play</guilabel> i projektmonitoren). Du vil se Napoli umiddelbart fulgt af Spoon. Hvis tidslinjemarkøren ikke er ved begyndelsen, så vil projektmonitoren starte et eller andet sted i midten; du kan flytte markøren ved at trække den enten i tidslinje-linealen eller  i projektmonitoren. Hvis du foretrækker tastaturgenveje, så gør <keycombo>&Ctrl;<keycap>Home</keycap></keycombo> det samme for den aktive monitor. (Vælg <guilabel>Projektmonitor</guilabel> hvis den ikke allerede er valgt før du bruger denne genvej.)</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Resize-Marker.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Markøren til at ændre størrelse</phrase>
-    </textobject>
-    <caption>
-      <para>Markøren til at ændre størrelse</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Tilføj nu klippet Billard. I de første 1,5 sekunder sker der ingenting i klippet, så det bør måske <emphasis>klippes</emphasis> for at undgå, at videoen bliver kedelig. En nem måde<footnote><para>Når man skriver sådan, så antyder det, at der er flere måder at klippe videoer på; det er der faktisk også</para></footnote> at gøre dette er at flytte tidslinjemarkøren til den ønskede position (dvs. til det sted, hvor du vil klippe videoen), og så trække i videoklippets venstre kant, når markøren til ændring af størrelsen dukker op. Den vil hægte sig til tidslinjemarkøren, når du flytter den tæt nok på.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Overlap-Clips.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Overlappende klip</phrase>
-    </textobject>
-    <caption>
-      <para>Overlappende klip</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>For at tilføje en <emphasis>overgang</emphasis> imellem Spoon og Billard, så skal de to klip overlappe. For at være nøjagtig, så skal det andet klip være under eller over det første, og det første klip skal slutte nogle billeder efter at det andet klip starter. Det hjælper at zoome ind, indtil mærkerne for enkelte billeder dukker op. Det er også en fordel altid at bruge samme varighed af overgangen, for eksempel fem billeder som her.</para>
-<para>Du kan zoome ind ved enten at bruge <guilabel>Zoom-skyderen</guilabel> for neden i <guilabel>Kdenlives</guilabel> vindue eller med <keycombo>&Ctrl;<keycap>Musehjul</keycap></keycombo>. <application>Kdenlive</application> vil zoome omkring tidslinjemarkøren, så sæt først den til den position, som du vil se forstørret og zoom så ind.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive-Quickstart-Add-Transition.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Overgangsmarkøren</phrase>
-    </textobject>
-    <caption>
-      <para>Overgangsmarkøren</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Nu, hvor klippene overlapper kan du tilføje en overgang. Det gør du ved at højreklikke på det øverste klip og vælge <guilabel>Tilføj overgang</guilabel> eller lettere, ved at klikke i det nederste venstre hjørne af klippet Spoon. Dette vil som standard tilføje en dissolve-overgang, som i dette tilfælde er det bedste, da skeen ikke skal bruges til at spille med alligevel.</para>
-<para>Dissolve-overgange fader det første klip ind i det næste.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive-Quickstart-Add-Last-Clip.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase></phrase>
-    </textobject>
-    <caption>
-      <para></para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Lad os nu tilføje det sidste klip, Piano, og igen anvende en dissolve-overgang. Hvis du føjer den til tidslinjens første spor, så skal du klikke i det nye klips nederste venstre hjørne for at tilføje overgangen til det forrige klip.</para>
-<sect1 id="effekter"><title>Effekter</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Add-Effect.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>List over effekter</phrase>
-    </textobject>
-    <caption>
-      <para>List over effekter</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Klaveret kan blive farvelagt ved at tilføje en <emphasis>effekt</emphasis> til det. Vælg klippet Piano og dobbeltklik på effekten <guilabel>RGB justering</guilabel> i <guilabel>Effektliste</guilabel>. Hvis denne ikke er synlig, så kan du bringe den frem ved hjælp af menuen <menuchoice><guimenu>Vis</guimenu><guimenuitem>Effektliste</guimenuitem></menuchoice>.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Effect-Flag.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase></phrase>
-    </textobject>
-    <caption>
-      <para></para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Når effekten er blevet tilføjet, vil dens navn blive føjet til klippet i tidslinjen. Det vil også blive vist i <guilabel>Effektstak</guilabel>-visningen.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive-Quickstart-EffectStack.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Effektstak med RGB justering</phrase>
-    </textobject>
-    <caption>
-      <para>Effektstak med RGB justering</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>For at give billedet en varm gul-orange tone, passende til den behagelige aften, så skal blå reduceres og rød og grøn fremhæves.</para>
-<para>Værdierne i Effektstak-visningen kan ændres ved brug af skyderne (midterste museknap sætter dem tilbage til standardværdierne), eller ved at skrive en værdi direkte efter dobbelt-klik på tallet til højre for skyderen.</para>
-<para>Effekter kan også tilføjes med ikonet <guilabel>Tilføj ny effekt</guilabel> (indrammet i billedet til venstre) i <guilabel>Effektstak</guilabel>-visningen; det refererer altid til det klip i tidslinjen, som aktuelt er markeret. Ved at fjerne fluebenet fra en effekt bliver den midlertidigt slået fra (dens indstillinger bevares dog), dette er fx nyttigt for effekter, som kræver masser af regnekraft, så de kan slås fra under redigering og slås til igen til generering.</para>
-<para>For nogle effekter, som den der er blevet brugt her, er det muligt at tilføje nøglerammer. Det indrammede ur-ikon indikerer dette. Nøglerammer bruges til at ændre effektens parametre over tid. I vort klip lader dette os fade klaverets farver fra en varm aftenfarve til en kold nattefarve.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Keyframes.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Nøglerammer til effekter</phrase>
-    </textobject>
-    <caption>
-      <para>Nøglerammer til effekter</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Efter at have klikket på ikonet <guilabel>Nøgleramme</guilabel> (det indrammede ur-ikon i forrige billede) bliver Effektstak-visningen omarrangeret. Som standard vil der være to nøglerammer, en i begyndelse af klippet i tidslinjen og et i slutningen. Flyt tidslinjemarkøren til enden af klippet i tidslinjen, sådan at projektmonitoren faktisk viser de nye farver, når du ændrer parametrene for nøglerammen i slutningen af klippet.</para>
-<para>Sørg for, at den sidste nøgleramme er valgt i effektstakkens liste. Så er du klar til at lade en dybblå farve flyde ud over klaveret.</para>
-<para>Flytte du tidslinjemarkøren til starten af projekter og spiller det (med <keycap>Mellemrum</keycap>-tasten eller med knappen <guilabel>Afspil</guilabel> i <guilabel>Projektmonitoren</guilabel>), så skulle klaveret nu ændre farve, som vi ønskede.</para>
-<para>Brug af nøglerammer var den vanskeligste del af denne vejledning. Hvis du klarede at gøre det, så vil du let kunne mestre <application>Kdenlive</application>!</para>
-</sect1>
-<sect1 id="musik"><title>Musik</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Fadeout.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Lyden fader ud</phrase>
-    </textobject>
-    <caption>
-      <para>Lyden fader ud</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Eftersom klippene ikke har nogen lyd, så lad os søge efter nogle gode stykker musik i din lokale samling eller på websider som <ulink url="http://www.jamendo.com">Jamendo</ulink>. Lydklippet skal, efter at du har føjet det til, placeres i et Audio spor på tidslinjen.</para>
-<para>Lydklippet udstrækning på tidslinjen kan ændres på samme måde som for videoklip. Markøren vil automatisk hægte sig til slutningen af projektet. For at tilføje en udfasningseffekt til sidst i lydklippet (med mindre du fandt en fil med præcis den rette længde) kan du lade musen svæve over tidslinjeklippets øverste højre (eller venstre) hjørne og trække den grønne skive til den position, hvor udfasningen skal starte.<footnote><para>Den grønne skive er en genvej for at tilføje effekten <menuchoice><guimenu>Fade</guimenu><guimenuitem>Udfasning</guimenuitem></menuchoice> Begge måder giver det samme resultat.</para></footnote></para>
-</sect1>
-</chapter>
-<chapter id="generering"><title>Generering</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Renderer.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Genereringsdialogen</phrase>
-    </textobject>
-    <caption>
-      <para>Genereringsdialogen</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Blot et par minutter til, så er projektet færdigt! Klik på knappen <guilabel>Generér</guilabel> (eller vælg menuen <menuchoice><guimenu>Projekt</guimenu><guimenuitem>Generér</guimenuitem></menuchoice> eller tast <keycombo>&Ctrl;&Enter;</keycombo>) for at få vist dialogen som vises her til venstre. Vælg den ønskede outputfil for vor nye video med alle effekter og overgange, vælg MPEG4 (virker næsten overalt) og en bitrate på 2000k (jo højere bitrate, jo større outputfil og jo bedre kvalitet &amp;mdash; men eftersom de anvendte klip har en bitrate på 2000k, så giver det ingen forbedring at vælge en højere bitrate), og klik på knappen <guilabel>Generér til fil</guilabel>.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Rendering.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Genereringsfremskridt</phrase>
-    </textobject>
-    <caption>
-      <para>Genereringsfremskridt</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Efter nogle sekunder vil genereringen være overstået, og dit første <application>Kdenlive</application>-projekt færdigt. Tillykke!</para>
-</chapter>
-
-<!-- empty chapter
-<chapter id="referencer-og-noter"><title>Referencer og noter</title>
-</chapter
-->
-<!--userbase-content-->
-<chapter id="credits">
-<title>Ophavsret</title>
-    <para>
-Se oplysninger op ophavsret for dokumentationen på UserBase
-    <ulink url="http://userbase.kde.org/index.php?title=Kdenlive/Manual/QuickStart/da&amp;action=history">Kdenlive/Manual/QuickStart/da page history</ulink></para>
-    <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
-&underFDL;
-</chapter>
-&documentation.index;
-</book>
--- a/doc/fr/CMakeLists.txt
+++ b/doc/fr/CMakeLists.txt
@@ -1 +0,0 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/fr SUBDIR kdenlive)
--- a/doc/fr/index.docbook
+++ b/doc/fr/index.docbook
@@ -1,406 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY % addindex "IGNORE">
-  <!ENTITY % French "INCLUDE">
-]>
-<book lang="&language;">
-<bookinfo>
-<title>Manuel de Kdenlive</title>
-<authorgroup>
-<author>
-<personname>
-      <firstname>Cette documentation a été converti à partir de la <ulink url=" http://userbase.kde.org/Kdenlive/Manual/QuickStart/fr">page KDE UserBase</ulink>.</firstname>
-<surname></surname>
-</personname>
-      </author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-      </authorgroup>
-<legalnotice>&FDLNotice;</legalnotice>
-<date>2011-09-10</date>
-      <releaseinfo>0.8.2</releaseinfo>
-<abstract>
-<para></para>
-      </abstract>
-      <keywordset>
-<keyword>KDE</keyword>
-<keyword>multimédia</keyword>
-<keyword>vidéo</keyword>
-</keywordset>
-</bookinfo>
-<!--userbase <timestamp>2011-09-10T11:45:53Z</timestamp>-->
-
-<!--userbase-content-->
-<chapter id="créer-un-nouveau-projet"><title>Créer un nouveau projet</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-folder-structure.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Structure de dossier Kdenlive</phrase>
-    </textobject>
-    <caption>
-      <para>Structure de dossier Kdenlive</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>La première étape est de créer un nouveau dossier (vide) pour notre nouveau projet. Appelons-le <filename>tutoriel-mise-en-route/</filename> dans ce tutoriel. Récupérez quelques vidéos échantillons, vous pouvez télécharger <ulink url="http://granjow.net/uploads/kdenlive/manual/kdenlive-tutorial-videos-2011-avi.tar.bz2">celles-ci (7 Mo)</ulink> <footnote><para>Si vous préférez Theora (peu probable vu que les vidéos Ogg provoquent souvent des problèmes), vous pouvez également télécharger <ulink url="http://granjow.net/uploads/kdenlive/manual/kdenlive-tutorial-videos-2011-ogv.tar.bz2">celles-ci</ulink></para></footnote>. Décompressez-les dans un sous-dossier du projet, par exemple <filename>tutoriel-mise-en-route/videos/</filename>.
-</para>
-<para>L'image de gauche montre la structure de dossier proposée : chaque projet a son propre dossier, avec des fichiers vidéo dans le sous-dossier <filename>videos</filename>, des fichiers audio dans le sous-dossier <filename>audio</filename>, &etc; (<ulink url="http://userbase.kde.org/Special:myLanguage/Kdenlive/Manual/Projects_and_Files#File_Structure">en savoir plus</ulink>)
-</para>
-<para>(à partir de maintenant le tutoriel suppose que vous utilisez les échantillons de vidéo fournis, mais il fonctionne avec n'importe quelle autre source.)
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-new-project.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Fenêtre de création de projet</phrase>
-    </textobject>
-    <caption>
-      <para>Fenêtre de création de projet</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Ouvrez <emphasis>Kdenlive</emphasis> et créez un nouveau projet (<menuchoice><guimenu>Fichier</guimenu><guimenuitem>Nouveau</guimenuitem></menuchoice>).
-</para>
-<para>Choisissez le dossier projet précédemment créé (<filename>tutoriel-mise-en-route/</filename>) et sélectionnez un profil de projet approprié. Les fichiers vidéo ci-dessus sont en 720p et 23,98 fps. <footnote><para> <ulink url="http://fr.wikipedia.org/wiki/720p">720</ulink> est la hauteur de la vidéo, p signifie <ulink url="http://fr.wikipedia.org/wiki/Balayage_progressif">balayage progressif</ulink> contrairement à <ulink url="http://fr.wikipedia.org/wiki/Entrelacement_(vidéo)">entrelacé</ulink>, et le nombre fps désigne le nombre d'images complètes par seconde.</para></footnote> Si vous utilisez vos propres fichiers et ne savez pas quel profil utiliser, <emphasis>Kdenlive</emphasis> proposera le plus approprié lorsque le premier clip sera ajouté, vous pouvez donc laisser ce champ tel quel.
-</para>
-</chapter>
-<chapter id="ajouter-des-clips"><title>Ajouter des clips</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-add-clips.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Arborescence du projet : ajout de clips vidéo</phrase>
-    </textobject>
-    <caption>
-      <para>Arborescence du projet : ajout de clips vidéo</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Maintenant que le projet est prêt, nous allons commencer à ajouter des clips (par exemple ceux que vous avez téléchargés). Cela se fait dans la zone <emphasis>Arborescence du projet</emphasis> ; un clic sur l'icône <guilabel>Ajouter un clip</guilabel> ouvre directement la boîte de dialogue d'ouverture de fichier, et un clic sur la petite flèche montre une liste des types de clips qui peuvent être ajoutés. Des vidéos, des fichiers audio, des images et d'autres projets <emphasis>Kdenlive</emphasis> peuvent être ajoutés via cette fenêtre <guilabel>Ajouter un clip</guilabel>.
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-mainwindow.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Fenêtre Kdenlive 0.8 avec les fichiers du didacticiel</phrase>
-    </textobject>
-    <caption>
-      <para>Fenêtre Kdenlive 0.8 avec les fichiers du didacticiel</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Après le chargement des clips, <emphasis>Kdenlive</emphasis> va ressembler à ceci. En haut à gauche on retrouve l'arborescence du projet déjà vue. A droite les moniteurs qui affichent les vidéos : le moniteur de clip qui affiche la vidéo des clips originaux, et le moniteur projet avec la vidéo telle qu'elle apparaîtra en sortie, avec tous les effets, transitions etc appliqués. Le troisième élément, également très important, est la ligne de montage (sous les moniteurs) : c'est là que les clips vidéo seront montés. Il y a deux types de pistes différents, vidéo et audio. Les pistes vidéo peuvent contenir n'importe quel type de clip, et les pistes audio aussi... mais lorsqu'on dépose un fichier vidéo sur une piste audio, seul le son sera utilisé.
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-save-project.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Enregistrer un projet Kdenlive</phrase>
-    </textobject>
-    <caption>
-      <para>Enregistrer un projet Kdenlive</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Enregistrons le travail via <menuchoice><guimenu>Fichier</guimenu><guimenuitem>Enregistrer</guimenuitem></menuchoice>. Notre projet est ainsi sauvegardé, c'est à dire la position des clips sur la ligne de montage, les effets appliqués, et ainsi de suite. Il ne peut <emphasis>pas</emphasis> être ouvert par un autre lecteur multimédia <footnote><para>Pour être exact, il <emphasis>peut</emphasis> être joué avec <varname>melt votre_projet.kdenlive</varname>, mais ce n'est pas la façon dont vous voulez présenter votre vidéo finale car elle est (probablement) trop lente. En outre, elle ne fonctionne que si melt est installé</para></footnote>. Le processus de création de la vidéo finale est appelée <emphasis>Rendu</emphasis>.
-</para>
-</chapter>
-<chapter id="ligne-de-montage"><title>Ligne de montage</title>
-<para>Maintenant nous arrivons au montage à proprement parler. Les clips du projet sont combinés sur la ligne de montage pour construire le film final. On les amène par glisser-déposer : attrapez par exemple la soupe napolitaine, et déposez-la sur la première piste de la ligne de montage (en supposant que vous utilisez les fichiers fournis ci-dessus, comme dans le reste de ce tutoriel de démarrage rapide, si non, assurez-vous que votre écran résiste à l'eau, et même à la tomate ?).
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-timeline-clips.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Premiers clips dans le montage</phrase>
-    </textobject>
-    <caption>
-      <para>Premiers clips dans le montage</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Comme il faut aussi quelques ustensiles de cuisine, déposez la cuillère sur la première piste également. Faites ensuite glisser Napoli au début du montage (sinon la vidéo rendue commencerait par quelques secondes de noir), puis Spoon à droite après Napoli, de sorte à obtenir quelque chose ressemblant à l'image sur la gauche (zoomée avec <keycombo>&Ctrl;<keycap>Molette</keycap></keycombo>).
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-timelinecursor.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Curseur de montage</phrase>
-    </textobject>
-    <caption>
-      <para>Curseur de montage</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Le résultat peut-être déjà prévisualisé en appuyant sur <keycap>Espace</keycap> (ou le bouton <guilabel>Lecture</guilabel> dans le moniteur du projet). Vous verrez la soupe directement suivie par la cuillère. Si le curseur de montage n'est pas au début, le moniteur projet va commencer à jouer la vidéo quelque part au milieu ; vous pouvez le déplacer en le faisant glisser sur la graduation de la ligne de montage ou dans le moniteur projet. Si vous préférez les raccourcis clavier, <keycombo>&Ctrl;<keycap>Début</keycap></keycombo> donne la même chose pour le moniteur activé (sélectionnez le moniteur projet s'il n'est pas sélectionné avant d'utiliser le raccourci).
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-resize-marker.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Marqueur de redimensionnement</phrase>
-    </textobject>
-    <caption>
-      <para>Marqueur de redimensionnement</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Après avoir mangé on peut jouer : il y a donc un clip de billard. Ajoutez-le aussi au montage. Pendant les 1,5 premières secondes rien ne se passe dans le clip, on pourrait donc plutôt le <emphasis>couper</emphasis> pour éviter que la vidéo ne devienne barbante. Une manière simple<footnote><para>Cela suggère qu'il y a plusieurs façons de couper un clip : c'est vrai</para></footnote> est de déplacer le curseur de montage à la position désirée (où vous voulez couper la vidéo), puis faire glisser le bord gauche du clip lorsque le marqueur de redimensionnement apparaît. Il sera attiré magnétiquement sur le curseur de montage quand il en sera suffisamment proche.
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-overlap-clips.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Clips se chevauchant</phrase>
-    </textobject>
-    <caption>
-      <para>Clips se chevauchant</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Pour faire une <emphasis>transition</emphasis> entre manger (à la cuillère) et jouer (au billard), les deux clips doivent se chevaucher. Pour être précis: le deuxième clip doit être au-dessus ou en dessous du premier, qui doit se terminer quelques images après que le deuxième ait commencé. Il peut être pratique d'augmenter le zoom jusqu'à avoir une graduation pour chaque image, cela simplifie aussi d'avoir toujours les mêmes durées de transitions, comme cinq images dans ce cas.
-</para>
-<para>Vous pouvez zoomer en utilisant soit le <emphasis>curseur de zoom</emphasis> au bas de la fenêtre <emphasis>Kdenlive</emphasis>, ou avec <keycombo>&Ctrl;<keycap>molette</keycap></keycombo>. <emphasis>Kdenlive</emphasis> zoomera sur le curseur de montage, donc il faut d'abord l'amener à la position que l'on veut agrandir.
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive-quickstart-add-transition.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Marqueur de transition</phrase>
-    </textobject>
-    <caption>
-      <para>Marqueur de transition</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Maintenant que les clips se chevauchent, on peut ajouter la transition. Pour cela on peut ou bien faire un clic droit sur le clip supérieur et choisir <guilabel>Ajouter une transition</guilabel>, ou bien plus simplement cliquer sur le coin inférieur droit du clip cuillère : cela ajoute par défaut une transition en fondu, qui est dans ce cas la meilleure idée puisqu'une cuillère est inutile pour jouer au billard.
-</para>
-<para>La transition en fondu dissout progressivement le premier clip dans le second.
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive-quickstart-add-last-clip.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Ajout du dernier clip</phrase>
-    </textobject>
-    <caption>
-      <para>Ajout du dernier clip</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Ajoutons maintenant le dernier clip, le piano, appliquons encore une transition en fondu. En l'ajoutant sur la première piste de la ligne de montage, il faut cliquer sur le coin bas gauche du nouveau clip pour ajouter la transition avec le clip précédent.
-</para>
-<sect1 id="effets"><title>Effets</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-add-effect.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Liste des effets</phrase>
-    </textobject>
-    <caption>
-      <para>Liste des effets</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Le piano peut être colorisé en lui appliquant un <emphasis>effet</emphasis> : sélectionner le clip piano, puis double-cliquer sur l'effet <guilabel>Ajustements RVB</guilabel> dans la <emphasis>liste des effets</emphasis>. Si elle n'est pas affichée, vous pouvez l'obtenir via <menuchoice><guimenu>Affichage</guimenu><guimenuitem>Liste des effet</guimenuitem></menuchoice>.
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-effect-flag.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Indication de l'effet appliqué sur le montage</phrase>
-    </textobject>
-    <caption>
-      <para>Indication de l'effet appliqué sur le montage</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Une fois l'effet ajouté, son nom apparaîtra sur le clip dans le montage. Il sera aussi indiqué dans le composant <emphasis>pile des effets</emphasis>.
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive-quickstart-effectstack.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Pile des effets avec l'ajustement RVB</phrase>
-    </textobject>
-    <caption>
-      <para>Pile des effets avec l'ajustement RVB</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Pour obtenir une ambiance visuelle jaune-orangé chaleureuse, adapté à la soirée confortable, les composantes bleues doivent être réduites, tandis que rouge et vert doivent être renforcées.
-</para>
-<para>Les valeurs dans le composant d'effet peuvent être modifiées en déplaçant le curseur (le bouton milieu de la souris réinitialise à la valeur par défaut), ou en entrant directement une valeur en double-cliquant sur le nombre à droite du curseur.
-</para>
-<para>Les effets peuvent aussi être ajoutés avec l'icône <guilabel>Ajouter un effet</guilabel> (encadrée dans l'image à gauche) dans la <emphasis>pile d'effets</emphasis> ; il s'applique toujours au clip sélectionné dans le montage. En décochant la case, les effets sont provisoirement désactivés (les réglages sont conservés), cela peut être utile par exemple pour les effets qui nécessitent beaucoup de puissance de calcul, que l'on peut ignorer pendant le montage et rétablir pour le rendu.
-</para>
-<para>Pour certains effets, comme celui utilisé ici, il est possible d'ajouter des images clés. L'icône à chronomètre encadrée signale cette possibilité. Les images clés servent à faire évoluer les paramètres de l'effet avec le temps. Dans notre clip cela permet de faire un dégradé de la couleur du piano depuis celle d'une soirée chaleureuse vers celle d'une nuit froide.
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-keyframes.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Images clés pour les effets</phrase>
-    </textobject>
-    <caption>
-      <para>Images clés pour les effets</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Après avoir cliqué sur le l'icône <guilabel>image-clé</guilabel> (le chronomètre encadrée dans l'image précédente), le composant de la pile d'effet se ré-organise. Par défaut il y aura deux images-clés, une au début du clip et une à la fin. Déplacez le curseur de montage à la fin du clip, afin que le moniteur de projet affiche les nouvelles couleurs, correspondant aux paramètres modifiés avec l'image clé de la fin.
-</para>
-<para>Vérifiez que la dernière image clé est sélectionnée dans la liste de la pile d'effets ; vous êtes alors prêt à baigner le piano d'une lumière bleue profonde.
-</para>
-<para>Déplacez le curseur de montage au début du projet lancez la lecture (avec <keycap>espace</keycap>, ou le bouton <guilabel>lecture</guilabel> dans le <emphasis>moniteur projet</emphasis>), le piano doit alors changer de couleur comme prévu.
-</para>
-<para>L'introduction d'images-clés était la partie la plus difficile de ce didacticiel. Si vous avez réussi à le faire, vous maîtriserez <emphasis>Kdenlive</emphasis> facilement !
-</para>
-</sect1>
-<sect1 id="musique"><title>Musique</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-fadeout.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Fondu sonore</phrase>
-    </textobject>
-    <caption>
-      <para>Fondu sonore</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Comme les clips ne contiennent aucun son, nous allons chercher un chouette morceau de musique, dans votre collection personnelle ou sur un site comme <ulink url="http://www.jamendo.com">Jamendo</ulink>. Le clip audio une fois ajouté au projet doit être déposé sur une piste audio du montage.
-</para>
-<para>Le clip audio peut être redimensionnée sur la ligne de montage de la même manière que des clips vidéo. Le curseur sera attiré automatiquement à la fin du projet. Pour ajouter un effet de fondu de sortie à la fin du clip audio (sauf si vous avez trouvé un fichier avec exactement la bonne longueur), vous pouvez passer la souris au dessus du coin haut-droit (ou gauche) du clip dans le montage, et faire glisser le disque vert à l'endroit où le fondu doit démarrer (ou terminer)<footnote><para>Le disque vert est un raccourci pour ajouter l'effet <menuchoice><guimenu>Fondu</guimenu><guimenuitem>Fondu sortant</guimenuitem></menuchoice> ; les deux façons mènent au même résultat</para></footnote>.
-</para>
-</sect1>
-</chapter>
-<chapter id="rendu"><title>Rendu</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-renderer.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Fenêtre de rendu</phrase>
-    </textobject>
-    <caption>
-      <para>Fenêtre de rendu</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Restent quelques minutes, et le projet sera terminé ! Cliquez sur le bouton <guilabel>Rendu</guilabel> (ou allez dans <menuchoice><guimenu>Projet</guimenu><guimenuitem>Rendu</guimenuitem></menuchoice>, ou appuyez sur <keycombo>&Ctrl;<keycap>Entrée</keycap></keycombo>) pour obtenir la fenêtre présentée ci-contre. Choisissez le nom fichier que vous voulez pour votre nouvelle vidéo avec tous les effets et transitions, choisissez le format MPEG4 (qui fonctionne presque partout) et un débit de 2000k (plus le débit est grand, plus le fichier de sortie est gros, mais la qualité est meilleure - mais comme le débit des clips d'origine était déjà de 2000k, utiliser un débit plus élevé n'améliorerait pas la qualité), et appuyez sur le bouton <emphasis>Rendu dans un fichier</emphasis>.
-</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="kdenlive_quickstart-rendering.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Progression du rendu</phrase>
-    </textobject>
-    <caption>
-      <para>Progression du rendu</para>
-    </caption>
-  </mediaobject>
-</screenshot>
-</para>
-<para>Après quelques secondes le rendu sera fini, et votre premier projet <emphasis>Kdenlive</emphasis> terminé. Félicitations !
-</para>
-</chapter>
-
-<!--userbase-content-->
-<chapter id="credits">
-<title>Remerciements et licence</title>
-      <para>
-Traduction française par 
-      <ulink url="http://userbase.kde.org/User_talk:Vpinon">Vpinon</ulink></para>
-      <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
-&underFDL;
-</chapter>
-&documentation.index;
-</book>
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -3,7 +3,7 @@
  <!ENTITY % addindex "IGNORE">
  <!ENTITY % English "INCLUDE">
 ]>
-<book lang="&language;">
+<book id="kdenlive" lang="&language;">
 <bookinfo>
 <title>The Kdenlive Quick Start Guide</title>
 <authorgroup>
@@ -115,7 +115,7 @@
    </caption>
  </mediaobject>
 </screenshot></para>
-<para>Let’s save the work via <menuchoice><guimenu>File</guimenu><guimenuitem>Save</guimenuitem></menuchoice>. This saves our project, &ie; where we placed the clips on the timeline, which effects we applied, and so on. It can <emphasis>not</emphasis> be played.<footnote><para>To be correct, it <emphasis>can</emphasis> be played using <screen>melt yourproject.kdenlive</screen>, but this is not the way you would want to present your final video since it is (most likely) too slow. Additionally, it only works if melt is installed.</para></footnote> The process of creating the final video is called <emphasis>Rendering</emphasis>.</para>
+<para>Let’s save the work via <menuchoice><guimenu>File</guimenu><guimenuitem>Save</guimenuitem></menuchoice>. This saves our project, &ie; where we placed the clips on the timeline, which effects we applied, and so on. It can <emphasis>not</emphasis> be played.<footnote><para>To be correct, it <emphasis>can</emphasis> be played using <varname>melt yourproject.kdenlive</varname>, but this is not the way you would want to present your final video since it is (most likely) too slow. Additionally, it only works if melt is installed.</para></footnote> The process of creating the final video is called <emphasis>Rendering</emphasis>.</para>
 </chapter>
 <chapter id="timeline"><title>Timeline</title> 
 <para>Now comes the actual editing. Project clips are combined to the final result on the timeline.  They get there by drag and drop: Drag some Napoli (assuming you are using the files provided above, as in the rest of this quick start tutorial; If not, please make sure your screen is waterproof, and perhaps tomatoproof), and drop it onto the first track in the timeline.</para>
@@ -199,7 +199,7 @@
    </caption>
  </mediaobject>
 </screenshot></para>
-<para>Now that the clips overlap, the transition can be added. This is done either by right-clicking on the upper clip and chosing <guilabel>Add Transition</guilabel> or, easier, by clicking the lower right corner of the Spoon clip. The latter by default adds a dissolve transition, which is in this case the best idea anyway since the Spoon is not required for playing anyway.</para>
+<para>Now that the clips overlap, the transition can be added. This is done either by right-clicking on the upper clip and choosing <guilabel>Add Transition</guilabel> or, easier, by clicking the lower right corner of the Spoon clip. The latter by default adds a dissolve transition, which is in this case the best idea anyway since the Spoon is not required for playing anyway.</para>
 <para>The dissolve transitions fades the first clip into the second one.</para>
 <para>
 <screenshot>
--- a/doc/nl/CMakeLists.txt
+++ b/doc/nl/CMakeLists.txt
@@ -1 +0,0 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl SUBDIR kdenlive)
--- a/doc/nl/index.docbook
+++ b/doc/nl/index.docbook
@@ -1,357 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY % addindex "IGNORE">
-  <!ENTITY % English "INCLUDE">
-]>
-<book lang="&language;">
-<bookinfo>
-<title>Het Kdenlive Quick Start handboek</title>
-<authorgroup>
-<author>
-<personname>
-    <firstname>Deze handleiding is afgeleid van de KDE UserBase <ulink url=" http://userbase.kde.org/Kdenlive/Manual/QuickStart">Kdenlive/Manual/QuickStart</ulink> page.</firstname>
-<surname></surname>
-</personname>
-    </author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-    </authorgroup>
-<legalnotice>&FDLNotice;</legalnotice>
-<date>2011-06-17</date>
-    <releaseinfo>0.8.2</releaseinfo>
-<abstract>
-<para></para>
-    </abstract>
-    <keywordset>
-<keyword>KDE</keyword>
-<keyword>multimedia</keyword>
-<keyword>video</keyword>
-</keywordset>
-</bookinfo>
-<!--userbase <timestamp>2011-06-17T15:39:59Z</timestamp>-->
-
-<!--userbase-content-->
-<chapter id="creating-a-new-project"><title>Een nieuw project starten</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Folder-Structure.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Opbouw Kdenlive mappen</phrase>
-    </textobject>
-    <caption>
-      <para>Opbouw Kdenlive mappen</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>De eerste stap is een nieuwe (lege) map maken voor ons project. Ik noem het <filename>quickstart-tutorial/</filename> in deze les. Vervolgens moeten we een aantal video clips hebben, en anders download ze van hier:<ulink url="http://granjow.net/uploads/kdenlive/manual/kdenlive-tutorial-videos-2011-avi.tar.bz2">kdenlive-tutorial-videos-2011-avi.tar.bz2</ulink> (7 MB)<footnote><para>Als de voorkeur uitgaat naar Theora (wat waarschijnlijk niet het geval is omdat Ogg Video meestal problemen veroorzaakt), dan kan als alternatief ze ook hier gedownload worden <ulink url="http://granjow.net/uploads/kdenlive/manual/kdenlive-tutorial-videos-2011-ogv.tar.bz2">kdenlive-tutorial-videos-2011-ogv.tar.bz2</ulink>.</para></footnote>, en pak ze vervolgens uit in &eg; een <filename>quickstart-tutorial/Videos/</filename> submap in de project map.</para>
-<para>De afbeelding links toont de voorgestelde mappen-structuur: elk project heeft zijn eigen map, met de video-bestanden in de <filename>Videos</filename> submap, audio-bestanden in de <filename>Audio</filename> map, &etc; (<ulink url="http://userbase.kde.org/Special:myLanguage/Kdenlive/Manual/Projects_and_Files#File_Structure">Lees hier meer daarover</ulink>)</para>
-<para>In deze tutorial wordt ervan uitgegaan dat de gedownloade video's worden gebruikt, maar andere videos kunnen ook gebruikt worden.)</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-New-Project.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Nieuw Project venster</phrase>
-    </textobject>
-    <caption>
-      <para>Nieuw Project venster</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Open <application>Kdenlive</application> en start een een nieuw project (<menuchoice><guimenu>Bestand</guimenu><guimenuitem>Nieuw</guimenuitem></menuchoice>).</para>
-<para>Kies de eerder gemaakte project map (<filename>quickstart-tutorial/</filename>) en kies het juiste projekt-profiel. De video-bestanden die bovengenoemd zijn gegeven zijn 720p, 23.98 fps.<footnote><para><ulink url="http://en.wikipedia.org/wiki/720p">720</ulink> is de hoogte van de video, p betekent <ulink url="http://en.wikipedia.org/wiki/Progressive_scan">Progressive scan</ulink> in tegenstelling tot <ulink url="http://en.wikipedia.org/wiki/Interlaced_video">interlaced video</ulink>, en de fps nummer betekent het aantal volledige frames per seconde.</para></footnote> Als eigen bestanden worden gebruikt en onbekend is welk profiel er moet worden gekozen, dan zal <application>Kdenlive</application> met een voorstel komen wanneer de eerste clip wordt toegevoegd, laat dan deze waarde staan op wat al is ingevuld.</para>
-</chapter>
-<chapter id="adding-clips"><title>Clips toevoegen</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Add-Clips.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Project boom: voeg een Video clip toe</phrase>
-    </textobject>
-    <caption>
-      <para>Project boom: voeg een video clip toe</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Nu het project is voorbereidt, laten we wat clips gaan toevoegen (&ie; diegene die net zijn gedownloaded). Dit gaat via de <emphasis>Project boom widget</emphasis>; een klik op de <guilabel>Voeg een clip toe</guilabel> icon opent direct een bestands-venster, een klik op het kleine pijltje laat een lijst zien van andere soorten clips die ook geïmporteerd kunnen worden.Video clips, audio clips, afbeeldingen, en andere <application>Kdenlive</application> projecten kunnen geïmporteerd worden via het gewone <guilabel>Voeg een clip toe</guilabel> venster.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Mainwindow.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Kdenlive 0.8 window met de tutorial bestanden</phrase>
-    </textobject>
-    <caption>
-      <para>Kdenlive 0.8 window met de tutorial bestanden</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Nadat de clips zijn toegevoegd, zal <application>Kdenlive</application> het eruitzien zoals dit. Linksboven is de al bekende project-boom, Rechts daarvan zijn monitors die video's laten zien; De clip monitor laat de orginele video zien, de project monitor laat het resultaat zien, met alle effecten, overgangen, &etc;. De derde ook erg belangrijk, onderdeel de tijdbalk (onder de monitors): dit is de plek waar de video clips bewerkt zullen worden. Hier zijn twee verschillende soorten tracks, Video en Audio. Video tracks kaunnen elk soort clip bevatten, audio tracks kunnen dat ook - maar wanneer een video bestand in een audio track wordt gestopt, dan zal alleen de audio worden gebruikt.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Save-Project.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Een Kdenlive project opslaan</phrase>
-    </textobject>
-    <caption>
-      <para>Een Kdenlive project opslaan</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Laten we het werk opslaan via <menuchoice><guimenu>Bestand</guimenu><guimenuitem>Opslaan</guimenuitem></menuchoice>. Dit bewaart ons project, &ie; waar we de clips op de tijdbalk hebben geplaatst, welke effecten we hebben toegepast, enzovoort. Dit kan nog <emphasis>niet</emphasis> worden afgespeeld.<footnote><para>Om precies te zijn, het <emphasis>kan</emphasis> worden afgespeeld door <screen>melt yourproject.kdenlive</screen> te gebruiken, maar dit is niet de manier waarop je het wilt presenteren omdat het (waarschijnlijk) te langzaam zal zijn. Ook werkt het alleen maar als melt is geïnstalleerd.</para></footnote> Het proces van het maken van de uiteindelijke video wordt <emphasis>Rendering</emphasis> genoemd.</para>
-</chapter>
-<chapter id="timeline"><title>Tijdbalk</title>
-<para>Nu komt het eigenlijke bewerken. De clips worden gecombineerd op de tijdsbalk om tot het uiteindelijke resultaat te komen. Ze kunnen gewoon daar naar toe gesleept worden: sleep enkele Napoli (aangenomen dat de gedownloade bestanden worden gebruikt,) en laat ze los boven de eerste track van de tijdsbalk.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Timeline-Clips.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>De eerste clips op de tijdsbalk</phrase>
-    </textobject>
-    <caption>
-      <para>De eerste clips in de tijdsbalk</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Er is ook het nodige snijwerk nodig, Laat ook de Spoon op de eerste track vallen. Versleep de Napoli naar het begin van de tijdsbalk (anders begint de gerenderde video met enige seconden zwart), en de Spoon onmiddelijk achter de Napoli, zoals eruit ziet als het beeld links (waar ik heb ingezoomd met <keycombo>&Ctrl;<keycap>Wheel</keycap></keycombo>.)</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-TimelineCursor.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Tijdsbalk cursor</phrase>
-    </textobject>
-    <caption>
-      <para>Tijdsbalk cursor</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Het resultaat kan al gepreviewt worden door op <keycap>Spatie</keycap> te klikken (of op de <guilabel>Afspelen</guilabel> knop bij de project monitor). Napoli wordt getoond, onmiddelijk gevolgt door Spoon. Als de tijdsbalk cursor niet aan het begin staat, dan zal de project monitor ergens in het midden starten met afspelen; dit kan verandert worden door de cursor in de tijdsbalk of in de project monitor te verslepen. Als de voorkeur wordt gegeven aan shortcuts, <keycombo>&Ctrl;<keycap>Home</keycap></keycombo> doet hetzelfde als de monitor in werking is. (Selecteer de <guilabel>Project Monitor</guilabel> als het nog niet is gekozen voordat de shortcut wordt gebruikt.)</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Resize-Marker.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Markering verschalen</phrase>
-    </textobject>
-    <caption>
-      <para>Markering verschalen</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Na het eten komt het spelen, er is een billard clip. voeg ook deze toe aan de tijdsbalk. Er gebeurt de eerste 1,5 seconde niets in de clip, we moeten daarom mischien gaan <guilabel>knippen</guilabel> om te voorkomen dat de video saai wordt. Een makkelijke manier <footnote><para>Op deze manier opgeschreven, geeft het het idee dat er meerdere manieren zijn om een clip te knippen. Dit is eigenlijk waar.</para></footnote> Beweeg hiervoor de cursor op de tijdsbalk naar de gewenste positie (&ie; de positie waar de video geknipt moet worden), versleep vervolgens de linker kant van de clip totdat de resize marker verschijnt. Het klikt aan de tijdsbalk cursor wanneer het er genoeg dichtbij is.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Overlap-Clips.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Overlappende clips</phrase>
-    </textobject>
-    <caption>
-      <para>Overlappende clips</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Om een <emphasis>overgang</emphasis> toe te voegen tussen het eten (de Spoon) en billard spelen, hebben de twee clips een overlap nodig. Om precies te zijn: de tweede clip moet onmiddelijk boven of onder de eerste clip zijn en enkele frames later eindigen als de tweede begint. Het is makkelijker als er zover ingezoomt is totdat de markeringen van de afzonderlijke frames zichtbaar zijn; het maakt het ook makkelijker om altijd dezelfde  tijdsduur voor een overgang te krijgen, zoals vijf frames in dit geval.</para>
-<para>Er kan ingezoomt worden door de <guilabel>zoom schuif</guilabel> onderaan het <application>Kdenlive</application> venster te bewegen, of met  <keycombo>&Ctrl;<keycap>muiswiel</keycap></keycombo>. <application>Kdenlive</application> in te zoomen op bij de tijdsbalk cursor, door eerst te klikken op de positie die vergroot moet worden, en vervolgens in te zoomen.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive-Quickstart-Add-Transition.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Overgang markering</phrase>
-    </textobject>
-    <caption>
-      <para>Overgang markering</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Nu de clips elkaar overlappen, kan de overgang worden aangebracht. Dit kan worden gedaan door rechtsklikken op de bovenste clip en vervolgens <guilabel>Overgang toevoegen</guilabel> te kiezen of, makkelijker, door op de hoek rechtsonder van de Spoon clip te klikken. Dit laatste voegt standaard een oplossende overgang toe, wat in dit geval een goed idee is omdat Spoon helemaal niet bedoeld is om af te spelen.</para>
-<para>De oplossende overgang laad de eerste clip vervagen naar de tweede clip.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive-Quickstart-Add-Last-Clip.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase></phrase>
-    </textobject>
-    <caption>
-      <para></para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>We gaan nu de laatste clip toevoegen, de Piano, en passen opnieuw een oplossende overgang toe. Wanneer het aan de eerste track van de tijdsbalk is toegevoegd, kan er op de linkeronderhoek worden geklikt om de overgang naar de vorige clip toe te voegen.</para>
-<sect1 id="effects"><title>Effecten</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Add-Effect.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Effecten lijst</phrase>
-    </textobject>
-    <caption>
-      <para>Effecten lijst</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>De Piano kan een kleurtje krijgen door een <emphasis>effect</emphasis> toe te voegen. Selecteer de piano clip, dubbelklik op de <guilabel>RGB instelling</guilabel> effect in de <guilabel>Effecten lijst</guilabel>. Als de lijst niet zichtbaar is, dan kan het ook via <menuchoice><guimenu>Bekijk</guimenu><guimenuitem>Effect Lijst</guimenuitem></menuchoice> ingeschakeld worden.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Effect-Flag.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase></phrase>
-    </textobject>
-    <caption>
-      <para></para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Als het effect is aangebracht, dan zal de naam ervan worden toegevoegd aan de clip op de tijdsbalk. De naam ervan is ook te zien in de lijst met <guilabel>Gestapelde effecten</guilabel>.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive-Quickstart-EffectStack.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Effecten stapel met RGB aanpassingen</phrase>
-    </textobject>
-    <caption>
-      <para>Effecten stapel met RGB aanpassingen</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Om de afbeelding een warm geel-oranje kleur te geven, passend bij een comfortabele avond, moet er minder blauw en meer rood en groen komen.</para>
-<para>De waarden in de effecten stapel kunnen veranderd worden via de schuiven (klikken met de middelste muisknop laat het weer terugspringen naar de standaard waarden), of door de waarde direkt in te voeren in het vakje rechts naast de schuiven.</para>
-<para>Effecten kunnen ook worden toegevoegd via de <guilabel>Voeg een nieuw effect toe</guilabel> icoon (linksonder de lijst) in the <guilabel>Effecten stapel</guilabel>; Het verwijst altijd naar de geselecteerde clip op de tijdsbalk. Door de checkbox uit te vinken, worden de effecten tijdelijk uitgeschakeld (maar de instellingen blijven wel bewaard), dit is &eg; handig bij effecten die veel coputerkracht nodig hebben, zodat ze uitgeschakeld kunnen worden bij het editen en weer ingeschakeld kunnen worden bij het renderen.</para>
-<para>Voor sommige effecten,zoals die we hier hebben gebruikt, is het mogelijk om keyframes toe te voegen. Het stopwatch icoon in de afbeelding geeft dit aan. Keyframes kunnen worden gebruikt om de effecten over de tijd een andere instelling te geven. In onze clip maakt het mogelijk om de kleur van de piano te laten veranderen van een warme avond kleur naar een koele nacht kleur.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Keyframes.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Keyframes for effects</phrase>
-    </textobject>
-    <caption>
-      <para>Keyframes for effects</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Na het klikken op de <guilabel>keyframe</guilabel> icoon (het stopwatch icoon in de vorige afbeelding), zal de effecten stapel opnieuw worden geordend. Standaard zijn er twee keyframes, een aan het begin van de clip en een aan het eind. Beweeg de cursor op de tijdsbalk naar het eind van de clip op de tijdsbalk, zodat de project monitor de nieuwe kleuren laat zien wanneer de instellingen van de keyframe aan het eind worden veranderd.</para>
-<para>Zorg ervoor dat de laatste keyframe is geselecteerd in de lijst van de effecten stapel. Dan is alles klaar om de piano te overspoelen met een diep blauw.</para>
-<para>Beweeg de cursor over de tijdlijn naar het begin van het project en speel het af via  (met <keycap>Spatie</keycap>, of de <guilabel>Afspelen</guilabel> knop onder de <guilabel>Project Monitor</guilabel>), de piano zou nu volgens wens van kleur moeten veranderen.</para>
-<para>Keyframing was het moeilijkste gedeelte van deze handleiding. Als dit beheerst wordt, dan is de rest van <guilabel>Kdenlive</guilabel> makkelijk!</para>
-</sect1>
-<sect1 id="music"><title>Muziek</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Fadeout.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Audio fadeout</phrase>
-    </textobject>
-    <caption>
-      <para>Audio fadeout</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Omdat de clips nog geen geluid hebben, laten we op zoek gaan naar wat leuke muziek, in de eigen verzameling of op web pagina's zoals <ulink url="http://www.jamendo.com">Jamendo</ulink>. Nadat de audio clip is toegevoegd, moet deze ook op een audio track op de tijdsbalk geplaatst worden.</para>
-<para>De audio clip kan in lengte verandert worden net zoals dat met de video clips is gedaan. De cursor zal automatisch vastklikken aan het eind van het project. Om een fade out effect toe te voegen aan het eind van de audio clip (behalve als de audio clip precies de juiste lengte heeft) kan er boven de rechterboven (of linkerboven) hoek van de clip op de tijdsbalk en versleep de groene schijf naar de plek waar de fade out zou moeten starten.<footnote><para>Deze groene schijf is een makkelijke manier om het effect  <menuchoice><guimenu>Fade</guimenu><guimenuitem>Fade out</guimenuitem></menuchoice> toe te voegen. Beide manieren geven het zelfde resultaat.</para></footnote></para>
-</sect1>
-</chapter>
-<chapter id="rendering"><title>Renderen</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Renderer.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Rendering venster</phrase>
-    </textobject>
-    <caption>
-      <para>Rendering venster</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Nog een paar minuten en het project is klaar! Klik op de Render knop (of ga naar <menuchoice><guimenu>Project</guimenu><guimenuitem>Render</guimenuitem></menuchoice>, of druk op <keycombo>&Ctrl;&Enter;</keycombo>) om het venster dat links getoond wordt te krijgen. Kies het gewenste bestandsformaat voor onze nieuwe video met al zijn effecten en overgangen, kies MPEG4 (werkt bijna altijd en overal) en een bitrate van 2000k (hoe hoger de bitrate, des te groter het bestand en des te beter de kwaliteit - maar omdat de bitrate van de input clips al 2000k was, zal een hogere bitrate de kwaliteit niet verbeteren en is daarom onnodig), en klik op de <emphasis>Renderen naar bestand</emphasis> knop.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Rendering.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Rendering voortgang</phrase>
-    </textobject>
-    <caption>
-      <para>Rendering voortgang</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>De rendering is na enkele secondes klaar en de eerste <application>Kdenlive</application> project is nu compleet. Gefeliciteerd!</para>
-</chapter>
-
-<!--userbase-content-->
-<chapter id="credits">
-<title>Dankbetuigingen en licenties</title>
-    <para>
-Copyright van de documentatie, zie de UserBase
-    <ulink url="http://userbase.kde.org/index.php?title=Kdenlive/Manual/QuickStart&amp;action=history">Kdenlive/Manual/QuickStart page history</ulink></para>
-    <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
-&underFDL;
-</chapter>
-&documentation.index;
-</book>
--- a/doc/uk/CMakeLists.txt
+++ b/doc/uk/CMakeLists.txt
@@ -1 +0,0 @@
-kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk SUBDIR kdenlive)
--- a/doc/uk/Kdenlive_Quickstart-Add-Clips_uk.png
+++ b/doc/uk/Kdenlive_Quickstart-Add-Clips_uk.png
--- a/doc/uk/Kdenlive_Quickstart-New-Project_uk.png
+++ b/doc/uk/Kdenlive_Quickstart-New-Project_uk.png
--- a/doc/uk/index.docbook
+++ b/doc/uk/index.docbook
@@ -1,359 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-  <!ENTITY % addindex "IGNORE">
-  <!ENTITY % Ukrainian "INCLUDE">
-]>
-<book lang="&language;">
-<bookinfo>
-<title>Короткий вступ до Kdenlive</title>
-<authorgroup>
-<author>
-<personname>
-    <firstname>Цю документацію було створено на основі сторінки UserBase KDE <ulink url=" http://userbase.kde.org/Kdenlive/Manual/QuickStart/uk">Kdenlive/Manual/QuickStart/uk</ulink>.</firstname>
-<surname></surname>
-</personname>
-    </author>
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-    </authorgroup>
-<legalnotice>&FDLNotice;</legalnotice>
-<date>2011-06-23</date>
-    <releaseinfo>0.8.2</releaseinfo>
-<abstract>
-<para></para>
-    </abstract>
-    <keywordset>
-<keyword>KDE</keyword>
-</keywordset>
-</bookinfo>
-<!--userbase <timestamp>2011-06-23T10:31:07Z</timestamp>-->
-
-<!--userbase-content-->
-<chapter id="Створення-проекту"><title>Створення проекту</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Folder-Structure.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Ієрархія каталогів Kdenlive</phrase>
-    </textobject>
-    <caption>
-      <para>Ієрархія каталогів Kdenlive</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Спочатку слід створити (порожню) теку для нашого нового проекту. Назвемо цю теку <filename>quickstart-tutorial/</filename>. Далі, нам потрібні будуть декілька зразків відеокліпів. Якщо у вас таких немає, ви можете скористатися нашими зразками: <ulink url="http://granjow.net/uploads/kdenlive/manual/kdenlive-tutorial-videos-2011-avi.tar.bz2">kdenlive-tutorial-videos-2011-avi.tar.bz2</ulink> (7 МБ)<footnote><para>Якщо ви надаєте перевагу форматам Theora (вам не варто цього робити, оскільки використання відео Ogg зазвичай призводить до проблем), ви можете скористатися іншим архівом <ulink url="http://granjow.net/uploads/kdenlive/manual/kdenlive-tutorial-videos-2011-ogv.tar.bz2">kdenlive-tutorial-videos-2011-ogv.tar.bz2</ulink>.</para></footnote>, які слід видобути, наприклад, до підтеки <filename>quickstart-tutorial/Videos/</filename> у теці проекту.</para>
-<para>На наведеному зображенні показано пропоновану структуру каталогів: кожному проекту відведено власник каталог, у якому відеофайли зберігаються у підкаталозі <filename>Videos</filename>, звукові файли — у підкаталозі <filename>Audio</filename> тощо. (<ulink url="http://userbase.kde.org/Special:myLanguage/Kdenlive/Manual/Projects_and_Files#File_Structure">докладніше про структуру</ulink>)</para>
-<para>(Надалі у цьому підручнику ми припускатимемо, що ви використовуєте надані зразки відео, але ви можете скористатися і власними відеофрагментами.)</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-New-Project_uk.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Діалогове вікно створення проекту</phrase>
-    </textobject>
-    <caption>
-      <para>Діалогове вікно створення проекту</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Запустіть <application>Kdenlive</application> і створіть проект (пункт меню <menuchoice><guimenu>Файл</guimenu><guimenuitem>Створити</guimenuitem></menuchoice>).</para>
-<para>Виберіть раніше створену теку проекту (<filename>quickstart-tutorial/</filename>) і відповідний профіль проекту. Згадані вище файли мають параметри 720p, 23,98 кадрів/с.<footnote><para><ulink url="http://en.wikipedia.org/wiki/720p">720</ulink> — висота зображення, p stands for <ulink url="http://en.wikipedia.org/wiki/Progressive_scan">прогресивна розгортка</ulink>, на відміну від <ulink url="http://en.wikipedia.org/wiki/Interlaced_video">черезрядкового відео</ulink>, кількість кадрів на секунду відповідає повному показу кадру.</para></footnote> Якщо ви використовуєте власні файли і не можете визначити для них профіль, <application>Kdenlive</application> запропонує відповідний профіль під час додавання першого кліпу, отже ви можете не заповнювати поле профілю, залишивши у ньому типове значення.</para>
-</chapter>
-<chapter id="Додавання-кліпів"><title>Додавання кліпів</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Add-Clips_uk.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Дерево проекту: додавання відеокліпів.</phrase>
-    </textobject>
-    <caption>
-      <para>Дерево проекту: додавання відеокліпів.</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Тепер, коли проект готовий, почнемо додавати до нього нові кліпи (тобто ті кліпи, які ви раніше звантажили). Зробити це можна за допомогою віджета <emphasis>Дерево проекту</emphasis>. Натискання кнопки <guilabel>Додати кліп</guilabel> призведе до відкриття діалогового вікна вибору файла, натискання кнопки з невеличкою стрілочкою покаже список додаткових типів файлів, які можна додати. За допомогою типового діалогового вікна <guilabel>Додавання кліпу</guilabel> у <application>Kdenlive</application> можна додавати відекліпи, звукові кліпи, зображення та інші проекти.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Mainwindow.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Вікно Kdenlive 0.8 з тестовими файлами</phrase>
-    </textobject>
-    <caption>
-      <para>Вікно Kdenlive 0.8 з тестовими файлами</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Після завантаження кліпів вікно <application>Kdenlive</application> набуде вигляду, подібного до наведеного. У верхній лівій частині вікна буде вже згадана нами ієрархія тек проекту. Праворуч будуть монітори для спостереження за відео. На моніторі кліпу буде показано відео з початкових версій кліпів, а на моніторі проекту — остаточний вигляд відео з застосуванням ефектів, переходів тощо. Третім дуже важливим елементом вікна є лінійка запису (під моніторами): це місце, де слід виконувати редагування кліпів. Передбачено два різних типи доріжок: відео та звукові. Відеодоріжки можуть містити будь-який кліп, звукові також, але якщо ви скинете відеофайл на звукову доріжку, буде використано лише звукові дані з відеофайла.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Save-Project.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Збереження проекту Kdenlive</phrase>
-    </textobject>
-    <caption>
-      <para>Збереження проекту Kdenlive</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Виконаємо збереження нашої роботи за допомогою пункту меню <menuchoice><guimenu>Файл</guimenu><guimenuitem>Зберегти</guimenuitem></menuchoice>. Програма виконає зберігання нашого проекту, тобто зберігання даних щодо розташування кліпів на лінійці запису, використання ефектів тощо. Збережений проект <emphasis>не можна</emphasis> буде відтворити.<footnote><para>Якщо бути точним, його <emphasis>можна</emphasis> відтворити за допомогою команди <screen>melt ваш_проект.kdenlive</screen>, але цей спосіб не варто використовувати, якщо ви бажаєте показати комусь результати, оскільки (найімовірніше) побудова зображення буде дуже повільною. Крім того, цим способом можна скористатися, лише якщо встановлено melt.</para></footnote> Процес створення остаточної версії відео називається <emphasis>Обробка</emphasis>.</para>
-</chapter>
-<chapter id="Лінійка-запису"><title>Лінійка запису</title>
-<para>Тепер перейдемо до самого редагування. Кліпи проекту поєднуються у остаточний результат на лінійці. Перенести кліп на лінійку можна за допомогою перетягування з наступним скиданням: перетягніть кліп з неаполітанським соусом (якщо ви користуєтеся вказаними вище файлами проекту, як і у інших розділах цього підручника; якщо ж це не так, переконайтеся, що екран вашого комп’ютера добре захищено від води та помідорів {{Smiley}}) і скиньте його на першу доріжку лінійки запису.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Timeline-Clips.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Перші кліпи на лінійці запису</phrase>
-    </textobject>
-    <caption>
-      <para>Перші кліпи на лінійці запису</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Оскільки нам знадобиться столове приладдя, скиньте на першу доріжку кліп з ложкою (spoon). Перетягніть кліп з неаполітанським соусом (Napoli) на початок лінійки запису (інакше остаточне відео розпочнеться з декількох секунд з повністю чорним екраном), а кліп з ложкою розташуйте одразу після кліпу з соусом так, як це показано на зображенні ліворуч. (Тут ми збільшили масштаб за допомогою комбінації <keycombo>&Ctrl;<keycap>коліщатко миші</keycap></keycombo>.)</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-TimelineCursor.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Курсор лінійки запису</phrase>
-    </textobject>
-    <caption>
-      <para>Курсор лінійки запису</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Отриманий попередній результат вже можна переглянути натисканням клавіші <keycap>Пробіл</keycap> (або кнопки <guilabel>Відтворити</guilabel> на панелі монітора проекту). Ви побачите, що після кліпу Napoli одразу почнеться відтворення кліпу Spoon. Якщо курсор лінійки запису розташовано не на початку, відтворення на моніторі проекту розпочнеться з середини кліпу. Змінити розташування точки початку відтворення можна або перетягуванням на лінійці запису або перетягуванням на моніторі проекту. Якщо ви надаєте перевагу клавіатурним скороченням, натискання комбінації <keycombo>&Ctrl;<keycap>Home</keycap></keycombo> переведе курсор у початкову точку для активного монітора. (Позначте <guilabel>Монітор проекту</guilabel>, якщо його ще не було позначено до використання клавіатурного скорочення.)</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Resize-Marker.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Позначка зміни розміру</phrase>
-    </textobject>
-    <caption>
-      <para>Позначка зміни розміру</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Після їжі час погратися, у нас ще є кліп з більярдом (Billard). Додайте і його на лінійку запису. Перші півтори секунди у кліпі нічого не відбувається, тому варто <guilabel>вирізати</guilabel> цю частину, щоб кліп не був занадто нудним. Простий спосіб<footnote><para>Це означає, що є ще декілька способів вирізати частину з кліпу. Це саме так.</para></footnote> виконання цього завдання полягає у пересуванні курсора лінійки запису до бажаної позиції (тобто позиції, на якій слід обрізати відео), після цього слід перетягти ліву межу кліпу так, щоб на лінійці з’явилася позначка зміни розміру. Ця позначка прилипне до курсора лінійки запису, коли наблизиться до неї.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Overlap-Clips.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Перекриття кліпів</phrase>
-    </textobject>
-    <caption>
-      <para>Перекриття кліпів</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Щоб додати <emphasis>перехід</emphasis> між їжею (кліп Spoon) та грою у більярд, нам слід перекрити два цих кліпи. Якщо точніше: зображення другого кліпу має бути над або під зображенням першого, перший кліп має завершуватися на декілька кадрів пізніше за початок другого кліпу. Тут може допомогти збільшення до масштабу, коли стають видимими позначки окремих кадрів. Також варто зберігати однакову тривалість переходів, наприклад, п’ять кадрів у нашому прикладі.</para>
-<para>Збільшити масштаб можна бо за допомогою <guilabel>повзунка масштабу</guilabel> у нижній частині вікна <application>Kdenlive</application> або за допомогою натискання комбінації <keycombo>&Ctrl;<keycap>коліщатко миші</keycap></keycombo>. Центром зміни масштабу у <application>Kdenlive</application> є курсор лінійки запису, отже для початку його слід встановити у відповіду позицію, а вже потім виконувати збільшення масштабу.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive-Quickstart-Add-Transition.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Позначка переходу</phrase>
-    </textobject>
-    <caption>
-      <para>Позначка переходу</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Тепер, коли кліпи перекриваються, можна додати перехід між ними. Зробити це можна або клацанням правою кнопкою миші на верхньому кліпів з наступним вибором пункту <guilabel>Додати перехід</guilabel> у контекстному меню або, простіше, клацанням лівою кнопкою у нижньому правому куті кліпу з ложкою (Spoon). У разі використання другого способу буде типово додано перехід з розмиванням. У цьому разі такий перехід буде найкращим, оскільки ложкою не можна грати у більярд. {{Smiley}}</para>
-<para>За допомогою переходів розмивання можна створити враження переходу першого кліпу у другий.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive-Quickstart-Add-Last-Clip.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase></phrase>
-    </textobject>
-    <caption>
-      <para></para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Давайте додамо останній кліп, кліп з піаніно (Piano) і знову застосуємо перехід з розмиванням. Під час додавання ефекту до першої доріжки на лінійці запису, вам слід клацнути у на лівій нижній межі нового кліпу, щоб додати перехід до попереднього кліпу.</para>
-<sect1 id="Ефекти"><title>Ефекти</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Add-Effect.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Список ефектів</phrase>
-    </textobject>
-    <caption>
-      <para>Список ефектів</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Розфарбувати кліп з піаніно можна додаванням до нього <emphasis>ефекту</emphasis>.  Позначте кліп з піаніно, а потім двічі клацніть лівою кнопкою миші на пункті <guilabel>Коригування RGB</guilabel> у <guilabel>Списку ефектів</guilabel>. Якщо панелі списку не показано, скористайтеся пунктом меню <menuchoice><guimenu>Перегляд</guimenu><guimenuitem>Список ефектів</guimenuitem></menuchoice>.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Effect-Flag.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase></phrase>
-    </textobject>
-    <caption>
-      <para></para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Після додавання ефекту його назву буде показано на кліпі лінійки запису. Цю назву також буде додано до списку віджета <guilabel>Стос ефектів</guilabel>.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive-Quickstart-EffectStack.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Стос ефектів з пунктом виправлення RGB</phrase>
-    </textobject>
-    <caption>
-      <para>Стос ефектів з пунктом виправлення RGB</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Щоб надати зображенню теплих жовто-помаранчевих тонів, характерних для вечірнього освітлення, слід зменшити рівень синього кольору і збільшити рівні червоного і зеленого компонентів кольору.</para>
-<para>Значення параметрів у віджеті стосу ефектів можна змінювати за допомогою повзунка (клацання коліщатком миші відновлює типове значення) або за допомогою безпосереднього введення значення після подвійного клацання лівою кнопкою миші на числі, розташованому праворуч від повзунка.</para>
-<para>Ефекти також можна додати за допомогою кнопки <guilabel>Додати новий ефект</guilabel> (у рамці на зображенні ліворуч) на панелі <guilabel>Стос ефектів</guilabel>. Ефекти завжди застосовуватимуться до поточного позначеного кліпу. Зняттям позначки з відповідного пункту можна тимчасово вимкнути ефект (параметри ефекту при цьому зберігатимуться), таке вимикання може бути корисним, наприклад, для ефектів, застосування яких значно навантажує обчислювальні ресурси. Можна тимчасово вимкнути такі ефекти на час редагування, а потім увімкнути їх перед остаточною обробкою.</para>
-<para>Для деяких ефектів, зокрема використаного у нашому прикладі, можна визначати ключові кадри. Такі ефекти позначено піктограмою з переглядом у рамці. Ключові кадри використовують для зміни параметрів ефекту. У нашому кліпі використання ключових кадрів надає змогу поступово змінити колір клавіш піаніно з теплого вечірнього на холодний нічний.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Keyframes.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Ключові кадри для ефектів</phrase>
-    </textobject>
-    <caption>
-      <para>Ключові кадри для ефектів</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Після натискання піктограми <guilabel>ключового кадру</guilabel> (піктограма з годинником у рамці на попередньому зображенні) у віджеті <guilabel>Стос ефектів</guilabel> буде виконано перевпорядкування. Типово, має бути два ключових кадри, один на початку кліпу на лінійці запису і один наприкінці. Пересуньте курсор лінійки запису на кінець кліпу на лінійці запису так, щоб на моніторі проекту було насправді показано нові кольори при зміні параметрів ключового кадру наприкінці кліпу.</para>
-<para>Переконайтеся, що у списку стосу ефектів позначено останній ключовий кадр. Після цього можна заливати зображення клавіш темно-синім кольором.</para>
-<para>Після пересування курсора лінійки запису на початок проекту і відтворення запису (за допомогою натискання клавіші <keycap>Пробіл</keycap> або кнопки <guilabel>Відтворити</guilabel> на панелі <guilabel>Монітор проекту</guilabel>) зображення клавіш піаніно має змінювати колір вказаним вами чином.</para>
-<para>Визначення переходів між ключовими кадрами є найважчою частиною цього підручника. Якщо ви впоралися з ним, ви без проблем станете експертом з <guilabel>Kdenilve</guilabel>!</para>
-</sect1>
-<sect1 id="Музика"><title>Музика</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Fadeout.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Приглушення звуку</phrase>
-    </textobject>
-    <caption>
-      <para>Приглушення звуку</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>Оскільки у кліпах не передбачено звукового супроводу, знайдемо якусь композицію з вашої локальної збірки або сторінки, подібної до <ulink url="http://www.jamendo.com">Jamendo</ulink>. Звуковий кліп має, після його додавання, опинитися на звуковій доріжці лінійки запису.</para>
-<para>Розміри звукового кліпу на лінійці запису можна змінювати у спосіб, подібний до способу зміни розмірів відеокліпів. Курсор автоматично прилипатиме до кінцевої точки проекту. Щоб додати ефект приглушення звуку наприкінці звукової доріжки (якщо файл доріжки не точно збігається за тривалістю з тривалістю проекту), ви можете навести вказівник миші на верхню праву (або ліву) межу кліпу на лінійці запису і перетягнути зелений кружечок на позицію, з якої має розпочатися приглушення.<footnote><para>Зелений кружечок — умовна позначка для додавання ефекту <menuchoice><guimenu>Знебарвлювання</guimenu><guimenuitem>Згасання гучності</guimenuitem></menuchoice>. Використання позначки і пункту меню дає однакові результати.</para></footnote></para>
-</sect1>
-</chapter>
-<chapter id="Обробка"><title>Обробка</title>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Renderer.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Діалогове вікно обробки</phrase>
-    </textobject>
-    <caption>
-      <para>Діалогове вікно обробки</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>До завершення роботи над проектом залишилося зовсім нічого. Натисніть кнопку <guilabel>Обробити</guilabel> (або скористайтеся пунктом меню <menuchoice><guimenu>Проект</guimenu><guimenuitem>Обробити</guimenuitem></menuchoice> чи натисніть комбінацію клавіш <keycombo>&Ctrl;&Enter;</keycombo>), щоб викликати діалогове вікно, зразок якого показано вище. Виберіть бажаний файл виведення даних для нового відео з застосуванням всіх ефектів та переходів, виберіть формат MPEG4 (можна переглядати майже всюди) та бітову швидкість у 2000 кБ/с (чим вищим буде значення бітової швидкості, тим більшим буде файл виведених даних та кращою якість зображення, але оскільки початкова бітова швидкість всіх файлів проекту дорівнювала 2000 кБ/с, використання більших значень не призведе до покращення якості зображення, тому не варто ними користуватися) і натисніть кнопку <guilabel>Обробка до файла</guilabel>.</para>
-<para>
-<screenshot>
-<screeninfo></screeninfo>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref="Kdenlive_Quickstart-Rendering.png" format="PNG"/>
-    </imageobject>
-    <textobject>
-      <phrase>Поступ обробки</phrase>
-    </textobject>
-    <caption>
-      <para>Поступ обробки</para>
-    </caption>
-  </mediaobject>
-</screenshot></para>
-<para>За декілька секунд обробку буде завершено, як і роботу над вашим першим проектом <application>Kdenlive</application>. Вітаємо!</para>
-</chapter>
-
-<!-- empty chapter
-<chapter id="Посилання-та-нотатки"><title>Посилання та нотатки</title>
-</chapter
-->
-<!--userbase-content-->
-<chapter id="credits">
-<title>Подяки і ліцензування</title>
-    <para>
-Авторські права на переклад документації належать особам, список яких викладено у 
-    <ulink url="http://userbase.kde.org/index.php?title=Kdenlive/Manual/QuickStart/uk&amp;action=history">журналі сторінки Kdenlive/Manual/QuickStart/uk</ulink></para>
-    <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
-&underFDL;
-</chapter>
-&documentation.index;
-</book>
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -10,6 +10,7 @@ chroma_hold.xml
 chroma.xml
 crop.xml
 dust.xml
+dynamictext.xml
 freeze.xml
 gamma.xml
 grain.xml
@@ -21,6 +22,7 @@ normalise.xml
 oldfilm.xml
 pan_zoom.xml
 obscure.xml
+region.xml
 rotation.xml
 rotation_keyframable.xml
 scratchlines.xml
@@ -46,8 +48,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
@@ -62,12 +66,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
@@ -87,6 +94,7 @@ 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
--- a/effects/README
+++ b/effects/README
@@ -49,6 +49,7 @@ The rest:
        - 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 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
        - attribute "type": widget (GUI) to use
            - "fixed":
@@ -71,15 +72,17 @@ The rest:
                - 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, similar to representation 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)
@@ -112,6 +115,13 @@ 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
 ==========

 ==========
--- a/effects/automask.xml
+++ b/effects/automask.xml
@@ -6,10 +6,33 @@
 	<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/effects/boxblur.xml
+++ b/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/effects/channelcopy.xml
+++ b/effects/channelcopy.xml
@@ -1,5 +1,5 @@
 <!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>
--- a/effects/chroma.xml
+++ b/effects/chroma.xml
@@ -3,7 +3,7 @@
 	<name>Blue Screen</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">
--- a/effects/chroma_hold.xml
+++ b/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/effects/crop.xml
+++ b/effects/crop.xml
@@ -1,6 +1,6 @@
 <!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="%maxHeight" min="0" default="0" suffix="pixels">
--- a/effects/dust.xml
+++ b/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/effects/dynamictext.xml
+++ b/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%:100%x100%:100" fixed="0">
+        <name>Geometry</name>
+    </parameter>
+    <parameter type="fontfamily" name="family" default="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/effects/fade_to_black.xml
+++ b/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/effects/fadeout.xml
+++ b/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/effects/frei0r_alpha0ps.xml
+++ b/effects/frei0r_alpha0ps.xml
@@ -1,33 +1,66 @@
 <!DOCTYPE kpartgui>
-<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>
+<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="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="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="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="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="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>
+	    <parameter type="bool" name="Invert" default="0">
+		    <name>Invert</name>
+	    </parameter>
+    </effect>

-</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/effects/frei0r_balanc0r.xml
+++ b/effects/frei0r_balanc0r.xml
@@ -4,7 +4,7 @@
 	<name>White Balance</name>
 	<description>Adjust the white balance / color temperature</description>
 	<author>Dan Dennedy</author>
-	<parameter type="color" name="Neutral Color" default="0xFFFFFF">
+	<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">
@@ -15,7 +15,7 @@
 	<name>White Balance</name>
 	<description>Adjust the white balance / color temperature</description>
 	<author>Dan Dennedy</author>
-	<parameter type="color" name="Neutral Color" default="0xFFFFFF">
+	<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">
--- a/effects/frei0r_colgate.xml
+++ b/effects/frei0r_colgate.xml
@@ -0,0 +1,14 @@
+<!DOCTYPE kpartgui>
+<effect tag="frei0r.colgate" id="frei0r.colgate">
+    <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/effects/frei0r_colordistance.xml
+++ b/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/effects/frei0r_colortap.xml
+++ b/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/effects/frei0r_iirblur.xml
+++ b/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/effects/frei0r_keyspillm0pup.xml
+++ b/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/effects/frei0r_medians.xml
+++ b/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/effects/frei0r_scale0tilt.xml
+++ b/effects/frei0r_scale0tilt.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui>
 <effect tag="frei0r.scale0tilt" id="frei0r.scale0tilt">
-	<name>Scale and Tilt</name>
+	<name>Crop, Scale and Position</name>
 	<description>Scales, Tilts and Crops an Image</description>
 	<author>Richard Spindler</author>
 	<parameter type="constant" name="Clip left" max="%width-1" min="0" default="0" factor="%width">
--- a/effects/frei0r_select0r.xml
+++ b/effects/frei0r_select0r.xml
@@ -1,47 +1,99 @@
 <!DOCTYPE kpartgui>
-<effect LC_NUMERIC="C" tag="frei0r.select0r" id="frei0r.select0r">
-        <name>Color Selection</name>
-        <description>Color based alpha selection</description>
-        <author>Marko Cebokli</author>
+<group>
+    <effect LC_NUMERIC="C" tag="frei0r.select0r" id="frei0r.select0r">
+            <name>Color Selection</name>
+            <description>Color based alpha selection</description>
+            <author>Marko Cebokli</author>
        
-        <parameter type="color" name="Color to select" default="0x00FF00">
-                <name>Color to select</name>
-        </parameter>
+            <parameter type="color" name="Color to select" default="0x00ff00ff">
+                    <name>Color to select</name>
+            </parameter>
        
-        <parameter type="bool" name="Invert selection" default="0">
-                <name>Invert selection</name>
-        </parameter>    
+            <parameter type="bool" name="Invert selection" default="0">
+                    <name>Invert selection</name>
+            </parameter>    
        
-        <parameter type="simplekeyframe" name="Delta R / A / Hue" default="200" min="0" max="1000" factor="1000">
-                <name>Delta R / A / Hue</name>
-        </parameter>
+            <parameter type="simplekeyframe" name="Delta R / A / Hue" default="200" min="0" max="1000" factor="1000">
+                    <name>Delta R / A / Hue</name>
+            </parameter>
        
-        <parameter type="simplekeyframe" name="Delta G / B / Chroma" default="200" min="0" max="1000" factor="1000">
-                <name>Delta G / B / Chroma</name>
-        </parameter>
+            <parameter type="simplekeyframe" name="Delta G / B / Chroma" default="200" min="0" max="1000" factor="1000">
+                    <name>Delta G / B / Chroma</name>
+            </parameter>
        
-        <parameter type="simplekeyframe" name="Delta B / I / I" default="200" min="0" max="1000" factor="1000">
-                <name>Delta B / I / I</name>
-        </parameter>
+            <parameter type="simplekeyframe" name="Delta B / I / I" default="200" min="0" max="1000" factor="1000">
+                    <name>Delta B / I / I</name>
+            </parameter>
        
-        <parameter type="list" name="Selection subspace" default="0.0" paramlist="0.0;0.5;1.0">
-                <paramlistdisplay>RGB,ABI,HCI</paramlistdisplay>
-                <name>Selection subspace</name>
-        </parameter>
+            <parameter type="list" name="Selection subspace" default="0.0" paramlist="0.0;0.5;1.0">
+                    <paramlistdisplay>RGB,ABI,HCI</paramlistdisplay>
+                    <name>Selection subspace</name>
+            </parameter>
        
-        <parameter type="list" name="Subspace shape" default="0.0" paramlist="0.0;0.5;1.0">
-                <paramlistdisplay>Box,Ellipsoid,Diamond</paramlistdisplay>
-                <name>Subspace shape</name>
-        </parameter>
+            <parameter type="list" name="Subspace shape" default="0.5" paramlist="0.0;0.5;1.0">
+                    <paramlistdisplay>Box,Ellipsoid,Diamond</paramlistdisplay>
+                    <name>Subspace shape</name>
+            </parameter>
        
-        <parameter type="list" name="Edge mode" default="0.0" paramlist="0.0;0.35;0.60;1.0">
-                <paramlistdisplay>Hard,Fat,Normal,Skinny</paramlistdisplay>
-                <name>Edge mode</name>
-        </parameter>
+            <parameter type="list" name="Edge mode" default="0.0" paramlist="0.0;0.35;0.60;1.0">
+                    <paramlistdisplay>Hard,Fat,Normal,Skinny</paramlistdisplay>
+                    <name>Edge mode</name>
+            </parameter>
        
-        <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>
+            <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>
+    </effect>
+
+
+    <effect LC_NUMERIC="C" tag="frei0r.select0r" id="frei0r.select0r" version="0.4">
+            <name>Color Selection</name>
+            <description>Color based alpha selection</description>
+            <author>Marko Cebokli</author>
        
-</effect>
+            <parameter type="color" name="Color to select" default="0x00ff00ff">
+                    <name>Color to select</name>
+            </parameter>
+        
+            <parameter type="bool" name="Invert selection" default="0">
+                    <name>Invert selection</name>
+            </parameter>
+
+            <parameter type="list" name="Selection subspace" default="0.0" paramlist="0.0;0.5;1.0">
+                    <paramlistdisplay>RGB,ABI,HCI</paramlistdisplay>
+                    <name>Selection subspace</name>
+            </parameter>
+        
+            <parameter type="list" name="Subspace shape" default="0.5" paramlist="0.0;0.5;1.0">
+                    <paramlistdisplay>Box,Ellipsoid,Diamond</paramlistdisplay>
+                    <name>Subspace shape</name>
+            </parameter>
+        
+            <parameter type="list" name="Edge mode" default="0.9" paramlist="0.0;0.35;0.60;0.7;0.9">
+                    <paramlistdisplay>Hard,Fat,Normal,Skinny,Slope</paramlistdisplay>
+                    <name>Edge mode</name>
+            </parameter>
+        
+            <parameter type="simplekeyframe" name="Delta R / A / Hue" default="200" min="0" max="1000" factor="1000">
+                    <name>Delta R / A / Hue</name>
+            </parameter>
+        
+            <parameter type="simplekeyframe" name="Delta G / B / Chroma" default="200" min="0" max="1000" factor="1000">
+                    <name>Delta G / B / Chroma</name>
+            </parameter>
+        
+            <parameter type="simplekeyframe" name="Delta B / I / I" default="200" min="0" max="1000" factor="1000">
+                    <name>Delta B / I / I</name>
+            </parameter>
+        
+            <parameter type="simplekeyframe" name="Slope" default="0" min="0" max="1000" factor="1000">
+                    <name>Slope</name>
+            </parameter>
+        
+            <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>
+    </effect>
+</group>
--- a/effects/frei0r_squareblur.xml
+++ b/effects/frei0r_squareblur.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE kpartgui>
 <effect tag="frei0r.squareblur" id="frei0r.squareblur">
 	<name>Square Blur</name>
-	<description>Variable-size square blur (frei0r.squareblur)</description>
+	<description>Square blur</description>
 	<author>Drone</author>
 	<parameter type="simplekeyframe" name="Kernel size" max="500" min="0" default="50" factor="1000">
 		<name>Kernel size</name>
--- a/effects/frei0r_three_point_balance.xml
+++ b/effects/frei0r_three_point_balance.xml
@@ -3,13 +3,13 @@
 	<name>3 point balance</name>
 	<description>Balances colors along with 3 points</description>
 	<author>Maksim Golovkin</author>
-	<parameter type="color" name="Black color" default="0x000000">
+	<parameter type="color" name="Black color" default="0x000000ff">
 		<name>Black color</name>
 	</parameter>
-	<parameter type="color" name="Gray color" default="0x808080">
+	<parameter type="color" name="Gray color" default="0x808080ff">
 		<name>Gray color</name>
 	</parameter>
-	<parameter type="color" name="White color" default="0xFFFFFF">
+	<parameter type="color" name="White color" default="0xffffffff">
 		<name>White color</name>
 	</parameter>
 	<parameter type="bool" name="Split preview" default="0">
--- a/effects/frei0r_timeout.xml
+++ b/effects/frei0r_timeout.xml
@@ -0,0 +1,16 @@
+<!DOCTYPE kpartgui>
+<group>
+    <effect tag="frei0r.timeout" id="frei0r.timeout">
+	<name>Timeout indicator</name>
+	<author>Simon A. Eugster (Granjow)</author>
+	<parameter type="color" name="color" default="0x6893C8ff">
+		<name>Indicator color</name>
+	</parameter>
+        <parameter type="simplekeyframe" name="time" default="0" min="0" max="1000" factor="1000">
+	  <name>Time</name>
+	</parameter>
+	<parameter type="simplekeyframe" name="transparency" default="0" min="0" max="1000" factor="1000">
+	  <name>Transparency</name>
+	</parameter>
+    </effect>
+</group>
--- a/effects/frei0r_tint0r.xml
+++ b/effects/frei0r_tint0r.xml
@@ -3,10 +3,10 @@
 	<name>Tint</name>
 	<description>Maps source image luminance between two colors specified</description>
 	<author>Maksim Golovkin</author>
-	<parameter type="color" name="Map black to" default="0x000000">
+	<parameter type="color" name="Map black to" default="0x000000ff">
 		<name>Map black to</name>
 	</parameter>
-	<parameter type="color" name="Map white to" default="0x80FF80">
+	<parameter type="color" name="Map white to" default="0x80FF80ff">
 		<name>Map white to</name>
 	</parameter>
 	<parameter type="simplekeyframe" name="Tint amount" default="250" min="0" max="1000" factor="1000">
--- a/effects/grain.xml
+++ b/effects/grain.xml
@@ -3,7 +3,7 @@
 	<name>Grain</name>
 	<description>Grain over the image</description>
 	<author>Marco Gittler</author>
-	<parameter type="double" name="noise" max="200" min="0" default="40">
+	<parameter type="double" name="noise" max="200" min="0" default="40" suffix="%">
 		<name>Noise</name>
 	</parameter>
 	<parameter type="double" name="contrast" max="400" min="0" default="160">
--- a/effects/mirror.xml
+++ b/effects/mirror.xml
@@ -4,6 +4,7 @@
 	<description>Flip your image in any direction</description>
 	<author>Charles Yates</author>
 	<parameter type="list" name="mirror" default="horizontal" paramlist="horizontal;vertical;diagonal;xdiagonal;flip;flop">
+	   <paramlistdisplay>Horizontal,Vertical,Diagonal,X Diagonal,Flip,Flop</paramlistdisplay>
 		<name>Mirroring direction</name>
 	</parameter>
 	<parameter type="bool" name="reverse" default="0">
--- a/effects/oldfilm.xml
+++ b/effects/oldfilm.xml
@@ -6,7 +6,7 @@
 	<parameter type="double" name="delta" max="400" min="0" default="14">
 		<name>Y-Delta</name>
 	</parameter>
-	<parameter type="double" name="every" max="100" min="0" default="20">
+	<parameter type="double" name="every" max="100" min="0" default="20" suffix="%">
 		<name>% of picture have a delta</name>
 	</parameter>
 	<parameter type="double" name="brightnessdelta_up" max="100" min="0" default="20">
@@ -15,7 +15,7 @@
 	<parameter type="double" name="brightnessdelta_down" max="100" min="0" default="30">
 		<name>Brightness down</name>
 	</parameter>
-	<parameter type="double" name="brightnessdelta_every" max="100" min="0" default="70">
+	<parameter type="double" name="brightnessdelta_every" max="100" min="0" default="70" suffix="%">
 		<name>Brightness every</name>
 	</parameter>
 	<parameter type="double" name="unevendevelop_up" max="100" min="0" default="60">
--- a/effects/pan_zoom.xml
+++ b/effects/pan_zoom.xml
@@ -9,4 +9,7 @@
        <parameter type="bool" name="transition.distort" default="0">
                <name>Distort</name>
        </parameter>
+	<parameter type="color" name="background" default="colour:0x00000000" alpha="1" paramprefix="colour:">
+		<name>Background Color</name>
+	</parameter>
 </effect>
--- a/effects/region.xml
+++ b/effects/region.xml
@@ -0,0 +1,13 @@
+<!DOCTYPE kpartgui>
+<effect tag="region" id="region">
+	<name>Regionalize</name>
+	<description>Apply sub-effects to a region defined by a clip's alpha channel</description>
+	<author>Charles Yates</author>
+	<parameter type="url" name="resource" default="">
+		<name>Url</name>
+	</parameter>
+	<parameter type="geometry" name="composite.geometry" default="0%,0%:100%x100%" fixed="1" opacity="false">
+		<name>Pan and Zoom</name>
+	</parameter>
+	<parameter type="fixed" name="filter_only" min="1" max="1" default="1" />
+</effect>
--- a/effects/rotation.xml
+++ b/effects/rotation.xml
@@ -36,4 +36,7 @@
 	<parameter type="geometry" name="transition.geometry" default="0%,0%:100%x100%" fixed="1" opacity="false">
 		<name>Pan and Zoom</name>
 	</parameter>
+	<parameter type="color" name="background" default="colour:0x00000000" alpha="1" paramprefix="colour:">
+		<name>Background Color</name>
+	</parameter>
 </effect>
--- a/effects/rotation_keyframable.xml
+++ b/effects/rotation_keyframable.xml
@@ -18,6 +18,9 @@
        <parameter type="simplekeyframe" name="transition.oy" max="32000" min="-32000" default="0">
                <name>Offset Y</name>
        </parameter>
+	<parameter type="color" name="background" default="colour:0x00000000" alpha="1" paramprefix="colour:">
+		<name>Background Color</name>
+	</parameter>
        <parameter type="fixed" name="transition.keyed" max="1" min="1" default="1" />
 	<parameter type="fixed" name="transition.always_active" max="1" min="1" default="1" />
 </effect>
--- a/effects/scratchlines.xml
+++ b/effects/scratchlines.xml
@@ -3,7 +3,7 @@
 	<name>Scratchlines</name>
 	<description>Scratchlines over the picture</description>
 	<author>Marco Gittler</author>
-	<parameter type="double" name="width" max="100" min="0" default="2">
+	<parameter type="double" name="line_width" max="100" min="0" default="2">
 		<name>Width of line</name>
 	</parameter>
 	<parameter type="double" name="num" max="100" min="0" default="5">
--- a/effects/sox_gain.xml
+++ b/effects/sox_gain.xml
@@ -3,7 +3,12 @@
 	<name>Sox Gain</name>
 	<description>Sox gain audio effect</description>
 	<author>http://sox.sourceforge.net</author>
-	<parameter type="constant" name="gain" max="50" min="-50" default="5">
+	<parameter type="double" name="gain" max="50" min="-50" default="5.00" decimals="2">
 		<name>Gain</name>
 	</parameter>
+	<parameter type="filterjob" filtertag="sox:analysis" filterparams="" consumer="null" consumerparams="video_off=1 all=1 terminate_on_pause=1">
+		<jobparam name="key">gain</jobparam>
+		<jobparam name="finalfilter">sox_gain</jobparam>
+		<name>Normalize</name>
+	</parameter>
 </effect>
--- a/effects/update/CMakeLists.txt
+++ b/effects/update/CMakeLists.txt
@@ -5,6 +5,7 @@ frei0r.cartoon.js
 frei0r.curves.js
 frei0r.levels.js
 frei0r.lightgraffiti.js
+frei0r.select0r.js
 frei0r.sopsat.js
 frei0r.vertigo.js
 DESTINATION ${DATA_INSTALL_DIR}/kdenlive/effects/update)
--- a/effects/update/frei0r.select0r.js
+++ b/effects/update/frei0r.select0r.js
@@ -0,0 +1,15 @@
+
+var update = new Object();
+
+update["Edge mode"] = new Array(new Array(0.4, function(v, d) { return this.upd1(v, d); }));
+
+function upd1(value, isDowngrade) {
+    if (isDowngrade) {
+        if (value == 0.7)
+            return 1.0;
+    } else {
+        if (value == 1.0)
+            return 0.7;
+    }
+    return value;
+}
--- a/effects/vignette.xml
+++ b/effects/vignette.xml
@@ -3,7 +3,7 @@
 	<name>Vignette Effect</name>
 	<description>Adjustable Vignette</description>
 	<author>Marco Gittler</author>
-	<parameter type="simplekeyframe" name="smooth" default="800" min="0" max="1000" factor="1000">
+	<parameter type="simplekeyframe" name="smooth" default="800" min="0" max="10000" factor="1000">
 		<name>smooth</name>
 	</parameter>
 	<parameter type="simplekeyframe" name="radius" default="500" min="0" max="1000" factor="1000" intimeline="1">
@@ -18,4 +18,7 @@
 	<parameter type="simplekeyframe" name="opacity" default="0" min="0" max="1000" factor="1000">
 		<name>opacity</name>
 	</parameter>
+	<parameter type="bool" name="mode" default="0">
+		<name>use cos instead of linear</name>
+	</parameter>
 </effect>
--- a/export/profiles.xml
+++ b/export/profiles.xml
@@ -1,147 +1,84 @@
 <profiles version="0.1">
-<group name="HDV" renderer="avformat" extension="m2t" type="av">
-  <profile name="PAL 1080 50i" standard="PAL" args="f=mpegts acodec=mp2 ab=384k ar=48000 ac=2 vcodec=mpeg2video s=1440x1080 vb=25000k g=12 trellis=1 mlt_profile=hdv_1080_50i pass=%passes" />
-  <profile name="PAL 1080 25p" standard="PAL" args="f=mpegts acodec=mp2 ab=384k ar=48000 ac=2 vcodec=mpeg2video s=1440x1080 vb=25000k g=12 trellis=1 mlt_profile=hdv_1080_25p pass=%passes" />
-  <profile name="PAL 720 25p" standard="PAL" args="f=mpegts acodec=mp2 ab=384k ar=48000 ac=2 vcodec=mpeg2video s=1280x720 vb=19700k g=12 trellis=1 mlt_profile=hdv_720_25p pass=%passes" />
-  <profile name="NTSC 1080 60i" standard="NTSC" args="f=mpegts acodec=mp2 ab=384k ar=48000 ac=2 vcodec=mpeg2video s=1440x1080 vb=25000k g=15 trellis=1 mlt_profile=hdv_1080_60i pass=%passes" />
-  <profile name="NTSC 1080 30p" standard="NTSC" args="f=mpegts acodec=mp2 ab=384k ar=48000 ac=2 vcodec=mpeg2video s=1440x1080 vb=25000k g=15 trellis=1 mlt_profile=hdv_1080_30p pass=%passes" />
-  <profile name="NTSC 720 30p" standard="NTSC" args="f=mpegts acodec=mp2 ab=384k ar=48000 ac=2 vcodec=mpeg2video s=1280x720 vb=19700k g=15 trellis=1 mlt_profile=hdv_720_30p pass=%passes" />
-</group>
+  <group name="Web" renderer="avformat" type="av">
+    <profile name="WebM" extension="webm" bitrates="400,600,800,1000,2000,4000,6000,8000" defaultbitrate="2000"
+      args="properties=webm ar=44100 vb=%bitrate+'k' aspect=%dar" />
+    <profile name="Theora" extension="ogv" bitrates="400,600,800,1000,2000,4000,6000,8000" defaultbitrate="2000"
+      audiobitrates="64,128,192,256,384" defaultaudiobitrate="128"
+      args="acodec=vorbis ar=44100 ab=%audiobitrate+'k' vcodec=libtheora vb=%bitrate+'k' aspect=%dar pass=%passes" />
+    <profile name="Flash" extension="flv" bitrates="200,400,600,800,1000,2000,4000,6000,8000" defaultbitrate="1000"
+      audiobitrates="64,128,192,256,384" defaultaudiobitrate="128"
+      args="properties=Flash vb=%bitrate+'k' pass=%passes" />
+  </group>

-<group name="Raw DV" renderer="avformat" type="av" extension="dv">
-  <profile name="DV PAL 4:3" standard="PAL" args="f=dv pix_fmt=yuv420p s=720x576 mlt_profile=dv_pal" />
-  <profile name="DV PAL 16:9" standard="PAL" args="f=dv pix_fmt=yuv420p s=720x576 mlt_profile=dv_pal_wide" />
-  <profile name="DVCPRO25 PAL 4:3" standard="PAL" args="f=dv pix_fmt=yuv411p s=720x576 mlt_profile=dv_pal" />
-  <profile name="DVCPRO25 PAL 16:9" standard="PAL" args="f=dv pix_fmt=yuv411p s=720x576 mlt_profile=dv_pal_wide" />
-  <profile name="DVCPRO50 PAL 4:3" standard="PAL" args="f=dv pix_fmt=yuv422p s=720x576 mlt_profile=dv_pal" />
-  <profile name="DVCPRO50 PAL 16:9" standard="PAL" args="f=dv pix_fmt=yuv422p s=720x576 mlt_profile=dv_pal_wide" />
+  <group name="Mobile devices" extension="mp4" renderer="avformat" type="av">
+    <profile name="Mobile devices"
+      args="acodec=aac ab=128k properties=x264-medium-baseline vb=700k s=480x320 aspect=%dar progressive=1 g=120 pass=%passes" />
+  </group>

-  <profile name="DV NTSC 4:3" standard="NTSC" args="f=dv pix_fmt=yuv411p s=720x480 mlt_profile=dv_ntsc" />
-  <profile name="DV NTSC 16:9" standard="NTSC" args="f=dv pix_fmt=yuv411p s=720x480 mlt_profile=dv_ntsc_wide" />
-  <profile name="DVCPRO25 NTSC 4:3" standard="NTSC" args="f=dv pix_fmt=yuv411p s=720x480 mlt_profile=dv_ntsc" />
-  <profile name="DVCPRO25 NTSC 16:9" standard="NTSC" args="f=dv pix_fmt=yuv411p s=720x480 mlt_profile=dv_ntsc_wide" />
-  <profile name="DVCPRO50 NTSC 4:3" standard="NTSC" args="f=dv pix_fmt=yuv422p s=720x480 mlt_profile=dv_ntsc" />
-  <profile name="DVCPRO50 NTSC 16:9" standard="NTSC" args="f=dv pix_fmt=yuv422p s=720x480 mlt_profile=dv_ntsc_wide" />
- </group>
+  <group name="MP4" extension="mp4" renderer="avformat" type="av">
+    <profile name="H.264/AAC" bitrates="400,600,800,1000,2000,4000,6000,8000,10000,12000,18000,25000" defaultbitrate="2000"
+      audiobitrates="64,128,192,256,384" defaultaudiobitrate="192"
+      args="acodec=aac ar=48000 ab=%audiobitrate+'k' vcodec=libx264 vb=%bitrate+'k' aspect=%dar pass=%passes" />
+    <profile name="MPEG-4/MP3" bitrates="400,600,800,1000,2000,4000,6000,8000,10000,12000,18000,25000" defaultbitrate="2000"
+      audiobitrates="64,128,192,256,384" defaultaudiobitrate="128"
+      args="properties=MPEG-4-ASP ab=%audiobitrate+'k' vb=%bitrate+'k' aspect=%dar pass=%passes" />
+  </group>

-<group name="AVI DV" renderer="avformat" type="av" extension="avi">
-  <profile name="DV PAL 4:3" standard="PAL" args="f=avi vcodec=dvvideo pix_fmt=yuv420p acodec=pcm_s16le s=720x576 mlt_profile=dv_pal" />
-  <profile name="DV PAL 16:9" standard="PAL" args="f=avi vcodec=dvvideo pix_fmt=yuv420p acodec=pcm_s16le s=720x576 mlt_profile=dv_pal_wide" />
-  <profile name="DVCPRO25 PAL 4:3" standard="PAL" args="f=avi vcodec=dvvideo pix_fmt=yuv411p acodec=pcm_s16le s=720x576 mlt_profile=dv_pal" />
-  <profile name="DVCPRO25 PAL 16:9" standard="PAL" args="f=avi vcodec=dvvideo pix_fmt=yuv411p acodec=pcm_s16le s=720x576 mlt_profile=dv_pal_wide" />
-  <profile name="DVCPRO50 PAL 4:3" standard="PAL" args="f=avi vcodec=dvvideo pix_fmt=yuv422p acodec=pcm_s16le s=720x576 mlt_profile=dv_pal" />
-  <profile name="DVCPRO50 PAL 16:9" standard="PAL" args="f=avi vcodec=dvvideo pix_fmt=yuv422p acodec=pcm_s16le s=720x576 mlt_profile=dv_pal_wide" />
+  <group name="MPEG-2" renderer="avformat" extension="mpg" type="av">
+    <profile name="MPEG-2" bitrates="600,800,1000,2000,4000,6000,8000,10000,12000,18000,25000" defaultbitrate="4000"
+      audiobitrates="64,128,192,256,384" defaultaudiobitrate="192"
+      args="properties=MPEG-2 ab=%audiobitrate+'k' vb=%bitrate+'k' aspect=%dar pass=%passes" />
+  </group>

-  <profile name="DV NTSC 4:3" standard="NTSC" args="f=avi vcodec=dvvideo pix_fmt=yuv411p acodec=pcm_s16le s=720x480 mlt_profile=dv_ntsc" />
-  <profile name="DV NTSC 16:9" standard="NTSC" args="f=avi vcodec=dvvideo pix_fmt=yuv411p acodec=pcm_s16le s=720x480 mlt_profile=dv_ntsc_wide" />
-  <profile name="DVCPRO25 NTSC 4:3" standard="NTSC" args="f=avi vcodec=dvvideo pix_fmt=yuv411p acodec=pcm_s16le s=720x480 mlt_profile=dv_ntsc" />
-  <profile name="DVCPRO25 NTSC 16:9" standard="NTSC" args="f=avi vcodec=dvvideo pix_fmt=yuv411p acodec=pcm_s16le s=720x480 mlt_profile=dv_ntsc_wide" />
-  <profile name="DVCPRO50 NTSC 4:3" standard="NTSC" args="f=avi vcodec=dvvideo pix_fmt=yuv422p acodec=pcm_s16le s=720x480 mlt_profile=dv_ntsc" />
-  <profile name="DVCPRO50 NTSC 16:9" standard="NTSC" args="f=avi vcodec=dvvideo pix_fmt=yuv422p acodec=pcm_s16le s=720x480 mlt_profile=dv_ntsc_wide" />
-</group>
+  <group name="HDV" renderer="avformat" type="av" extension="m2t">
+    <profile name="PAL 1080 50i"  standard="PAL"  args="properties=hdv_1080_50i mlt_profile=hdv_1080_50i vb=25000k pass=%passes" />
+    <profile name="PAL 1080 25p"  standard="PAL"  args="properties=hdv_1080_25p mlt_profile=hdv_1080_25p vb=25000k pass=%passes" />
+    <profile name="PAL 720 25p"   standard="PAL"  args="properties=hdv_720_25p  mlt_profile=hdv_720_25p  vb=19700k pass=%passes" />
+    <profile name="NTSC 1080 60i" standard="NTSC" args="properties=hdv_1080_60i mlt_profile=hdv_1080_60i vb=25000k pass=%passes" />
+    <profile name="NTSC 1080 30p" standard="NTSC" args="properties=hdv_1080_30p mlt_profile=hdv_1080_30p vb=25000k pass=%passes" />
+    <profile name="NTSC 720 30p"  standard="NTSC" args="properties=hdv_720_30p  mlt_profile=hdv_720_30p  vb=19700k pass=%passes" />
+  </group>

-<group name="DVD" renderer="avformat" type="av">
-<groupname id="dvd">DVD</groupname>
-  <profile name="PAL 4:3 VOB" standard="PAL" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 vb=5000k maxrate=8000k minrate=0 bufsize=1835008 packetsize=2048 muxrate=10080000 ab=192k ar=48000 s=720x576 g=15 me_range=63 trellis=1 mlt_profile=dv_pal pass=%passes" />
-  <profile name="PAL 16:9 VOB" standard="PAL" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 vb=5000k maxrate=8000k minrate=0 bufsize=1835008 packetsize=2048 muxrate=10080000 ab=192k ar=48000 s=720x576 g=15 me_range=63 trellis=1 mlt_profile=dv_pal_wide pass=%passes" />
-  <profile name="NTSC 4:3 VOB" standard="NTSC" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 s=720x480 vb=6000k maxrate=9000k minrate=0 bufsize=1835008 packetsize=2048 muxrate=10080000 ab=192k ar=48000 g=18 me_range=63 trellis=1 mlt_profile=dv_ntsc pass=%passes" />
-  <profile name="NTSC 16:9 VOB" standard="NTSC" extension="vob" args="f=dvd vcodec=mpeg2video acodec=ac3 s=720x480 vb=6000k maxrate=9000k minrate=0 bufsize=1835008 packetsize=2048 muxrate=10080000 ab=192k ar=48000 g=18 me_range=63 trellis=1 mlt_profile=dv_ntsc_wide pass=%passes" />
-</group>
+  <group name="DVD" renderer="avformat" type="av" extension="vob">
+    <profile name="PAL 4:3 VOB"   standard="PAL"  args="properties=dv_pal/DVD       mlt_profile=dv_pal       pass=%passes" />
+    <profile name="PAL 16:9 VOB"  standard="PAL"  args="properties=dv_pal_wide/DVD  mlt_profile=dv_pal_wide  pass=%passes" />
+    <profile name="NTSC 4:3 VOB"  standard="NTSC" args="properties=dv_ntsc/DVD      mlt_profile=dv_ntsc      pass=%passes" />
+    <profile name="NTSC 16:9 VOB" standard="NTSC" args="properties=dv_ntsc_wide/DVD mlt_profile=dv_ntsc_wide pass=%passes" />
+  </group>

-<group name="MPEG-2" renderer="avformat" extension="mpg" type="av">
-  <profile name="MPEG-2" bitrates="200,400,600,800,1000,2000,4000,6000,8000,10000,12000,18000,25000" defaultbitrate="12000" audiobitrates="64,128,192,256,384" defaultaudiobitrate="384"
-           args="f=mpeg acodec=mp2 ab=%audiobitrate+'k' ar=48000 vcodec=mpeg2video minrate=0 vb=%bitrate+'k' bf=2 b_strategy=1 trellis=1 aspect=%dar pass=%passes" />
-</group>
+  <group name="Media players" renderer="avformat" type="av">
+    <profile name="AVI XVid4" extension="avi" bitrates="400,600,800,1000,2000,4000,8000" defaultbitrate="2000"
+      audiobitrates="64,128,192,256,384" defaultaudiobitrate="128"
+      args="acodec=libmp3lame ab=%audiobitrate+'k' ar=44100 vcodec=libxvid vb=%bitrate+'k' aspect=%dar pass=%passes" />
+    <profile name="Windows Media Player WMV7" bitrates="400,1000,2000" defaultbitrate="2000"
+      extension="avi" args="acodec=libmp3lame ab=128k ar=48000 ac=2 vcodec=wmv1 minrate=0 vb=%bitrate+'k' aspect=%dar pass=%passes" />
+    <profile name="Apple Quicktime" bitrates="400,1000,2000" defaultbitrate="2000"
+      extension="mov" args="acodec=aac ab=128k ac=2 ar=48000 vcodec=mpeg4 vb=%bitrate+'k' aspect=%dar pass=%passes" />
+  </group>

-<group name="MPEG-4" renderer="avformat" extension="mp4" type="av">
-  <profile name="MPEG-4" bitrates="200,400,600,800,1000,2000,4000,6000,8000,10000,12000,18000,25000" defaultbitrate="12000" audiobitrates="64,128,192,256,384" defaultaudiobitrate="128"
-           args="f=mp4 acodec=libmp3lame ab=%audiobitrate+'k' ar=44100 vcodec=mpeg4 minrate=0 vb=%bitrate+'k' aspect=%dar mbd=2 trellis=1 mv4=1 pass=%passes" />
-</group>
+  <group name="Raw DV" renderer="avformat" type="av" extension="dv">
+    <profile name="DV PAL 4:3"         standard="PAL"  args="properties=dv_pal/DV             mlt_profile=dv_pal" />
+    <profile name="DV PAL 16:9"        standard="PAL"  args="properties=dv_pal_wide/DV        mlt_profile=dv_pal_wide" />
+    <profile name="DVCPRO50 PAL 4:3"   standard="PAL"  args="properties=dv_pal/DVCPRO50       mlt_profile=dv_pal" />
+    <profile name="DVCPRO50 PAL 16:9"  standard="PAL"  args="properties=dv_pal_wide/DVCPRO50  mlt_profile=dv_pal_wide" />
+    <profile name="DV NTSC 4:3"        standard="NTSC" args="properties=dv_ntsc/DV            mlt_profile=dv_ntsc" />
+    <profile name="DV NTSC 16:9"       standard="NTSC" args="properties=dv_ntsc_wide/DV       mlt_profile=dv_ntsc_wide" />
+    <profile name="DVCPRO50 NTSC 4:3"  standard="NTSC" args="properties=dv_ntsc/DVCPRO50      mlt_profile=dv_ntsc" />
+    <profile name="DVCPRO50 NTSC 16:9" standard="NTSC" args="properties=dv_ntsc_wide/DVCPRO50 mlt_profile=dv_ntsc_wide" />
+  </group>

-<group name="XVid4" renderer="avformat" extension="avi" type="av">
-  <profile name="XVid4" bitrates="400,600,800,1000,2000,4000,8000,10000,12000" defaultbitrate="8000"
-  audiobitrates="64,128,192,256,384" defaultaudiobitrate="128" args="acodec=libmp3lame ab=%audiobitrate+'k' ar=44100 vcodec=libxvid minrate=0 vb=%bitrate+'k' aspect=%dar mbd=2 trellis=1 mv4=1 pass=%passes" />
-</group>
+  <group name="Audio only" renderer="avformat" type="audio">
+    <profile name="WAV 22050 KHz" extension="wav" args="properties=WAV ar=22050" />
+    <profile name="WAV 44100 KHz" extension="wav" args="properties=WAV ar=44100" />
+    <profile name="WAV 48000 KHz" extension="wav" args="properties=WAV ar=48000" />
+  </group>

-<group name="H.264" renderer="avformat" extension="mp4" type="av">
-  <profile name="H.264" bitrates="200,400,600,800,1000,2000,4000,6000,8000,10000,12000,18000,25000" defaultbitrate="12000" audiobitrates="64,128,192,256,384" defaultaudiobitrate="384"
-           args="f=mp4 hq=1 acodec=aac ab=%audiobitrate+'k' ar=48000 pix_fmt=yuv420p vcodec=libx264 minrate=0 vb=%bitrate+'k' g=250 bf=3 b_strategy=1 subcmp=2 cmp=2 coder=1 flags=+loop flags2=dct8x8 qmax=51 subq=7 qmin=10 qcomp=0.6 qdiff=4 trellis=1 aspect=%dar pass=%passes" />
-</group>
-
-<group name="Flash" renderer="avformat" extension="flv" type="av">
-  <profile name="Flash" bitrates="200,400,600,800,1000,2000,4000,6000,8000,10000,12000" defaultbitrate="8000"
-           args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 vb=%bitrate+'k' progressive=1 pass=%passes threads=1" />
-  <profile name="Flash 720x576" standard="PAL" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 vb=12000k s=720x576 progressive=1 pass=%passes threads=1" />
-  <profile name="Flash 720x480" standard="NTSC" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 vb=12000k s=720x480 progressive=1 pass=%passes threads=1" />
-</group>
-
-<group name="RealVideo" renderer="avformat" extension="rm" type="av">
-  <profile name="RealVideo" bitrates="200,400,600,800,1000,2000,4000,6000,8000,10000,12000" defaultbitrate="8000"
-           args="vcodec=rv20 acodec=ac3 minrate=0 vb=%bitrate+'k' ab=128k ar=44100 g=8 pass=%passes" />
-  <profile name="RealVideo 720x576" standard="PAL" args="vcodec=rv20 acodec=ac3 minrate=0 vb=12000k ab=384k ar=48000 s=720x576 g=8 pass=%passes" />
-  <profile name="RealVideo 720x480" standard="NTSC" args="vcodec=rv20 acodec=ac3 minrate=0 vb=12000k ab=384k ar=48000 s=720x480 g=8 pass=%passes" />
-</group>
-
-<group name="Theora" renderer="avformat" extension="ogv" type="av">
-  <profile name="Theora" bitrates="200,400,600,800,1000,2000,4000,6000,8000,10000,12000" defaultbitrate="8000"
-           audiobitrates="64,128,192,256,384" defaultaudiobitrate="128" args="acodec=vorbis ab=%audiobitrate+'k' ar=44100 aq=50 vcodec=libtheora minrate=0 vb=%bitrate+'k' aspect=%dar pass=%passes" />
-  <profile name="Theora 720x576" standard="PAL" args="acodec=vorbis ab=384k aq=30 ar=44100 vcodec=libtheora minrate=0 vb=12000k s=720x576 aspect=%dar pass=%passes" />
-  <profile name="Theora 720x480" standard="NTSC" args="acodec=vorbis ab=384k aq=30 ar=44100 vcodec=libtheora minrate=0 vb=12000k s=720x480 aspect=%dar pass=%passes" />
-</group>
-
-<group name="WebM" renderer="avformat" extension="webm" type="av">
-  <profile name="WebM" bitrates="200,400,600,800,1000,2000,4000,6000,8000,10000,12000" defaultbitrate="8000"
-          audiobitrates="64,128,192,256,384" defaultaudiobitrate="128" args="acodec=vorbis ab=%audiobitrate+'k' ar=44100 aq=50 vcodec=libvpx minrate=0 vb=%bitrate+'k' aspect=%dar maxrate=%bitrate*2+'k' g=120 qmax=42 qmin=10" />
-</group>
-
-<group name="Media players" renderer="avformat" type="av">
-  <groupname id="mediaplayers">Media players</groupname>
-  <profile name="Windows Media Player WMV V7" bitrates="400,1000,2000" defaultbitrate="2000"
-           extension="avi" args="acodec=libmp3lame ab=128k ar=48000 ac=2 vcodec=wmv1 minrate=0 vb=%bitrate+'k' aspect=%dar pass=%passes" />
-  <profile name="Apple Quicktime Player MPEG-4" bitrates="400,1000,2000" defaultbitrate="2000"
-           extension="mov" args="acodec=aac ab=128k ac=2 ar=48000 vcodec=mpeg4 minrate=0 vb=%bitrate+'k' aspect=%dar pass=%passes" />
-</group>
-
-<group name="Web sites" renderer="avformat" type="av">
-  <groupname id="websites">Web sites</groupname>
-  <profile name="Dailymotion 320x240" extension="flv" args="f=flv acodec=libmp3lame ab=128k ar=44100 vcodec=flv minrate=0 vb=800k s=320x240 aspect=%dar trellis=1 pass=%passes" url="http://www.dailymotion.com/upload" />
-  <profile name="Dailymotion 512x384" extension="mp4" args="f=mp4 acodec=aac ab=96k ar=44100 vcodec=libx264 minrate=0 vb=600k g=250 bf=3 s=512x384 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51 pass=%passes" url="http://www.dailymotion.com/upload" />
-  <profile name="Dailymotion 1280x720" extension="mp4" args="f=mp4 acodec=aac ab=96k ar=44100 vcodec=libx264 minrate=0 vb=1500k g=250 bf=3 s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51 pass=%passes" url="http://www.dailymotion.com/upload" />
-  <profile name="Vimeo 640x480" extension="mp4" args="f=mp4 acodec=aac ab=128k ar=44100 vcodec=libx264 minrate=0 vb=3000k g=250 bf=3 s=640x480 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51 pass=%passes" url="http://www.vimeo.com/upload" />
-  <profile name="Vimeo 1280x720" extension="mp4" args="f=mp4 acodec=aac ab=128k ar=44100 vcodec=libx264 minrate=0 vb=5000k g=250 bf=3 s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51 pass=%passes" url="http://www.vimeo.com/upload" />
-  <profile name="YouTube 640x480" extension="mp4" args="f=mp4 acodec=libmp3lame ab=128k ar=44100 vcodec=mpeg4 minrate=0 vb=800k s=640x480 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51 pass=%passes" url="http://www.youtube.com/upload" />
-  <profile name="YouTube 1280x720" extension="mp4" args="f=mp4 hq=1 acodec=aac ab=128k ar=44100 vcodec=mpeg4 minrate=0 vb=2000k s=1280x720 aspect=%dar mbd=2 trellis=1 mv4=1 subq=7 qmin=10 qcomp=0.6 qdiff=4 qmax=51 pass=%passes" url="http://www.youtube.com/upload" />
-</group>
-
-
-<group name="Wav" renderer="avformat" type="audio">
-  <groupname id="audioonly">Audio only</groupname>
-  <profile name="WAV 22050 KHz" extension="wav" args="f=wav ar=22050 video_off=1" />
-  <profile name="WAV 32000 KHz" extension="wav" args="f=wav ar=32000 video_off=1" />
-  <profile name="WAV 44100 KHz" extension="wav" args="f=wav ar=44100 video_off=1" />
-  <profile name="WAV 48000 KHz" extension="wav" args="f=wav ar=48000 video_off=1" />
-</group>
-
-<group name="Lossless/HQ" renderer="avformat" type="av">
-  <groupname id="lossless">Lossless / HQ</groupname>
-  <profile name="FFV1 lossless (video) + FLAC (sound)" extension="avi" args="f=avi acodec=flac ar=48000 ab=1024k ac=2 vcodec=ffv1 qscale=1 aspect=%dar" />
-  <profile name="HuffYUV lossless (video) + PCM (sound)" extension="avi" args="f=avi acodec=pcm_s16le ac=2 vcodec=huffyuv aspect=%dar" />
-  <profile name="MPEG-2 I-frame only (video) + MP2 (sound)" extension="mpg" args="f=mpeg acodec=mp2 ab=384k ar=48000 ac=2 vcodec=mpeg2video qscale=1 qmin=1 aspect=%dar intra=1" />
-  <profile name="MPEG-4 I-frame only (video) + MP3 (sound)" extension="mp4" args="f=mp4 acodec=libmp3lame ab=384k ar=48000 ac=2 vcodec=mpeg4 qscale=1 qmin=1 aspect=%dar intra=1" />
-  <profile name="H.264 I-frame only (video) + AAC (sound)" extension="mp4" args="f=mp4 acodec=aac ab=384k ar=48000 ac=2 pix_fmt=yuv420p vcodec=libx264 cqp=1 subq=1 qmax=1 qmin=1 qcomp=0.6 qdiff=0 coder=ac trellis=1 aspect=%dar intra=1" />
-  <profile name="H.264 lossless slow (video) + AAC (sound)" extension="mp4" args="f=mp4 acodec=aac ab=384k ar=48000 ac=2 pix_fmt=yuv420p vcodec=libx264 cqp=0 me_method=esa subq=8 qmin=10 qcomp=0.6 qdiff=4 qmax=51 coder=ac partitions=+parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 refs=16 flags2=+dct8x8+mixed_refs trellis=1 aspect=%dar" />
-  <profile name="H.264 lossless fast (video) + AAC (sound)" extension="mp4" args="f=mp4 acodec=aac ab=384k ar=48000 ac=2 pix_fmt=yuv420p vcodec=libx264 cqp=0 me_method=dia subq=1 qmin=10 qcomp=0.6 qdiff=4 qmax=51 partitions=-parti4x4-parti8x8-partp4x4-partp8x8-partb8x8 trellis=1 aspect=%dar" />
-</group>
-
-<group name="Apple" renderer="avformat" type="av">
-  <groupname id="mobile">Mobile devices</groupname>
-  <profile name="iPod Classic 500k" extension="m4v" args="s=320x240 aspect=%dar progressive=1 acodec=aac ab=128k vcodec=libx264 vb=500k flags=+loop cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=umh subq=5 me_range=16 g=250 keyint_min=25 sc_threshold=40 i_qfactor=0.71 qcomp=0.6 qmin=10 qmax=51 qdiff=4 directpred=1 trellis=1 coder=0 bf=0 refs=1 flags2=-wpred-dct8x8 level=13 maxrate=3000k bufsize=768k wpredp=0 bt=256k pass=%passes" />
-  <profile name="iPhone/iPod Touch 700k" extension="m4v" args="s=480x320 aspect=%dar progressive=1 acodec=aac ab=128k vcodec=libx264 vb=700k flags=+loop cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=umh subq=7 me_range=16 g=250 keyint_min=25 sc_threshold=40 i_qfactor=0.71 qcomp=0.6 qmin=10 qmax=51 qdiff=4 directpred=1 trellis=1 coder=0 bf=0 refs=3 flags2=-wpred-dct8x8 level=30 maxrate=10000k bufsize=10000k wpredp=0 pass=%passes" />
-</group>
-
-<group name="Android" renderer="avformat" type="av">
-  <groupname id="mobile">Mobile devices</groupname>
-  <profile name="480x320 700k" extension="mp4" args="s=480x320 aspect=%dar progressive=1 acodec=aac ab=128k vcodec=libx264 vb=700k flags=+loop cmp=+chroma partitions=+parti8x8+parti4x4+partp8x8+partb8x8 me_method=umh subq=7 me_range=16 g=250 keyint_min=25 sc_threshold=40 i_qfactor=0.71 qcomp=0.6 qmin=10 qmax=51 qdiff=4 directpred=1 trellis=1 coder=0 bf=0 refs=1 flags2=-wpred-dct8x8 level=30 maxrate=10000k bufsize=10000k wpredp=0 pass=%passes" />
-</group>
+  <group name="Lossless/HQ" renderer="avformat" type="av">
+    <profile name="Lossless FFV1 + FLAC"    extension="mkv" args="properties=lossless/FFV1" />
+    <profile name="Lossless HuffYUV + FLAC" extension="mkv" args="properties=lossless/HuffYUV" />
+    <profile name="Lossless MPEG-2 + AC3"   extension="mpg" args="properties=lossless/MPEG-2" />
+    <profile name="Lossless MPEG-4 + PCM"   extension="avi" args="properties=lossless/MPEG-4" />
+    <profile name="Lossless H.264 + AAC"    extension="mp4" args="properties=lossless/H.264" />
+  </group>

 </profiles>
--- a/git-workflow.svg
+++ b/git-workflow.svg
@@ -0,0 +1,560 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1400"
+   height="800"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="git-workflow.svg"
+   inkscape:export-filename="/tmp/kdenlive-git-workflow.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend"
+       style="overflow:visible">
+      <path
+         id="path3935"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend"
+       style="overflow:visible">
+      <path
+         id="path3941"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Lend-9"
+       style="overflow:visible">
+      <path
+         id="path3935-3"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="774.51484"
+     inkscape:cy="378.04332"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="709"
+     inkscape:window-x="-3"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-global="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:bbox-paths="true">
+    <sodipodi:guide
+       orientation="1,0"
+       position="350.72496,666.09459"
+       id="guide5235" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="412.95036,332.34019"
+       id="guide5237" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="779,274"
+       id="guide5239" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="1004,542"
+       id="guide5245" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="940.45202,657.60931"
+       id="guide3244" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(325.2691,253.92633)">
+    <rect
+       style="color:#000000;fill:#6c87d6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2985"
+       width="162"
+       height="72"
+       x="-789.76361"
+       y="-244.63782" />
+    <g
+       id="g3850"
+       transform="translate(20.681252,9.4129353)">
+      <use
+         height="1052.3622"
+         width="744.09448"
+         transform="translate(646.46509,470.75735)"
+         id="use3816"
+         xlink:href="#g3811"
+         y="0"
+         x="0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text2991"
+         y="278.65509"
+         x="94"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><tspan
+           y="278.65509"
+           x="94"
+           id="tspan2993"
+           sodipodi:role="line">Release</tspan></text>
+    </g>
+    <g
+       id="g3791"
+       transform="translate(-181.31874,-86.712769)">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#rect2985"
+         id="use2995"
+         transform="translate(1058.7636,292)"
+         width="744.09448"
+         height="1052.3622" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text2997"
+         y="99.362183"
+         x="296"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><tspan
+           y="99.362183"
+           x="296"
+           id="tspan2999"
+           sodipodi:role="line">Master</tspan></text>
+    </g>
+    <g
+       id="g3845"
+       transform="translate(15.730902,-2.5870447)">
+      <use
+         height="1052.3622"
+         width="744.09448"
+         transform="translate(1017.4651,482.75736)"
+         id="use3843"
+         xlink:href="#g3811"
+         y="0"
+         x="0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3005"
+         y="289.24088"
+         x="461"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><tspan
+           y="289.24088"
+           x="461"
+           id="tspan3007"
+           sodipodi:role="line">Feature</tspan></text>
+    </g>
+    <g
+       id="g3781"
+       transform="translate(416.7309,-297.58704)">
+      <use
+         height="1052.3622"
+         width="744.09448"
+         transform="translate(826.76364,502)"
+         id="use3001"
+         xlink:href="#rect2985"
+         y="0"
+         x="0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3009"
+         y="309.36218"
+         x="77"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+         xml:space="preserve"><tspan
+           y="309.36218"
+           x="77"
+           id="tspan3011"
+           sodipodi:role="line">Next</tspan></text>
+    </g>
+    <g
+       id="g3811"
+       transform="translate(-791.14841,-65.171573)">
+      <rect
+         style="color:#000000;fill:#ebeef8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3805"
+         width="162"
+         height="72"
+         x="236.68333"
+         y="-162.2236" />
+      <rect
+         y="-170.2236"
+         x="224.68333"
+         height="72"
+         width="162"
+         id="rect3807"
+         style="color:#000000;fill:#b5c2e6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:#6c87d6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3809"
+         width="162"
+         height="72"
+         x="211.68333"
+         y="-177.2236" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:end;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:end;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       x="25.45586"
+       y="-40.224854"
+       id="text3874"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3876"
+         x="25.45586"
+         y="-40.224854">Keep stable</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       x="678.7309"
+       y="-40.224854"
+       id="text3878"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3880"
+         x="678.7309"
+         y="-40.224854">Testing branch</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       x="678.7309"
+       y="237.77515"
+       id="text3882"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3884"
+         x="678.7309"
+         y="237.77515">Experimental features</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="25.45586"
+       y="237.77515"
+       id="text3886"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3888"
+         x="25.45586"
+         y="237.77515">Bugfix branches</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+       d="m 160.13708,65.079645 0,141.421365"
+       id="path3909"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="87.681259"
+       y="118.6328"
+       id="text4541"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4543"
+         x="92.775009"
+         y="118.6328">Branch a tagged release </tspan><tspan
+         sodipodi:role="line"
+         x="87.681259"
+         y="138.6328"
+         id="tspan5179">for working on urgent fixes</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+       d="m 539.28845,217.81471 0,-154.149285"
+       id="path4545"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       x="615.18292"
+       y="118.6328"
+       id="text4731"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4733"
+         x="615.18292"
+         y="118.6328">New features and bugfixes </tspan><tspan
+         sodipodi:role="line"
+         x="615.18292"
+         y="138.6328"
+         id="tspan5229">ready for testing</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 428.12193,-2.6015947 z"
+       id="path4773"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+       d="m 426.70772,-14.622415 -154.14928,0"
+       id="path4775"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="289.52899"
+       y="-28.057436"
+       id="text4961"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4963"
+         x="289.52899"
+         y="-28.057436">Stable features</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="25.45586"
+       y="-5.6674438"
+       id="text4965"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4967"
+         x="30.54961"
+         y="-5.6674438">Trivial bugfixes and features </tspan><tspan
+         sodipodi:role="line"
+         x="25.45586"
+         y="14.332556"
+         id="tspan3242">are done here</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="314.27774"
+       y="30.632429"
+       id="text5155"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5157"
+         x="314.27774"
+         y="30.632429">Updates</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="678.7309"
+       y="266.05316"
+       id="text5159"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5161"
+         x="678.7309"
+         y="266.05316">Can be local or public</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="678.7309"
+       y="-9.317338"
+       id="text5163"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         x="678.7309"
+         y="-9.317338"
+         id="tspan5167">Branch that is more or less stable</tspan><tspan
+         sodipodi:role="line"
+         x="678.7309"
+         y="10.682662"
+         id="tspan5259">with the newest features</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:36px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#484848;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="-280.72137"
+       y="-116.26205"
+       id="text5171"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5173"
+         x="-280.72137"
+         y="-116.26205">Kdenlive’s git workflow</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="-750.03271"
+       y="-269.9263"
+       id="text5175"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5177"
+         x="-750.03271"
+         y="-269.9263">Originals of the clones in the drawing</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="25.45586"
+       y="270.67548"
+       id="text5181"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5183"
+         x="25.45586"
+         y="270.67548">Urgent bugfixes are done here</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="25.45586"
+       y="41.56461"
+       id="text5231"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5233"
+         x="25.45586"
+         y="41.56461">Releases are tagged</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path5247"
+       d="m 271.73042,5.8836853 154.14928,0"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text5249"
+       y="294.68268"
+       x="678.7309"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         id="tspan5253"
+         y="294.68268"
+         x="678.7309"
+         sodipodi:role="line">Normal development goes on here only</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="678.7309"
+       y="324.26544"
+       id="text3179"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3181"
+         x="678.7309"
+         y="324.26544">For new features and non-trivial bugfixes</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3183"
+       y="298.95975"
+       x="25.45586"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         y="298.95975"
+         x="25.45586"
+         id="tspan3185"
+         sodipodi:role="line">(No need to create a new branch</tspan><tspan
+         y="318.95975"
+         x="25.45586"
+         sodipodi:role="line"
+         id="tspan3187">if no urgent bugfixes)</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path3189"
+       d="m 189.83556,207.32903 0,-141.421365"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)" />
+    <text
+       sodipodi:linespacing="125%"
+       id="text3191"
+       y="118.6328"
+       x="207.04877"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         id="tspan3195"
+         y="118.6328"
+         x="207.04877"
+         sodipodi:role="line">Bugfixes</tspan></text>
+    <path
+       style="color:#000000;fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow2Lend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 274.35745,59.807513 425.6783,211.12836"
+       id="path3201"
+       inkscape:connector-curvature="0" />
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="215.48257"
+       y="-171.13846"
+       id="text3226"
+       sodipodi:linespacing="125%"
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"><tspan
+         sodipodi:role="line"
+         id="tspan3228"
+         x="215.48257"
+         y="-171.13846">Changes affecting development</tspan></text>
+    <text
+       sodipodi:linespacing="125%"
+       id="text3230"
+       y="404.93527"
+       x="26.639454"
+       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       xml:space="preserve"><tspan
+         y="404.93527"
+         x="26.639454"
+         id="tspan3232"
+         sodipodi:role="line">Notes</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans"
+       x="87.681259"
+       y="405.27512"
+       id="text3234"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3236"
+         x="87.681259"
+         y="405.27512">When a new feature is implemented, its branch is first merged to Next. When the feature is regarded as stable,</tspan><tspan
+         sodipodi:role="line"
+         x="87.681259"
+         y="425.27512"
+         id="tspan3238">the feature branch is merged directly into Master.</tspan></text>
+  </g>
+</svg>
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,3 +1,8 @@
-#FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.svg*")
-kde4_install_icons( ${DATA_INSTALL_DIR}/kdenlive/icons)
-#install( FILES ${files} DESTINATION ${ICON_INSTALL_DIR} )
+install(FILES
+    visible.png  	
+    novisible.png
+    DESTINATION ${DATA_INSTALL_DIR}/kdenlive/pics)
+    
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
+
+
--- a/icons/hi16-action-kdenlive-deleffect.png
+++ b/icons/hi16-action-kdenlive-deleffect.png
--- a/icons/hi16-action-kdenlive-down.png
+++ b/icons/hi16-action-kdenlive-down.png
--- a/icons/hi16-action-kdenlive-menu.png
+++ b/icons/hi16-action-kdenlive-menu.png
--- a/icons/hi16-action-kdenlive-up.png
+++ b/icons/hi16-action-kdenlive-up.png
--- a/icons/novisible.png
+++ b/icons/novisible.png
--- a/icons/ox16-action-kdenlive-deleffect.png
+++ b/icons/ox16-action-kdenlive-deleffect.png
--- a/icons/ox16-action-kdenlive-down.png
+++ b/icons/ox16-action-kdenlive-down.png
--- a/icons/ox16-action-kdenlive-menu.png
+++ b/icons/ox16-action-kdenlive-menu.png
--- a/icons/ox16-action-kdenlive-up.png
+++ b/icons/ox16-action-kdenlive-up.png
--- a/icons/visible.png
+++ b/icons/visible.png
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -1,57 +0,0 @@
-Name:           kdenlive
-Version:        0.7
-Release:        1%{?dist}
-Summary:        Non-linear video editor
-
-Group:          Applications/Multimedia
-License:        GPL
-URL:            http://kdenlive.org/
-Source0:        kdenlive-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  mlt, mlt++, soprano-devel
-Requires:       kdebase
-
-%description
-Kdenlive is a non-linear video editor for GNU/Linux and FreeBSD, which
-supports DV, AVCHD (experimental support) and HDV editing. Kdenlive relies
-on several other open source projects, such as FFmpeg and the MLT video
-framework. It was designed to answer all needs, from basic video editing to
-semi-professional work.
-
-%prep
-%setup -q
-
-
-%build
-cmake -DCMAKE_INSTALL_PREFIX=/usr CMakeLists.txt
-make %{?_smp_mflags}
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root,-)
-%doc
-
-%{_bindir}/kdenlive
-   /usr/bin/kdenlive_render
-   /usr/lib/kde4/westleypreview.so
-   /usr/share/applications/kde/kdenlive.desktop
-   /usr/share/config.kcfg/kdenlivesettings.kcfg
-   /usr/share/icons/oxygen/scalable/mimetypes/application-x-kdenlive.svgz
-   /usr/share/icons/oxygen/scalable/mimetypes/video-mlt-playlist.svgz
-   /usr/share/kde4/apps/kdenlive/*
-   /usr/share/kde4/services/westleypreview.desktop
-   /usr/share/locale/*/LC_MESSAGES/kdenlive.mo
-   /usr/share/mime/packages/kdenlive.xml
-   /usr/share/mime/packages/westley.xml
-
-%changelog
--- a/lumas/burst.pgm
+++ b/lumas/burst.pgm
--- a/lumas/checkerboard_small.pgm
+++ b/lumas/checkerboard_small.pgm
--- a/lumas/horizontal_blinds.pgm
+++ b/lumas/horizontal_blinds.pgm
--- a/lumas/symmetric_clock.pgm
+++ b/lumas/symmetric_clock.pgm
--- a/kdenlive-mindmap.svg
+++ b/kdenlive-mindmap.svg
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,7 +1,3 @@
+include_directories(${CMAKE_SOURCE_DIR}/src)

-    INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src
-                        ${KDE4_INCLUDES}
-                        ${QT4_INCLUDES}
-                       )
-
-    ADD_SUBDIRECTORY(sampleplugin)
+add_subdirectory(sampleplugin)
--- a/plugins/sampleplugin/CMakeLists.txt
+++ b/plugins/sampleplugin/CMakeLists.txt
@@ -1,27 +1,28 @@
+set(sampleplugin_SRCS sampleplugin.cpp)

-include_directories (
-    ${CMAKE_SOURCE_DIR} 
-    ${CMAKE_BINARY_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${KDE4_INCLUDES}
+kde4_add_ui_files(sampleplugin_UIS countdown_ui.ui)
+
+kde4_add_plugin(kdenlive_sampleplugin WITH_PREFIX
+  ${sampleplugin_SRCS}
+  ${sampleplugin_UIS}
 )

-add_definitions( ${KDE4_DEFINITIONS} )
+add_definitions(${KDE4_DEFINITIONS})

-#add_definitions (${QT_DEFINITIONS})
-ADD_DEFINITIONS(-DQT_PLUGIN)
-#ADD_DEFINITIONS(-DQT_NO_DEBUG)
-ADD_DEFINITIONS(-DQT_SHARED)
+include_directories(${KDE4_INCLUDES})

-kde4_add_ui_files(plugin_UI countdown_ui.ui)
+include(${QT_USE_FILE})

-SET(sampleplugindir_SRCS
-        sampleplugin.cpp)
+#add_definitions(${QT_DEFINITIONS})
+#add_definitions(-DQT_NO_DEBUG)
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_SHARED)

-KDE4_ADD_PLUGIN(kdenlive_sampleplugin WITH_PREFIX ${sampleplugindir_SRCS} ${plugin_UI})
-#ADD_LIBRARY(kdenlive_sampleplugin SHARED ${sampleplugindir_SRCS})
-
-TARGET_LINK_LIBRARIES(kdenlive_sampleplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
-
-INSTALL(TARGETS kdenlive_sampleplugin DESTINATION ${PLUGIN_INSTALL_DIR})
+target_link_libraries(kdenlive_sampleplugin
+  ${KDE4_KDECORE_LIBS}
+  ${KDE4_KDEUI_LIBS}
+  ${KDE4_KIO_LIBS}
+  ${QT_LIBRARIES}
+)

+install(TARGETS kdenlive_sampleplugin DESTINATION ${PLUGIN_INSTALL_DIR})
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/da SUBDIR kdenlive)`